Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[janderwald] 23567: * add registry test code from bug 1750 by P43LOk

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 13 22:52:57 2006 New Revision: 23567 URL: http://svn.reactos.org/svn/reactos?rev=23567&view=rev Log: * add registry test code from bug 1750 by P43LOk Modified: trunk/reactos/regtests/winetests/advapi32/registry.c Modified: trunk/reactos/regtests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/advapi3… ============================================================================== --- trunk/reactos/regtests/winetests/advapi32/registry.c (original) +++ trunk/reactos/regtests/winetests/advapi32/registry.c Sun Aug 13 22:52:57 2006 @@ -351,10 +351,21 @@ static void test_reg_delete_key() { DWORD ret; - + HKEY hkResult = NULL; + ret = RegDeleteKey(hkey_main, NULL); ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_ACCESS_DENIED, "expected ERROR_INVALID_PARAMETER or ERROR_ACCESS_DENIED, got %ld\n", ret); + + ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Tost", &hkResult); + + ret = RegDeleteValue(hkResult, "noExists"); + ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %ld\n", ret); + + ret = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Tost"); + + ret = RegCloseKey(hkResult); + } static void test_reg_save_key()

18 years, 4 months

[arty] 23566: Accept a NULL ResourceList if the caller is just asking how big the result will be, as indicated by a zero BufferSize.

by arty＠svn.reactos.org

Author: arty Date: Sun Aug 13 11:05:14 2006 New Revision: 23566 URL: http://svn.reactos.org/svn/reactos?rev=23566&view=rev Log: Accept a NULL ResourceList if the caller is just asking how big the result will be, as indicated by a zero BufferSize. Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c Sun Aug 13 11:05:14 2006 @@ -103,7 +103,7 @@ ULONG ResourceListSize; PAGED_CODE(); - ASSERT((Status && ResourceList) || *BufferSize != 0); + ASSERT((Status && ResourceList) || (BufferSize && *BufferSize == 0)); NDIS_DbgPrint(MAX_TRACE, ("Called\n"));

18 years, 4 months

[jimtabor] 23565: - User32: menu, Patch by Aric Stewart, Implement MNS_NOTIFYBYPOS. Added WM_MENUCOMMAND to winuser.h.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Aug 13 08:48:34 2006 New Revision: 23565 URL: http://svn.reactos.org/svn/reactos?rev=23565&view=rev Log: - User32: menu, Patch by Aric Stewart, Implement MNS_NOTIFYBYPOS. Added WM_MENUCOMMAND to winuser.h. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/include/psdk/winuser.h 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 (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sun Aug 13 08:48:34 2006 @@ -2387,7 +2387,12 @@ } else { - PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0); + if (MenuInfo->dwStyle & MNS_NOTIFYBYPOS) + PostMessageW(Mt->OwnerWnd, WM_MENUCOMMAND, + MenuInfo->FocusedItem, + (LPARAM)MenuInfo->Self); + else + PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0); } } wID = ItemInfo.wID; Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Sun Aug 13 08:48:34 2006 @@ -1435,6 +1435,7 @@ #define WM_MENURBUTTONUP 290 #endif #define WM_MENUCHAR 288 +#define WM_MENUCOMMAND 294 #define WM_MENUSELECT 287 #define WM_NEXTMENU 531 #define WM_MOVE 3

18 years, 4 months

[mc] 23564: modified porting-tools/mstscax/mstscax.cpp Guard against NULL pointers in certain methods Append a newline to debug messages Support a couple forgotten VARIANT types Corrected implementations of IUnknown::QueryInterface Better debug output for IDispatch::GetIDsOfNames and IDispatch::Invoke Debug output for IQuickActivate modified porting-tools/rdesktop-core-tester/activex.cpp Way too many changes to list. Basically, I wrote an ActiveX control without any help from third party librari

by mc＠svn.reactos.org

