Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[cgutman] 41600: - Fix a crash that happens when we are running at APC_LEVEL, acquire the recursive mutex (which improperly handled APC_LEVEL), then attempt to access paged pool (or do anything else that depends on Irql < DISPATCH_LEVEL) - Optimize the code for acquiring and releasing the recursive mutex at DISPATCH_LEVEL
by cgutman＠svn.reactos.org 24 Jun '09

24 Jun '09

Author: cgutman Date: Thu Jun 25 01:57:48 2009 New Revision: 41600 URL: http://svn.reactos.org/svn/reactos?rev=41600&view=rev Log: - Fix a crash that happens when we are running at APC_LEVEL, acquire the recursive mutex (which improperly handled APC_LEVEL), then attempt to access paged pool (or do anything else that depends on Irql < DISPATCH_LEVEL) - Optimize the code for acquiring and releasing the recursive mutex at DISPATCH_LEVEL Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/recm… ============================================================================== --- trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c [iso-8859-1] Thu Jun 25 01:57:48 2009 @@ -14,6 +14,7 @@ SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) { NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); + KIRQL CurrentIrql; /* Wait for the previous user to unlock the RecMutex state. There might be * multiple waiters waiting to change the state. We need to check each @@ -27,9 +28,13 @@ return TRUE; } - if( KeGetCurrentIrql() == PASSIVE_LEVEL ) { + CurrentIrql = KeGetCurrentIrql(); + + ASSERT(CurrentIrql <= DISPATCH_LEVEL); + + if( CurrentIrql <= APC_LEVEL ) { ExAcquireFastMutex( &RecMutex->Mutex ); - RecMutex->OldIrql = PASSIVE_LEVEL; + RecMutex->OldIrql = CurrentIrql; while( RecMutex->Locked ) { ExReleaseFastMutex( &RecMutex->Mutex ); Status = KeWaitForSingleObject( &RecMutex->StateLockedEvent, @@ -45,7 +50,8 @@ RecMutex->LockCount++; ExReleaseFastMutex( &RecMutex->Mutex ); } else { - KeAcquireSpinLock( &RecMutex->SpinLock, &RecMutex->OldIrql ); + KeAcquireSpinLockAtDpcLevel( &RecMutex->SpinLock ); + RecMutex->OldIrql = DISPATCH_LEVEL; RecMutex->Locked = TRUE; RecMutex->Writer = ToWrite; RecMutex->CurrentThread = CurrentThread; @@ -56,14 +62,13 @@ } VOID RecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ) { - if( RecMutex->LockCount == 0 ) { - return; - } else - RecMutex->LockCount--; + + ASSERT(RecMutex->LockCount > 0); + RecMutex->LockCount--; if( !RecMutex->LockCount ) { RecMutex->CurrentThread = NULL; - if( RecMutex->OldIrql == PASSIVE_LEVEL ) { + if( RecMutex->OldIrql <= APC_LEVEL ) { ExAcquireFastMutex( &RecMutex->Mutex ); RecMutex->Locked = FALSE; RecMutex->Writer = FALSE; @@ -71,10 +76,9 @@ } else { RecMutex->Locked = FALSE; RecMutex->Writer = FALSE; - KeReleaseSpinLock( &RecMutex->SpinLock, RecMutex->OldIrql ); + KeReleaseSpinLockFromDpcLevel( &RecMutex->SpinLock ); } - RecMutex->OldIrql = PASSIVE_LEVEL; KePulseEvent( &RecMutex->StateLockedEvent, IO_NETWORK_INCREMENT, FALSE ); }

1 0

[cwittich] 41599: stub NtSetThreadExecutionState needed by PowerPoint Viewer 2003
by cwittich＠svn.reactos.org 24 Jun '09

24 Jun '09

Author: cwittich Date: Wed Jun 24 23:53:54 2009 New Revision: 41599 URL: http://svn.reactos.org/svn/reactos?rev=41599&view=rev Log: stub NtSetThreadExecutionState needed by PowerPoint Viewer 2003 Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Jun 24 23:53:54 2009 @@ -588,6 +588,16 @@ NtSetThreadExecutionState(IN EXECUTION_STATE esFlags, OUT EXECUTION_STATE *PreviousFlags) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + static EXECUTION_STATE current = + ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; + EXECUTION_STATE old = current; + + UNIMPLEMENTED; + + if (!(current & ES_CONTINUOUS) || (esFlags & ES_CONTINUOUS)) + current = esFlags; + + *PreviousFlags = old; + + return STATUS_SUCCESS; +}

