Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Jan 12 06:29:53 2009 New Revision: 38720 URL: http://svn.reactos.org/svn/reactos?rev=38720&view=rev Log: - Revert 38719. Modified: trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/roshack.diff Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… ============================================================================== --- trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] Mon Jan 12 06:29:53 2009 @@ -120,8 +120,7 @@ ok(written == sizeof(obuf2), "write file len 2\n"); ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - //ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); - skip("skipping PeekNamePipe with buffer value of 1.\n"); + ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); @@ -672,9 +671,9 @@ DWORD alarmThreadId; trace("test_NamedPipe_2 starting\n"); - /* Set up a twenty second timeout */ + /* Set up a ten second timeout */ alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); - alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); + alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId); /* The servers we're about to exercize do try to clean up carefully, * but to reduce the change of a test failure due to a pipe handle @@ -1328,6 +1327,9 @@ { HMODULE hmod; + skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); + return; + hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… ============================================================================== --- trunk/rostests/winetests/kernel32/process.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/process.c [iso-8859-1] Mon Jan 12 06:29:53 2009 @@ -1203,6 +1203,9 @@ unsigned msg_len; BOOL run_tests = TRUE; + skip("ROS-HACK: Skipping process console tests\n"); + return; + memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; Modified: trunk/rostests/winetests/kernel32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/roshac… ============================================================================== --- trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] Mon Jan 12 06:29:53 2009 @@ -1,50 +1,28 @@ Index: pipe.c =================================================================== ---- pipe.c (revision 38718) +--- pipe.c (revision 38314) +++ pipe.c (working copy) -@@ -120,7 +120,8 @@ - ok(written == sizeof(obuf2), "write file len 2\n"); - ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); -- ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); -+ //ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); -+ skip("skipping PeekNamePipe with buffer value of 1.\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); - ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); -@@ -671,9 +672,9 @@ - DWORD alarmThreadId; - - trace("test_NamedPipe_2 starting\n"); -- /* Set up a ten second timeout */ -+ /* Set up a twenty second timeout */ - alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); -- alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId); -+ alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); - - /* The servers we're about to exercize do try to clean up carefully, - * but to reduce the change of a test failure due to a pipe handle -@@ -1327,9 +1328,6 @@ +@@ -1327,6 +1327,9 @@ { HMODULE hmod; -- skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); -- return; -- ++ skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); ++ return; ++ hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); Index: process.c =================================================================== ---- process.c (revision 38718) +--- process.c (revision 38314) +++ process.c (working copy) -@@ -1203,9 +1203,6 @@ +@@ -1202,6 +1202,9 @@ + const char* msg = "This is a std-handle inheritance test."; unsigned msg_len; BOOL run_tests = TRUE; - -- skip("ROS-HACK: Skipping process console tests\n"); -- return; -- ++ ++ skip("ROS-HACK: Skipping process console tests\n"); ++ return; + memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES;

15 years, 8 months

[mjmartin] 38719: - Re-enable pipe tests as the npfs driver is in much better shape. - Change the timeout value passed to WaitForSingleObject to 20 so tests pass on slower systems. - Re-enable process console test as they now complete.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Jan 12 06:13:54 2009 New Revision: 38719 URL: http://svn.reactos.org/svn/reactos?rev=38719&view=rev Log: - Re-enable pipe tests as the npfs driver is in much better shape. - Change the timeout value passed to WaitForSingleObject to 20 so tests pass on slower systems. - Re-enable process console test as they now complete. Modified: trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/roshack.diff Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… ============================================================================== --- trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] Mon Jan 12 06:13:54 2009 @@ -120,7 +120,8 @@ ok(written == sizeof(obuf2), "write file len 2\n"); ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); + //ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); + skip("skipping PeekNamePipe with buffer value of 1.\n"); ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); @@ -671,9 +672,9 @@ DWORD alarmThreadId; trace("test_NamedPipe_2 starting\n"); - /* Set up a ten second timeout */ + /* Set up a twenty second timeout */ alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); - alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId); + alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); /* The servers we're about to exercize do try to clean up carefully, * but to reduce the change of a test failure due to a pipe handle @@ -1327,9 +1328,6 @@ { HMODULE hmod; - skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); - return; - hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… ============================================================================== --- trunk/rostests/winetests/kernel32/process.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/process.c [iso-8859-1] Mon Jan 12 06:13:54 2009 @@ -1203,9 +1203,6 @@ unsigned msg_len; BOOL run_tests = TRUE; - skip("ROS-HACK: Skipping process console tests\n"); - return; - memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES; Modified: trunk/rostests/winetests/kernel32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/roshac… ============================================================================== --- trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] Mon Jan 12 06:13:54 2009 @@ -1,28 +1,50 @@ Index: pipe.c =================================================================== ---- pipe.c (revision 38314) +--- pipe.c (revision 38718) +++ pipe.c (working copy) -@@ -1327,6 +1327,9 @@ +@@ -120,7 +120,8 @@ + ok(written == sizeof(obuf2), "write file len 2\n"); + ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); + ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); +- ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); ++ //ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); ++ skip("skipping PeekNamePipe with buffer value of 1.\n"); + ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); + ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); + ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); +@@ -671,9 +672,9 @@ + DWORD alarmThreadId; + + trace("test_NamedPipe_2 starting\n"); +- /* Set up a ten second timeout */ ++ /* Set up a twenty second timeout */ + alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); +- alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId); ++ alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); + + /* The servers we're about to exercize do try to clean up carefully, + * but to reduce the change of a test failure due to a pipe handle +@@ -1327,9 +1328,6 @@ { HMODULE hmod; -+ skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); -+ return; -+ +- skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); +- return; +- hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); Index: process.c =================================================================== ---- process.c (revision 38314) +--- process.c (revision 38718) +++ process.c (working copy) -@@ -1202,6 +1202,9 @@ - const char* msg = "This is a std-handle inheritance test."; +@@ -1203,9 +1203,6 @@ unsigned msg_len; BOOL run_tests = TRUE; -+ -+ skip("ROS-HACK: Skipping process console tests\n"); -+ return; - + +- skip("ROS-HACK: Skipping process console tests\n"); +- return; +- memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES;

15 years, 8 months

[tkreuzer] 38718: update README.WINE

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 21:20:27 2009 New Revision: 38718 URL: http://svn.reactos.org/svn/reactos?rev=38718&view=rev Log: update README.WINE Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 11 21:20:27 2009 @@ -162,8 +162,8 @@ reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 User32 - - reactos/dll/win32/user32/controls/button.c # Synced at 20071022 - reactos/dll/win32/user32/controls/combo.c # Synced at 20071022 + reactos/dll/win32/user32/controls/button.c # Synced at Wine-1_1_12 + reactos/dll/win32/user32/controls/combo.c # Synced at Wine-1_1_12 reactos/dll/win32/user32/controls/edit.c # Synced at 20071022 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20071023 @@ -176,7 +176,7 @@ reactos/dll/win32/user32/misc/exticon.c # Last sync date unknown reactos/dll/win32/user32/misc/resources.c # Forked? reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown - reactos/dll/win32/user32/misc/wsprintf.c # Synced at 20060623 + reactos/dll/win32/user32/misc/wsprintf.c # Synced at Wine-1_1_12 reactos/dll/win32/user32/windows/defwnd.c # Forked reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c)