Author: mc Date: Sun Aug 13 00:40:12 2006 New Revision: 23564 URL: http://svn.reactos.org/svn/reactos?rev=23564&view=rev Log: modified porting-tools/mstscax/mstscax.cpp Guard against NULL pointers in certain methods Append a newline to debug messages Support a couple forgotten VARIANT types Corrected implementations of IUnknown::QueryInterface Better debug output for IDispatch::GetIDsOfNames and IDispatch::Invoke Debug output for IQuickActivate modified porting-tools/rdesktop-core-tester/activex.cpp Way too many changes to list. Basically, I wrote an ActiveX control without any help from third party libraries such as ATL. It was educative, but not terribly fun. Very nearly there All properties of the control are now supported, aligned to the behavior of the original control, version 5.2. Parameter validation and range enforcement eveeywhere modified porting-tools/rdesktop-core-tester/mstsclib.idl Reindented Removed explicit __stdcall convention Added alternate interface ids/class ids for compatibility with the msrdp.ocx redistributable. Code does not support this yet modified porting-tools/rdesktop-core-tester/mstsclib.rc added porting-tools/rdesktop-core-tester/mstsclib_redist.idl added porting-tools/rdesktop-core-tester/mstsclib_redist.rc modified porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj added porting-tools/rdesktop-core-tester/typelib.rh Support two type libraries for compatibility with the msrdp.ocx redistributable. Code does not support this yet modified porting-tools/rdesktop-core-tester/mstsclib_h.h modified porting-tools/rdesktop-core-tester/mstsclib_i.c added porting-tools/rdesktop-core-tester/mstsclib_redist_h.h added porting-tools/rdesktop-core-tester/mstsclib_redist_i.c Auto-generated files, for the poor souls without MIDL modified porting-tools/rdesktop-core-tester/stdafx.h Added missing OLE header Corrected typo Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist.idl trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist.rc trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist_h.h trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist_i.c trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/typelib.rh Modified: trunk/reactos/base/applications/tsclient/porting-tools/mstscax/mstscax.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib.idl trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib.rc trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_h.h trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_i.c trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/tsclient/porting-tools/mstscax/mstscax.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_h.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_i.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist_h.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/mstsclib_redist_i.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/rdesktop-core-tester.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… Added: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/typelib.rh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient…

18 years, 4 months

[janderwald] 23563: * implement unattend switch for intl * makes ReactOS gui setup run unattended (untill VmWare popsup)

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 23:32:57 2006 New Revision: 23563 URL: http://svn.reactos.org/svn/reactos?rev=23563&view=rev Log: * implement unattend switch for intl * makes ReactOS gui setup run unattended (untill VmWare popsup) Modified: trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=23… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Sat Aug 12 23:32:57 2006 @@ -26,6 +26,8 @@ #include <windows.h> #include <commctrl.h> #include <cpl.h> +#include <setupapi.h> +#include <tchar.h> #include "intl.h" #include "resource.h" @@ -38,7 +40,7 @@ HINSTANCE hApplet = 0; - +HINF hSetupInf = INVALID_HANDLE_VALUE; /* Applets */ APPLET Applets[NUM_APPLETS] = @@ -58,6 +60,71 @@ psp->pfnDlgProc = DlgProc; } +BOOL +OpenSetupInf() +{ + LPTSTR lpCmdLine; + LPTSTR lpSwitch; + size_t len; + + lpCmdLine = GetCommandLine(); + + lpSwitch = _tcsstr(lpCmdLine, _T("/f:\"")); + + if(!lpSwitch) + { + return FALSE; + } + + len = _tcslen(lpSwitch); + if (len < 5) + { + return FALSE; + } + + if(lpSwitch[len-1] != _T('\"')) + { + return FALSE; + } + + lpSwitch[len-1] = _T('\0'); + + hSetupInf = SetupOpenInfFile(&lpSwitch[4], + NULL, + INF_STYLE_OLDNT, + NULL); + + return (hSetupInf != INVALID_HANDLE_VALUE); +} + +LONG ParseSetupInf() +{ + INFCONTEXT InfContext; + INT LocaleID; + TCHAR szBuffer[30]; + + if (!SetupFindFirstLine(hSetupInf, + _T("Unattend"), + _T("LocaleID"), + &InfContext)) + { + return -1; + } + + if (!SetupGetStringField(&InfContext, + 1, + szBuffer, + sizeof(szBuffer) / sizeof(TCHAR), + NULL)) + { + return -1; + } + LocaleID = _ttoi(szBuffer); + SetNewLocale((LCID)LocaleID); + SetupCloseInfFile(hSetupInf); + + return 0; +} LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) @@ -65,6 +132,11 @@ PROPSHEETPAGE psp[6]; PROPSHEETHEADER psh; TCHAR Caption[256]; + + if (OpenSetupInf()) + { + return ParseSetupInf(); + } LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=23… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Sat Aug 12 23:32:57 2006 @@ -55,6 +55,9 @@ WPARAM wParam, LPARAM lParam); + +void SetNewLocale(LCID lcid); + #endif /* __CPL_INTL_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Sat Aug 12 23:32:57 2006 @@ -11,6 +11,7 @@ <library>user32</library> <library>comctl32</library> <library>advapi32</library> + <library>setupapi</library> <file>currency.c</file> <file>date.c</file> <file>general.c</file>

