Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[tkreuzer] 60949: [NTOSKRNL] Fix SystemUnloadGdiDriverInformation case of NtSetSystemInformation.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 11 19:09:53 2013 New Revision: 60949 URL: http://svn.reactos.org/svn/reactos?rev=60949&view=rev Log: [NTOSKRNL] Fix SystemUnloadGdiDriverInformation case of NtSetSystemInformation. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/win32ss/gdi/eng/ldevobj.c trunk/reactos/win32ss/gdi/eng/ldevobj.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Nov 11 19:09:53 2013 @@ -1397,7 +1397,7 @@ /* Class 27 - Unload Image */ SSI_DEF(SystemUnloadGdiDriverInformation) { - PVOID SectionPointer = Buffer; + PVOID *SectionPointer = Buffer; /* Validate size */ if (Size != sizeof(PVOID)) @@ -1410,7 +1410,7 @@ if (ExGetPreviousMode() != KernelMode) return STATUS_PRIVILEGE_NOT_HELD; /* Unload the image */ - MmUnloadSystemImage(SectionPointer); + MmUnloadSystemImage(*SectionPointer); return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] Mon Nov 11 19:09:53 2013 @@ -9,6 +9,7 @@ #include <win32k.h> #define NDEBUG #include <debug.h> +DBG_DEFAULT_CHANNEL(EngLDev); #ifndef RVA_TO_ADDR #define RVA_TO_ADDR(Base,Rva) ((PVOID)(((ULONG_PTR)(Base)) + (Rva))) @@ -16,9 +17,9 @@ /** Globals *******************************************************************/ -HSEMAPHORE ghsemLDEVList; -LDEVOBJ *gpldevHead = NULL; -LDEVOBJ *gpldevWin32k = NULL; +static HSEMAPHORE ghsemLDEVList; +static LDEVOBJ *gpldevHead = NULL; +static LDEVOBJ *gpldevWin32k = NULL; /** Private functions *********************************************************/ @@ -26,7 +27,7 @@ INIT_FUNCTION NTSTATUS NTAPI -InitLDEVImpl() +InitLDEVImpl(VOID) { ULONG cbSize; @@ -34,6 +35,7 @@ ghsemLDEVList = EngCreateSemaphore(); if (!ghsemLDEVList) { + ERR("Failed to create ghsemLDEVList\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -69,9 +71,10 @@ return STATUS_SUCCESS; } +static PLDEVOBJ -NTAPI -LDEVOBJ_AllocLDEV(LDEVTYPE ldevtype) +LDEVOBJ_AllocLDEV( + _In_ LDEVTYPE ldevtype) { PLDEVOBJ pldev; @@ -79,7 +82,7 @@ pldev = ExAllocatePoolWithTag(PagedPool, sizeof(LDEVOBJ), GDITAG_LDEV); if (!pldev) { - DPRINT1("Failed to allocate LDEVOBJ.\n"); + ERR("Failed to allocate LDEVOBJ.\n"); return NULL; } @@ -92,9 +95,10 @@ return pldev; } +static VOID -NTAPI -LDEVOBJ_vFreeLDEV(PLDEVOBJ pldev) +LDEVOBJ_vFreeLDEV( + _In_ _Post_ptr_invalid_ PLDEVOBJ pldev) { /* Make sure we don't have a driver loaded */ ASSERT(pldev && pldev->pGdiDriverInfo == NULL); @@ -107,19 +111,19 @@ PDEVMODEINFO NTAPI LDEVOBJ_pdmiGetModes( - PLDEVOBJ pldev, - HANDLE hDriver) + _In_ PLDEVOBJ pldev, + _In_ HANDLE hDriver) { ULONG cbSize, cbFull; PDEVMODEINFO pdminfo; - DPRINT("LDEVOBJ_pdmiGetModes(%p, %p)\n", pldev, hDriver); + TRACE("LDEVOBJ_pdmiGetModes(%p, %p)\n", pldev, hDriver); /* Call the driver to get the required size */ cbSize = pldev->pfn.GetModes(hDriver, 0, NULL); if (!cbSize) { - DPRINT1("DrvGetModes returned 0\n"); + ERR("DrvGetModes returned 0\n"); return NULL; } @@ -130,7 +134,7 @@ pdminfo = ExAllocatePoolWithTag(PagedPool, cbFull, GDITAG_DEVMODE); if (!pdminfo) { - DPRINT1("Could not allocate devmodeinfo\n"); + ERR("Could not allocate devmodeinfo\n"); return NULL; } @@ -142,7 +146,7 @@ if (!cbSize) { /* Could not get modes */ - DPRINT1("returned size %lu(%lu)\n", cbSize, pdminfo->cbdevmode); + ERR("returned size %lu(%lu)\n", cbSize, pdminfo->cbdevmode); ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); pdminfo = NULL; } @@ -150,12 +154,11 @@ return pdminfo; } - +static BOOL -NTAPI LDEVOBJ_bLoadImage( - IN PLDEVOBJ pldev, - PUNICODE_STRING pstrPathName) + _Inout_ PLDEVOBJ pldev, + _In_ PUNICODE_STRING pustrPathName) { PSYSTEM_GDI_DRIVER_INFORMATION pDriverInfo; NTSTATUS Status; @@ -165,19 +168,19 @@ ASSERT(pldev && pldev->pGdiDriverInfo == NULL); /* Allocate a SYSTEM_GDI_DRIVER_INFORMATION structure */ - cbSize = sizeof(SYSTEM_GDI_DRIVER_INFORMATION) + pstrPathName->Length; + cbSize = sizeof(SYSTEM_GDI_DRIVER_INFORMATION) + pustrPathName->Length; pDriverInfo = ExAllocatePoolWithTag(PagedPool, cbSize, GDITAG_LDEV); if (!pDriverInfo) { - DPRINT1("Failed to allocate SYSTEM_GDI_DRIVER_INFORMATION\n"); + ERR("Failed to allocate SYSTEM_GDI_DRIVER_INFORMATION\n"); return FALSE; } /* Initialize the UNICODE_STRING and copy the driver name */ RtlInitEmptyUnicodeString(&pDriverInfo->DriverName, (PWSTR)(pDriverInfo + 1), - pstrPathName->Length); - RtlCopyUnicodeString(&pDriverInfo->DriverName, pstrPathName); + pustrPathName->Length); + RtlCopyUnicodeString(&pDriverInfo->DriverName, pustrPathName); /* Try to load the driver */ Status = ZwSetSystemInformation(SystemLoadGdiDriverInformation, @@ -186,8 +189,8 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to load a GDI driver: '%S', Status = 0x%lx\n", - pstrPathName->Buffer, Status); + ERR("Failed to load a GDI driver: '%wZ', Status = 0x%lx\n", + pustrPathName, Status); /* Free the allocated memory */ ExFreePoolWithTag(pDriverInfo, GDITAG_LDEV); @@ -201,10 +204,10 @@ return TRUE; } +static VOID -NTAPI LDEVOBJ_vUnloadImage( - IN PLDEVOBJ pldev) + _Inout_ PLDEVOBJ pldev) { NTSTATUS Status; @@ -220,11 +223,11 @@ /* Unload the driver */ Status = ZwSetSystemInformation(SystemUnloadGdiDriverInformation, - &pldev->pGdiDriverInfo->ImageAddress, + &pldev->pGdiDriverInfo->SectionPointer, sizeof(HANDLE)); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to unload the driver, this is bad.\n"); + ERR("Failed to unload the driver, this is bad.\n"); } /* Free the driver info structure */ @@ -232,10 +235,10 @@ pldev->pGdiDriverInfo = NULL; } +static BOOL -NTAPI -LDEVOBJ_bLoadDriver( - IN PLDEVOBJ pldev) +LDEVOBJ_bEnableDriver( + _Inout_ PLDEVOBJ pldev) { PFN_DrvEnableDriver pfnEnableDriver; DRVENABLEDATA ded; @@ -249,10 +252,7 @@ pfnEnableDriver = pldev->pGdiDriverInfo->EntryPoint; if (!pfnEnableDriver(GDI_ENGINE_VERSION, sizeof(ded), &ded)) { - DPRINT1("DrvEnableDriver failed\n"); - - /* Unload the image. */ - LDEVOBJ_vUnloadImage(pldev); + ERR("DrvEnableDriver failed\n"); return FALSE; } @@ -269,12 +269,11 @@ return TRUE; } - +static PVOID -NTAPI LDEVOBJ_pvFindImageProcAddress( - IN PLDEVOBJ pldev, - IN LPSTR pszProcName) + _In_ PLDEVOBJ pldev, + _In_z_ LPSTR pszProcName) { PVOID pvImageBase; PIMAGE_EXPORT_DIRECTORY pExportDir; @@ -318,8 +317,8 @@ PLDEVOBJ NTAPI EngLoadImageEx( - LPWSTR pwszDriverName, - ULONG ldevtype) + _In_z_ LPWSTR pwszDriverName, + _In_ ULONG ldevtype) { WCHAR acwBuffer[MAX_PATH]; PLDEVOBJ pldev; @@ -327,7 +326,7 @@ SIZE_T cwcLength; LPWSTR pwsz; - DPRINT("EngLoadImageEx(%ls, %lu)\n", pwszDriverName, ldevtype); + TRACE("EngLoadImageEx(%ls, %lu)\n", pwszDriverName, ldevtype); ASSERT(pwszDriverName); /* Initialize buffer for the the driver name */ @@ -343,7 +342,7 @@ pwsz = pwszDriverName + cwcLength; while (pwsz > pwszDriverName) { - if (_wcsnicmp(pwsz, L"\\system32\\", 10) == 0) + if ((*pwsz == L'\\') && (_wcsnicmp(pwsz, L"\\system32\\", 10) == 0)) { /* Driver name starts after system32 */ pwsz += 10; @@ -356,12 +355,11 @@ RtlAppendUnicodeToString(&strDriverName, pwsz); /* MSDN says "The driver must include this suffix in the pwszDriver string." - But in fact it's optional. - - ms win32k EngLoadImageEx loading .sys file without append .dll - */ - if ( (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) && - (_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0) ) + But in fact it's optional. The function can also load .sys files without + appending the .dll extension. */ + if ((cwcLength < 4) || + ((_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) && + (_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0)) ) { /* Append the .dll suffix */ RtlAppendUnicodeToString(&strDriverName, L".dll"); @@ -392,7 +390,7 @@ pldev = LDEVOBJ_AllocLDEV(ldevtype); if (!pldev) { - DPRINT1("Could not allocate LDEV\n"); + ERR("Could not allocate LDEV\n"); goto leave; } @@ -401,7 +399,7 @@ { LDEVOBJ_vFreeLDEV(pldev); pldev = NULL; - DPRINT1("LDEVOBJ_bLoadImage failed\n"); + ERR("LDEVOBJ_bLoadImage failed\n"); goto leave; } @@ -409,9 +407,12 @@ if (ldevtype != LDEV_IMAGE) { /* Load the driver */ - if (!LDEVOBJ_bLoadDriver(pldev)) + if (!LDEVOBJ_bEnableDriver(pldev)) { - DPRINT1("LDEVOBJ_bLoadDriver failed\n"); + ERR("LDEVOBJ_bEnableDriver failed\n"); + + /* Unload the image. */ + LDEVOBJ_vUnloadImage(pldev); LDEVOBJ_vFreeLDEV(pldev); pldev = NULL; goto leave; @@ -431,8 +432,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemLDEVList); - DPRINT("EngLoadImageEx returning %p\n", pldev); - + TRACE("EngLoadImageEx returning %p\n", pldev); return pldev; } Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.h [iso-8859-1] Mon Nov 11 19:09:53 2013 @@ -30,36 +30,16 @@ } LDEVOBJ, *PLDEVOBJ; -extern PLDEVOBJ gpldevHead; -extern HSEMAPHORE ghsemDriverMgmt; - -PLDEVOBJ +INIT_FUNCTION +NTSTATUS NTAPI -LDEVOBJ_pldevLoadImage( - PUNICODE_STRING pusPathName, - LDEVTYPE ldevtype); - -BOOL -NTAPI -LDEVOBJ_bLoadDriver( - IN PLDEVOBJ pldev); - -PVOID -NTAPI -LDEVOBJ_pvFindImageProcAddress( - IN PLDEVOBJ pldev, - IN LPSTR lpProcName); +InitLDEVImpl(VOID); PDEVMODEINFO NTAPI LDEVOBJ_pdmiGetModes( - PLDEVOBJ pldev, - HANDLE hDriver); - -INIT_FUNCTION -NTSTATUS -NTAPI -InitLDEVImpl(VOID); + _In_ PLDEVOBJ pldev, + _In_ HANDLE hDriver); PLDEVOBJ APIENTRY @@ -75,6 +55,6 @@ NTSTATUS APIENTRY DriverEntry ( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath); + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath);