15 years, 8 months

[tkreuzer] 38717: Sync wsprintf.c to wine head (Wine-1_1_12) Alexandre Julliard <julliard@winehq.org> user32: Convert wvsprintfA/W to use an MS ABI vararg list for x86_64.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 20:46:45 2009 New Revision: 38717 URL: http://svn.reactos.org/svn/reactos?rev=38717&view=rev Log: Sync wsprintf.c to wine head (Wine-1_1_12) Alexandre Julliard <julliard(a)winehq.org> user32: Convert wvsprintfA/W to use an MS ABI vararg list for x86_64. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/wsprintf.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sun Jan 11 20:46:45 2009 @@ -231,5 +231,17 @@ #define SYSCOLOR_GetPen(index) GetSysColorPen(index) #define WIN_GetFullHandle(h) ((HWND)(h)) +#ifndef __ms_va_list +# if defined(__x86_64__) && defined (__GNUC__) +# define __ms_va_list __builtin_ms_va_list +# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __ms_va_end(list) __builtin_ms_va_end(list) +# else +# define __ms_va_list va_list +# define __ms_va_start(list,arg) va_start(list,arg) +# define __ms_va_end(list) va_end(list) +# endif +#endif + #endif /* EOF */ Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Sun Jan 11 20:46:45 2009 @@ -541,3 +541,76 @@ return ValidateHwnd(hwnd); } + +/* + * @implemented + */ +DWORD WINAPI WCSToMBEx(WORD CodePage,LPWSTR UnicodeString,LONG UnicodeSize,LPSTR *MBString,LONG MBSize,BOOL Allocate) +{ + DWORD Size; + if (UnicodeSize == -1) + { + UnicodeSize = wcslen(UnicodeString)+1; + } + if (MBSize == -1) + { + if (!Allocate) + { + return 0; + } + MBSize = UnicodeSize * 2; + } + if (Allocate) + { + LPSTR SafeString = RtlAllocateHeap(GetProcessHeap(), 0, MBSize); + if (SafeString == NULL) + return 0; + *MBString = SafeString; + } + if (CodePage == 0) + { + RtlUnicodeToMultiByteN(*MBString,MBSize,&Size,UnicodeString,UnicodeSize); + } + else + { + WideCharToMultiByte(CodePage,0,UnicodeString,UnicodeSize,*MBString,MBSize,0,0); + } + return UnicodeSize; +} + +/* + * @implemented + */ +DWORD WINAPI MBToWCSEx(WORD CodePage,LPSTR MBString,LONG MBSize,LPWSTR *UnicodeString,LONG UnicodeSize,BOOL Allocate) +{ + DWORD Size; + if (MBSize == -1) + { + MBSize = strlen(MBString)+1; + } + if (UnicodeSize == -1) + { + if (!Allocate) + { + return 0; + } + UnicodeSize = MBSize; + } + if (Allocate) + { + LPWSTR SafeString = RtlAllocateHeap(GetProcessHeap(), 0, UnicodeSize); + if (SafeString == NULL) + return 0; + *UnicodeString = SafeString; + } + UnicodeSize *= sizeof(WCHAR); + if (CodePage == 0) + { + RtlMultiByteToUnicodeN(*UnicodeString,UnicodeSize,&Size,MBString,MBSize); + } + else + { + Size = MultiByteToWideChar(CodePage,0,MBString,MBSize,*UnicodeString,UnicodeSize); + } + return Size; +} Modified: trunk/reactos/dll/win32/user32/misc/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wspr… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/wsprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/wsprintf.c [iso-8859-1] Sun Jan 11 20:46:45 2009 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * NOTE: * This code is duplicated in shlwapi. If you change something here make sure @@ -33,6 +33,7 @@ #include <user32.h> +#define WINE_NO_TRACE_MSGS #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(string); @@ -282,7 +283,7 @@ /*********************************************************************** * wvsnprintfA (internal) */ -static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) +static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -290,7 +291,7 @@ CHAR number[20]; WPRINTF_DATA argData; - //TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec)); + TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec)); while (*spec && (maxlen > 1)) { @@ -377,7 +378,7 @@ maxlen -= len; } *p = 0; - //TRACE("%s\n",debugstr_a(buffer)); + TRACE("%s\n",debugstr_a(buffer)); return (maxlen > 1) ? (INT)(p - buffer) : -1; } @@ -385,7 +386,7 @@ /*********************************************************************** * wvsnprintfW (internal) */ -static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) +static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; @@ -393,7 +394,7 @@ CHAR number[20]; WPRINTF_DATA argData; - //TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec)); + TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec)); while (*spec && (maxlen > 1)) { @@ -479,15 +480,14 @@ maxlen -= len; } *p = 0; - //TRACE("%s\n",debugstr_w(buffer)); + TRACE("%s\n",debugstr_w(buffer)); return (maxlen > 1) ? (INT)(p - buffer) : -1; } /*********************************************************************** * wvsprintfA (USER32.@) - * @implemented - */ -INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) + */ +INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, __ms_va_list args ) { INT res = wvsnprintfA( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -496,9 +496,8 @@ /*********************************************************************** * wvsprintfW (USER32.@) - * @implemented - */ -INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args ) + */ +INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, __ms_va_list args ) { INT res = wvsnprintfW( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -506,101 +505,28 @@ /*********************************************************************** * wsprintfA (USER32.@) - * @implemented */ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) { - va_list valist; + __ms_va_list valist; INT res; - va_start( valist, spec ); + __ms_va_start( valist, spec ); res = wvsnprintfA( buffer, 1024, spec, valist ); - va_end( valist ); + __ms_va_end( valist ); return ( res == -1 ) ? 1024 : res; } /*********************************************************************** * wsprintfW (USER32.@) - * @implemented */ INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) { - va_list valist; + __ms_va_list valist; INT res; - va_start( valist, spec ); + __ms_va_start( valist, spec ); res = wvsnprintfW( buffer, 1024, spec, valist ); - va_end( valist ); + __ms_va_end( valist ); return ( res == -1 ) ? 1024 : res; } -/* - * @implemented - */ -DWORD WINAPI WCSToMBEx(WORD CodePage,LPWSTR UnicodeString,LONG UnicodeSize,LPSTR *MBString,LONG MBSize,BOOL Allocate) -{ - DWORD Size; - if (UnicodeSize == -1) - { - UnicodeSize = wcslen(UnicodeString)+1; - } - if (MBSize == -1) - { - if (!Allocate) - { - return 0; - } - MBSize = UnicodeSize * 2; - } - if (Allocate) - { - LPSTR SafeString = RtlAllocateHeap(GetProcessHeap(), 0, MBSize); - if (SafeString == NULL) - return 0; - *MBString = SafeString; - } - if (CodePage == 0) - { - RtlUnicodeToMultiByteN(*MBString,MBSize,&Size,UnicodeString,UnicodeSize); - } - else - { - WideCharToMultiByte(CodePage,0,UnicodeString,UnicodeSize,*MBString,MBSize,0,0); - } - return UnicodeSize; -} -/* - * @implemented - */ -DWORD WINAPI MBToWCSEx(WORD CodePage,LPSTR MBString,LONG MBSize,LPWSTR *UnicodeString,LONG UnicodeSize,BOOL Allocate) -{ - DWORD Size; - if (MBSize == -1) - { - MBSize = strlen(MBString)+1; - } - if (UnicodeSize == -1) - { - if (!Allocate) - { - return 0; - } - UnicodeSize = MBSize; - } - if (Allocate) - { - LPWSTR SafeString = RtlAllocateHeap(GetProcessHeap(), 0, UnicodeSize); - if (SafeString == NULL) - return 0; - *UnicodeString = SafeString; - } - UnicodeSize *= sizeof(WCHAR); - if (CodePage == 0) - { - RtlMultiByteToUnicodeN(*UnicodeString,UnicodeSize,&Size,MBString,MBSize); - } - else - { - Size = MultiByteToWideChar(CodePage,0,MBString,MBSize,*UnicodeString,UnicodeSize); - } - return Size; -}

