Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 41056: - Check the pointer for client thread information for null not thread information.
by jimtabor＠svn.reactos.org 23 May '09

23 May '09

Author: jimtabor Date: Sat May 23 08:01:27 2009 New Revision: 41056 URL: http://svn.reactos.org/svn/reactos?rev=41056&view=rev Log: - Check the pointer for client thread information for null not thread information. 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat May 23 08:01:27 2009 @@ -1999,7 +1999,7 @@ BOOL APIENTRY IntInitMessagePumpHook() { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) { ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++; return TRUE; @@ -2010,7 +2010,7 @@ BOOL APIENTRY IntUninitMessagePumpHook() { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <= 0) {

1 0

[mjmartin] 41055: - CreateClassDeviceObject/ClassAddDevice: Again do not create device with exclusive access.
by mjmartin＠svn.reactos.org 23 May '09

23 May '09

Author: mjmartin Date: Sat May 23 06:02:48 2009 New Revision: 41055 URL: http://svn.reactos.org/svn/reactos?rev=41055&view=rev Log: - CreateClassDeviceObject/ClassAddDevice: Again do not create device with exclusive access. Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Sat May 23 06:02:48 2009 @@ -331,7 +331,7 @@ &DeviceNameU, FILE_DEVICE_MOUSE, FILE_DEVICE_SECURE_OPEN, - TRUE, + FALSE, &Fdo); if (NT_SUCCESS(Status)) goto cleanup; @@ -625,7 +625,7 @@ NULL, Pdo->DeviceType, Pdo->Characteristics & FILE_DEVICE_SECURE_OPEN ? FILE_DEVICE_SECURE_OPEN : 0, - TRUE, + FALSE, &Fdo); if (!NT_SUCCESS(Status)) {

1 0

[mjmartin] 41054: - CreateClassDeviceObject/ClassAddDevice: Do not create KeyboardClass device with exclusive access as it will prevent key loggers from working.
by mjmartin＠svn.reactos.org 23 May '09

23 May '09

Author: mjmartin Date: Sat May 23 05:37:34 2009 New Revision: 41054 URL: http://svn.reactos.org/svn/reactos?rev=41054&view=rev Log: - CreateClassDeviceObject/ClassAddDevice: Do not create KeyboardClass device with exclusive access as it will prevent key loggers from working. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sat May 23 05:37:34 2009 @@ -354,7 +354,7 @@ &DeviceNameU, FILE_DEVICE_KEYBOARD, FILE_DEVICE_SECURE_OPEN, - TRUE, + FALSE, &Fdo); if (NT_SUCCESS(Status)) goto cleanup; @@ -649,7 +649,7 @@ NULL, Pdo->DeviceType, Pdo->Characteristics & FILE_DEVICE_SECURE_OPEN ? FILE_DEVICE_SECURE_OPEN : 0, - TRUE, + FALSE, &Fdo); if (!NT_SUCCESS(Status)) {

1 0

[jimtabor] 41053: - Remove the rest...
by jimtabor＠svn.reactos.org 23 May '09

23 May '09

Author: jimtabor Date: Sat May 23 05:15:45 2009 New Revision: 41053 URL: http://svn.reactos.org/svn/reactos?rev=41053&view=rev Log: - Remove the rest... Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat May 23 05:15:45 2009 @@ -91,7 +91,6 @@ LIST_ENTRY DriverObjListHead; struct _KBL* KeyboardLayout; W32HEAP_USER_MAPPING HeapMappings; - PPROCESSINFO ProcessInfo; } W32PROCESS, *PW32PROCESS; typedef struct _PROCESSINFO Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sat May 23 05:15:45 2009 @@ -101,7 +101,7 @@ void FASTCALL DestroyProcessClasses(PW32PROCESS Process ) { PWINDOWCLASS Class; - PPROCESSINFO pi = Process->ProcessInfo; + PPROCESSINFO pi = (PPROCESSINFO)Process; if (pi != NULL) {

1 0

[tkreuzer] 41052: syssetup: convert to spec
by tkreuzer＠svn.reactos.org 23 May '09

23 May '09

