Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[mpiulachs] 30802: - reverted 30799 as I found there was a reason. we have a dll with the same name odbccp32
by mpiulachs＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: mpiulachs Date: Tue Nov 27 03:46:16 2007 New Revision: 30802 URL: http://svn.reactos.org/svn/reactos?rev=30802&view=rev Log: - reverted 30799 as I found there was a reason. we have a dll with the same name odbccp32 Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Tue Nov 27 03:46:16 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="odbccp32" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> +<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> <importlibrary definition="odbccp32.def" /> <include base="odbccp32">.</include> <define name="_WIN32_IE">0x600</define>

1 0

[weiden] 30801: cmd_alloc_dbg is NOT available in release builds!!!
by weiden＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: weiden Date: Tue Nov 27 03:41:44 2007 New Revision: 30801 URL: http://svn.reactos.org/svn/reactos?rev=30801&view=rev Log: cmd_alloc_dbg is NOT available in release builds!!! Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Tue Nov 27 03:41:44 2007 @@ -1123,8 +1123,11 @@ *retlen = needed; if ( *ret ) cmd_free ( *ret ); -// *ret = (LPTSTR)cmd_alloc ( *retlen * sizeof(TCHAR) ); +#ifdef _DEBUG_MEM *ret = (LPTSTR)cmd_alloc_dbg ( *retlen * sizeof(TCHAR), file, line ); +#else + *ret = (LPTSTR)cmd_alloc ( *retlen * sizeof(TCHAR) ); +#endif if ( !*ret ) SetLastError ( ERROR_OUTOFMEMORY ); return *ret != NULL;

1 0

[tkreuzer] 30800: - implement GrowIfNecessary_dbg() using file and line from the caller to cmd_alloc_dbg memory. - fix memory allocation size, respecting the terminating 0 See issue #2845 for more details.
by tkreuzer＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: tkreuzer Date: Tue Nov 27 03:28:40 2007 New Revision: 30800 URL: http://svn.reactos.org/svn/reactos?rev=30800&view=rev Log: - implement GrowIfNecessary_dbg() using file and line from the caller to cmd_alloc_dbg memory. - fix memory allocation size, respecting the terminating 0 See issue #2845 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Tue Nov 27 03:28:40 2007 @@ -1116,18 +1116,20 @@ } BOOL -GrowIfNecessary ( UINT needed, LPTSTR* ret, UINT* retlen ) +GrowIfNecessary_dbg ( UINT needed, LPTSTR* ret, UINT* retlen, const char *file, int line ) { if ( *ret && needed < *retlen ) return TRUE; *retlen = needed; if ( *ret ) cmd_free ( *ret ); - *ret = (LPTSTR)cmd_alloc ( *retlen * sizeof(TCHAR) ); +// *ret = (LPTSTR)cmd_alloc ( *retlen * sizeof(TCHAR) ); + *ret = (LPTSTR)cmd_alloc_dbg ( *retlen * sizeof(TCHAR), file, line ); if ( !*ret ) SetLastError ( ERROR_OUTOFMEMORY ); return *ret != NULL; } +#define GrowIfNecessary(x, y, z) GrowIfNecessary_dbg(x, y, z, __FILE__, __LINE__) LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ) @@ -1222,7 +1224,7 @@ return ret; } - GrowIfNecessary(_tcslen(varName) + 2, &ret, &retlen); + GrowIfNecessary(_tcslen(varName) + 3, &ret, &retlen); _stprintf(ret,_T("%%%s%%"),varName); return ret; /* not found - return orginal string */ }

1 0

[mpiulachs] 30799: - Fix what seems to be a typo in the module name. Undo it if the name was intentional caution: manually deleting makefile.auto maybe required!
by mpiulachs＠svn.reactos.org 26 Nov '07

26 Nov '07

Author: mpiulachs Date: Tue Nov 27 02:33:44 2007 New Revision: 30799 URL: http://svn.reactos.org/svn/reactos?rev=30799&view=rev Log: - Fix what seems to be a typo in the module name. Undo it if the name was intentional caution: manually deleting makefile.auto maybe required! Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Tue Nov 27 02:33:44 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> +<module name="odbccp32" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> <importlibrary definition="odbccp32.def" /> <include base="odbccp32">.</include> <define name="_WIN32_IE">0x600</define>

1 0

[janderwald] 30798: - pass the directory of the target application in - should fix bug 2849 See issue #2849 for more details.
by janderwald＠svn.reactos.org 26 Nov '07

26 Nov '07