1 0

[cwittich] 41598: fix crash while loading PowerPoint 2003 Viewer See issue #4624 for more details.
by cwittich＠svn.reactos.org 24 Jun '09

24 Jun '09

Author: cwittich Date: Wed Jun 24 23:53:06 2009 New Revision: 41598 URL: http://svn.reactos.org/svn/reactos?rev=41598&view=rev Log: fix crash while loading PowerPoint 2003 Viewer See issue #4624 for more details. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Wed Jun 24 23:53:06 2009 @@ -36,7 +36,7 @@ } else { - if (lpwszDevice) // First + if ((lpwszDevice) && (wcslen(lpwszDevice) != 0)) // First { if (!_wcsnicmp(lpwszDevice, L"\\\\.\\DISPLAY",11)) Display = TRUE; RtlInitUnicodeString(&Device, lpwszDevice);

1 0

[sginsberg] 41597: - Hey Arch, try to learn basic PSEH2 syntax before fuddling around with it.
by sginsberg＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: sginsberg Date: Wed Jun 24 03:06:10 2009 New Revision: 41597 URL: http://svn.reactos.org/svn/reactos?rev=41597&view=rev Log: - Hey Arch, try to learn basic PSEH2 syntax before fuddling around with it. Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/string/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] Wed Jun 24 03:06:10 2009 @@ -82,6 +82,8 @@ Ret = lpString1; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } _SEH2_END; return Ret; @@ -103,6 +105,8 @@ Ret = lpString1; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } _SEH2_END; return Ret; @@ -123,6 +127,8 @@ Ret = strcat(lpString1, lpString2); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } _SEH2_END; return Ret; @@ -143,6 +149,8 @@ Ret = strlen(lpString); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } _SEH2_END; return Ret; @@ -223,6 +231,8 @@ Ret = lpString1; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } _SEH2_END; return Ret; @@ -243,6 +253,8 @@ Ret = wcscpy(lpString1, lpString2); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } _SEH2_END; return Ret; @@ -263,6 +275,8 @@ Ret = wcscat(lpString1, lpString2); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } _SEH2_END; return Ret; @@ -283,7 +297,9 @@ Ret = wcslen(lpString); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - _SEH2_END; - - return Ret; -} + { + } + _SEH2_END; + + return Ret; +}

1 0