11 years, 1 month

[aandrejevic] 60948: [FAST486] Fix the previous fix in the Mod-Reg-R/M parser. EBP is still used if the mode is 1 or 2.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Nov 11 19:08:28 2013 New Revision: 60948 URL: http://svn.reactos.org/svn/reactos?rev=60948&view=rev Log: [FAST486] Fix the previous fix in the Mod-Reg-R/M parser. EBP is still used if the mode is 1 or 2. Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Mon Nov 11 19:08:28 2013 @@ -720,7 +720,7 @@ if (Index != FAST486_REG_ESP) Index = State->GeneralRegs[Index].Long; else Index = 0; - if ((SibByte & 0x07) != FAST486_REG_EBP) + if (((SibByte & 0x07) != FAST486_REG_EBP) || (Mode != 0)) { /* Use the register a base */ Base = State->GeneralRegs[SibByte & 0x07].Long;

11 years, 1 month

[tkreuzer] 60947: [NTOSKRNL] Fix PsSetProcessWin32Process and PsSetThreadWin32Thread

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 11 18:52:59 2013 New Revision: 60947 URL: http://svn.reactos.org/svn/reactos?rev=60947&view=rev Log: [NTOSKRNL] Fix PsSetProcessWin32Process and PsSetThreadWin32Thread Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Mon Nov 11 18:52:59 2013 @@ -56,19 +56,21 @@ ); NTKERNELAPI -VOID +NTSTATUS NTAPI PsSetProcessWin32Process( _Inout_ PEPROCESS Process, - _In_ PVOID Win32Process -); - -NTKERNELAPI -VOID + _In_opt_ PVOID Win32Process, + _In_opt_ PVOID OldWin32Process +); + +NTKERNELAPI +PVOID NTAPI PsSetThreadWin32Thread( _Inout_ PETHREAD Thread, - PVOID Win32Thread + _In_ PVOID Win32Thread, + _In_ PVOID OldWin32Thread ); NTKERNELAPI Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Mon Nov 11 18:52:59 2013 @@ -1031,10 +1031,10 @@ @ stdcall PsSetProcessPriorityByClass(ptr ptr) @ stdcall PsSetProcessPriorityClass(ptr long) @ stdcall PsSetProcessSecurityPort(ptr ptr) -@ stdcall PsSetProcessWin32Process(ptr ptr) +@ stdcall PsSetProcessWin32Process(ptr ptr ptr) @ stdcall PsSetProcessWindowStation(ptr ptr) @ stdcall PsSetThreadHardErrorsAreDisabled(ptr long) -@ stdcall PsSetThreadWin32Thread(ptr ptr) +@ stdcall PsSetThreadWin32Thread(ptr ptr ptr) @ stdcall PsTerminateSystemThread(long) @ extern PsThreadType _PsThreadType ;PsWrapApcWow64Thread Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Mon Nov 11 18:52:59 2013 @@ -1240,12 +1240,58 @@ /* * @implemented */ -VOID -NTAPI -PsSetProcessWin32Process(PEPROCESS Process, - PVOID Win32Process) -{ - Process->Win32Process = Win32Process; +NTSTATUS +NTAPI +PsSetProcessWin32Process( + _Inout_ PEPROCESS Process, + _In_opt_ PVOID Win32Process, + _In_opt_ PVOID OldWin32Process) +{ + NTSTATUS Status; + + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Lock the process */ + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&Process->ProcessLock); + + /* Check if we set a new win32 process */ + if (Win32Process != NULL) + { + /* Check if the process is in the right state */ + if (((Process->Flags & PSF_PROCESS_DELETE_BIT) == 0) && + (Process->Win32Process == NULL)) + { + /* Set the new win32 process */ + Process->Win32Process = Win32Process; + } + else + { + /* Otherwise fail */ + Status = STATUS_PROCESS_IS_TERMINATING; + } + } + else + { + /* Reset the win32 process, did the caller specify the correct old value? */ + if (Process->Win32Process == OldWin32Process) + { + /* Yes, so reset the win32 process to NULL */ + Process->Win32Process = 0; + } + else + { + /* Otherwise fail */ + Status = STATUS_UNSUCCESSFUL; + } + } + + /* Unlock the process */ + ExReleasePushLockExclusive(&Process->ProcessLock); + KeLeaveCriticalRegion(); + + return Status; } /* Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Mon Nov 11 18:52:59 2013 @@ -904,12 +904,27 @@ /* * @implemented */ -VOID -NTAPI -PsSetThreadWin32Thread(IN PETHREAD Thread, - IN PVOID Win32Thread) -{ - Thread->Tcb.Win32Thread = Win32Thread; +PVOID +NTAPI +PsSetThreadWin32Thread( + _Inout_ PETHREAD Thread, + _In_ PVOID Win32Thread, + _In_ PVOID OldWin32Thread) +{ + /* Are we setting the win32 process? */ + if (Win32Thread != NULL) + { + /* Just exchange it */ + return InterlockedExchangePointer(&Thread->Tcb.Win32Thread, + Win32Thread); + } + else + { + /* We are resetting, only exchange when the old win32 thread matches */ + return InterlockedCompareExchangePointer(&Thread->Tcb.Win32Thread, + Win32Thread, + OldWin32Thread); + } } NTSTATUS Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Nov 11 18:52:59 2013 @@ -85,7 +85,7 @@ RtlZeroMemory(ppiCurrent, sizeof(PROCESSINFO)); - PsSetProcessWin32Process(Process, ppiCurrent); + PsSetProcessWin32Process(Process, ppiCurrent, NULL); #if DBG DbgInitDebugChannels(); @@ -237,7 +237,7 @@ #endif /* Free the PROCESSINFO */ - PsSetProcessWin32Process(Process, NULL); + PsSetProcessWin32Process(Process, NULL, ppiCurrent); ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); } @@ -280,7 +280,7 @@ /* Initialize the THREADINFO */ - PsSetThreadWin32Thread(Thread, ptiCurrent); + PsSetThreadWin32Thread(Thread, ptiCurrent, NULL); IntReferenceThreadInfo(ptiCurrent); ptiCurrent->pEThread = Thread; ptiCurrent->ppi = PsGetCurrentProcessWin32Process(); @@ -463,7 +463,7 @@ IntSetThreadDesktop(NULL, TRUE); - PsSetThreadWin32Thread(pti->pEThread, NULL); + PsSetThreadWin32Thread(pti->pEThread, NULL, pti); ExFreePoolWithTag(pti, USERTAG_THREADINFO); } }