15 years, 8 months

[tkreuzer] 38716: reduce diff to wine

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 20:10:58 2009 New Revision: 38716 URL: http://svn.reactos.org/svn/reactos?rev=38716&view=rev Log: reduce diff to wine Modified: trunk/reactos/dll/win32/user32/windows/mdi.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sun Jan 11 20:10:58 2009 @@ -1188,11 +1188,7 @@ return 0; case WM_MDIDESTROY: -#ifndef __REACTOS__ - return MDIDestroyChild( hwnd, ci, WIN_GetFullHandle( (HWND)wParam ), TRUE ); -#else return MDIDestroyChild( hwnd, ci, (HWND)wParam, TRUE ); -#endif case WM_MDIGETACTIVE: if (lParam) *(BOOL *)lParam = IsZoomed(ci->hwndActiveChild); return (LRESULT)ci->hwndActiveChild; @@ -1210,11 +1206,7 @@ case WM_MDINEXT: /* lParam != 0 means previous window */ { -#ifndef __REACTOS__ - HWND next = MDI_GetWindow( ci, WIN_GetFullHandle( (HWND)wParam ), !lParam, 0 ); -#else HWND next = MDI_GetWindow( ci, (HWND)wParam, !lParam, 0 ); -#endif MDI_SwitchActiveChild( ci, next, TRUE ); break; } @@ -1483,9 +1475,7 @@ MDICLIENTINFO *ci = get_client_info( client ); TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); -#ifndef __REACTOS__ hwnd = WIN_GetFullHandle( hwnd ); -#endif if (!ci) return DefWindowProcA( hwnd, message, wParam, lParam ); switch (message) @@ -1526,9 +1516,7 @@ MDICLIENTINFO *ci = get_client_info( client ); TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); -#ifndef __REACTOS__ hwnd = WIN_GetFullHandle( hwnd ); -#endif if (!ci) return DefWindowProcW( hwnd, message, wParam, lParam ); switch (message)

15 years, 8 months

[tkreuzer] 38715: Sync combo.c to wine head (Wine-1_1_12) Austin English <austinenglish@gmail.com> Spelling fixes. Aric Stewart <aric@codeweavers.com> user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well. Dmitry Timoshkov <dmitry@codeweavers.com> user32: Add a test for combobox navigation with arrow keys, make it pass under Wine. James Hawkins <jhawkins@codeweavers.com> janitorial: Remove links to any microsoft site. Lei Zhang

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 20:09:12 2009 New Revision: 38715 URL: http://svn.reactos.org/svn/reactos?rev=38715&view=rev Log: Sync combo.c to wine head (Wine-1_1_12) Austin English <austinenglish(a)gmail.com> Spelling fixes. Aric Stewart <aric(a)codeweavers.com> user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well. Dmitry Timoshkov <dmitry(a)codeweavers.com> user32: Add a test for combobox navigation with arrow keys, make it pass under Wine. James Hawkins <jhawkins(a)codeweavers.com> janitorial: Remove links to any microsoft site. Lei Zhang <thestig(a)google.com> user32: Use wine_dbgstr_rect() in traces. Andrew Talbot <andrew.talbot(a)talbotville.com> user32: Fix a typo. Modified: trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/include/user32p.h Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sun Jan 11 20:09:12 2009 @@ -80,9 +80,10 @@ /********************************************************************* * combo class descriptor */ +static const WCHAR comboboxW[] = {'C','o','m','b','o','B','o','x',0}; const struct builtin_class_descr COMBO_builtin_class = { - L"ComboBox", /* name */ + comboboxW, /* name */ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ ComboWndProcA, /* procA */ ComboWndProcW, /* procW */ @@ -434,14 +435,11 @@ if (lprEdit->right < lprEdit->left) lprEdit->right = lprEdit->left; - TRACE("\ttext\t= (%ld,%ld-%ld,%ld)\n", - lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom); - - TRACE("\tbutton\t= (%ld,%ld-%ld,%ld)\n", - lprButton->left, lprButton->top, lprButton->right, lprButton->bottom); - - TRACE("\tlbox\t= (%ld,%ld-%ld,%ld)\n", - lprLB->left, lprLB->top, lprLB->right, lprLB->bottom ); + TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); + + TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); + + TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); } /*********************************************************************** @@ -491,7 +489,7 @@ */ if (posChanging->cy != newComboHeight) { - TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%ld, oldtop=%ld\n", + TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n", posChanging->cy, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; @@ -773,7 +771,7 @@ clipRegion=NULL; } - if (!(IsWindowEnabled(lphc->self) & WS_DISABLED)) itemState |= ODS_DISABLED; + if (!IsWindowEnabled(lphc->self)) itemState |= ODS_DISABLED; dis.CtlType = ODT_COMBOBOX; dis.CtlID = ctlid; @@ -888,16 +886,9 @@ } else { - if (lphc->wState & CBF_EDIT) - { + /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, (WPARAM)hDC, (LPARAM)lphc->self ); - } - else - { - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX, - (WPARAM)hDC, (LPARAM)lphc->self ); - } } /* @@ -1051,8 +1042,8 @@ */ static void CBDropDown( LPHEADCOMBO lphc ) { - HMONITOR monitor; - MONITORINFO mon_info; + HMONITOR monitor; + MONITORINFO mon_info; RECT rect,r; int nItems = 0; int nDroppedHeight; @@ -1118,7 +1109,7 @@ { if (nItems < 5) nDroppedHeight = (nItems+1)*nIHeight; - else + else if (nDroppedHeight < 6*nIHeight) nDroppedHeight = 6*nIHeight; } } @@ -1354,7 +1345,15 @@ TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lphc->wState ); - CB_NOTIFY( lphc, CBN_SELCHANGE ); + /* do not roll up if selection is being tracked + * by arrow keys in the dropdown listbox */ + if (!(lphc->wState & CBF_NOROLLUP)) + { + CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE ); + } + else lphc->wState &= ~CBF_NOROLLUP; + + CB_NOTIFY( lphc, CBN_SELCHANGE ); if( HIWORD(wParam) == LBN_SELCHANGE) { @@ -1367,17 +1366,11 @@ SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); } else + { InvalidateRect(lphc->self, &lphc->textRect, TRUE); + UpdateWindow(lphc->self); + } } - - /* do not roll up if selection is being tracked - * by arrowkeys in the dropdown listbox */ - if( ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) ) - { - CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE ); - } - else lphc->wState &= ~CBF_NOROLLUP; - break; case LBN_SETFOCUS: @@ -1842,8 +1835,6 @@ /*********************************************************************** * ComboWndProc_common - * - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl… */ static LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) @@ -1922,7 +1913,7 @@ /* fall through */ case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, message == WM_SIZE ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, message == WM_SIZE ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); @@ -1937,22 +1928,14 @@ return TRUE; case WM_KILLFOCUS: { -#ifdef __REACTOS__ - HWND hwndFocus = (HWND)wParam; -#else HWND hwndFocus = WIN_GetFullHandle( (HWND)wParam ); -#endif if( !hwndFocus || (hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox )) COMBO_KillFocus( lphc ); return TRUE; } case WM_COMMAND: -#ifdef __REACTOS__ - return COMBO_Command( lphc, wParam, (HWND)lParam); -#else return COMBO_Command( lphc, wParam, WIN_GetFullHandle( (HWND)lParam ) ); -#endif case WM_GETTEXT: return unicode ? COMBO_GetTextW( lphc, wParam, (LPWSTR)lParam ) : COMBO_GetTextA( lphc, wParam, (LPSTR)lParam ); @@ -2027,11 +2010,11 @@ CBRollUp( lphc, wParam == VK_RETURN, FALSE ); return TRUE; } - else if ((wParam == VK_F4) && !(lphc->wState & CBF_EUI)) - { - COMBO_FlipListbox( lphc, FALSE, FALSE ); - return TRUE; - } + else if ((wParam == VK_F4) && !(lphc->wState & CBF_EUI)) + { + COMBO_FlipListbox( lphc, FALSE, FALSE ); + return TRUE; + } if( lphc->wState & CBF_EDIT ) hwndTarget = lphc->hWndEdit; @@ -2209,9 +2192,13 @@ lParam = (LPARAM)MapSL(lParam); if( lParam ) { - RECT r; - CBGetDroppedControlRect( lphc, &r ); - CONV_RECT32TO16( &r, (LPRECT16)lParam ); + RECT r; + RECT16 *r16 = (RECT16 *)lParam; + CBGetDroppedControlRect( lphc, &r ); + r16->left = r.left; + r16->top = r.top; + r16->right = r.right; + r16->bottom = r.bottom; } return CB_OKAY; #endif @@ -2340,10 +2327,9 @@ return (lphc->wState & CBF_EUI) ? TRUE : FALSE; case CB_GETCOMBOBOXINFO: return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); - case CB_LIMITTEXT: - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); - break; + case CB_LIMITTEXT: + if( lphc->wState & CBF_EDIT ) + return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); case WM_UPDATEUISTATE: if (unicode) Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sun Jan 11 20:09:12 2009 @@ -229,6 +229,7 @@ PVOID FASTCALL ValidateHandle(HANDLE, UINT); #define SYSCOLOR_GetPen(index) GetSysColorPen(index) +#define WIN_GetFullHandle(h) ((HWND)(h)) #endif /* EOF */

