Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33735: Add Gdi entry flag.
by jimtabor＠svn.reactos.org 28 May '08

28 May '08

Author: jimtabor Date: Wed May 28 00:01:17 2008 New Revision: 33735 URL: http://svn.reactos.org/svn/reactos?rev=33735&view=rev Log: Add Gdi entry flag. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Wed May 28 00:01:17 2008 @@ -40,6 +40,9 @@ #define GDI_ENTRY_FLAGS_MASK 0xff000000 #define GDI_ENTRY_REUSECNT_SHIFT 8 #define GDI_ENTRY_UPPER_SHIFT 16 + +/* GDI Entry Flags */ +#define GDI_ENTRY_FLAG_NEED_UPDATE 4 /*! \defgroup GDI object types *

1 0

[jimtabor] 33734: NtUserRegisterClassExWOW also given FNID. Added one more fnid type.
by jimtabor＠svn.reactos.org 28 May '08

28 May '08

Author: jimtabor Date: Tue May 27 23:04:35 2008 New Revision: 33734 URL: http://svn.reactos.org/svn/reactos?rev=33734&view=rev Log: NtUserRegisterClassExWOW also given FNID. Added one more fnid type. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 27 23:04:35 2008 @@ -276,6 +276,7 @@ #define FNID_STATIC 0x02A8 #define FNID_IME 0x02A9 +#define FNID_DDEML 0x2000 // Registers DDEML #define FNID_DESTROY 0x4000 // This is sent when WM_NCDESTROY or in the support routine. // Seen during WM_CREATE on error exit too. @@ -1873,7 +1874,7 @@ BOOL bUnicodeClass, WNDPROC wpExtra, DWORD dwUnknown4, - DWORD dwUnknown5, + DWORD fnID, DWORD dwUnknown6, DWORD dwUnknown7);

1 0

[jimtabor] 33733: NtUserSetWindowFNID is needed for supporting NtUserGetClassName bGetRealClass.
by jimtabor＠svn.reactos.org 28 May '08

28 May '08

Author: jimtabor Date: Tue May 27 21:36:25 2008 New Revision: 33733 URL: http://svn.reactos.org/svn/reactos?rev=33733&view=rev Log: NtUserSetWindowFNID is needed for supporting NtUserGetClassName bGetRealClass. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 27 21:36:25 2008 @@ -77,6 +77,7 @@ INT ClsExtra; INT WndExtra; PVOID Dce; + DWORD fnID; HINSTANCE hInstance; HANDLE hIcon; /* FIXME - Use pointer! */ HANDLE hIconSm; /* FIXME - Use pointer! */ @@ -263,6 +264,32 @@ PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); + +// FNID's for NtUserSetWindowFNID +#define FNID_BUTTON 0x02A1 +#define FNID_COMBOBOX 0x02A2 +#define FNID_COMBOLBOX 0x02A3 +#define FNID_DIALOG 0x02A4 +#define FNID_EDIT 0x02A5 +#define FNID_LISTBOX 0x02A6 +#define FNID_MDICLIENT 0x02A7 +#define FNID_STATIC 0x02A8 +#define FNID_IME 0x02A9 + +#define FNID_DESTROY 0x4000 // This is sent when WM_NCDESTROY or in the support routine. + // Seen during WM_CREATE on error exit too. + +// ICLS's for NtUserGetClassName FNID to ICLS +#define ICLS_BUTTON 0 +#define ICLS_EDIT 1 +#define ICLS_STATIC 2 +#define ICLS_LISTBOX 3 +#define ICLS_COMBOBOX 5 +#define ICLS_MDICLIENT 6 +#define ICLS_COMBOLBOX 7 +#define ICLS_IME 15 +#define ICLS_DIALOG 17 +#define ICLS_END 31 DWORD NTAPI @@ -2186,11 +2213,11 @@ TIMERPROC lpTimerFunc ); -DWORD +BOOL NTAPI NtUserSetWindowFNID( - DWORD Unknown0, - DWORD Unknown1); + HWND hWnd, + WORD fnID); LONG NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue May 27 21:36:25 2008 @@ -4159,17 +4159,41 @@ /* - * @unimplemented - */ -DWORD STDCALL -NtUserSetWindowFNID(DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - + * @implemented + */ +BOOL STDCALL +NtUserSetWindowFNID(HWND hWnd, + WORD fnID) +{ + PWINDOW_OBJECT Window; + PWINDOW Wnd; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSetWindowFNID\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN( FALSE); + } + Wnd = Window->Wnd; + + if (Wnd->Class) + { // From user land we only set these. + if ((fnID != FNID_DESTROY) || ((fnID < FNID_BUTTON) && (fnID > FNID_IME)) ) + { + RETURN( FALSE); + } + else + Wnd->Class->fnID |= fnID; + } + RETURN( TRUE); + +CLEANUP: + DPRINT("Leave NtUserSetWindowFNID\n"); + UserLeave(); + END_CLEANUP; +} /*