11 years, 1 month

[aandrejevic] 60946: [NTVDM] Implement CMOS registers 15h, 16h, 17h and 18h.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Nov 11 17:59:04 2013 New Revision: 60946 URL: http://svn.reactos.org/svn/reactos?rev=60946&view=rev Log: [NTVDM] Implement CMOS registers 15h, 16h, 17h and 18h. Modified: branches/ntvdm/subsystems/ntvdm/cmos.c branches/ntvdm/subsystems/ntvdm/cmos.h Modified: branches/ntvdm/subsystems/ntvdm/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/cmos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/cmos.c [iso-8859-1] Mon Nov 11 17:59:04 2013 @@ -11,6 +11,7 @@ #define NDEBUG #include "cmos.h" +#include "bios.h" #include "pic.h" /* PRIVATE VARIABLES **********************************************************/ @@ -134,6 +135,18 @@ /* Return the old value */ return Value; } + + case CMOS_REG_BASE_MEMORY_LOW: + return Bda->MemorySize & 0xFF; + + case CMOS_REG_BASE_MEMORY_HIGH: + return Bda->MemorySize >> 8; + + case CMOS_REG_EXT_MEMORY_LOW: + return ((MAX_ADDRESS - 0x100000) / 1024) & 0xFF; + + case CMOS_REG_EXT_MEMORY_HIGH: + return ((MAX_ADDRESS - 0x100000) / 1024) >> 8; case CMOS_REG_STATUS_A: case CMOS_REG_STATUS_B: Modified: branches/ntvdm/subsystems/ntvdm/cmos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/cmos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/cmos.h [iso-8859-1] Mon Nov 11 17:59:04 2013 @@ -67,9 +67,12 @@ CMOS_REG_STATUS_D, CMOS_REG_DIAGNOSTICS, CMOS_REG_SHUTDOWN_STATUS, + CMOS_REG_BASE_MEMORY_LOW = 0x15, + CMOS_REG_BASE_MEMORY_HIGH = 0x16, + CMOS_REG_EXT_MEMORY_LOW = 0x17, + CMOS_REG_EXT_MEMORY_HIGH = 0x18, CMOS_REG_MAX = 0x40 } CMOS_REGISTERS, *PCMOS_REGISTERS; - /* * CMOS Memory Map

11 years, 1 month

[gadamopoulos] 60945: [shell32] - Fix a couple of bugs I introduced in latest commit

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Nov 11 17:49:30 2013 New Revision: 60945 URL: http://svn.reactos.org/svn/reactos?rev=60945&view=rev Log: [shell32] - Fix a couple of bugs I introduced in latest commit Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Mon Nov 11 17:49:30 2013 @@ -171,7 +171,7 @@ LPCITEMIDLIST pidlChild, REFCLSID clsid, LPVOID * ppvOut) { HRESULT hr; - IShellFolder* pShellFolder; + IShellFolder* pShellFolder = NULL; TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); @@ -218,9 +218,10 @@ } ILFree (pidlAbsolute); } + + *ppvOut = pShellFolder; + TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); - - *ppvOut = pShellFolder; return hr; }

11 years, 1 month

[aandrejevic] 60944: [FAST486] Fix the Mod-Reg-R/M parser. EBP cannot be used as a SIB byte base, instead it's used to mark that the base is an immediate operand.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Nov 11 17:24:22 2013 New Revision: 60944 URL: http://svn.reactos.org/svn/reactos?rev=60944&view=rev Log: [FAST486] Fix the Mod-Reg-R/M parser. EBP cannot be used as a SIB byte base, instead it's used to mark that the base is an immediate operand. Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Mon Nov 11 17:24:22 2013 @@ -719,7 +719,21 @@ Index = (SibByte >> 3) & 0x07; if (Index != FAST486_REG_ESP) Index = State->GeneralRegs[Index].Long; else Index = 0; - Base = State->GeneralRegs[SibByte & 0x07].Long; + + if ((SibByte & 0x07) != FAST486_REG_EBP) + { + /* Use the register a base */ + Base = State->GeneralRegs[SibByte & 0x07].Long; + } + else + { + /* Fetch the base */ + if (!Fast486FetchDword(State, &Base)) + { + /* Exception occurred */ + return FALSE; + } + } /* Calculate the address */ ModRegRm->MemoryAddress = Base + Index * Scale;

11 years, 1 month