15 years, 8 months

[tkreuzer] 38714: Sync button.c to wine head (1_1_12) Francois Gouget <fgouget@codeweavers.com> user32: Remove WINAPI/CALLBACK on static functions where not needed. Michael Stefaniuc <mstefani@redhat.de> user32: HGDIOBJ is interchangeable with other handle types; no casts are needed. Austin English <austinenglish@gmail.com> Spelling fixes. Alexandre Julliard <julliard@winehq.org> user32: Added support for WS_EX_RIGHT in the button control. Andrew Talbot <andrew.talbot@talbotville.com> user32: Re

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 18:46:34 2009 New Revision: 38714 URL: http://svn.reactos.org/svn/reactos?rev=38714&view=rev Log: Sync button.c to wine head (1_1_12) Francois Gouget <fgouget(a)codeweavers.com> user32: Remove WINAPI/CALLBACK on static functions where not needed. Michael Stefaniuc <mstefani(a)redhat.de> user32: HGDIOBJ is interchangeable with other handle types; no casts are needed. Austin English <austinenglish(a)gmail.com> Spelling fixes. Alexandre Julliard <julliard(a)winehq.org> user32: Added support for WS_EX_RIGHT in the button control. Andrew Talbot <andrew.talbot(a)talbotville.com> user32: Remove unneeded casts. Dmitry Timoshkov <dmitry(a)codeweavers.com> user32: Make sure to setup clipping before any painting is done. Dmitry Timoshkov <dmitry(a)codeweavers.com> user32: Always clip the button painting to the client rectangle. Andrew Talbot <andrew.talbot(a)talbotville.com> user32: Constify some variables. Alexandre Julliard <julliard(a)winehq.org> user32: Store the builtin class names in Unicode. Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. Andrew Talbot <Andrew.Talbot(a)talbotville.com> user32: Replace inline static with static inline. Clinton Stimpson <cjstimpson(a)utwire.net> user32: WM_SETFONT on button doesn't repaint directly. Modified: trunk/reactos/dll/win32/user32/controls/button.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sun Jan 11 18:46:34 2009 @@ -22,11 +22,11 @@ * * This code was audited for completeness against the documented features * of Comctl32.dll version 6.0 on Oct. 3, 2004, by Dimitrie O. Paun. - * + * * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. - * + * * TODO * Styles * - BS_NOTIFY: is it complete? @@ -43,7 +43,7 @@ * - BCM_GETTEXTMARGIN * - BCM_SETIMAGELIST * - BCM_SETTEXTMARGIN - * + * * Notifications * - BCN_HOTITEMCHANGE * - BN_DISABLE @@ -148,9 +148,10 @@ /********************************************************************* * button class descriptor */ +static const WCHAR buttonW[] = {'B','u','t','t','o','n',0}; const struct builtin_class_descr BUTTON_builtin_class = { - L"Button", /* name */ + buttonW, /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ ButtonWndProcA, /* procA */ ButtonWndProcW, /* procW */ @@ -160,12 +161,12 @@ }; -__inline static LONG get_button_state( HWND hwnd ) +static inline LONG get_button_state( HWND hwnd ) { return GetWindowLongW( hwnd, STATE_GWL_OFFSET ); } -__inline static void set_button_state( HWND hwnd, LONG state ) +static inline void set_button_state( HWND hwnd, LONG state ) { SetWindowLongW( hwnd, STATE_GWL_OFFSET, state ); } @@ -185,18 +186,18 @@ return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); } -__inline static void set_button_font( HWND hwnd, HFONT font ) +static inline void set_button_font( HWND hwnd, HFONT font ) { SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, (LONG_PTR)font ); } -__inline static UINT get_button_type( LONG window_style ) +static inline UINT get_button_type( LONG window_style ) { return (window_style & 0x0f); } /* paint a button of any type */ -__inline static void paint_button( HWND hwnd, LONG style, UINT action ) +static inline void paint_button( HWND hwnd, LONG style, UINT action ) { if (btnPaintFunc[style] && IsWindowVisible(hwnd)) { @@ -207,7 +208,7 @@ } /* retrieve the button text; returned buffer must be freed by caller */ -__inline static WCHAR *get_button_text( HWND hwnd ) +static inline WCHAR *get_button_text( HWND hwnd ) { INT len = 512; WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); @@ -215,6 +216,15 @@ return buffer; } +static void setup_clipping( HWND hwnd, HDC hdc ) +{ + RECT rc; + + GetClientRect( hwnd, &rc ); + DPtoLP( hdc, (POINT *)&rc, 2 ); + IntersectClipRect( hdc, rc.left, rc.top, rc.right, rc.bottom ); +} + /* Retrieve the UI state for the control */ static BOOL button_update_uistate(HWND hwnd, BOOL unicode) { @@ -239,8 +249,8 @@ /*********************************************************************** * ButtonWndProc_common */ -static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { RECT rect; POINT pt; @@ -431,7 +441,7 @@ case WM_SETFONT: set_button_font( hWnd, (HFONT)wParam ); - if (lParam) paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); + if (lParam) InvalidateRect(hWnd, NULL, TRUE); break; case WM_GETFONT: @@ -598,9 +608,8 @@ /********************************************************************** * Convert button styles to flags used by DrawText. - * TODO: handle WS_EX_RIGHT extended style. - */ -static UINT BUTTON_BStoDT(DWORD style) + */ +static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) { UINT dtStyle = DT_NOCLIP; /* We use SelectClipRgn to limit output */ @@ -624,8 +633,10 @@ /* all other flavours have left aligned text */ } + if (ex_style & WS_EX_RIGHT) dtStyle = DT_RIGHT | (dtStyle & ~(DT_LEFT | DT_CENTER)); + /* DrawText ignores vertical alignment for multiline text, - * but we use these flags to align label manualy. + * but we use these flags to align label manually. */ if (get_button_type(style) != BS_GROUPBOX) { @@ -657,10 +668,11 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) { LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); WCHAR *text; ICONINFO iconInfo; BITMAP bm; - UINT dtStyle = BUTTON_BStoDT(style); + UINT dtStyle = BUTTON_BStoDT( style, ex_style ); RECT r = *rc; INT n; @@ -706,7 +718,7 @@ empty_rect: rc->right = r.left; rc->bottom = r.top; - return (UINT)(LONG)-1; + return (UINT)-1; } /* Position label inside bounding rectangle according to @@ -766,7 +778,7 @@ * * Common function for drawing button label. */ -static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, RECT *rc) +static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc) { DRAWSTATEPROC lpOutputProc = NULL; LPARAM lp; @@ -844,8 +856,11 @@ parent = GetParent(hwnd); if (!parent) parent = hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); - hOldPen = (HPEN)SelectObject(hDC, SYSCOLOR_GetPen(COLOR_WINDOWFRAME)); - hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); + + setup_clipping( hwnd, hDC ); + + hOldPen = SelectObject(hDC, SYSCOLOR_GetPen(COLOR_WINDOWFRAME)); + hOldBrush = SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); oldBkMode = SetBkMode(hDC, TRANSPARENT); if (get_button_type(style) == BS_DEFPUSHBUTTON) @@ -940,6 +955,7 @@ if (!hBrush) /* did the app forget to call defwindowproc ? */ hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd ); + setup_clipping( hwnd, hDC ); if (style & BS_LEFTTEXT) { @@ -961,7 +977,7 @@ /* Draw label */ client = rtext; dtFlags = BUTTON_CalcLabelRect(hwnd, hDC, &rtext); - + /* Only adjust rbox when rtext is valid */ if (dtFlags != (UINT)-1L) { @@ -986,11 +1002,11 @@ /* rbox must have the correct height */ delta = rbox.bottom - rbox.top - checkBoxHeight; - + if (style & BS_TOP) { if (delta > 0) { rbox.bottom = rbox.top + checkBoxHeight; - } else { + } else { rbox.top -= -delta/2 + 1; rbox.bottom = rbox.top + checkBoxHeight; } @@ -1019,8 +1035,6 @@ if (dtFlags == (UINT)-1L) /* Noting to draw */ return; - IntersectClipRect(hDC, client.left, client.top, client.right, client.bottom); - if (action == ODA_DRAWENTIRE) BUTTON_DrawLabel(hwnd, hDC, dtFlags, &rtext); @@ -1084,6 +1098,7 @@ if (!hbr) /* did the app forget to call defwindowproc ? */ hbr = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd); + setup_clipping( hwnd, hDC ); GetClientRect( hwnd, &rc); rcFrame = rc; @@ -1103,7 +1118,7 @@ * But Windows doesn't clip label's rect, so do I. */ - /* There is 1-pixel marging at the left, right, and bottom */ + /* There is 1-pixel margin at the left, right, and bottom */ rc.left--; rc.right++; rc.bottom++; FillRect(hDC, &rc, hbr); rc.left++; rc.right--; rc.bottom--; @@ -1155,8 +1170,6 @@ { LONG state = get_button_state( hwnd ); DRAWITEMSTRUCT dis; - HRGN clipRegion; - RECT clipRect; LONG_PTR id = GetWindowLongPtrW( hwnd, GWLP_ID ); HWND parent; HFONT hFont, hPrevFont = 0; @@ -1173,21 +1186,13 @@ dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); - clipRegion = CreateRectRgnIndirect(&dis.rcItem); - if (GetClipRgn(hDC, clipRegion) != 1) - { - DeleteObject(clipRegion); - clipRegion=NULL; - } - clipRect = dis.rcItem; - DPtoLP(hDC, (LPPOINT) &clipRect, 2); - IntersectClipRect(hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); - if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); + + setup_clipping( hwnd, hDC ); + SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (hPrevFont) SelectObject(hDC, hPrevFont); - SelectClipRgn(hDC, clipRegion); -} +}