18 years, 4 months

[janderwald] 23562: * make rundll32 work w/o kernel32 hack * thnx to Alex_Ionescu for hint

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 23:29:08 2006 New Revision: 23562 URL: http://svn.reactos.org/svn/reactos?rev=23562&view=rev Log: * make rundll32 work w/o kernel32 hack * thnx to Alex_Ionescu for hint Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Sat Aug 12 23:29:08 2006 @@ -724,7 +724,7 @@ ZeroMemory(&StartupInfo, sizeof(STARTUPINFO)); StartupInfo.cb = sizeof(STARTUPINFO); - if (!CreateProcess(_T("rundll32.exe"), + if (!CreateProcess(NULL, lpCommandLine, NULL, NULL, @@ -752,6 +752,7 @@ LPARAM lParam) { PSETUPDATA SetupData; + TCHAR szBuffer[MAX_PATH]; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); @@ -777,14 +778,16 @@ { case IDC_CUSTOMLOCALE: { - RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL intl.cpl,,5")); + _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,5")); + RunControlPanelApplet(hwndDlg, szBuffer); /* FIXME: Update input locale name */ } break; case IDC_CUSTOMLAYOUT: { - RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL main.cpl,@1")); + _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); + RunControlPanelApplet(hwndDlg, szBuffer); } break; } @@ -802,7 +805,8 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData->UnattendSetup) { - RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\"")); + _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\"")); + RunControlPanelApplet(hwndDlg, szBuffer); SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; }

18 years, 4 months