Author: janderwald Date: Tue Nov 27 01:18:50 2007 New Revision: 30798 URL: http://svn.reactos.org/svn/reactos?rev=30798&view=rev Log: - pass the directory of the target application in - should fix bug 2849 See issue #2849 for more details. Modified: trunk/reactos/dll/win32/shell32/dialogs.c Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c Tue Nov 27 01:18:50 2007 @@ -119,7 +119,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { int ic ; - char *psz, szMsg[256] ; + char *psz, *pdir, szMsg[256]; static RUNFILEDLGPARAMS *prfdp = NULL ; switch (message) @@ -144,8 +144,16 @@ { psz = HeapAlloc( GetProcessHeap(), 0, (ic + 2) ); GetWindowTextA (htxt, psz, ic + 1) ; - - if (ShellExecuteA(NULL, "open", psz, NULL, NULL, SW_SHOWNORMAL) < (HINSTANCE)33) + pdir = HeapAlloc( GetProcessHeap(), 0, (ic + 2) ); + if (pdir) + { + char * ptr; + strcpy(pdir, psz); + ptr = strrchr(pdir, '\\'); + if(ptr) + ptr[0] = '\0'; + } + if (ShellExecuteA(NULL, "open", psz, NULL, pdir, SW_SHOWNORMAL) < (HINSTANCE)33) { char *pszSysMsg = NULL ; FormatMessageA ( @@ -161,11 +169,13 @@ MessageBoxA (hwnd, szMsg, "Nix", MB_OK | MB_ICONEXCLAMATION) ; HeapFree(GetProcessHeap(), 0, psz); + HeapFree(GetProcessHeap(), 0, pdir); SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; return TRUE ; } FillList (htxt, psz) ; HeapFree(GetProcessHeap(), 0, psz); + HeapFree(GetProcessHeap(), 0, pdir); EndDialog (hwnd, 0) ; } }

1 0

[dreimer] 30797: Fix crap I made
by dreimer＠svn.reactos.org 26 Nov '07

26 Nov '07

Author: dreimer Date: Tue Nov 27 01:11:54 2007 New Revision: 30797 URL: http://svn.reactos.org/svn/reactos?rev=30797&view=rev Log: Fix crap I made Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/uk-U…

1 0

[dreimer] 30796: Bug 2844: Ukrainian translation update (temarezATyandexDTru) Bug 2852: New Greek resource files (djapalATgmailDTcom) Part 2
by dreimer＠svn.reactos.org 26 Nov '07

26 Nov '07

Author: dreimer Date: Tue Nov 27 00:55:36 2007 New Revision: 30796 URL: http://svn.reactos.org/svn/reactos?rev=30796&view=rev Log: Bug 2844: Ukrainian translation update (temarezATyandexDTru) Bug 2852: New Greek resource files (djapalATgmailDTcom) Part 2 Added: trunk/reactos/dll/cpl/access/lang/el-GR.rc (with props) trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc (with props) trunk/reactos/dll/win32/shell32/lang/el-GR.rc (with props) Modified: trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/cpl/access/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/el-GR.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… Added: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/uk-U… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… Added: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el…

1 0

[dreimer] 30795: Bug 2844: Ukrainian translation update (temarezATyandexDTru) Bug 2852: New Greek resource files (djapalATgmailDTcom) Part 1 (Who deleted scrnsave when I wanted to commit???!)
by dreimer＠svn.reactos.org 26 Nov '07

26 Nov '07

Author: dreimer Date: Tue Nov 27 00:51:56 2007 New Revision: 30795 URL: http://svn.reactos.org/svn/reactos?rev=30795&view=rev Log: Bug 2844: Ukrainian translation update (temarezATyandexDTru) Bug 2852: New Greek resource files (djapalATgmailDTcom) Part 1 (Who deleted scrnsave when I wanted to commit???!) Modified: trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc trunk/rosapps/packmgr/gui/packmgr.rc Modified: trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc Tue Nov 27 00:51:56 2007 @@ -10,7 +10,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Blank" + IDS_DESCRIPTION "Ïîðîæíüî" IDS_TITLE "Ïðî" IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." END Modified: trunk/rosapps/packmgr/gui/packmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/packmgr.rc?rev… ============================================================================== --- trunk/rosapps/packmgr/gui/packmgr.rc (original) +++ trunk/rosapps/packmgr/gui/packmgr.rc Tue Nov 27 00:51:56 2007 @@ -19,5 +19,6 @@ #include "es.rc" #include "fr.rc" #include "ru.rc" +#include "uk.rc" /* EOF */

1 0

[mpiulachs] 30794: - updated blankscr.scr file location
by mpiulachs＠svn.reactos.org 26 Nov '07

26 Nov '07