15 years, 8 months

[tkreuzer] 38713: exchange members for ansi and unicode WNDPROC in builtin_class_descr. Reduces diff to wine a bit more.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 18:36:14 2009 New Revision: 38713 URL: http://svn.reactos.org/svn/reactos?rev=38713&view=rev Log: exchange members for ansi and unicode WNDPROC in builtin_class_descr. Reduces diff to wine a bit more. Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/include/regcontrol.h trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -150,23 +150,13 @@ */ const struct builtin_class_descr BUTTON_builtin_class = { -#ifdef __REACTOS__ L"Button", /* name */ - CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ - ButtonWndProcW, /* procW */ - ButtonWndProcA, /* procA */ - NB_EXTRA_BYTES, /* extra */ - (LPWSTR)IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "Button", /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ ButtonWndProcA, /* procA */ ButtonWndProcW, /* procW */ NB_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif }; Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -82,23 +82,13 @@ */ const struct builtin_class_descr COMBO_builtin_class = { -#ifdef __REACTOS__ L"ComboBox", /* name */ - CS_PARENTDC | CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS, /* style */ - (WNDPROC) ComboWndProcW, /* procW */ - (WNDPROC) ComboWndProcA, /* procA */ - sizeof(HEADCOMBO *), /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "ComboBox", /* name */ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ ComboWndProcA, /* procA */ ComboWndProcW, /* procW */ sizeof(HEADCOMBO *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif }; Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -295,23 +295,13 @@ */ const struct builtin_class_descr EDIT_builtin_class = { -#ifdef __REACTOS__ L"Edit", /* name */ - CS_DBLCLKS | CS_PARENTDC, /* style */ - (WNDPROC)EditWndProcW, /* procW */ - (WNDPROC)EditWndProcA, /* procA */ - sizeof(EDITSTATE *), /* extra */ - (LPWSTR)IDC_IBEAM, /* cursor */ - 0 /* brush */ -#else - "Edit", /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ sizeof(EDITSTATE *), /* extra */ IDC_IBEAM, /* cursor */ 0 /* brush */ -#endif }; Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -37,15 +37,6 @@ */ const struct builtin_class_descr ICONTITLE_builtin_class = { -#ifdef __REACTOS__ - ICONTITLE_CLASS_ATOM, /* name */ - 0, /* style */ - IconTitleWndProc, /* procW */ - NULL, /* procA (winproc is Unicode only) */ - 0, /* extra */ - IDC_ARROW, /* cursor */ - 0 /* brush */ -#else ICONTITLE_CLASS_ATOM, /* name */ 0, /* style */ NULL, /* procA (winproc is Unicode only) */ @@ -53,7 +44,6 @@ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif }; Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -149,23 +149,13 @@ */ const struct builtin_class_descr LISTBOX_builtin_class = { -#ifdef __REACTOS__ L"ListBox", /* name */ - CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ - (WNDPROC)ListBoxWndProcW, /* procW */ - (WNDPROC)ListBoxWndProcA, /* procA */ - sizeof(LB_DESCR *), /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "ListBox", /* name */ CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ ListBoxWndProcA, /* procA */ ListBoxWndProcW, /* procW */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif }; @@ -174,23 +164,13 @@ */ const struct builtin_class_descr COMBOLBOX_builtin_class = { -#ifdef __REACTOS__ L"ComboLBox", /* name */ - CS_DBLCLKS | CS_SAVEBITS, /* style */ - (WNDPROC)ListBoxWndProcW, /* procW */ - (WNDPROC)ListBoxWndProcA, /* procA */ - sizeof(LB_DESCR *), /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "ComboLBox", /* name */ CS_DBLCLKS | CS_SAVEBITS, /* style */ ListBoxWndProcA, /* procA */ ListBoxWndProcW, /* procW */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif }; #ifndef __REACTOS__ Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -82,8 +82,8 @@ { L"ScrollBar", /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ + ScrollBarWndProcA, /* procA */ ScrollBarWndProcW, /* procW */ - ScrollBarWndProcA, /* procA */ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -97,23 +97,13 @@ */ const struct builtin_class_descr STATIC_builtin_class = { -#ifdef __REACTOS__ L"Static", /* name */ - CS_DBLCLKS | CS_PARENTDC, /* style */ - (WNDPROC) StaticWndProcW, /* procW */ - (WNDPROC) StaticWndProcA, /* procA */ - STATIC_EXTRA_BYTES, /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ /* FIXME Wine uses IDC_ARROWA */ - 0 /* brush */ -#else - "Static", /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ StaticWndProcA, /* procA */ StaticWndProcW, /* procW */ STATIC_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif }; static __inline void set_ui_state( HWND hwnd, LONG flags ) Modified: trunk/reactos/dll/win32/user32/include/regcontrol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/r… ============================================================================== --- trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -19,8 +19,8 @@ { LPCWSTR name; /* class name */ UINT style; /* class style */ + WNDPROC procA; /* Ansi window procedure */ WNDPROC procW; /* Unicode window procedure */ - WNDPROC procA; /* Ansi window procedure */ INT extra; /* window extra bytes */ LPCWSTR cursor; /* cursor name */ HBRUSH brush; /* brush or system color */ Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -128,8 +128,8 @@ { DIALOG_CLASS_ATOMW, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ + (WNDPROC) DefDlgProcA, /* procA */ (WNDPROC) DefDlgProcW, /* procW */ - (WNDPROC) DefDlgProcA, /* procA */ DLGWINDOWEXTRA, /* extra */ (LPCWSTR) IDC_ARROW, /* cursor */ 0 /* brush */ Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -203,8 +203,8 @@ { L"MDIClient", /* name */ 0, /* style */ + MDIClientWndProcA, /* procA */ MDIClientWndProcW, /* procW */ - MDIClientWndProcA, /* procA */ sizeof(MDICLIENTINFO), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */ Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -80,8 +80,8 @@ { POPUPMENU_CLASS_ATOMW, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ + (WNDPROC) NULL, /* FIXME - procA */ (WNDPROC) PopupMenuWndProcW, /* FIXME - procW */ - (WNDPROC) NULL, /* FIXME - procA */ sizeof(MENUINFO *), /* extra */ (LPCWSTR) IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_MENU + 1) /* brush */