Author: tkreuzer Date: Sat May 23 05:02:23 2009 New Revision: 41052 URL: http://svn.reactos.org/svn/reactos?rev=41052&view=rev Log: syssetup: convert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def (removed) @@ -1,31 +1,0 @@ -LIBRARY SYSSETUP.DLL -EXPORTS -;ApplyAcls -;DevInstallW -;GenerateScsiHwIdList -InitializeSetupActionLog@4 -InstallLiveCD@4 -InstallReactOS@4 -KeyboardClassInstaller@12 -;LogItem@8 -;LogItem0 -;LogItem1 -;LogItem2 -;LogItem3 -;LogItemN -MouseClassInstaller@12 -;PnPInitializationThread -;RepairStartMenuItems -;ReportError -;ScsiClassInstaller -SetupChangeFontSize@8 -SetupChangeLocale@8 -SetupChangeLocaleEx@24 -;SetupCreateOptionalComponentsPage -;SetupInfObjectInstallActionW -;SetupSetLargeDialogFont -;TapeClassInstaller -TerminateSetupActionLog@0 -;UpgradePrinters -;ViewSetupActionLog -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] Sat May 23 05:02:23 2009 @@ -1,5 +1,5 @@ <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll" unicode="yes" allowwarnings="true" crt="msvcrt"> - <importlibrary definition="syssetup.def" /> + <importlibrary definition="syssetup.spec" /> <include base="syssetup">.</include> <library>pseh</library> <library>uuid</library> Added: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Sat May 23 05:02:23 2009 @@ -1,0 +1,28 @@ +#@ stdcall ApplyAcls +#@ stdcall DevInstallW +#@ stdcall GenerateScsiHwIdList +@ stdcall InitializeSetupActionLog(long) +@ stdcall InstallLiveCD(ptr) +@ stdcall InstallReactOS(ptr) +@ stdcall KeyboardClassInstaller(long ptr ptr) +#@ stdcall LogItem@8 +#@ stdcall LogItem0 +#@ stdcall LogItem1 +#@ stdcall LogItem2 +#@ stdcall LogItem3 +#@ stdcall LogItemN +@ stdcall MouseClassInstaller(long ptr ptr) +#@ stdcall PnPInitializationThread +#@ stdcall RepairStartMenuItems +#@ stdcall ReportError +#@ stdcall ScsiClassInstaller +@ stdcall SetupChangeFontSize(ptr ptr) +@ stdcall SetupChangeLocale(ptr long) +@ stdcall SetupChangeLocaleEx(ptr long ptr long long long) +#@ stdcall SetupCreateOptionalComponentsPage +#@ stdcall SetupInfObjectInstallActionW +#@ stdcall SetupSetLargeDialogFont +#@ stdcall TapeClassInstaller +@ stdcall TerminateSetupActionLog() +#@ stdcall UpgradePrinters +#@ stdcall ViewSetupActionLog Propchange: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jimtabor] 41051: - Move Process Information structure back into kernel space. We use client information via TEB to provide a pointer for user space as a reference pointer.
by jimtabor＠svn.reactos.org 23 May '09

23 May '09