[hbelusca] 60943: [NTVDM]: Display more detailed information about which unknown interruption was called.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 11 17:05:02 2013 New Revision: 60943 URL: http://svn.reactos.org/svn/reactos?rev=60943&view=rev Log: [NTVDM]: Display more detailed information about which unknown interruption was called. Modified: branches/ntvdm/subsystems/ntvdm/int32.c Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Mon Nov 11 17:05:02 2013 @@ -16,6 +16,7 @@ #include "bop.h" #include "bios.h" +#include "registers.h" /* PRIVATE VARIABLES **********************************************************/ @@ -123,7 +124,7 @@ if (Int32Proc[IntNum] != NULL) Int32Proc[IntNum](Stack); else - DPRINT1("Unhandled 32-bit interrupt: 0x%02X\n", IntNum); + DPRINT1("Unhandled 32-bit interrupt: 0x%02X, AX = 0x%04X\n", IntNum, getAX()); } VOID WINAPI InitializeInt32(WORD BiosSegment)

11 years, 1 month

[aandrejevic] 60942: [NTVDM] Implement INT 15h, AH = 87h, "Copy Extended Memory".

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Nov 11 16:47:10 2013 New Revision: 60942 URL: http://svn.reactos.org/svn/reactos?rev=60942&view=rev Log: [NTVDM] Implement INT 15h, AH = 87h, "Copy Extended Memory". Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Mon Nov 11 16:47:10 2013 @@ -1181,6 +1181,38 @@ { switch (getAH()) { + /* Copy Extended Memory */ + case 0x87: + { + WORD Count = getCX() * 2 - 1; + PFAST486_GDT_ENTRY Gdt = (PFAST486_GDT_ENTRY)SEG_OFF_TO_PTR(getES(), getSI()); + DWORD SourceBase = Gdt[2].Base + (Gdt[2].BaseMid << 16) + (Gdt[2].BaseHigh << 24); + DWORD SourceLimit = Gdt[2].Limit + (Gdt[2].LimitHigh << 16); + DWORD DestBase = Gdt[3].Base + (Gdt[3].BaseMid << 16) + (Gdt[3].BaseHigh << 24); + DWORD DestLimit = Gdt[3].Limit + (Gdt[3].LimitHigh << 16); + + /* Check for flags */ + if (Gdt[2].Granularity) SourceLimit = (SourceLimit << 12) | 0xFFF; + if (Gdt[3].Granularity) DestLimit = (DestLimit << 12) | 0xFFF; + + if ((Count > SourceLimit) || (Count > DestLimit)) + { + setAX(0x80); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + + break; + } + + /* Copy */ + RtlMoveMemory((PVOID)((ULONG_PTR)BaseAddress + DestBase), + (PVOID)((ULONG_PTR)BaseAddress + SourceBase), + Count); + + setAX(ERROR_SUCCESS); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + break; + } + /* Get Extended Memory Size */ case 0x88: {

11 years, 1 month

