Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

by sserapion＠svn.reactos.org

Author: sserapion Date: Sun Jan 17 23:02:50 2010 New Revision: 45126 URL: http://svn.reactos.org/svn/reactos?rev=45126&view=rev Log: Fix win32k build Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sun Jan 17 23:02:50 2010 @@ -188,7 +188,7 @@ LRESULT FASTCALL IntDispatchMessage(MSG* Msg); BOOL FASTCALL -IntTranslateKbdMessage(LPMSG lpMsg, HKL dwhkl); +IntTranslateKbdMessage(LPMSG lpMsg, UINT flags); VOID FASTCALL co_MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jan 17 23:02:50 2010 @@ -2283,7 +2283,7 @@ BOOL APIENTRY NtUserTranslateMessage(LPMSG lpMsg, - HKL dwhkl) + UINT flags) { NTSTATUS Status; MSG SafeMsg; @@ -2299,7 +2299,7 @@ RETURN( FALSE); } - RETURN( IntTranslateKbdMessage(&SafeMsg, dwhkl)); + RETURN( IntTranslateKbdMessage(&SafeMsg, flags)); CLEANUP: DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_);

14 years, 8 months

[spetreolle] 45125: Add parameters check to ReadEventLog. Fixes last advapi32:eventlog crash

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Jan 17 22:40:39 2010 New Revision: 45125 URL: http://svn.reactos.org/svn/reactos?rev=45125&view=rev Log: Add parameters check to ReadEventLog. Fixes last advapi32:eventlog crash Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sun Jan 17 22:40:39 2010 @@ -672,6 +672,12 @@ TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); + + if(!pnBytesRead || !pnMinNumberOfBytesNeeded) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } /* If buffer is NULL set nNumberOfBytesToRead to 0 to prevent rpcrt4 from trying to access a null pointer */ @@ -736,6 +742,12 @@ TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); + + if(!pnBytesRead || !pnMinNumberOfBytesNeeded) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } /* If buffer is NULL set nNumberOfBytesToRead to 0 to prevent rpcrt4 from trying to access a null pointer */

14 years, 8 months

[sserapion] 45124: Fix user32 build.

by sserapion＠svn.reactos.org

Author: sserapion Date: Sun Jan 17 22:38:25 2010 New Revision: 45124 URL: http://svn.reactos.org/svn/reactos?rev=45124&view=rev Log: Fix user32 build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Sun Jan 17 22:38:25 2010 @@ -59,21 +59,21 @@ /* dealing with bitmap object */ if (uFormat != CF_BITMAP) { - size = NtUserGetClipboardData(uFormat, NULL); + size = (DWORD_PTR)NtUserGetClipboardData(uFormat, NULL); if (size) { hGlobal = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, size); pGlobal = GlobalLock(hGlobal); - size = NtUserGetClipboardData(uFormat, pGlobal); + size = (DWORD_PTR)NtUserGetClipboardData(uFormat, pGlobal); GlobalUnlock(hGlobal); } } else { - hGlobal = (HANDLE)NtUserGetClipboardData(CF_BITMAP, NULL); + hGlobal = NtUserGetClipboardData(CF_BITMAP, NULL); } return hGlobal; Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jan 17 22:38:25 2010 @@ -2881,7 +2881,7 @@ NTAPI NtUserTranslateMessage( LPMSG lpMsg, - HKL dwhkl ); + UINT flags ); BOOL NTAPI

14 years, 8 months