Author: mpiulachs Date: Tue Nov 27 00:48:35 2007 New Revision: 30794 URL: http://svn.reactos.org/svn/reactos?rev=30794&view=rev Log: - updated blankscr.scr file location Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Nov 27 00:48:35 2007 @@ -463,7 +463,7 @@ modules\rosapps\avtest\avtest.sys 1 optional modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional -modules\rosapps\applications\screensavers\scrnsave\blankscr.scr 1 optional +modules\rosapps\applications\screensavers\blankscr\blankscr.scr 1 optional modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional modules\rosapps\cmdutils\comp\comp.exe 1 optional

1 0

[mpiulachs] 30793: final step , rename the scrnsave.scr to blankscr.scr to avoid conflicts with scrnsave.lib caution: manually deleting makefile.auto may be required! note: It works fine in windows it highlights a but in reactos
by mpiulachs＠svn.reactos.org 26 Nov '07

26 Nov '07

Author: mpiulachs Date: Tue Nov 27 00:47:35 2007 New Revision: 30793 URL: http://svn.reactos.org/svn/reactos?rev=30793&view=rev Log: final step , rename the scrnsave.scr to blankscr.scr to avoid conflicts with scrnsave.lib caution: manually deleting makefile.auto may be required! note: It works fine in windows it highlights a but in reactos Added: trunk/rosapps/applications/screensavers/blankscr/ - copied from r30653, trunk/rosapps/applications/screensavers/scrnsave/ trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild - copied, changed from r30753, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild trunk/rosapps/applications/screensavers/blankscr/lang/ - copied from r30792, trunk/rosapps/applications/screensavers/scrnsave/lang/ trunk/rosapps/applications/screensavers/blankscr/scrnsave.c - copied, changed from r30792, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c trunk/rosapps/applications/screensavers/blankscr/scrnsave.def - copied unchanged from r30792, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.def Removed: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild trunk/rosapps/applications/screensavers/scrnsave/ Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild Copied: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild (from r30753, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild (original) +++ trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild Tue Nov 27 00:47:35 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr"> +<module name="blankscr" type="win32scr" installbase="system32" installname="blankscr.scr"> <importlibrary definition="scrnsave.def" /> <library>scrnsave</library> <library>kernel32</library> @@ -9,7 +9,7 @@ <library>opengl32</library> <library>glu32</library> <library>advapi32</library> - <library>shell32</library> + <library>shell32</library> <file>scrnsave.c</file> <file>scrnsave.rc</file> Copied: trunk/rosapps/applications/screensavers/blankscr/scrnsave.c (from r30792, trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c) URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/scrnsave/scrnsave.c (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.c Tue Nov 27 00:47:35 2007 @@ -17,39 +17,39 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <windows.h> -#include <scrnsave.h> +#include <windows.h> +#include <scrnsave.h> #include "resource.h" -LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT WINAPI ScreenSaverProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static HDC hdc; + static HDC hdc; static RECT rc; - switch(message) - { - case WM_CREATE: - break; - case WM_DESTROY: - PostQuitMessage(0); - break; - case WM_ERASEBKGND: - hdc = GetDC(hwnd); - GetClientRect (hwnd, &rc); - FillRect (hdc, &rc, GetStockObject(BLACK_BRUSH)); - ReleaseDC(hwnd,hdc); - break; - case WM_PAINT: - break; - default: - return DefScreenSaverProc(hwnd, message, wParam, lParam); - } - return 0; + switch(message) + { + case WM_CREATE: + break; + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_ERASEBKGND: + hdc = GetDC(hwnd); + GetClientRect (hwnd, &rc); + FillRect (hdc, &rc, GetStockObject(BLACK_BRUSH)); + ReleaseDC(hwnd,hdc); + break; + case WM_PAINT: + break; + default: + return DefScreenSaverProc(hwnd, message, wParam, lParam); + } + return 0; } -BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - return FALSE; +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + return FALSE; } BOOL WINAPI RegisterDialogClasses(HANDLE hInst) Removed: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rbuild (removed) @@ -1,13 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="true"> - <library>kernel32</library> - <library>user32</library> - <library>gdi32</library> - <library>opengl32</library> - <library>glu32</library> - <library>winmm</library> - - <file>scrnsave.c</file> - <file>scrnsave.rc</file> -</module> Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild (original) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild Tue Nov 27 00:47:35 2007 @@ -7,8 +7,8 @@ <directory name="matrix"> <xi:include href="matrix/matrix.rbuild" /> </directory> - <directory name="scrnsave"> - <xi:include href="scrnsave/scrnsave.rbuild" /> + <directory name="blankscr"> + <xi:include href="blankscr/blankscr.rbuild" /> </directory> <directory name="starfield"> <xi:include href="starfield/starfield.rbuild" />

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007