Author: jimtabor Date: Sat May 23 04:57:51 2009 New Revision: 41051 URL: http://svn.reactos.org/svn/reactos?rev=41051&view=rev Log: - Move Process Information structure back into kernel space. We use client information via TEB to provide a pointer for user space as a reference pointer. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.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] Sat May 23 04:57:51 2009 @@ -1,7 +1,7 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H -struct _PROCESSINFO; +typedef struct _PROCESSINFO *PPROCESSINFO; struct _W32THREADINFO; struct _WINDOW; @@ -334,20 +334,6 @@ DWORD TimeTick; DWORD SrvEventActivity; } SERVERINFO, *PSERVERINFO; - -typedef struct _PROCESSINFO -{ - PVOID UserHandleTable; - HANDLE hUserHeap; - ULONG_PTR UserHeapDelta; - HINSTANCE hModUser; - PWINDOWCLASS LocalClassList; - PWINDOWCLASS GlobalClassList; - PWINDOWCLASS SystemClassList; - - UINT RegisteredSysClasses : 1; - -} PROCESSINFO, *PPROCESSINFO; #define CTI_INSENDMESSAGE 0x0002 Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat May 23 04:57:51 2009 @@ -94,4 +94,17 @@ PPROCESSINFO ProcessInfo; } W32PROCESS, *PW32PROCESS; +typedef struct _PROCESSINFO +{ + W32PROCESS XzyxW32Process; /* Place holder. */ + /* ReactOS */ + HINSTANCE hModUser; + PWINDOWCLASS LocalClassList; + PWINDOWCLASS GlobalClassList; + PWINDOWCLASS SystemClassList; + + UINT RegisteredSysClasses : 1; + +} PROCESSINFO; + #endif /* __INCLUDE_NAPI_WIN32_H */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat May 23 04:57:51 2009 @@ -67,12 +67,12 @@ { /* FIXME - lock the process */ Win32Process = ExAllocatePoolWithTag(NonPagedPool, - sizeof(W32PROCESS), + sizeof(PROCESSINFO), TAG('W', '3', '2', 'p')); if (Win32Process == NULL) RETURN( STATUS_NO_MEMORY); - RtlZeroMemory(Win32Process, sizeof(W32PROCESS)); + RtlZeroMemory(Win32Process, sizeof(PROCESSINFO)); PsSetProcessWin32Process(Process, Win32Process); /* FIXME - unlock the process */ @@ -151,12 +151,6 @@ if(LogonProcess == Win32Process) { LogonProcess = NULL; - } - - if (Win32Process->ProcessInfo != NULL) - { - UserHeapFree(Win32Process->ProcessInfo); - Win32Process->ProcessInfo = NULL; } } @@ -339,12 +333,12 @@ if (Process->Win32Process == NULL) { /* FIXME - lock the process */ - Process->Win32Process = ExAllocatePool(NonPagedPool, sizeof(W32PROCESS)); + Process->Win32Process = ExAllocatePool(NonPagedPool, sizeof(PROCESSINFO)); if (Process->Win32Process == NULL) return STATUS_NO_MEMORY; - RtlZeroMemory(Process->Win32Process, sizeof(W32PROCESS)); + RtlZeroMemory(Process->Win32Process, sizeof(PROCESSINFO)); /* FIXME - unlock the process */ Win32kProcessCallback(Process, TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sat May 23 04:57:51 2009 @@ -463,43 +463,7 @@ PPROCESSINFO GetW32ProcessInfo(VOID) { - PPROCESSINFO pi; - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); - - if (W32Process == NULL) - { - /* FIXME - temporary hack for system threads... */ - return NULL; - } - - if (W32Process->ProcessInfo == NULL) - { - pi = UserHeapAlloc(sizeof(PROCESSINFO)); - if (pi != NULL) - { - RtlZeroMemory(pi, - sizeof(PROCESSINFO)); - - /* initialize it */ - pi->UserHandleTable = gHandleTable; - pi->hUserHeap = W32Process->HeapMappings.KernelMapping; - pi->UserHeapDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - - (ULONG_PTR)W32Process->HeapMappings.UserMapping; - - if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo, - pi, - NULL) != NULL) - { - UserHeapFree(pi); - } - } - else - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - } - } - - return W32Process->ProcessInfo; + return (PPROCESSINFO)PsGetCurrentProcessWin32Process(); } PW32THREADINFO Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat May 23 04:57:51 2009 @@ -893,12 +893,13 @@ { UserEnterShared(); GetW32ThreadInfo(); - PPROCESSINFO ppi = GetW32ProcessInfo(); + PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); _SEH2_TRY { pUserConnect->siClient.psi = gpsi; - pUserConnect->siClient.aheList = ppi->UserHandleTable; - pUserConnect->siClient.ulSharedDelta = ppi->UserHeapDelta; + pUserConnect->siClient.aheList = gHandleTable; + pUserConnect->siClient.ulSharedDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - + (ULONG_PTR)W32Process->HeapMappings.UserMapping; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -909,7 +910,6 @@ { SetLastNtError(Status); } - DPRINT("NtUserPC SI 0x%x : HT 0x%x : D 0x%x\n", gpsi, ppi->UserHandleTable, ppi->UserHeapDelta); UserLeave(); return Status; }