[ekohl] 45123: Implement ElfrRegisterEventSourceA.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 17 16:16:26 2010 New Revision: 45123 URL: http://svn.reactos.org/svn/reactos?rev=45123&view=rev Log: Implement ElfrRegisterEventSourceA. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Jan 17 16:16:26 2010 @@ -29,7 +29,6 @@ } Status = RpcServerRegisterIf(eventlog_v0_0_s_ifspec, NULL, NULL); - if (Status != RPC_S_OK) { DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); @@ -37,7 +36,6 @@ } Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); - if (Status != RPC_S_OK) { DPRINT("RpcServerListen() failed (Status %lx)\n", Status); @@ -533,8 +531,48 @@ DWORD MinorVersion, IELF_HANDLE *LogHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING UNCServerNameW = { 0, 0, NULL }; + UNICODE_STRING ModuleNameW = { 0, 0, NULL }; + + if (UNCServerName && + !RtlCreateUnicodeStringFromAsciiz(&UNCServerNameW, UNCServerName)) + { + return STATUS_NO_MEMORY; + } + + if (ModuleName && + !RtlAnsiStringToUnicodeString(&ModuleNameW, (PANSI_STRING)ModuleName, TRUE)) + { + RtlFreeUnicodeString(&UNCServerNameW); + return STATUS_NO_MEMORY; + } + + /* RegModuleName must be an empty string */ + if (RegModuleName->Length > 0) + { + RtlFreeUnicodeString(&UNCServerNameW); + RtlFreeUnicodeString(&ModuleNameW); + return STATUS_INVALID_PARAMETER; + } + + if ((MajorVersion != 1) || (MinorVersion != 1)) + { + RtlFreeUnicodeString(&UNCServerNameW); + RtlFreeUnicodeString(&ModuleNameW); + return STATUS_INVALID_PARAMETER; + } + + /*FIXME: UNCServerName must specify the server or empty for local */ + + /*FIXME: Must verify that caller has write access */ + + *LogHandle = ElfCreateEventLogHandle(ModuleNameW.Buffer, + TRUE); + + RtlFreeUnicodeString(&UNCServerNameW); + RtlFreeUnicodeString(&ModuleNameW); + + return STATUS_SUCCESS; }

14 years, 8 months

[ekohl] 45122: Empty the card stacks before showing the win message box.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 17 13:51:16 2010 New Revision: 45122 URL: http://svn.reactos.org/svn/reactos?rev=45122&view=rev Log: Empty the card stacks before showing the win message box. Modified: trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Sun Jan 17 13:51:16 2010 @@ -201,6 +201,8 @@ /* Game finished successfully */ void GameFinished() { + SpiderWnd.EmptyStacks(); + MessageBox(SpiderWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION); if( IDYES == MessageBox(SpiderWnd, MsgDeal, szAppName, MB_YESNO | MB_ICONQUESTION) ) { @@ -208,7 +210,6 @@ } else { - SpiderWnd.EmptyStacks(); fGameStarted = false; } }

14 years, 8 months

[mkupfer] 45121: - fix and add several German and English translations

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jan 17 13:51:08 2010 New Revision: 45121 URL: http://svn.reactos.org/svn/reactos?rev=45121&view=rev Log: - fix and add several German and English translations Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Sun Jan 17 13:51:08 2010 @@ -48,7 +48,7 @@ CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 LTEXT "Tastatur:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 - LTEXT "Klicken Sie auf Weiter um Installationsort zu konfigurieren.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -81,13 +81,22 @@ PUSHBUTTON "&Abbrechen", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installationszusammenfassung", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Klicken Sie auf Weiter um die Installation zu starten.", IDC_STATIC, 10, 180 ,277, 20 +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + CONTROL "Installationsaktion", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Installation der Dateien...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -96,15 +105,15 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "Vervollständige ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + CONTROL "Abschließen der ersten Stufe des ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Sie haben die erste Stufe des ReactOS Setup erfolgreich abgeschlossen.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Wenn Sie auf Beenden klicken wird der Computer neugestartet.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie sie. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 10, 180, 297, 20 END @@ -116,12 +125,14 @@ IDS_TYPESUBTITLE "Wählen Sie einen Setuptyp." IDS_DEVICETITLE "Einstellen der Basisgeräte" IDS_DEVICESUBTITLE "Einstellungen der Anzeigegeräte und der Tastatur." - IDS_DRIVETITLE "Setup the installation partition and system folder" - IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." - IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" - IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_DRIVETITLE "Richte Installationspartition und Systemverzeichnis ein" + IDS_DRIVESUBTITLE "Vorbereiten von Installationspartition, Systemverzeichnis und Bootloader." + IDS_PROCESSTITLE "Richte Partition ein, kopiere Dateien und richte System ein." + IDS_PROCESSSUBTITLE "Erstelle und formatiere Partition, kopiere Dateien, installiere und konfiguriere Bootloader" + IDS_RESTARTTITLE "Erste Stufe des Setup wurde abgeschlossen." + IDS_RESTARTSUBTITLE "Die erste Stufe des Setup wurde abgeschlossen, starten Sie den Rechner neu, um mit der zweiten Stufe fortzufahren." + IDS_SUMMARYTITLE "Installationszusammenfassung" + IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die Geräte auf" IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, dann müssen Sie das Setup nochmal ausführen, um ReactOS zu installieren. Wirklich beenden?" IDS_ABORTSETUP2 "Installation abbrechen?" END Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sun Jan 17 13:51:08 2010 @@ -48,7 +48,7 @@ CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 - LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -141,7 +141,7 @@ IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." - IDS_PROCESSTITLE "Prepare partition, copy files and setup system" + IDS_PROCESSTITLE "Setup partition, copy files and setup system" IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" IDS_RESTARTTITLE "First stage of setup finished" IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"