1 0

[tkreuzer] 33732: exception.h: merge changes from wine. Revision 1.37 fixes the exception in ole32 when opening a file with FoxitReader. Also fixes some warnings and hopefully some usermode crashes. 1.28: Jonathan Ernst <jonathan@ernstfamily.ch> Update the address of the Free Software Foundation. 1.29: Alexandre Julliard <julliard@winehq.org> include: Exception filters should return LONG, not DWORD. Also move UnhandledExceptionFilter definitions to winbase.h since they are there in the latest SD
by tkreuzer＠svn.reactos.org 28 May '08

28 May '08

Author: tkreuzer Date: Tue May 27 19:41:13 2008 New Revision: 33732 URL: http://svn.reactos.org/svn/reactos?rev=33732&view=rev Log: exception.h: merge changes from wine. Revision 1.37 fixes the exception in ole32 when opening a file with FoxitReader. Also fixes some warnings and hopefully some usermode crashes. 1.28: Jonathan Ernst <jonathan(a)ernstfamily.ch> Update the address of the Free Software Foundation. 1.29: Alexandre Julliard <julliard(a)winehq.org> include: Exception filters should return LONG, not DWORD. Also move UnhandledExceptionFilter definitions to winbase.h since they are there in the latest SDK. 1.30: Rob Shearman <rob(a)codeweavers.com> include: Move Wine-specific EH_* defines from winnt.h to include/wine/exception.h. 1.33: Rob Shearman <rob(a)codeweavers.com> Add a new convenience macro for an exception handler that handles all exceptions. When using native compiler exceptions, the previous method of doing this, __EXCEPT(NULL), would expand to __except( (NULL)(GetExceptionInformation())) which doesn't compile as NULL isn't a function. So add a new macro, __EXCEPT_ALL, which works correctly both when using native compiler exceptions and without and which makes the meaning of code in which it is used clearer. 1.35: Alexandre Julliard <julliard(a)winehq.org> ntdll: Make the exception handling functions inline. 1.36: Alexandre Julliard <julliard(a)winehq.org> exception.h: Only push the exception frame after sigsetjmp. Otherwise on Windows longjmp may want to mess with the exception frame. 1.37: Alexandre Julliard <julliard(a)winehq.org> exception.h: Preserve registers when calling RtlUnwind. See issue #812 for more details. Modified: trunk/reactos/include/reactos/wine/exception.h Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Tue May 27 19:41:13 2008 @@ -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 */ #ifndef __WINE_WINE_EXCEPTION_H @@ -79,6 +79,7 @@ #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } #define __ENDTRY /*nothing*/ #define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) +#define __EXCEPT_ALL __except(EXCEPTION_EXECUTE_HANDLER) #else /* USE_COMPILER_EXCEPTIONS */ @@ -100,7 +101,28 @@ } else { \ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ - __wine_push_frame( &__f.frame ); \ + if (setjmp( __f.jmp )) { \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ + do { + +/* convenience handler for page fault exceptions */ +#define __EXCEPT_PAGE_FAULT \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + break; \ + } else { \ + __f.frame.Handler = __wine_exception_handler_page_fault; \ + if (setjmp( __f.jmp )) { \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ + do { + +/* convenience handler for all exception */ +#define __EXCEPT_ALL \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + break; \ + } else { \ + __f.frame.Handler = __wine_exception_handler_all; \ if (setjmp( __f.jmp )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -109,6 +131,7 @@ } while (0); \ break; \ } \ + __wine_push_frame( &__f.frame ); \ __first = 0; \ } \ } while (0); @@ -127,13 +150,10 @@ } while (0); -typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); +typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); -/* convenience handler for page fault exceptions */ -#define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) - -#define WINE_EXCEPTION_FILTER(func) DWORD CALLBACK func( PEXCEPTION_POINTERS __eptr ) +#define WINE_EXCEPTION_FILTER(func) LONG WINAPI func( EXCEPTION_POINTERS *__eptr ) #define WINE_FINALLY_FUNC(func) void CALLBACK func( BOOL __normal ) #define GetExceptionInformation() (__eptr) @@ -193,6 +213,39 @@ #ifndef USE_COMPILER_EXCEPTIONS +static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame ) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + + /* hack to make GetExceptionCode() work in handler */ + wine_frame->ExceptionCode = record->ExceptionCode; + wine_frame->ExceptionRecord = wine_frame; + +#if defined(__GNUC__) && defined(__i386__) + { + /* RtlUnwind clobbers registers on Windows */ + int dummy1, dummy2, dummy3; + __asm__ __volatile__("pushl %%ebp\n\t" + "pushl %%ebx\n\t" + "pushl $0\n\t" + "pushl %2\n\t" + "pushl $0\n\t" + "pushl %1\n\t" + "call *%0\n\t" + "popl %%ebx\n\t" + "popl %%ebp" + : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) + : "0" (RtlUnwind), "1" (frame), "2" (record) + : "ecx", "edx", "memory" ); + } +#else + RtlUnwind( frame, 0, record, 0 ); +#endif + __wine_pop_frame( frame ); + longjmp( wine_frame->jmp, 1 ); +} + static __inline EXCEPTION_DISPOSITION __wine_exception_handler( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) @@ -224,15 +277,28 @@ break; } } - /* hack to make GetExceptionCode() work in handler */ - wine_frame->ExceptionCode = record->ExceptionCode; - wine_frame->ExceptionRecord = wine_frame; - - RtlUnwind( frame, 0, record, 0 ); - __wine_pop_frame( frame ); - longjmp( wine_frame->jmp, 1 ); -} - + __wine_unwind_frame( record, frame ); +} + +static __inline EXCEPTION_DISPOSITION +__wine_exception_handler_page_fault( struct _EXCEPTION_RECORD *record, void *frame, + struct _CONTEXT *context, void *pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + if (record->ExceptionCode != STATUS_ACCESS_VIOLATION) + return ExceptionContinueSearch; + __wine_unwind_frame( record, frame ); +} + +static __inline EXCEPTION_DISPOSITION +__wine_exception_handler_all( struct _EXCEPTION_RECORD *record, void *frame, + struct _CONTEXT *context, void *pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + __wine_unwind_frame( record, frame ); +} static __inline EXCEPTION_DISPOSITION __wine_finally_handler( struct _EXCEPTION_RECORD *record, void *frame, @@ -248,6 +314,14 @@ #endif /* USE_COMPILER_EXCEPTIONS */ +/* Exception handling flags - from OS/2 2.0 exception handling */ + +/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ +#define EH_NONCONTINUABLE 0x01 +#define EH_UNWINDING 0x02 +#define EH_EXIT_UNWIND 0x04 +#define EH_STACK_INVALID 0x08 +#define EH_NESTED_CALL 0x10 /* Wine-specific exceptions codes */