1 0

[tkreuzer] 41050: sndblast: convert to spec
by tkreuzer＠svn.reactos.org 23 May '09

23 May '09

Author: tkreuzer Date: Sat May 23 04:53:54 2009 New Revision: 41050 URL: http://svn.reactos.org/svn/reactos?rev=41050&view=rev Log: sndblast: convert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def (removed) @@ -1,15 +1,0 @@ -; $Id: sndblst.def 34299 2008-07-05 02:43:17Z silverblade $ -; -; sndblst.def -; -; ReactOS Operating System -; -LIBRARY sndblst.dll -EXPORTS -DriverProc@20 -widMessage@20 -wodMessage@20 -midMessage@20 -modMessage@20 -mxdMessage@20 -auxMessage@20 Modified: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] Sat May 23 04:53:54 2009 @@ -1,7 +1,7 @@  <module name="sndblst" type="win32dll" installbase="system32" installname="sndblst.dll" unicode="yes"> - <importlibrary definition="sndblst.def" /> + <importlibrary definition="sndblst.spec" /> <include base="ReactOS">include/reactos/libs/sound</include> <include base="sndblst">.</include> <define name="DEBUG_NT4" /> Added: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec [iso-8859-1] Sat May 23 04:53:54 2009 @@ -1,0 +1,7 @@ +@ stdcall DriverProc(long ptr long long long) +@ stdcall widMessage(long long long long long) +@ stdcall wodMessage(long long long long long) +@ stdcall midMessage(long long long long long) +@ stdcall modMessage(long long long long long) +@ stdcall mxdMessage(long long long long long) +@ stdcall auxMessage(long long long long long) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 41049: Change return type of OpenMRUListW and CreateMRUListW to HANDLE, add a comment that CREATEMRULISTW is already defined differently in explorer_new/undoc.h
by tkreuzer＠svn.reactos.org 23 May '09

23 May '09

Author: tkreuzer Date: Sat May 23 04:15:56 2009 New Revision: 41049 URL: http://svn.reactos.org/svn/reactos?rev=41049&view=rev Log: Change return type of OpenMRUListW and CreateMRUListW to HANDLE, add a comment that CREATEMRULISTW is already defined differently in explorer_new/undoc.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 23 04:15:56 2009 @@ -81,7 +81,8 @@ #define MRUF_STRING_LIST 0 -typedef int (WINAPI *CREATEMRULISTW)( +// FIXME: CREATEMRULISTW is also a structure, see explorer_new/undoc.h +typedef HANDLE (WINAPI *CREATEMRULISTW)( LPMRUINFO lpmi ); @@ -105,7 +106,7 @@ static HRESULT WINAPI SHEOWCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj); static ULONG WINAPI SHEOWCm_fnRelease(IContextMenu2 *iface); -int OpenMRUList(HKEY hKey); +HANDLE OpenMRUList(HKEY hKey); void LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, WCHAR * szExt); void LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, WCHAR * szExt); void InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName); @@ -424,7 +425,7 @@ WCHAR * pFileExt; HKEY hKey; LONG result; - int hList; + HANDLE hList; /* get file extension */ pFileExt = wcsrchr(szFileName, L'.'); @@ -448,10 +449,10 @@ } /* insert the entry */ - result = (*AddMRUStringW)((HANDLE)hList, szAppName); + result = (*AddMRUStringW)(hList, szAppName); /* close mru list */ - (*FreeMRUList)((HANDLE)hList); + (*FreeMRUList)(hList); /* create mru list key */ RegCloseKey(hKey); } @@ -994,7 +995,7 @@ FIXME("implement me :)))\n"); } -int +HANDLE OpenMRUList(HKEY hKey) { MRUINFO info; @@ -1031,7 +1032,7 @@ void AddItemFromMRUList(POPEN_WITH_CONTEXT pContext, HKEY hKey) { - int hList; + HANDLE hList; int nItem, nCount, nResult; WCHAR szBuffer[MAX_PATH];

1 0