14 years, 8 months

[tkreuzer] 45120: [KE] - Fix setting of fs in KeContextToTrapFrame and comparison in KiGeneralProtectionFault

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 17 10:38:11 2010 New Revision: 45120 URL: http://svn.reactos.org/svn/reactos?rev=45120&view=rev Log: [KE] - Fix setting of fs in KeContextToTrapFrame and comparison in KiGeneralProtectionFault Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c [iso-8859-1] Sun Jan 17 10:38:11 2010 @@ -102,7 +102,7 @@ /* Set valid selectors */ TrapFrame->SegDs = KGDT_64_DATA | RPL_MASK; TrapFrame->SegEs = KGDT_64_DATA | RPL_MASK; - TrapFrame->SegFs = KGDT_32_R3_TEB; + TrapFrame->SegFs = KGDT_32_R3_TEB | RPL_MASK; TrapFrame->SegGs = KGDT_64_DATA | RPL_MASK; } else @@ -218,7 +218,7 @@ /* Set valid selectors */ Context->SegDs = KGDT_64_DATA | RPL_MASK; Context->SegEs = KGDT_64_DATA | RPL_MASK; - Context->SegFs = KGDT_32_R3_TEB; + Context->SegFs = KGDT_32_R3_TEB | RPL_MASK; Context->SegGs = KGDT_64_DATA | RPL_MASK; } else Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sun Jan 17 10:38:11 2010 @@ -577,10 +577,11 @@ jne KiGpfPopSegDs cmp [rbp + KTRAP_FRAME_SegEs], dx jne KiGpfPopSegEs + cmp [rbp + KTRAP_FRAME_SegGs], dx + jne KiGpfPopSegGs + mov dx, 0x0053 // KGDT64_R3_CMTEB | RPL_MASK cmp [rbp + KTRAP_FRAME_SegFs], dx jne KiGpfPopSegFs - cmp [rbp + KTRAP_FRAME_SegGs], dx - jne KiGpfPopSegGs KiGpfFatal:

14 years, 8 months