[janderwald] 23561: revert my useless code

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 22:16:17 2006 New Revision: 23561 URL: http://svn.reactos.org/svn/reactos?rev=23561&view=rev Log: revert my useless code Modified: trunk/reactos/dll/win32/kernel32/process/create.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Sat Aug 12 22:16:17 2006 @@ -1227,70 +1227,7 @@ DPRINT("Quoted CmdLine: %S\n", QuotedCmdLine); } -#if 0 - else if(lpApplicationName && lpCommandLine) - { - int len; - int Size = 0; - WCHAR * AppName; - - AppName = wcsrchr(lpApplicationName, L'\\'); - if (AppName) - { - AppName++; - } - else - { - AppName = (WCHAR*)lpApplicationName; - } - - len = wcslen(AppName); - if (!_wcsnicmp(AppName, lpCommandLine, len-4) && lpCommandLine[len-4] == L' ') - { - /* remove application name */ - NullBuffer = wcschr(lpCommandLine, L' '); - } - else if (!_wcsnicmp(lpApplicationName, lpCommandLine, wcslen(lpApplicationName))) - { - NullBuffer = lpCommandLine + wcslen(lpApplicationName) + 1; - } - else - { - NullBuffer = (WCHAR*)lpCommandLine; - } - - if (NullBuffer) - { - Size = wcslen(NullBuffer) + 1; - } - - /* Allocate a buffer */ - QuotedCmdLine = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - (Size + wcslen(lpApplicationName) + 2 + 1) * - sizeof(WCHAR)); - if (QuotedCmdLine == NULL) - { - DPRINT1("Cannot allocate memory for quoted command line\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto Cleanup; - } - - /* Copy the first quote */ - wcscpy(QuotedCmdLine, L"\""); - - /* Add the command line and the finishing quote */ - wcscat(QuotedCmdLine, lpApplicationName); - wcscat(QuotedCmdLine, L"\""); - - if (Size) - { - wcscat(QuotedCmdLine, L" "); - wcscat(QuotedCmdLine, NullBuffer); - } - lpCommandLine = QuotedCmdLine; - } -#endif + if (Escape) { if (QuotedCmdLine == NULL)

18 years, 4 months

[janderwald] 23560: disable code for now

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 21:41:38 2006 New Revision: 23560 URL: http://svn.reactos.org/svn/reactos?rev=23560&view=rev Log: disable code for now Modified: trunk/reactos/dll/win32/kernel32/process/create.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Sat Aug 12 21:41:38 2006 @@ -1227,6 +1227,7 @@ DPRINT("Quoted CmdLine: %S\n", QuotedCmdLine); } +#if 0 else if(lpApplicationName && lpCommandLine) { int len; @@ -1289,7 +1290,7 @@ } lpCommandLine = QuotedCmdLine; } - +#endif if (Escape) { if (QuotedCmdLine == NULL)

18 years, 4 months

[janderwald] 23559: * handle special case

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 21:29:38 2006 New Revision: 23559 URL: http://svn.reactos.org/svn/reactos?rev=23559&view=rev Log: * handle special case Modified: trunk/reactos/dll/win32/kernel32/process/create.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Sat Aug 12 21:29:38 2006 @@ -673,7 +673,7 @@ * key (see http://blogs.msdn.com/oldnewthing/archive/2005/12/19/505449.aspx) */ - DPRINT1("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" + DPRINT("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" " lpEnvironment: %p lpCurrentDirectory: %S dwCreationFlags: %lx\n", lpApplicationName, lpCommandLine, lpEnvironment, lpCurrentDirectory, dwCreationFlags); @@ -1248,6 +1248,10 @@ { /* remove application name */ NullBuffer = wcschr(lpCommandLine, L' '); + } + else if (!_wcsnicmp(lpApplicationName, lpCommandLine, wcslen(lpApplicationName))) + { + NullBuffer = lpCommandLine + wcslen(lpApplicationName) + 1; } else {

18 years, 4 months

[jimtabor] 23558: Remove hack for TS messages.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Aug 12 19:55:03 2006 New Revision: 23558 URL: http://svn.reactos.org/svn/reactos?rev=23558&view=rev Log: Remove hack for TS messages. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Sat Aug 12 19:55:03 2006 @@ -1103,19 +1103,13 @@ /* Copy data if required */ if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) { - - DPRINT1("Copy message to kernel from the User! %x from %x\n", KernelMem, UserModeMsg->lParam); - RtlCopyMemory(KernelMem, (PVOID) UserModeMsg->lParam, Size); - Status = STATUS_SUCCESS; - - -// Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); -// if (! NT_SUCCESS(Status)) -// { -// DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); -// ExFreePool(KernelMem); -// return Status; -// } + Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); + ExFreePool(KernelMem); + return Status; + } } else {

18 years, 4 months

← Newer
1
...
26
27
28
29
30
31
32
...
45
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 August 2006