1 0

[fireball] 33731: - More header fixes.
by fireball＠svn.reactos.org 27 May '08

27 May '08

Author: fireball Date: Tue May 27 13:59:59 2008 New Revision: 33731 URL: http://svn.reactos.org/svn/reactos?rev=33731&view=rev Log: - More header fixes. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/reactos/mc/ntstatus.mc Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=33… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue May 27 13:59:59 2008 @@ -1057,7 +1057,7 @@ FILE_LOCK_INFO FileLock; } FILE_EXCLUSIVE_LOCK_ENTRY, *PFILE_EXCLUSIVE_LOCK_ENTRY; -typedef NTSTATUS (*PCOMPLETE_LOCK_IRP_ROUTINE) ( +typedef NTSTATUS (NTAPI *PCOMPLETE_LOCK_IRP_ROUTINE) ( IN PVOID Context, IN PIRP Irp ); Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… ============================================================================== --- trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] Tue May 27 13:59:59 2008 @@ -279,6 +279,23 @@ The specified process is part of a job. . +MessageId=0x125 +Severity=Success +Facility=System +SymbolicName=STATUS_VOLSNAP_HIBERNATE_READY +Language=English +{Volume Shadow Copy Service} +The system is now ready for hibernation. + +. +MessageId=0x126 +Severity=Success +Facility=System +SymbolicName=STATUS_FSFILTER_OP_COMPLETED_SUCCESSFULLY +Language=English +A file system or file system filter driver has successfully completed an FsFilter operation. + +. MessageId=0x367 Severity=Success Facility=System