15 years, 8 months

[tkreuzer] 38712: user32 revert lite ; -P - revert 32934: remove the hack for disabled button font, as it's not needed anymore since we have tahoma - partly revert 28055: use InvalidateRect and add it to ntwrapper.h - add a define for SYSCOLOR_GetPen to reduce diff to wine

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 11 17:08:47 2009 New Revision: 38712 URL: http://svn.reactos.org/svn/reactos?rev=38712&view=rev Log: user32 revert lite ;-P - revert 32934: remove the hack for disabled button font, as it's not needed anymore since we have tahoma - partly revert 28055: use InvalidateRect and add it to ntwrapper.h - add a define for SYSCOLOR_GetPen to reduce diff to wine Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/include/ntwrapper.h trunk/reactos/dll/win32/user32/include/user32p.h Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sun Jan 11 17:08:47 2009 @@ -259,8 +259,8 @@ LONG state; HANDLE oldHbitmap; - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); switch (uMsg) { @@ -433,7 +433,7 @@ if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam ); if (btn_type == BS_GROUPBOX) /* Yes, only for BS_GROUPBOX */ - NtUserInvalidateRect( hWnd, NULL, TRUE ); + InvalidateRect( hWnd, NULL, TRUE ); else paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); return 1; /* success. FIXME: check text length */ @@ -469,7 +469,7 @@ break; case WM_SYSCOLORCHANGE: - NtUserInvalidateRect( hWnd, NULL, FALSE ); + InvalidateRect( hWnd, NULL, FALSE ); break; #ifndef __REACTOS__ @@ -506,8 +506,8 @@ return 0; } oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam ); - NtUserInvalidateRect( hWnd, NULL, FALSE ); - return (LRESULT)oldHbitmap; + InvalidateRect( hWnd, NULL, FALSE ); + return (LRESULT)oldHbitmap; case BM_GETIMAGE: return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); @@ -582,7 +582,6 @@ } return 0; } - /*********************************************************************** * ButtonWndProcW @@ -826,22 +825,8 @@ return; } - /* ROS Hack to make font look less ugly */ - if ( ((style & (BS_ICON|BS_BITMAP)) == BS_TEXT) && - (flags & DSS_DISABLED) ) - { - ++rc->left; ++rc->top; ++rc->right; ++rc->bottom; - SetTextColor(hdc, GetSysColor(COLOR_3DHILIGHT)); - DrawTextW(hdc, (LPCWSTR)lp, -1, rc, (UINT)wp); - --rc->left; --rc->top; --rc->right; --rc->bottom; - SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); - DrawTextW(hdc, (LPCWSTR)lp, -1, rc, (UINT)wp); - } - else - { - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, - rc->right - rc->left, rc->bottom - rc->top, flags); - } + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, + rc->right - rc->left, rc->bottom - rc->top, flags); HeapFree( GetProcessHeap(), 0, text ); } @@ -869,11 +854,7 @@ parent = GetParent(hwnd); if (!parent) parent = hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); -#ifdef __REACTOS__ - hOldPen = (HPEN)SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME)); -#else hOldPen = (HPEN)SelectObject(hDC, SYSCOLOR_GetPen(COLOR_WINDOWFRAME)); -#endif hOldBrush =(HBRUSH)SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); oldBkMode = SetBkMode(hDC, TRANSPARENT); Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sun Jan 11 17:08:47 2009 @@ -1233,7 +1233,7 @@ */ static void CBRepaintButton( LPHEADCOMBO lphc ) { - NtUserInvalidateRect(lphc->self, &lphc->buttonRect, TRUE); + InvalidateRect(lphc->self, &lphc->buttonRect, TRUE); UpdateWindow(lphc->self); } @@ -1252,9 +1252,7 @@ /* lphc->wState |= CBF_FOCUSED; */ if( !(lphc->wState & CBF_EDIT) ) - { - NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); - } + InvalidateRect(lphc->self, &lphc->textRect, TRUE); CB_NOTIFY( lphc, CBN_SETFOCUS ); lphc->wState |= CBF_FOCUSED; @@ -1276,11 +1274,11 @@ if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST ) SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0); - lphc->wState &= ~CBF_FOCUSED; + lphc->wState &= ~CBF_FOCUSED; /* redraw text */ - if( !(lphc->wState & CBF_EDIT) ) - NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); + if( !(lphc->wState & CBF_EDIT) ) + InvalidateRect(lphc->self, &lphc->textRect, TRUE); CB_NOTIFY( lphc, CBN_KILLFOCUS ); } @@ -1298,12 +1296,12 @@ switch( HIWORD(wParam) >> 8 ) { - case (EN_SETFOCUS >> 8): + case (EN_SETFOCUS >> 8): TRACE("[%p]: edit [%p] got focus\n", lphc->self, lphc->hWndEdit ); - COMBO_SetFocus( lphc ); - break; + COMBO_SetFocus( lphc ); + break; case (EN_KILLFOCUS >> 8): @@ -1379,7 +1377,7 @@ SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); } else - NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); + InvalidateRect(lphc->self, &lphc->textRect, TRUE); } /* do not roll up if selection is being tracked @@ -1699,7 +1697,7 @@ CBUpdateEdit( lphc, index ); else { - NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); + InvalidateRect(lphc->self, &lphc->textRect, TRUE); } } return (LRESULT)index; @@ -2009,7 +2007,7 @@ EnableWindow( lphc->hWndLBox, (BOOL)wParam ); /* Force the control to repaint when the enabled state changes. */ - NtUserInvalidateRect(lphc->self, NULL, TRUE); + InvalidateRect(lphc->self, NULL, TRUE); return TRUE; case WM_SETREDRAW: if( wParam ) @@ -2194,7 +2192,7 @@ SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW); } else - NtUserInvalidateRect(lphc->self, NULL, TRUE); + InvalidateRect(lphc->self, NULL, TRUE); return TRUE; case CB_INITSTORAGE: return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam); @@ -2283,7 +2281,7 @@ if( lphc->wState & CBF_EDIT ) CBUpdateEdit( lphc, (INT)wParam ); else - NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); + InvalidateRect(lphc->self, &lphc->textRect, TRUE); lphc->wState &= ~CBF_SELCHANGE; return lParam; #ifndef __REACTOS__ Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Jan 11 17:08:47 2009 @@ -5521,7 +5521,7 @@ es->flags &= ~EF_UPDATE; EDIT_NOTIFY_PARENT(es, EN_UPDATE); } - NtUserInvalidateRect(es->hwndSelf, rc, bErase); + InvalidateRect(es->hwndSelf, rc, bErase); } /******************************************************************** Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun Jan 11 17:08:47 2009 @@ -396,7 +396,7 @@ else scroll = FALSE; } - if (!scroll) NtUserInvalidateRect( descr->self, NULL, TRUE ); + if (!scroll) InvalidateRect( descr->self, NULL, TRUE ); descr->top_item = index; LISTBOX_UpdateScroll( descr ); return LB_OKAY; @@ -418,7 +418,7 @@ if (page_size == descr->page_size) return; descr->page_size = page_size; if (descr->style & LBS_MULTICOLUMN) - NtUserInvalidateRect( descr->self, NULL, TRUE ); + InvalidateRect( descr->self, NULL, TRUE ); LISTBOX_SetTopItem( descr, descr->top_item, FALSE ); } @@ -473,7 +473,7 @@ /* Invalidate the focused item so it will be repainted correctly */ if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) == 1) { - NtUserInvalidateRect( descr->self, &rect, FALSE ); + InvalidateRect( descr->self, &rect, FALSE ); } } @@ -702,7 +702,7 @@ descr->style &= ~LBS_NOREDRAW; if (descr->style & LBS_DISPLAYCHANGED) { /* page was changed while setredraw false, refresh automatically */ - NtUserInvalidateRect(descr->self, NULL, TRUE); + InvalidateRect(descr->self, NULL, TRUE); if ((descr->top_item + descr->page_size) > descr->nb_items) { /* reset top of page if less than number of items/page */ descr->top_item = descr->nb_items - descr->page_size; @@ -1240,14 +1240,14 @@ return; } rect.bottom = descr->height; - NtUserInvalidateRect( descr->self, &rect, TRUE ); + InvalidateRect( descr->self, &rect, TRUE ); if (descr->style & LBS_MULTICOLUMN) { /* Repaint the other columns */ rect.left = rect.right; rect.right = descr->width; rect.top = 0; - NtUserInvalidateRect( descr->self, &rect, TRUE ); + InvalidateRect( descr->self, &rect, TRUE ); } } } @@ -1257,7 +1257,7 @@ RECT rect; if (LISTBOX_GetItemRect( descr, index, &rect ) == 1) - NtUserInvalidateRect( descr->self, &rect, TRUE ); + InvalidateRect( descr->self, &rect, TRUE ); } /*********************************************************************** @@ -1308,7 +1308,7 @@ LISTBOX_UpdatePage( descr ); LISTBOX_UpdateScroll( descr ); if (repaint) - NtUserInvalidateRect( descr->self, 0, TRUE ); + InvalidateRect( descr->self, 0, TRUE ); } return LB_OKAY; } @@ -1333,12 +1333,12 @@ RECT rect; /* Invalidate the focused item so it will be repainted correctly */ if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) == 1) - NtUserInvalidateRect( descr->self, &rect, TRUE ); + InvalidateRect( descr->self, &rect, TRUE ); ScrollWindowEx( descr->self, diff, 0, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } else - NtUserInvalidateRect( descr->self, NULL, TRUE ); + InvalidateRect( descr->self, NULL, TRUE ); } @@ -2719,7 +2719,7 @@ case LB_RESETCONTENT: LISTBOX_ResetContent( descr ); LISTBOX_UpdateScroll( descr ); - NtUserInvalidateRect( descr->self, NULL, TRUE ); + InvalidateRect( descr->self, NULL, TRUE ); return 0; #ifndef __REACTOS__ @@ -3256,7 +3256,7 @@ return LISTBOX_Destroy( descr ); case WM_ENABLE: - NtUserInvalidateRect( hwnd, NULL, TRUE ); + InvalidateRect( hwnd, NULL, TRUE ); return 0; case WM_SETREDRAW: @@ -3282,7 +3282,7 @@ return (LRESULT)descr->font; case WM_SETFONT: LISTBOX_SetFont( descr, (HFONT)wParam ); - if (lParam) NtUserInvalidateRect( hwnd, 0, TRUE ); + if (lParam) InvalidateRect( hwnd, 0, TRUE ); return 0; case WM_SETFOCUS: descr->in_focus = TRUE; Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jan 11 17:08:47 2009 @@ -1358,7 +1358,7 @@ Rect.bottom = Rect.top + ThumbSize; } HideCaret(Wnd); - NtUserInvalidateRect(Wnd, &Rect, FALSE); + InvalidateRect(Wnd, &Rect, FALSE); DestroyCaret(); } break; Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Sun Jan 11 17:08:47 2009 @@ -498,3 +498,8 @@ return(NtUserSetCapture(hWnd)); } +EXTINLINE BOOL WINAPI +InvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase) +{ + return NtUserInvalidateRect(hWnd, lpRect, bErase); +} Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sun Jan 11 17:08:47 2009 @@ -228,5 +228,7 @@ PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE); PVOID FASTCALL ValidateHandle(HANDLE, UINT); +#define SYSCOLOR_GetPen(index) GetSysColorPen(index) + #endif /* EOF */