[gadamopoulos] 60941: [shell32] - Add IID_PPV_ARG macro and use it in shell32 to make querying object interfaces type safe

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Nov 11 16:42:16 2013 New Revision: 60941 URL: http://svn.reactos.org/svn/reactos?rev=60941&view=rev Log: [shell32] - Add IID_PPV_ARG macro and use it in shell32 to make querying object interfaces type safe Modified: trunk/reactos/dll/win32/shell32/CMenuBand.cpp trunk/reactos/dll/win32/shell32/autocomplete.cpp trunk/reactos/dll/win32/shell32/brsfolder.cpp trunk/reactos/dll/win32/shell32/classes.cpp trunk/reactos/dll/win32/shell32/dataobject.cpp trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/drive.cpp trunk/reactos/dll/win32/shell32/enumidlist.cpp trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/folders/admintools.cpp trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/fonts.cpp trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/printers.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/fprop.cpp trunk/reactos/dll/win32/shell32/newmenu.cpp trunk/reactos/dll/win32/shell32/pidl.cpp trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shellitem.cpp trunk/reactos/dll/win32/shell32/shelllink.cpp trunk/reactos/dll/win32/shell32/shellole.cpp trunk/reactos/dll/win32/shell32/shellord.cpp trunk/reactos/dll/win32/shell32/shlexec.cpp trunk/reactos/dll/win32/shell32/shlfolder.cpp trunk/reactos/dll/win32/shell32/shlfsbind.cpp trunk/reactos/dll/win32/shell32/shlmenu.cpp trunk/reactos/dll/win32/shell32/shlview.cpp trunk/reactos/include/psdk/shlobj_undoc.h Modified: trunk/reactos/dll/win32/shell32/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuBand.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -250,7 +250,7 @@ return S_OK; hwndParent = NULL; - hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&m_site)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site)); if (SUCCEEDED(hResult)) { m_site->GetWindow(&hwndParent); Modified: trunk/reactos/dll/win32/shell32/autocomplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -122,7 +122,7 @@ return this->hwndEdit ? E_FAIL : E_UNEXPECTED; } - if (!SUCCEEDED (punkACL->QueryInterface(IID_IEnumString, (LPVOID *)&enumstr))) + if (!SUCCEEDED(punkACL->QueryInterface(IID_PPV_ARG(IEnumString,&enumstr)))) { TRACE("No IEnumString interface\n"); return E_NOINTERFACE; Modified: trunk/reactos/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -218,7 +218,7 @@ ILFree(pidlParent); return; } - hr = lpsfDesktop->BindToObject(pidlParent, 0, IID_IShellFolder, (LPVOID *)&lpsfParent); + hr = lpsfDesktop->BindToObject(pidlParent, 0, IID_PPV_ARG(IShellFolder, &lpsfParent)); lpsfDesktop->Release(); } @@ -230,7 +230,7 @@ } if (pidlChild && pidlChild->mkid.cb) { - hr = lpsfParent->BindToObject(pidlChild, 0, IID_IShellFolder, (LPVOID *)&lpsfRoot); + hr = lpsfParent->BindToObject(pidlChild, 0, IID_PPV_ARG(IShellFolder, &lpsfRoot)); } else { lpsfRoot = lpsfParent; hr = lpsfParent->AddRef(); @@ -417,7 +417,7 @@ lpsf->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlTemp, &ulAttrs); if (ulAttrs & SFGAO_FOLDER) { - hr = lpsf->BindToObject(pidlTemp, NULL, IID_IShellFolder, (LPVOID *)&pSFChild); + hr = lpsf->BindToObject(pidlTemp, NULL, IID_PPV_ARG(IShellFolder, &pSFChild)); if (SUCCEEDED(hr)) { DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); @@ -519,8 +519,7 @@ return 0; if (lptvid->lpi && lptvid->lpi->mkid.cb) { - r = lptvid->lpsfParent->BindToObject(lptvid->lpi, 0, - IID_IShellFolder, (LPVOID *)&lpsf2 ); + r = lptvid->lpsfParent->BindToObject(lptvid->lpi, 0, IID_PPV_ARG(IShellFolder, &lpsf2)); } else { lpsf2 = lptvid->lpsfParent; r = lpsf2->AddRef(); @@ -735,12 +734,12 @@ hr = SHGetDesktopFolder(&desktop); if(FAILED(hr)) return hr; - hr = desktop->BindToObject(info->pidlRet, 0, IID_IShellFolder, (LPVOID *)&cur); + hr = desktop->BindToObject(info->pidlRet, 0, IID_PPV_ARG(IShellFolder, &cur)); desktop->Release(); if(FAILED(hr)) return hr; - hr = cur->QueryInterface(IID_ISFHelper, (LPVOID *)&sfhelper); + hr = cur->QueryInterface(IID_PPV_ARG(ISFHelper, &sfhelper)); if(FAILED(hr)) return hr; Modified: trunk/reactos/dll/win32/shell32/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -487,8 +487,7 @@ hr = SHGetDesktopFolder(&psfDesktop); if (SUCCEEDED(hr)) { - hr = psfDesktop->BindToObject(pidlFolder, NULL, IID_IShellFolder, - (LPVOID*)&psfFolder); + hr = psfDesktop->BindToObject(pidlFolder, NULL, IID_PPV_ARG(IShellFolder,&psfFolder)); if (SUCCEEDED(hr)) hr = psfFolder->GetAttributesOf(0, NULL, pdwAttributes); } Modified: trunk/reactos/dll/win32/shell32/dataobject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dataobje… ============================================================================== --- trunk/reactos/dll/win32/shell32/dataobject.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dataobject.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -139,7 +139,7 @@ ATLTRY (theEnumerator = new CComObject<IEnumFORMATETCImpl>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface (IID_IEnumFORMATETC, (void **)&result); + hResult = theEnumerator->QueryInterface (IID_PPV_ARG(IEnumFORMATETC, &result)); if (FAILED (hResult)) { delete theEnumerator; @@ -362,7 +362,7 @@ ATLTRY (theDataObject = new CComObject<IDataObjectImpl>); if (theDataObject == NULL) return E_OUTOFMEMORY; - hResult = theDataObject->QueryInterface (IID_IDataObject, (void **)&result); + hResult = theDataObject->QueryInterface(IID_PPV_ARG(IDataObject, &result)); if (FAILED (hResult)) { delete theDataObject; Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -139,7 +139,7 @@ IDataObject *pDataObj; TRACE("cidl %u\n", pdcm->cidl); - if (SUCCEEDED(SHCreateDataObject(pdcm->pidlFolder, pdcm->cidl, pdcm->apidl, NULL, IID_IDataObject, (void**)&pDataObj))) + if (SUCCEEDED(SHCreateDataObject(pdcm->pidlFolder, pdcm->cidl, pdcm->apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) m_pDataObj = pDataObj; if (!pdcm->cidl) @@ -150,7 +150,7 @@ else { IPersistFolder2 *pf = NULL; - if (SUCCEEDED(pdcm->psf->QueryInterface(IID_IPersistFolder2, (PVOID*)&pf))) + if (SUCCEEDED(pdcm->psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) { if (FAILED(pf->GetCurFolder((_ITEMIDLIST**)&m_pidlFolder))) ERR("GetCurFolder failed\n"); @@ -357,7 +357,7 @@ return S_OK; IContextMenu *pcm; - hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_IContextMenu, (void**)&pcm); + hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IContextMenu, &pcm)); if (hr != S_OK) { ERR("SHCoCreateInstance failed %x\n", GetLastError()); @@ -365,7 +365,7 @@ } IShellExtInit *pExtInit; - hr = pcm->QueryInterface(IID_IShellExtInit, (void**)&pExtInit); + hr = pcm->QueryInterface(IID_PPV_ARG(IShellExtInit, &pExtInit)); if (hr != S_OK) { ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); @@ -998,7 +998,7 @@ /* use desktop shellfolder */ psfFrom = psfDesktop; } - else if (FAILED(psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom))) + else if (FAILED(psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)))) { ERR("no IShellFolder\n"); @@ -1016,7 +1016,7 @@ if (m_Dcm.cidl) { psfDesktop->Release(); - hr = m_Dcm.psf->BindToObject(m_Dcm.apidl[0], NULL, IID_IShellFolder, (LPVOID*)&psfTarget); + hr = m_Dcm.psf->BindToObject(m_Dcm.apidl[0], NULL, IID_PPV_ARG(IShellFolder, &psfTarget)); } else { @@ -1024,7 +1024,7 @@ LPITEMIDLIST pidl; /* cidl is zero due to explorer view */ - hr = m_Dcm.psf->QueryInterface(IID_IPersistFolder2, (LPVOID *) &ppf2); + hr = m_Dcm.psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (SUCCEEDED(hr)) { hr = ppf2->GetCurFolder(&pidl); @@ -1039,7 +1039,7 @@ else { /* retrieve target desktop folder */ - hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfTarget); + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfTarget)); } TRACE("psfTarget %x %p, Desktop %u\n", hr, psfTarget, _ILIsDesktop(pidl)); ILFree(pidl); @@ -1062,7 +1062,7 @@ /* get source and destination shellfolder */ ISFHelper *psfhlpdst; - if (FAILED(psfTarget->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpdst))) + if (FAILED(psfTarget->QueryInterface(IID_PPV_ARG(ISFHelper, &psfhlpdst)))) { ERR("no IID_ISFHelper for destination\n"); @@ -1077,7 +1077,7 @@ } ISFHelper *psfhlpsrc; - if (FAILED(psfFrom->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpsrc))) + if (FAILED(psfFrom->QueryInterface(IID_PPV_ARG(ISFHelper, &psfhlpsrc)))) { ERR("no IID_ISFHelper for source\n"); @@ -1185,7 +1185,7 @@ return E_FAIL; IShellLinkW *pLink; - hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkW, (void**)&pLink); + hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkW, &pLink)); if (hr != S_OK) return hr; @@ -1196,7 +1196,7 @@ if (SUCCEEDED(pLink->SetPath(wszPath)) && SUCCEEDED(pLink->SetWorkingDirectory(szDirPath))) { - if (SUCCEEDED(pLink->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf))) + if (SUCCEEDED(pLink->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)))) { hr = ppf->Save(wszTarget, TRUE); ppf->Release(); @@ -1280,7 +1280,7 @@ LPDATAOBJECT pDataObj; HRESULT hr; - if (SUCCEEDED(SHCreateDataObject(m_Dcm.pidlFolder, m_Dcm.cidl, m_Dcm.apidl, NULL, IID_IDataObject, (void**)&pDataObj))) + if (SUCCEEDED(SHCreateDataObject(m_Dcm.pidlFolder, m_Dcm.cidl, m_Dcm.apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) { hr = OleSetClipboard(pDataObj); pDataObj->Release(); @@ -1364,7 +1364,7 @@ IPersistFolder2 *pf; /* pidlFolder is optional */ - if (SUCCEEDED(m_Dcm.psf->QueryInterface(IID_IPersistFolder2, (PVOID*)&pf))) + if (SUCCEEDED(m_Dcm.psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) { pf->GetCurFolder((_ITEMIDLIST**)&pidlParent); pf->Release(); @@ -1794,7 +1794,7 @@ pdcm.cKeys = nKeys; pdcm.aKeys = ahkeyClsKeys; - HRESULT hr = SHCreateDefaultContextMenu(&pdcm, IID_IContextMenu, (void**)ppcm); + HRESULT hr = SHCreateDefaultContextMenu(&pdcm, IID_PPV_ARG(IContextMenu, ppcm)); return hr; } Modified: trunk/reactos/dll/win32/shell32/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -147,7 +147,7 @@ } CComPtr<IDataObject> pDataObj; - HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj); + HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); if (SUCCEEDED(hr)) { Modified: trunk/reactos/dll/win32/shell32/enumidlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli… ============================================================================== --- trunk/reactos/dll/win32/shell32/enumidlist.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/enumidlist.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -291,7 +291,7 @@ ATLTRY (theEnumerator = new CComObject<IEnumIDListImpl>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface (IID_IEnumIDList, (void **)&result); + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); if (FAILED (hResult)) { delete theEnumerator; Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -197,11 +197,11 @@ LPITEMIDLIST pSimplePidl = ILFindLastID(pidl); HRESULT hr; - hr = SHCreateDefaultExtractIcon(IID_IDefaultExtractIconInit, (void **)&initIcon); + hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); if (FAILED(hr)) return NULL; - hr = initIcon->QueryInterface(IID_IExtractIconW, (void **)&extractIcon); + hr = initIcon->QueryInterface(IID_PPV_ARG(IExtractIconW,&extractIcon)); if (FAILED(hr)) return NULL; @@ -383,7 +383,7 @@ if (!extractIconW) return NULL; - hr = extractIconW->QueryInterface(IID_IExtractIconA, (void **)&extractIconA); + hr = extractIconW->QueryInterface(IID_PPV_ARG(IExtractIconA, &extractIconA)); extractIconW->Release(); if (FAILED(hr)) return NULL; Modified: trunk/reactos/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -149,7 +149,7 @@ ATLTRY (theEnumerator = new CComObject<CDesktopFolderEnumY>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface (IID_IEnumIDList, (void **)&result); + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); if (FAILED (hResult)) { delete theEnumerator; Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -388,7 +388,7 @@ ATLTRY (theEnumerator = new CComObject<CControlPanelEnum>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface (IID_IEnumIDList, (void **)&result); + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); if (FAILED (hResult)) { delete theEnumerator; @@ -1024,11 +1024,11 @@ FIXME("Couldn't retrieve pointer to cpl structure\n"); return E_FAIL; } - hResult = CShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkA, (void **)&isl); + hResult = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkA, &isl)); if (SUCCEEDED(hResult)) { isl->SetPath(szTarget); - if (SUCCEEDED(isl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf))) + if (SUCCEEDED(isl->QueryInterface(IID_PPV_ARG(IPersistFile,&ppf)))) ppf->Save(szPath, TRUE); } return NOERROR; Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -430,7 +430,7 @@ if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface (IID_IEnumIDList, (void **)&result); + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); if (FAILED (hResult)) { delete theEnumerator; @@ -857,7 +857,7 @@ if (_ILGetGUIDPointer(pidl)) { - if (SUCCEEDED(BindToObject(pidl, NULL, IID_IShellFolder2, (LPVOID *)&psf))) + if (SUCCEEDED(BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder2, &psf)))) { hr = psf->SetNameOf(hwndOwner, pidl, lpName, dwFlags, pPidlOut); return hr; @@ -1218,7 +1218,7 @@ TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); - pSFFrom->QueryInterface(IID_IPersistFolder2, (LPVOID *)&ppf2); + pSFFrom->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (ppf2) { if (FAILED(ppf2->GetCurFolder(&pidl))) Modified: trunk/reactos/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -233,7 +233,7 @@ ATLTRY (theEnumerator = new CComObject<CDesktopFolderEnumZ>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface (IID_IEnumIDList, (void **)&result); + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); if (FAILED (hResult)) { delete theEnumerator; @@ -314,7 +314,7 @@ } else if (IsEqualIID (riid, IID_IShellView)) { - hr = IShellView_Constructor ((IShellFolder *)this, &pShellView); + hr = IShellView_Constructor (this, &pShellView); if (pShellView) hr = pShellView->QueryInterface(riid, ppvOut); } @@ -345,7 +345,7 @@ CComPtr<IShellFolder> psfParent; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(pidlRoot, IID_IShellFolder, (LPVOID *)&psfParent, (LPCITEMIDLIST *)&rpidl); + hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), (LPCITEMIDLIST *)&rpidl); if (SUCCEEDED(hr)) SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); } Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -127,8 +127,7 @@ if (FAILED(r)) return NULL; - r = param->QueryInterface(IID_IFileSystemBindData, - (LPVOID*)&fsbd ); + r = param->QueryInterface(IID_PPV_ARG(IFileSystemBindData,&fsbd)); if (SUCCEEDED(r)) { r = fsbd->GetFindData(&wfd); @@ -265,8 +264,8 @@ ATLTRY (theEnumerator = new CComObject<CFileSysEnum>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface (IID_IEnumIDList, (void **)&result); - if (FAILED (hResult)) + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); + if (FAILED(hResult)) { delete theEnumerator; return hResult; @@ -404,7 +403,7 @@ IShellFolder *psfParent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(pidlRoot, IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), &rpidl); if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); @@ -1050,7 +1049,7 @@ TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); - hr = pSFFrom->QueryInterface (IID_IPersistFolder2, (LPVOID *) & ppf2); + hr = pSFFrom->QueryInterface (IID_PPV_ARG(IPersistFolder2, &ppf2)); if (SUCCEEDED(hr)) { hr = ppf2->GetCurFolder(&pidl); Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -389,7 +389,7 @@ ATLTRY (theEnumerator = new CComObject<CPrintersEnum>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface(IID_IEnumIDList, (void **)&result); + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); if (FAILED (hResult)) { delete theEnumerator; Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -505,7 +505,7 @@ ATLTRY (theEnumerator = new CComObject<CRecycleBinEnum>); if (theEnumerator == NULL) return E_OUTOFMEMORY; - hResult = theEnumerator->QueryInterface(IID_IEnumIDList, (void **)&result); + hResult = theEnumerator->QueryInterface(IID_PPV_ARG(IEnumIDList, &result)); if (FAILED (hResult)) { delete theEnumerator; Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -128,7 +128,7 @@ Header.pszCaption = PathFindFileNameW(wszPath); CComPtr<IDataObject> pDataObj; - HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj); + HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); if (SUCCEEDED(hr)) { Modified: trunk/reactos/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/newmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/newmenu.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -350,15 +350,15 @@ // return E_FAIL; /* Get current folder */ - hr = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&pFolderView); + hr = IUnknown_QueryService(psv, SID_IFolderView, IID_PPV_ARG(IFolderView, &pFolderView)); if (FAILED(hr)) return hr; - hr = pFolderView->GetFolder(IID_IShellFolder, (void **)&pParentFolder); + hr = pFolderView->GetFolder(IID_PPV_ARG(IShellFolder, &pParentFolder)); if (FAILED(hr)) return hr; - hr = pParentFolder->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlp); + hr = pParentFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfhlp)); if (FAILED(hr)) return hr; @@ -394,19 +394,19 @@ WCHAR wszPath[MAX_PATH]; CComPtr<IFolderView> pFolderView; CComPtr<IShellFolder> pParentFolder; - CComPtr<IPersistFolder3> psf; + CComPtr<IPersistFolder2> psf; HRESULT hr; /* Get current folder */ - hr = IUnknown_QueryService(psv, SID_IFolderView, IID_IFolderView, (void **)&pFolderView); + hr = IUnknown_QueryService(psv, SID_IFolderView, IID_PPV_ARG(IFolderView, &pFolderView)); if (FAILED(hr)) return hr; - hr = pFolderView->GetFolder(IID_IShellFolder, (void **)&pParentFolder); + hr = pFolderView->GetFolder(IID_PPV_ARG(IShellFolder, &pParentFolder)); if (FAILED(hr)) return hr; - if (pParentFolder->QueryInterface(IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) + if (pParentFolder->QueryInterface(IID_PPV_ARG(IPersistFolder2, &psf)) != S_OK) { ERR("Failed to get interface IID_IPersistFolder2\n"); return E_FAIL; Modified: trunk/reactos/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.cpp… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -118,7 +118,7 @@ } else { - ret = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); + ret = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psfParent), &pidllast); if (SUCCEEDED(ret)) { ret = psfParent->GetDisplayNameOf(pidllast, flag, &strret); @@ -1221,7 +1221,7 @@ if (!pidl) return FALSE; - hr = SHBindToParent(pidl, IID_IShellFolder, (VOID**)&psfFolder, &pidlLast); + hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psfFolder), &pidlLast); if (FAILED(hr)) { ERR("SHBindToParent failed: %x\n", hr); Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -467,7 +467,7 @@ /* get the parent shellfolder */ if (pidl) { - hr = SHBindToParent( pidl, IID_IShellFolder, (LPVOID*)&psfParent, + hr = SHBindToParent( pidl, IID_PPV_ARG(IShellFolder, &psfParent), (LPCITEMIDLIST*)&pidlLast ); if (SUCCEEDED(hr)) pidlLast = ILClone(pidlLast); Modified: trunk/reactos/dll/win32/shell32/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellite… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellitem.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellitem.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -69,7 +69,7 @@ { hr = SHGetDesktopFolder(&desktop); if (SUCCEEDED(hr)) - hr = desktop->BindToObject(parent_pidl, NULL, IID_IShellFolder, reinterpret_cast<void **>(ppsf)); + hr = desktop->BindToObject(parent_pidl, NULL, IID_PPV_ARG(IShellFolder, ppsf)); ILFree(parent_pidl); } @@ -179,7 +179,7 @@ if (piOrder == NULL || oth == NULL) return E_POINTER; - hr = oth->QueryInterface(IID_IPersistIDList, reinterpret_cast<void **>(&pIDList)); + hr = oth->QueryInterface(IID_PPV_ARG(IPersistIDList, &pIDList)); if (SUCCEEDED(hr)) { hr = pIDList->GetIDList(&pidl); @@ -256,7 +256,7 @@ { CComPtr<IPersistFolder2> ppf2Parent; - if (FAILED(psfParent->QueryInterface(IID_IPersistFolder2, (void**)&ppf2Parent))) + if (FAILED(psfParent->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2Parent)))) { FIXME("couldn't get IPersistFolder2 interface of parent\n"); return E_NOINTERFACE; @@ -284,14 +284,14 @@ return E_OUTOFMEMORY; } - hr = CShellItem::_CreatorClass::CreateInstance(NULL, IID_IShellItem, (void**)&newShellItem); + hr = CShellItem::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellItem, &newShellItem)); if (FAILED(hr)) { *ppsi = NULL; ILFree(new_pidl); return hr; } - hr = newShellItem->QueryInterface(IID_IPersistIDList, (void **)&newPersistIDList); + hr = newShellItem->QueryInterface(IID_PPV_ARG(IPersistIDList, &newPersistIDList)); if (FAILED(hr)) { ILFree(new_pidl); Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -1095,7 +1095,7 @@ { LPCITEMIDLIST pidlLast; - HRESULT hr = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&psf, &pidlLast); + HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psf), &pidlLast); if (SUCCEEDED(hr)) { @@ -1365,7 +1365,7 @@ LPCITEMIDLIST pidlLast; UINT wFlags; - HRESULT hr = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&psf, &pidlLast); + HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &psf), &pidlLast); if (SUCCEEDED(hr)) { @@ -2111,7 +2111,7 @@ *ppv = NULL; - hr = psl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf); + hr = psl->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)); if (SUCCEEDED(hr)) { Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -22,8 +22,6 @@ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); - -extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); static const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; @@ -129,7 +127,7 @@ /* now we create an instance */ if (bLoadFromShell32) { - if (! SUCCEEDED(DllGetClassObject(*myclsid, IID_IClassFactory, (LPVOID*)&pcf))) { + if (! SUCCEEDED(DllGetClassObject(*myclsid, IID_PPV_ARG(IClassFactory, &pcf)))) { ERR("LoadFromShell failed for CLSID=%s\n", shdebugstr_guid(myclsid)); } } else if (bLoadWithoutCOM) { @@ -286,7 +284,7 @@ if(!psf) return E_INVALIDARG; *psf = NULL; - hres = CDesktopFolder::_CreatorClass::CreateInstance(NULL, IID_IShellFolder, (void**)psf); + hres = CDesktopFolder::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellFolder, psf)); TRACE("-- %p->(%p)\n",psf, *psf); return hres; @@ -388,7 +386,7 @@ ATLTRY (theClassObject = new CComObject<IDefClFImpl>); if (theClassObject == NULL) return E_OUTOFMEMORY; - hResult = theClassObject->QueryInterface (IID_IClassFactory, (void **)&result); + hResult = theClassObject->QueryInterface (IID_PPV_ARG(IClassFactory, &result)); if (FAILED (hResult)) { delete theClassObject; Modified: trunk/reactos/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -934,12 +934,10 @@ hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, - IID_IShellLinkA, - (void **)&psl); + IID_PPV_ARG(IShellLinkA,&psl)); if(SUCCEEDED(hres)) { - hres = psl->QueryInterface(IID_IPersistFile, - (LPVOID *)&pPf); + hres = psl->QueryInterface(IID_PPV_ARG(IPersistFile,&pPf)); if(FAILED(hres)) { /* bombed */ ERR("failed QueryInterface for IPersistFile %08x\n", hres); @@ -1021,7 +1019,7 @@ if (FAILED(hRes)) return hRes; - hRes = psf->QueryInterface(IID_IShellView, (LPVOID *)ppv); + hRes = psf->QueryInterface(IID_PPV_ARG(IShellView, ppv)); psf->Release(); return hRes; @@ -1773,9 +1771,9 @@ /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. Only if both interfaces are supported it's a real shell extension. Then call IShellExtInit's Initialize method. */ - if (SUCCEEDED(CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + if (SUCCEEDED(CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, IID_PPV_ARG(IShellPropSheetExt, &pspsx)))) { - if (SUCCEEDED(pspsx->QueryInterface(IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(pspsx->QueryInterface(IID_PPV_ARG(IShellExtInit, &psxi)))) { if (SUCCEEDED(psxi->Initialize(NULL, pDataObj, hKey))) { @@ -1900,7 +1898,7 @@ return hRes; pef->AddRef(); - hRes = pef->QueryInterface(IID_IEnumFORMATETC, (LPVOID*)ppenumFormatetc); + hRes = pef->QueryInterface(IID_PPV_ARG(IEnumFORMATETC, ppenumFormatetc)); pef->Release(); return hRes; @@ -1926,7 +1924,7 @@ if (FAILED(hRes)) return hRes; - hRes = psf->QueryInterface(IID_IShellView, (LPVOID *)ppsv); + hRes = psf->QueryInterface(IID_PPV_ARG(IShellView, ppsv)); psf->Release(); return hRes; Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -1224,7 +1224,7 @@ pidl = ILCreateFromPathW(fullpath); } - r = SHBindToParent(pidl, IID_IShellFolder, (LPVOID*)&shf, &pidllast); + r = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &shf), &pidllast); if (FAILED(r)) goto end; @@ -1324,7 +1324,7 @@ goto end; r = CoCreateInstance(*guid, NULL, CLSCTX_INPROC_SERVER, - IID_IShellExtInit, (LPVOID*)&obj); + IID_PPV_ARG(IShellExtInit, &obj)); if (FAILED(r)) { ERR("failed %08x\n", r); @@ -1693,7 +1693,7 @@ { IShellExecuteHookW* pSEH; - HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_IShellExecuteHookW, (LPVOID*)&pSEH, NULL); + HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL); if (SUCCEEDED(hr)) { Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -133,7 +133,7 @@ TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlInOut ? *pidlInOut : NULL, debugstr_w (szNext)); /* get the shellfolder for the child pidl and let it analyse further */ - hr = psf->BindToObject(*pidlInOut, pbc, IID_IShellFolder, (LPVOID *)&psfChild); + hr = psf->BindToObject(*pidlInOut, pbc, IID_PPV_ARG(IShellFolder, &psfChild)); if (SUCCEEDED(hr)) { hr = psfChild->ParseDisplayName(hwndOwner, pbc, szNext, pEaten, &pidlOut, pdwAttributes); @@ -171,10 +171,11 @@ LPCITEMIDLIST pidlChild, REFCLSID clsid, LPVOID * ppvOut) { HRESULT hr; + IShellFolder* pShellFolder; TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); - hr = SHCoCreateInstance(NULL, &clsid, NULL, IID_IShellFolder, ppvOut); + hr = SHCoCreateInstance(NULL, &clsid, NULL, IID_PPV_ARG(IShellFolder, &pShellFolder)); if (SUCCEEDED (hr)) { LPITEMIDLIST pidlAbsolute = ILCombine (pidlRoot, pidlChild); @@ -182,7 +183,7 @@ IPersistFolder3 *ppf; if (_ILIsFolder(pidlChild) && - SUCCEEDED (((IUnknown *)(*ppvOut))->QueryInterface(IID_IPersistFolder3, (LPVOID *) & ppf))) + SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf)))) { PERSIST_FOLDER_TARGET_INFO ppfti; @@ -210,7 +211,7 @@ ppf->InitializeEx(NULL, pidlAbsolute, &ppfti); ppf->Release(); } - else if (SUCCEEDED ((hr = ((IUnknown *)(*ppvOut))->QueryInterface (IID_IPersistFolder, (LPVOID *) & pPF)))) + else if (SUCCEEDED((hr = pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder, &pPF))))) { pPF->Initialize(pidlAbsolute); pPF->Release(); @@ -218,6 +219,9 @@ ILFree (pidlAbsolute); } TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); + + *ppvOut = pShellFolder; + return hr; } @@ -323,7 +327,7 @@ { IShellFolder *psfChild; - hr = psf->BindToObject(pidlFirst, NULL, IID_IShellFolder, (LPVOID *) & psfChild); + hr = psf->BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); if (SUCCEEDED (hr)) { STRRET strTemp; @@ -454,7 +458,7 @@ if (SFGAO_HASSUBFOLDER & *pdwAttributes) { IShellFolder *psf2; - if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_IShellFolder, (LPVOID *)&psf2))) + if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) { IEnumIDList *pEnumIL = NULL; if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) @@ -533,7 +537,7 @@ } else if (isEmpty2) { return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); /* optimizing end */ - } else if (SUCCEEDED (iface->BindToObject(firstpidl, NULL, IID_IShellFolder, (LPVOID *)&psf))) { + } else if (SUCCEEDED (iface->BindToObject(firstpidl, NULL, IID_PPV_ARG(IShellFolder, &psf)))) { nReturn = psf->CompareIDs(lParam, nextpidl1, nextpidl2); psf->Release(); } Modified: trunk/reactos/dll/win32/shell32/shlfsbind.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfsbin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -66,7 +66,7 @@ *ppV = NULL; - hResult = IFileSystemBindDataImpl::_CreatorClass::CreateInstance(NULL, IID_IFileSystemBindData, (void **)&fileSystemBindData); + hResult = IFileSystemBindDataImpl::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IFileSystemBindData, &fileSystemBindData)); if (FAILED(hResult)) return hResult; hResult = fileSystemBindData->SetFindData(pfd); @@ -106,7 +106,7 @@ ret = pbc->GetObjectParam((LPOLESTR)wFileSystemBindData, &pUnk); if (SUCCEEDED(ret)) { - ret = pUnk->QueryInterface(IID_IFileSystemBindData, (LPVOID *)&pfsbd); + ret = pUnk->QueryInterface(IID_PPV_ARG(IFileSystemBindData, &pfsbd)); if (SUCCEEDED(ret)) ret = pfsbd->GetFindData(pfd); } @@ -124,7 +124,7 @@ ret = pbc->GetObjectParam((LPOLESTR)wFileSystemBindData, &pUnk); if (SUCCEEDED(ret)) { - ret = pUnk->QueryInterface(IID_IFileSystemBindData, (LPVOID *)&pfsbd); + ret = pUnk->QueryInterface(IID_PPV_ARG(IFileSystemBindData, &pfsbd)); if (SUCCEEDED(ret)) ret = pfsbd->SetFindData(pfd); } Modified: trunk/reactos/dll/win32/shell32/shlmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlmenu.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlmenu.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -156,7 +156,7 @@ if (SUCCEEDED (SHGetDesktopFolder(&lpsf))) { - if (SUCCEEDED(lpsf->BindToObject(pidl, 0, IID_IShellFolder, (LPVOID *)&lpsf2))) + if (SUCCEEDED(lpsf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &lpsf2)))) { IEnumIDList *lpe = NULL; Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -350,7 +350,7 @@ HRESULT WINAPI CDefView::Initialize(IShellFolder *shellFolder) { pSFParent = shellFolder; - shellFolder->QueryInterface(IID_IShellFolder2, (LPVOID *)&pSF2Parent); + shellFolder->QueryInterface(IID_PPV_ARG(IShellFolder2, &pSF2Parent)); return S_OK; } @@ -936,11 +936,11 @@ } } - if (SUCCEEDED(this->QueryInterface(IID_IDropTarget, (LPVOID*)&pdt))) + if (SUCCEEDED(QueryInterface(IID_PPV_ARG(IDropTarget, &pdt)))) RegisterDragDrop(m_hWnd, pdt); /* register for receiving notifications */ - pSFParent->QueryInterface(IID_IPersistFolder2, (LPVOID*)&ppf2); + pSFParent->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (ppf2) { ppf2->GetCurFolder((LPITEMIDLIST*)&ntreg.pidl); @@ -1114,7 +1114,7 @@ if (!hMenu) return E_FAIL; - hResult = GetItemObject( SVGIO_SELECTION, IID_IContextMenu, (LPVOID *)&pCM); + hResult = GetItemObject( SVGIO_SELECTION, IID_PPV_ARG(IContextMenu2, &pCM)); if (FAILED(hResult)) goto cleanup; @@ -1181,7 +1181,7 @@ cidl = ListView_GetSelectedCount(hWndList); - hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_IContextMenu, (LPVOID *)&pCM); + hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu2, &pCM)); if (FAILED( hResult)) goto cleanup; @@ -1235,7 +1235,7 @@ if (!hMenu) return 0; - hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_IContextMenu, (LPVOID *)&pCM); + hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu2, &pCM)); if (FAILED( hResult)) goto cleanup; @@ -1958,7 +1958,7 @@ /* try to get the ICommDlgBrowserInterface, adds a reference !!! */ pCommDlgBrowser = NULL; - if (SUCCEEDED(pShellBrowser->QueryInterface(IID_ICommDlgBrowser, (LPVOID *)&pCommDlgBrowser))) + if (SUCCEEDED(pShellBrowser->QueryInterface(IID_PPV_ARG(ICommDlgBrowser, &pCommDlgBrowser)))) { TRACE("-- CommDlgBrowser\n"); } @@ -2415,8 +2415,7 @@ { /* We are not above one of the listview's subitems. Bind to the parent folder's * DropTarget interface. */ - hr = pSFParent->QueryInterface(IID_IDropTarget, - (LPVOID*)&pCurDropTarget); + hr = pSFParent->QueryInterface(IID_PPV_ARG(IDropTarget,&pCurDropTarget)); } else { @@ -2600,7 +2599,7 @@ if (theView == NULL) return E_OUTOFMEMORY; - hResult = theView->QueryInterface (IID_IShellView, (void **)&result); + hResult = theView->QueryInterface(IID_PPV_ARG(IShellView, &result)); if (FAILED (hResult)) { delete theView; Modified: trunk/reactos/include/psdk/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj_undoc.… ============================================================================== --- trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] Mon Nov 11 16:42:16 2013 @@ -25,6 +25,12 @@ #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ + +#ifdef __cplusplus +#define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) +#else +#define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType) +#endif /***************************************************************************** * New shellstate structure