1 0

[dreimer] 33730: Polish language Update by Olaf Siejka
by dreimer＠svn.reactos.org 27 May '08

27 May '08

Author: dreimer Date: Tue May 27 13:54:23 2008 New Revision: 33730 URL: http://svn.reactos.org/svn/reactos?rev=33730&view=rev Log: Polish language Update by Olaf Siejka Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Tue May 27 13:54:23 2008 @@ -12,14 +12,14 @@ CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wybierz us³ugi dla ka¿dego u¿ywanego jêzyka z listy.\nListê mo¿na modyfikowaæ przyciskami Dodaj i Usuñ.", -1, 9, 6, 238, 17 - CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 - PUSHBUTTON "&Ustaw domylne", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "&Dodaj...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "U&suñ...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&W³aciwoci...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferencje", -1, 7, 185, 240, 36 - PUSHBUTTON "Us&tawienia klawiszy...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + LTEXT "Wybierz us³ugi dla ka¿dego u¿ywanego jêzyka z listy.\nListê mo¿na modyfikowaæ przyciskami Dodaj i Usuñ.", -1, 9, 6, 238, 17 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 + PUSHBUTTON "&Ustaw domylne", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Dodaj...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "U&suñ...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&W³aciwoci...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "Preferencje", -1, 7, 185, 240, 36 + PUSHBUTTON "Us&tawienia klawiszy...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -54,22 +54,22 @@ IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 - LTEXT "Shift", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 - AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 - LTEXT "Shift", -1, 74, 87, 27, 12 - CTEXT "+", -1, 63, 87, 8, 9 - AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "Left A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 - DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 +CAPTION "Zmiana sekwencji klawiszy" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Prze³¹cz uk³ad klawiatury", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Lewy &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "P&rze³¹cz uk³ad klawiatur", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Lewy A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 172, 27, 50, 14 END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -87,7 +87,7 @@ STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Jêzyki i ts³ugi tekstowe" + IDS_CPLSYSTEMNAME "Jêzyki i us³ugi tekstowe" IDS_CPLSYSTEMDESCRIPTION "Umo¿liwia zmianê ustawieñ jêzyków." IDS_KEYBOARD "Klawiatura" IDS_NONE "(Brak)" @@ -96,13 +96,13 @@ IDS_WHATS_THIS "Co to jest?" IDS_LANGUAGE "Jêzyk" IDS_LAYOUT "Uk³ad klawiatury" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" - IDS_CONFIRMATION "Confirmation" - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_REM_QUESTION "Czy chcesz usun¹æ dany uk³ad klawiatury?" + IDS_CONFIRMATION "Potwierdzenie" + IDS_LAYOUT_EXISTS "Taki uk³ad ju¿ istnieje." + IDS_LAYOUT_EXISTS2 "Taki uk³ad ju¿ istnieje i nie mo¿na go dodaæ ponownie." IDS_CTRL_SHIFT "Ctrl+Shift" - IDS_LEFT_ALT_SHIFT "Left Alt+Shift" - IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_LEFT_ALT_SHIFT "Lewy Alt+Shift" + IDS_SWITCH_BET_INLANG "Prze³¹cza pomiêdzy uk³adami klawiatury" END STRINGTABLE @@ -239,10 +239,10 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Malediwski (Maszynisty)" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bu³garski (Fonetyczny)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bu³garski (Fonetyczny, BDS)" - IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" - IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" - IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" - IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" - IDS_BURMESE_LAYOUT, "Burmese" - IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bu³garski BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "Niemiecki (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "Niemiecki (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "Niemiecki (de_ergo)" + IDS_BURMESE_LAYOUT, "Birmañski" + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukraiñski (Student)" +END