15 years, 8 months

[dchapyshev] 38711: - Update Polish translation by Maciej Bialas (bjauy@o2.pl)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Jan 11 14:15:25 2009 New Revision: 38711 URL: http://svn.reactos.org/svn/reactos?rev=38711&view=rev Log: - Update Polish translation by Maciej Bialas (bjauy(a)o2.pl) Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Sun Jan 11 14:15:25 2009 @@ -1,27 +1,27 @@ /* -* translated by xrogers -* xxrogers(a)users.sourceforge.net +* translated by niski +* bjauy(a)o2.pl * https://sourceforge.net/projects/reactospl */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "Witamy w Kreatorze dodawania sprzêtu", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Ten kreator pomo¿e Ci:", -1, 114, 40, 182, 8 + LTEXT "1) Zainstalowaæ oprogramowanie do obs³ugi urz¹dzenia dodanego do Twojego komputera.", -1, 121, 56, 184, 16 + LTEXT "2) Rozwi¹zaæ problemy sprzêtowe.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Jeli do urz¹dzenia do³¹czona zosta³a instalacyjna p³yta CD, zaleca siê klikniêcie przycisku Anuluj w celu zamkniêcia tego kreatora i u¿ycie p³yty CD producenta do zainstalowania tego urz¹dzenia.", 503, 150, 106, 155, 50 + LTEXT "Aby kontynuowaæ, kliknij Dalej.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -30,63 +30,63 @@ IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "Czy urz¹dzenie zosta³o ju¿ pod³¹czone do komputera?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Tak, urz¹dzenie zosta³o ju¿ pod³¹czone", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&Nie, urz¹dzenie nie zosta³o jeszcze pod³¹czone", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 - LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 - LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + LTEXT "Wybierz z poni¿szej listy zainstalowane urz¹dzenie, nastêpnie kliknij Dalej, aby sprawdziæ jego w³aciwoci lub rozwi¹zaæ ewentualny problem.", -1, 21, 8, 275, 22 + LTEXT "Aby dodaæ urz¹dzenie, którego nie ma na licie, kliknij przycisk ""Dodaj nowe urz¹dzenie""", -1, 21, 32, 275, 24 + LTEXT "&Zainstalowane urz¹dzenia:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + LTEXT "Kreator mo¿e wyszukaæ inne urz¹dzenie i zainstalowaæ je automatycznie. Mo¿esz tak¿e wybraæ urz¹dzenie z listy, jeli wiesz dok³adnie, jaki model urz¹dzenia chcesz zainstalowaæ.", -1, 21, 8, 280, 24 + LTEXT "Co chcesz, aby zrobi³ kreator?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "Wy&szukaj i zainstaluj nowe urz¹dzenie automatycznie (zalecane)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Zainstaluj urz¹dzenie, które wybiorê rêcznie z listy (zaawansowane)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Wykryte urz¹dzenia:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 - LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + LTEXT "Jeli nie widzisz odpowiedniej kategorii urz¹dzeñ kliknij przycisk Poka¿ wszystkie urz¹dzenia.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "&Popularne typy urz¹dzeñ:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "Wyszukiwanie nowych urz¹dzeñ mo¿e zaj¹æ kilka minut.", -1, 21, 8, 275, 15 + LTEXT "Postêp ca³kowity:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -94,58 +94,58 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "Koñczenie pracy Kreatora dodawania sprzêtu", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Pomylnie zakoñczono pracê Kreatora dodawania sprzêtu.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Aby zamkn¹æ kreatora, kliknij Zakoñcz", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Koñczenie pracy Kreatora dodawania sprzêtu", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Kreator znalaz³ nastêpuj¹ce urz¹dzenia pod³¹czone do tego komputera:", -1, 114, 32, 193, 19 + LTEXT "Aby zamkn¹æ kreatora, kliknij Zakoñcz", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + LTEXT "Koñczenie pracy Kreatora dodawania sprzêtu", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Oto aktualny stan wybranego urz¹dzenia:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "Aby uruchomiæ modu³ rozwi¹zywania problemów, który mo¿e pomóc Ci rozwi¹zaæ ewentualne problemy z urz¹dzeniem, kliknij Zakoñcz.", -1, 114, 136, 193, 16 + LTEXT "Aby zamkn¹æ kreatora, kliknij przycisk Anuluj", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Kreator dodawania sprzêtu" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Nie mo¿na kontynuowaæ pracy Kreatora dodawania sprzêtu", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Aby kontynuowaæ, pod³¹cz nowe urz¹dzenie do komputera.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Wy³¹cz komputer po klikniêciu przycisku Zakoñcz, aby mo¿na by³o otworzyæ komputer i pod³¹czyæ urz¹dzenie.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "W wiêkszoci przypadków ReactOS automatycznie zainstaluje urz¹dzenie po jego pod³¹czeniu. Jeli ReactOS nie odnajdzie urz¹dzenia, uruchom ponownie tego kreatora w celu zainstalowania oprogramowania do obs³ugi urz¹dzenia.", -1, 114, 98, 193, 32 + LTEXT "Aby zamkn¹æ kreatora, kliknij Zakoñcz.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Dodaj sprzêt" IDS_CPLDESCRIPTION "Dodaje sprzêt do Twojego komputera." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "Add a new hardware device" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_SEARCHTITLE "Czekaj, kreator przeprowadza wyszukiwanie..." + IDS_SEARCHTEXT "Ten kreator wyszukuje urz¹dzenia, które zosta³y ostatnio pod³¹czone do tego komputera, ale jeszcze nie zosta³y zainstalowane." + IDS_ISCONNECTED "Czy urz¹dzenie zosta³o ju¿ pod³¹czone do komputera?" + IDS_PROBELISTTITLE "Poni¿sze urz¹dzenia s¹ ju¿ zainstalowane na tym komputerze" + IDS_ADDNEWDEVICE "Dodaj nowe urz¹dzenie sprzêtowe" + IDS_SELECTWAYTITLE "Kreator mo¿e pomóc Tobie zainstalowaæ inne urz¹dzenie" END

15 years, 8 months

← Newer
1
...
51
52
53
54
55
56
57
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009