[tkreuzer] 41048: Shel32: - DialogProc returns INT_PTR and not BOOL - Don't cast a pointer to LONG - Use INT_PTR instead of int for pointer math
by tkreuzer＠svn.reactos.org 22 May '09

22 May '09

Author: tkreuzer Date: Sat May 23 03:56:31 2009 New Revision: 41048 URL: http://svn.reactos.org/svn/reactos?rev=41048&view=rev Log: Shel32: - DialogProc returns INT_PTR and not BOOL - Don't cast a pointer to LONG - Use INT_PTR instead of int for pointer math Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -1164,7 +1164,7 @@ } -BOOL +INT_PTR CALLBACK FormatDriveDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -536,7 +536,7 @@ SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); - SetWindowLongPtr(hwndDlg, DWL_USER, (LONG)pBuf); + SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)pBuf); /* select first item */ hDlgCtrl = GetDlgItem(hwndDlg, 14009); Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -623,7 +623,7 @@ } -static BOOL CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -61,7 +61,7 @@ #define AdminToolsHELLVIEWCOLUMNS (4) -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -41,9 +41,9 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; static const IContextMenu2Vtbl vt_ContextMenu2FontItem; -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); -#define _IContextMenuFontItem_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem))) +#define _IContextMenuFontItem_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem))) #define _ICOM_THIS_From_IContextMenu2FontItem(class, name) class* This = (class*)(((char*)name)-_IContextMenuFontItem_Offset); #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -41,7 +41,7 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -35,7 +35,7 @@ LPITEMIDLIST pidl; } IExtractIconWImpl; -#define _IExtractIconA_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA))) +#define _IExtractIconA_Offset ((INT_PTR)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA))) #define _ICOM_THIS_From_IExtractIconA(class, name) class* This = (class*)(((char*)name)-_IExtractIconA_Offset); static shvheader PrinterSFHeader[] = { @@ -305,7 +305,7 @@ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } IGenericSFImpl; -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl)

1 0

[tkreuzer] 41047: Get rid of deprectaed LargeInteger functions and use native int64 math instead.
by tkreuzer＠svn.reactos.org 22 May '09

22 May '09

Author: tkreuzer Date: Sat May 23 03:52:52 2009 New Revision: 41047 URL: http://svn.reactos.org/svn/reactos?rev=41047&view=rev Log: Get rid of deprectaed LargeInteger functions and use native int64 math instead. Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 23 03:52:52 2009 @@ -17,12 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define LARGEINT_PROTOS -#define LargeIntegerDivide RtlLargeIntegerDivide -#define ExtendedIntegerMultiply RtlExtendedIntegerMultiply -#define ConvertUlongToLargeInteger RtlConvertUlongToLargeInteger -#define LargeIntegerSubtract RtlLargeIntegerSubtract #define MAX_PROPERTY_SHEET_PAGE 32 #define WIN32_NO_STATUS @@ -33,7 +27,6 @@ #include <windows.h> #include <ndk/ntndk.h> #include <fmifs/fmifs.h> -#include <largeint.h> #include <precomp.h> @@ -294,20 +287,21 @@ LARGE_INTEGER GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumberOfBytes) { - LARGE_INTEGER Temp, Result, Remainder; + LARGE_INTEGER Temp, Result; if (TotalNumberOfFreeBytes.QuadPart == 0LL) { - return ConvertUlongToLargeInteger(0); + Result.QuadPart = 1; + return Result; } - Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder); + Temp.QuadPart = TotalNumberOfBytes.QuadPart / 100; if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart) { - Result = ConvertUlongToLargeInteger(1); + Result.QuadPart = 1; }else { - Result = LargeIntegerDivide(TotalNumberOfFreeBytes, Temp, &Remainder); + Result.QuadPart = TotalNumberOfFreeBytes.QuadPart / Temp.QuadPart; } return Result; @@ -431,7 +425,7 @@ swprintf(szResult, L"%02d%%", Result.QuadPart); SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); /* store used share amount */ - Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); + Result.QuadPart = 100 - Result.QuadPart; swprintf(szResult, L"%02d%%", Result.QuadPart); SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)))

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