[cfinck] 41596: Merge 41447
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 22:25:52 2009 New Revision: 41596 URL: http://svn.reactos.org/svn/reactos?rev=41596&view=rev Log: Merge 41447 Modified: branches/ros-branch-0_3_10/reactos/ (props changed) branches/ros-branch-0_3_10/reactos/base/applications/downloader/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/base/applications/dxdiag/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/base/applications/msconfig/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/base/applications/paint/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/base/applications/shutdown/lang/ru-RU.rc branches/ros-branch-0_3_10/reactos/base/applications/shutdown/shutdown.c branches/ros-branch-0_3_10/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/dll/cpl/mmsys/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/lang/pl-PL.rc branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/ros-branch-0_3_10/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 23 22:25:52 2009 @@ -1,1 +1,1 @@ -/trunk/reactos:41526 +/trunk/reactos:41447,41526 Modified: branches/ros-branch-0_3_10/reactos/base/applications/downloader/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/downloader/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/downloader/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -52,7 +52,7 @@ IDS_XMLERROR_2 "Nie uda³o siê przetworzyæ pliku XML !" IDS_DOWNLOAD_ERROR "Sci¹ganie pliku nieudane.\nProszê sprawdziæ po³¹czenie z internetem." IDS_VERSION "Wersja: " - IDS_LICENCE "Licenccja: " + IDS_LICENCE "Licencja: " IDS_MAINTAINER "Opiekun: " IDS_APPS_TITLE "Programy" IDS_CATS_TITLE "Kategorie" Modified: branches/ros-branch-0_3_10/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -62,7 +62,7 @@ RTEXT "GPU:", -1, 20, 45, 70, 10 RTEXT "Typ DAC:", -1, 20, 55, 70, 10 RTEXT "Pamiêæ:", -1, 20, 65, 70, 10 - RTEXT "Bierz¹ca rozdzielczoæ:", -1, 20, 75, 70, 10 + RTEXT "Bie¿¹ca rozdzielczoæ:", -1, 20, 75, 70, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10 @@ -188,7 +188,7 @@ IDS_NETWORK_DIALOG "Sieæ" IDS_HELP_DIALOG "Pomoc" IDS_FORMAT_MB "%I64uMB RAM" - IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" + IDS_FORMAT_SWAP "%I64u MB u¿ytych, %I64u MB dostêpnych" IDS_FORMAT_UNIPROC "%s (%u CPU)" IDS_FORMAT_MPPROC "%s (%u CPUs)" IDS_VERSION_UNKNOWN "Wersja nieznana" Modified: branches/ros-branch-0_3_10/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/msconfig/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/msconfig/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -158,7 +158,7 @@ IDS_TOOLS_INFO_CMD "winver.exe" IDS_TOOLS_REGEDIT_NAME "Edytor rejestru" - IDS_TOOLS_REGEDIT_DESCR "Opens the Registry-Editor." + IDS_TOOLS_REGEDIT_DESCR "Otwiera edytor rejestru." IDS_TOOLS_REGEDIT_CMD "regedit.exe" IDS_TOOLS_SYSDM_NAME "W³aciwoci systemu" Modified: branches/ros-branch-0_3_10/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -43,7 +43,7 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU -CAPTION "About" +CAPTION "O programie" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 @@ -54,7 +54,7 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Wait.." +CAPTION "Czekaj.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CTEXT "£adowanie logów zdarzeñ. Proszê czekaæ ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX @@ -63,7 +63,7 @@ IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Event Detail" +CAPTION "Szczegó³y zdarzenia" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Zamknij",IDOK,12,258,50,14 @@ -77,13 +77,13 @@ LTEXT "Czas:",IDC_STATIC,14,27,36,8 LTEXT "Statycznie",IDC_EVENTTIMESTATIC,56,27,72,8 LTEXT "&U¿ytkownik:",IDC_STATIC,14,41,36,8 - LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 - LTEXT "&Computer:",IDC_STATIC,14,54,36,8 + LTEXT "Statycznie",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Komputer:",IDC_STATIC,14,54,36,8 LTEXT "Statycznie",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 LTEXT "Numer ID:",IDC_STATIC,133,15,36,8 LTEXT "Statycznie",IDC_EVENTIDSTATIC,175,15,87,8 LTEXT "¯ród³o:",IDC_STATIC,133,28,36,8 - LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Statycznie",IDC_EVENTSOURCESTATIC,175,28,87,8 LTEXT "Typ:",IDC_STATIC,133,42,36,8 LTEXT "Statycznie",IDC_EVENTTYPESTATIC,175,42,87,8 LTEXT "Kategoria:",IDC_STATIC,133,55,36,8 @@ -102,7 +102,7 @@ IDC_EVENTLOG_WARNING_TYPE "Ostrze¿enie" IDC_EVENTLOG_INFORMATION_TYPE "Informacja" IDC_EVENTLOG_AUDIT_SUCCESS "Udany Audyt" - IDC_EVENTLOG_AUDIT_FAILURE "Nieudany Audit" + IDC_EVENTLOG_AUDIT_FAILURE "Nieudany Audyt" IDC_EVENTLOG_SUCCESS "Sukces" IDC_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" END Modified: branches/ros-branch-0_3_10/reactos/base/applications/paint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -64,13 +64,13 @@ MENUITEM "Kadrowanie", IDM_IMAGECROP MENUITEM "Odwrócenie kolorów\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "Atrybuty...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "Wyczyæ obraz\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Rysuj nieprzezroczyste", IDM_IMAGEDRAWOPAQUE END POPUP "&Kolory" BEGIN - MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE + MENUITEM "Edytuj kolory...", IDM_COLORSEDITPALETTE END POPUP "&?" @@ -131,9 +131,9 @@ LTEXT "Data:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Rozmiar:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 LTEXT "Rozdzielczoæ:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 + LTEXT "Niedostêpny", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 + LTEXT "Niedostêpny", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 + LTEXT "Niedostêpny", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 GROUPBOX "Jednostki", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 AUTORADIOBUTTON "Cale", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 @@ -186,7 +186,7 @@ IDS_TOOLTIP12, "Krzywa Beziera" IDS_TOOLTIP13, "Prostok¹t" IDS_TOOLTIP14, "Polygon" - IDS_TOOLTIP15, "Ellipsa" + IDS_TOOLTIP15, "Elipsa" IDS_TOOLTIP16, "Zaokr¹glony Prostok¹t" IDS_OPENFILTER, "Pliki Bitmapy (*.bmp;*.dib)\1*.bmp;*.dib\1Wszystkie pliki (*.*)\1*.*\1" IDS_SAVEFILTER, "Bitmapa 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1" Modified: branches/ros-branch-0_3_10/reactos/base/applications/shutdown/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/shutdown/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/shutdown/lang/ru-RU.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -10,7 +10,8 @@ -l\t\t\tÇàâåðøåíèå ñåàíñà\n\ -s\t\t\tÂûêëþ÷åíèå ýòîãî êîìïüþòåðà\n\ -r\t\t\tÏåðåçàãðóçêà ýòîãî êîìïüþòåðà\n\ - -f\t\t\tÈãíîðèðîâàíèå çàïóùåííûõ ïðîãðàìì è çàâåðøåíèå èõ áåç ïðåäóïðåæäåíèÿ\n\ - \t\t\tÅñëè âû íå óêàçàëè äðóãèå ïàðàìåòðû, òî ýòà îïöèÿ ïðèâåäåò ê\n\ - \t\t\tçàâåðøåíèþ ñåàíñà." + -f\t\t\tÈãíîðèðîâàíèå çàïóùåííûõ ïðîãðàìì è çàâåðøåíèå èõ áåç\n\ + \t\t\tïðåäóïðåæäåíèÿ\n\ + \t\t\tÅñëè âû íå óêàçàëè äðóãèå ïàðàìåòðû, òî ýòà îïöèÿ\n\ + \t\t\tïðèâåäåò ê çàâåðøåíèþ ñåàíñà." END Modified: branches/ros-branch-0_3_10/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -10,12 +10,21 @@ // Print information about which commandline arguments the program accepts. static void PrintUsage() { LPTSTR lpUsage = NULL; + DWORD errLength; // error message length + LPTSTR resMsg; // for error message in OEM symbols if( AllocAndLoadString( &lpUsage, GetModuleHandle(NULL), IDS_USAGE ) ) { - _putts( lpUsage ); + errLength = strlen(lpUsage) + 1; + resMsg = (LPTSTR)LocalAlloc(LPTR, errLength * sizeof(TCHAR)); + CharToOemBuff(lpUsage, resMsg, errLength); + + _putts( resMsg ); + + LocalFree(lpUsage); + LocalFree(resMsg); } } @@ -126,20 +135,28 @@ void DisplayLastError() { int errorCode = GetLastError(); - LPTSTR lpMsgBuf; + LPTSTR lpMsgBuf = NULL; + DWORD errLength; // error message length + LPTSTR resMsg; // for error message in OEM symbols // Display the error message to the user - FormatMessage( + errLength = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, errorCode, LANG_USER_DEFAULT, (LPTSTR) &lpMsgBuf, 0, - NULL); - - _ftprintf(stderr, lpMsgBuf); + NULL) + 1; + + resMsg = (LPTSTR)LocalAlloc(LPTR, errLength * sizeof(TCHAR)); + CharToOemBuff(lpMsgBuf, resMsg, errLength); + + _ftprintf(stderr, resMsg); _ftprintf(stderr, _T("Error code: %d\n"), errorCode); + + LocalFree(lpMsgBuf); + LocalFree(resMsg); } void EnableShutdownPrivileges() Modified: branches/ros-branch-0_3_10/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/c… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -148,5 +148,5 @@ 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" - IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" + IDS_HDTYPESTITLE "Wybierz z poni¿szej listy typ urz¹dzenia, które chcesz zainstalowaæ" END Modified: branches/ros-branch-0_3_10/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/c… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -111,7 +111,7 @@ CAPTION "Zapisz schemat jako..." FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Zapisz bierz¹cy schemat dzwiêkowy jako:", -1, 7, 7, 212, 9 + LTEXT "&Zapisz bie¿¹cy schemat dzwiêkowy jako:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 PUSHBUTTON "Anuluj", IDCANCEL, 157, 36, 60, 14 @@ -191,38 +191,38 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Opis ma byæ tutaj.", 9506, 8, 4, 212, 24 - LTEXT "Low", 9473, 65, 31, 14, 8 + LTEXT "Ma³a", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 - LTEXT "High", 9474, 202, 31, 17, 8 - LTEXT "Low", 9477, 65, 50, 14, 8 + LTEXT "Du¿a", 9474, 202, 31, 17, 8 + LTEXT "Ma³a", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 - LTEXT "High", 9478, 202, 50, 17, 8 - LTEXT "Low", 9481, 65, 69, 14, 8 + LTEXT "Du¿a", 9478, 202, 50, 17, 8 + LTEXT "Ma³a", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 - LTEXT "High", 9482, 202, 69, 17, 8 - LTEXT "Low", 9485, 65, 88, 14, 8 + LTEXT "Du¿a", 9482, 202, 69, 17, 8 + LTEXT "Ma³a", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 - LTEXT "High", 9486, 202, 88, 17, 8 - LTEXT "Low", 9489, 65, 107, 14, 8 + LTEXT "Du¿a", 9486, 202, 88, 17, 8 + LTEXT "Ma³a", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 - LTEXT "High", 9490, 202, 107, 17, 8 - LTEXT "Low", 9493, 65, 126, 14, 8 + LTEXT "Du¿a", 9490, 202, 107, 17, 8 + LTEXT "Ma³a", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 - LTEXT "High", 9494, 202, 126, 17, 8 - LTEXT "Low", 9497, 65, 145, 14, 8 + LTEXT "Du¿a", 9494, 202, 126, 17, 8 + LTEXT "Ma³a", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 - LTEXT "High", 9498, 202, 145, 17, 8 - LTEXT "Low", 9501, 65, 164, 14, 8 + LTEXT "Du¿a", 9498, 202, 145, 17, 8 + LTEXT "Ma³a", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 - LTEXT "High", 9502, 202, 164, 17, 8 + LTEXT "Du¿a", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Po³¹cz wszystkie suwaki", 9504, 5, 185, 216, 9 PUSHBUTTON "Odtwórz &domylne", 9505, 110, 199, 110, 14 END @@ -258,12 +258,12 @@ 5835 "Wywo³anie Menu" 5836 "Minimalizuj" 5837 "Powiadomienie o nowej poczcie" - 5838 "Start Navigation" + 5838 "Rozpoczêcie nawigacji" 5839 "Uruchomienie programu" 5840 "Zakoñczenie programu" - 5841 "Restore Down" - 5842 "Restore Up" - 5843 "Asterisk" + 5841 "Przywrócenie w dó³" + 5842 "Przywrócenie w górê" + 5843 "Gwiazdka" 5844 "Dwiêk domylny" 5845 "Wykrzyknik" 5846 "Zamkniêcie ReactOS" @@ -271,7 +271,7 @@ 5848 "Powiadomienie systemowe" 5849 "Znak zapytania" 5850 "Uruchomienie ReactOS" - 5851 "Start Menu" + 5851 "Menu Start" 5852 "Wylogowanie z ReactOS" 5853 "Logowanie do ReactOS" END Modified: branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Tue Jun 23 22:25:52 2009 @@ -222,7 +222,7 @@ IDS_CMT_RDESKTOP "Uruchom Zdalny pulpit" IDS_CMT_EVENTVIEW "Uruchom Podgl¹d Zdarzeñ" IDS_CMT_MSCONFIG "Uruchom Narzêdzie konfiguracji systemu" - IDS_CMT_PAINT "Launch Paint" + IDS_CMT_PAINT "Uruchom Paint" END Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 23 22:25:52 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095 -/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41526 +/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 23 22:25:52 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.c:41526 +/trunk/reactos/tools/rsym/rsym.c:41447,41526 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 23 22:25:52 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.h:41526 +/trunk/reactos/tools/rsym/rsym.h:41447,41526 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 23 22:25:52 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.mak:41526 +/trunk/reactos/tools/rsym/rsym.mak:41447,41526 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 23 22:25:52 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym_common.c:41526 +/trunk/reactos/tools/rsym/rsym_common.c:41447,41526

1 0

[cfinck] 41595: Hack: Add the APPDATA variable to the environment created by userenv. This code is not entirely correct due to the hardcoded string, but otherwise fits well into our existing CreateEnvironmentBlock implementation and served us well in the past.
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 20:33:26 2009 New Revision: 41595 URL: http://svn.reactos.org/svn/reactos?rev=41595&view=rev Log: Hack: Add the APPDATA variable to the environment created by userenv. This code is not entirely correct due to the hardcoded string, but otherwise fits well into our existing CreateEnvironmentBlock implementation and served us well in the past. Modified: branches/ros-branch-0_3_10/reactos/dll/win32/userenv/environment.c Modified: branches/ros-branch-0_3_10/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/win32/userenv/environment.c [iso-8859-1] Tue Jun 23 20:33:26 2009 @@ -379,6 +379,9 @@ L"USERPROFILE", Buffer, FALSE); + + wcscat(Buffer, L"\\Application Data"); + SetUserEnvironmentVariable(lpEnvironment, L"APPDATA", Buffer, FALSE); } /* FIXME: Set 'USERDOMAIN' variable */

1 0

[cfinck] 41594: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:37:25 2009 New Revision: 41594 URL: http://svn.reactos.org/svn/reactos?rev=41594&view=rev Log: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases Modified: branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c Modified: branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Tue Jun 23 19:37:25 2009 @@ -198,19 +198,12 @@ static VOID -GeneralOnInit(HWND hwnd, - PINFO pInfo) -{ - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hGeneralPage = hwnd; - +GeneralOnInit(PINFO pInfo) +{ SetWindowPos(pInfo->hGeneralPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -256,13 +249,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - GeneralOnInit(hDlg, (PINFO)lParam); + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); return TRUE; case WM_COMMAND: @@ -746,23 +740,16 @@ static VOID -DisplayOnInit(HWND hwnd, - PINFO pInfo) +DisplayOnInit(PINFO pInfo) { DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hDisplayPage = hwnd; - SetWindowPos(pInfo->hDisplayPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -836,13 +823,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - DisplayOnInit(hDlg, (PINFO)lParam); + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; case WM_DRAWITEM: @@ -986,11 +974,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_GENERAL), - pInfo->hTab, - GeneralDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -1001,11 +988,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_DISPLAY), - pInfo->hTab, - DisplayDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM));

1 0

[cfinck] 41593: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20.
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:34:47 2009 New Revision: 41593 URL: http://svn.reactos.org/svn/reactos?rev=41593&view=rev Log: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20. Modified: branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c Modified: branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/win32/riched20/editor.c [iso-8859-1] Tue Jun 23 19:34:47 2009 @@ -4162,7 +4162,9 @@ ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - goto do_default; + if (wParam) + ME_RewrapRepaint(editor); + return 0; case WM_SIZE: { RECT clientRect;

1 0

[cfinck] 41592: - Change the version to 0.3.10 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:27:12 2009 New Revision: 41592 URL: http://svn.reactos.org/svn/reactos?rev=41592&view=rev Log: - Change the version to 0.3.10 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop Modified: branches/ros-branch-0_3_10/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c branches/ros-branch-0_3_10/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_10/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/boot/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Tue Jun 23 19:27:12 2009 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","DragFullWindows",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 Modified: branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Jun 23 19:27:12 2009 @@ -756,6 +756,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE); Modified: branches/ros-branch-0_3_10/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_10/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/include/reactos/version.h [iso-8859-1] Tue Jun 23 19:27:12 2009 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 10 #define COPYRIGHT_YEAR "2009" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

1 0

[cfinck] 41591: Merge 41526
by cfinck＠svn.reactos.org 23 Jun '09

23 Jun '09

Author: cfinck Date: Tue Jun 23 19:20:22 2009 New Revision: 41591 URL: http://svn.reactos.org/svn/reactos?rev=41591&view=rev Log: Merge 41526 Modified: branches/ros-branch-0_3_10/reactos/ (props changed) branches/ros-branch-0_3_10/reactos/dll/win32/wininet/cookie.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/dialogs.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/ftp.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/http.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.h branches/ros-branch-0_3_10/reactos/dll/win32/wininet/netconnection.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/urlcache.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/utility.c branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.rbuild branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.spec branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rbuild_helper/ (props changed) branches/ros-branch-0_3_10/reactos/tools/rbuild_helper/rbuild_helper.cpp (props changed) branches/ros-branch-0_3_10/reactos/tools/rbuild_helper/rbuild_helper.rbuild (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/log2lines.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/log2lines.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w… Modified: branches/ros-branch-0_3_10/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/dll/w…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009