[cwittich] 45119: [advpack] update advpack to wine 1.1.36

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 17 09:29:56 2010 New Revision: 45119 URL: http://svn.reactos.org/svn/reactos?rev=45119&view=rev Log: [advpack] update advpack to wine 1.1.36 Modified: trunk/reactos/dll/win32/advpack/files.c Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Sun Jan 17 09:29:56 2010 @@ -279,13 +279,13 @@ if (lpszDestFile) { dwLen = lstrlenW(lpszDestFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR)); lstrcpyW(szDestFilename, lpszDestFile); } else { dwLen = lstrlenW(lpszSourceFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR)); lstrcpyW(szDestFilename, lpszSourceFile); } @@ -648,6 +648,18 @@ return dwNumFound; } +static void free_file_list(SESSION* session) +{ + struct FILELIST *next, *curr = session->FileList; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } +} + /*********************************************************************** * ExtractFilesA (ADVPACK.@) * @@ -728,20 +740,8 @@ session.Operation |= EXTRACT_EXTRACTFILES; res = pExtract(&session, CabName); - if (session.FileList) - { - struct FILELIST *curr = session.FileList; - struct FILELIST *next; - - while (curr) - { - next = curr->next; - free_file_node(curr); - curr = next; - } - } - done: + free_file_list(&session); FreeLibrary(hCabinet); HeapFree(GetProcessHeap(), 0, szConvertedList);

14 years, 8 months

[cwittich] 45118: [cabinet_winetest] update cabinet winetest to wine 1.1.36

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 17 09:23:35 2010 New Revision: 45118 URL: http://svn.reactos.org/svn/reactos?rev=45118&view=rev Log: [cabinet_winetest] update cabinet winetest to wine 1.1.36 Modified: trunk/rostests/winetests/cabinet/extract.c Modified: trunk/rostests/winetests/cabinet/extract.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/extract… ============================================================================== --- trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] Sun Jan 17 09:23:35 2010 @@ -329,6 +329,26 @@ return TRUE; } +static void free_file_node(struct FILELIST *node) +{ + HeapFree(GetProcessHeap(), 0, node->FileName); + HeapFree(GetProcessHeap(), 0, node); +} + +static void free_file_list(SESSION* session) +{ + struct FILELIST *next, *curr = session->FileList; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } + + session->FileList = NULL; +} + static void test_Extract(void) { SESSION session; @@ -370,6 +390,7 @@ ok(check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); /* try fill file list operation */ ZeroMemory(&session, sizeof(SESSION)); @@ -454,7 +475,10 @@ ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); /* remove two of the files in the list */ + node = session.FileList->next; session.FileList->next = session.FileList->next->next; + free_file_node(node); + free_file_node(session.FileList->next->next); session.FileList->next->next = NULL; session.FilterList = NULL; CreateDirectoryA("dest", NULL); @@ -482,6 +506,7 @@ ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); session.Operation = EXTRACT_FILLFILELIST; session.FileList = NULL; @@ -564,6 +589,7 @@ ok(check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); /* cabinet does not exist */ ZeroMemory(&session, sizeof(SESSION)); @@ -593,6 +619,7 @@ ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); + free_file_list(&session); /* first file exists */ createTestFile("dest\\a.txt"); @@ -631,6 +658,7 @@ ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); } ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); + free_file_list(&session); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\a.txt"); @@ -670,7 +698,8 @@ ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); - ok(check_list(&node, "a.txt", TRUE), "list entry wrong\n"); + ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n"); + free_file_list(&session); SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\testdir\\c.txt");

14 years, 8 months

[sserapion] 45117: [KDBG] - Make backtrace addresses also print correctly.

by sserapion＠svn.reactos.org

Author: sserapion Date: Sun Jan 17 09:02:52 2010 New Revision: 45117 URL: http://svn.reactos.org/svn/reactos?rev=45117&view=rev Log: [KDBG] - Make backtrace addresses also print correctly. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sun Jan 17 09:02:52 2010 @@ -841,11 +841,15 @@ } else { +#ifdef _M_AMD64 + KdbpPrint("Rip:\n"); +#else KdbpPrint("Eip:\n"); +#endif /* Try printing the function at EIP */ if (!KdbSymPrintAddress((PVOID)KdbCurrentTrapFrame->Tf.Eip)) - KdbpPrint("<%x>\n", KdbCurrentTrapFrame->Tf.Eip); + KdbpPrint("<%p>\n", KdbCurrentTrapFrame->Tf.Eip); else KdbpPrint("\n"); }

14 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
53
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 2010