11 years, 1 month

[hbelusca] 60940: [FAST486]: Put the inlined function in its proper file. No code changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 11 15:34:18 2013 New Revision: 60940 URL: http://svn.reactos.org/svn/reactos?rev=60940&view=rev Log: [FAST486]: Put the inlined function in its proper file. No code changes. Modified: branches/ntvdm/lib/fast486/common.h branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Mon Nov 11 15:34:18 2013 @@ -163,22 +163,6 @@ /* INLINED FUNCTIONS **********************************************************/ -/* static */ FORCEINLINE -INT -Fast486GetCurrentPrivLevel(PFAST486_STATE State) -{ - if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) - { - /* In protected mode, return the RPL of the CS */ - return GET_SEGMENT_RPL(State->SegmentRegs[FAST486_REG_CS].Selector); - } - else - { - /* Real mode is always in supervisor mode */ - return 0; - } -} - #include "common.inl" #endif // _COMMON_H_ Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Mon Nov 11 15:34:18 2013 @@ -24,6 +24,22 @@ /* PUBLIC FUNCTIONS ***********************************************************/ FORCEINLINE +INT +Fast486GetCurrentPrivLevel(PFAST486_STATE State) +{ + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + { + /* In protected mode, return the RPL of the CS */ + return GET_SEGMENT_RPL(State->SegmentRegs[FAST486_REG_CS].Selector); + } + else + { + /* Real mode is always in supervisor mode */ + return 0; + } +} + +FORCEINLINE ULONG Fast486GetPageTableEntry(PFAST486_STATE State, ULONG VirtualAddress,

11 years, 1 month

← Newer
1
...
19
20
21
22
23
24
25
...
35
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 November 2013