1 0

[janderwald] 33729: - access parameter after they have been verified as valid - fixes a kernel32_winetest crash - fixes bug 3264
by janderwald＠svn.reactos.org 27 May '08

27 May '08

Author: janderwald Date: Tue May 27 05:53:23 2008 New Revision: 33729 URL: http://svn.reactos.org/svn/reactos?rev=33729&view=rev Log: - access parameter after they have been verified as valid - fixes a kernel32_winetest crash - fixes bug 3264 Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Tue May 27 05:53:23 2008 @@ -1305,7 +1305,7 @@ LPCWSTR p; DWORD sp = 0, lp = 0; DWORD tmplen; - BOOL unixabsolute = (shortpath[0] == '/'); + BOOL unixabsolute; WIN32_FIND_DATAW wfd; HANDLE goit; @@ -1328,7 +1328,7 @@ lstrcpynW( longpath, shortpath, longlen ); return wcslen(longpath); } - + unixabsolute = (shortpath[0] == '/'); /* check for drive letter */ if (!unixabsolute && shortpath[1] == ':' ) {

1 0

[janderwald] 33728: - fix typo in CreateServiceA - bug found by Michael martinmnet at hotmail dot com (IRC: bugboy)
by janderwald＠svn.reactos.org 27 May '08

27 May '08

Author: janderwald Date: Tue May 27 03:54:07 2008 New Revision: 33728 URL: http://svn.reactos.org/svn/reactos?rev=33728&view=rev Log: - fix typo in CreateServiceA - bug found by Michael martinmnet at hotmail dot com (IRC: bugboy) Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Tue May 27 03:54:07 2008 @@ -508,7 +508,7 @@ if (lpServiceStartName) { len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); - lpServiceStartName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + lpServiceStartNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!lpServiceStartNameW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY);

1 0

[gedmurphy] 33727: Another typo. Yep, I'm officially today's jester...
by gedmurphy＠svn.reactos.org 27 May '08

27 May '08

Author: gedmurphy Date: Tue May 27 03:34:28 2008 New Revision: 33727 URL: http://svn.reactos.org/svn/reactos?rev=33727&view=rev Log: Another typo. Yep, I'm officially today's jester... Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Tue May 27 03:34:28 2008 @@ -88,7 +88,7 @@ if (NT_SUCCESS(Status)) { LPWSTR lpBuffer = (LPWSTR)kvpInfo->Data; - if (lpBuffer != UNICODE_NULL) + if (*lpBuffer != UNICODE_NULL) { INT bytesToCopy, nullPos;

1 0

[gedmurphy] 33726: fix typo
by gedmurphy＠svn.reactos.org 27 May '08

27 May '08

Author: gedmurphy Date: Tue May 27 03:32:19 2008 New Revision: 33726 URL: http://svn.reactos.org/svn/reactos?rev=33726&view=rev Log: fix typo Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Tue May 27 03:32:19 2008 @@ -104,9 +104,9 @@ /* ensure string is terminated */ szAppInit[nullPos] = UNICODE_NULL; + + bRet = TRUE; } - - bRet = TRUE; } } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs