Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 63042: [BASESRV] Implement BaseSrvDisconnect and BaseSrvCleanupVdmRecords, which will remove VDM console and DOS records which have been left behind by a terminated ntvdm process. Imp...
by aandrejevic＠svn.reactos.org 29 Apr '14

29 Apr '14

Author: aandrejevic Date: Tue Apr 29 00:41:48 2014 New Revision: 63042 URL: http://svn.reactos.org/svn/reactos?rev=63042&view=rev Log: [BASESRV] Implement BaseSrvDisconnect and BaseSrvCleanupVdmRecords, which will remove VDM console and DOS records which have been left behind by a terminated ntvdm process. Implement the "VDM voodoo" in BaseSrvCreateProcess. It's supposed to store the process ID of the VDM in the VDM console record. Fix minor bugs. Add function declarations to the header file. Modified: branches/ntvdm/subsystems/win/basesrv/init.c branches/ntvdm/subsystems/win/basesrv/proc.c branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/in… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/init.c [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -570,6 +570,14 @@ LoadedServerDll->SharedSection = BaseStaticServerData; } +VOID +NTAPI +BaseSrvDisconnect(PCSR_PROCESS Process) +{ + /* Cleanup the VDM console records */ + BaseSrvCleanupVdmRecords(HandleToUlong(Process->ClientId.UniqueProcess)); +} + CSR_SERVER_DLL_INIT(ServerDllInitialization) { /* Setup the DLL Object */ @@ -582,7 +590,7 @@ #endif LoadedServerDll->SizeOfProcessData = 0; LoadedServerDll->ConnectCallback = NULL; - LoadedServerDll->DisconnectCallback = NULL; + LoadedServerDll->DisconnectCallback = BaseSrvDisconnect; LoadedServerDll->ShutdownProcessCallback = NULL; BaseSrvDllInstance = LoadedServerDll->ServerHandle; Modified: branches/ntvdm/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/pr… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/proc.c [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "basesrv.h" +#include "vdm.h" #define NDEBUG #include <debug.h> @@ -167,7 +168,30 @@ /* FIXME: Should notify user32 */ - /* FIXME: VDM vodoo */ + /* Check if this is a VDM process */ + if (CreateProcessRequest->VdmBinaryType) + { + PVDM_CONSOLE_RECORD ConsoleRecord; + + if (CreateProcessRequest->VdmTask != 0) + { + /* Get the console record using the task ID */ + Status = GetConsoleRecordBySessionId(CreateProcessRequest->VdmTask, + &ConsoleRecord); + } + else + { + /* Get the console record using the console handle */ + Status = BaseSrvGetConsoleRecord(CreateProcessRequest->hVDM, + &ConsoleRecord); + } + + /* Check if it failed */ + if (!NT_SUCCESS(Status)) return Status; + + /* Store the process ID of the VDM in the console record */ + ConsoleRecord->ProcessId = HandleToUlong(CreateProcessRequest->ClientId.UniqueProcess); + } /* Return the result of this operation */ return Status; Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -203,7 +203,7 @@ return Status; } -VOID BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo) +VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo) { /* Free the allocated structure members */ if (CommandInfo->CmdLine != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->CmdLine); @@ -219,6 +219,61 @@ RtlFreeHeap(BaseSrvHeap, 0, CommandInfo); } +VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId) +{ + PLIST_ENTRY i; + PVDM_CONSOLE_RECORD ConsoleRecord = NULL; + PVDM_DOS_RECORD DosRecord; + + /* Enter the critical section */ + RtlEnterCriticalSection(&DosCriticalSection); + + /* Search for a record that has the same process handle */ + for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink) + { + ConsoleRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry); + + if (ConsoleRecord->ProcessId == ProcessId) + { + /* Cleanup the DOS records */ + while (ConsoleRecord->DosListHead.Flink != &ConsoleRecord->DosListHead) + { + DosRecord = CONTAINING_RECORD(ConsoleRecord->DosListHead.Flink, + VDM_DOS_RECORD, + Entry); + + /* Set the event and close it */ + NtSetEvent(DosRecord->ServerEvent, NULL); + NtClose(DosRecord->ServerEvent); + + /* Remove the DOS entry */ + if (DosRecord->CommandInfo) BaseSrvFreeVDMInfo(DosRecord->CommandInfo); + RemoveEntryList(&DosRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, DosRecord); + } + + if (ConsoleRecord->CurrentDirs != NULL) + { + /* Free the current directories */ + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord->CurrentDirs); + ConsoleRecord->CurrentDirs = NULL; + ConsoleRecord->CurDirsLength = 0; + } + + /* Close the event handle */ + if (ConsoleRecord->ServerEvent) NtClose(ConsoleRecord->ServerEvent); + + /* Remove the console record */ + i = i->Blink; + RemoveEntryList(&ConsoleRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord); + } + } + + /* Leave the critical section */ + RtlLeaveCriticalSection(&DosCriticalSection); +} + BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord) { BOOLEAN Success = FALSE; @@ -367,7 +422,7 @@ } NTSTATUS NTAPI BaseSrvFillCommandInfo(PVDM_COMMAND_INFO CommandInfo, - PBASE_GET_NEXT_VDM_COMMAND Message) + PBASE_GET_NEXT_VDM_COMMAND Message) { /* Copy the data */ Message->iTask = CommandInfo->TaskId; Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -23,6 +23,7 @@ HANDLE ProcessHandle; HANDLE ServerEvent; HANDLE ClientEvent; + ULONG ProcessId; ULONG ReenterCount; PCHAR CurrentDirs; ULONG CurDirsLength; @@ -43,6 +44,17 @@ /* FUNCTIONS ******************************************************************/ NTSTATUS NTAPI BaseSrvGetConsoleRecord(HANDLE ConsoleHandle, PVDM_CONSOLE_RECORD *Record); +NTSTATUS NTAPI GetConsoleRecordBySessionId(ULONG TaskId, PVDM_CONSOLE_RECORD *Record); +ULONG NTAPI GetNextDosSesId(VOID); +BOOLEAN NTAPI BaseSrvIsVdmAllowed(VOID); +NTSTATUS NTAPI BaseSrvCreatePairWaitHandles(PHANDLE ServerEvent, PHANDLE ClientEvent); +VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo); +VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId); +BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord); +NTSTATUS NTAPI BaseSrvFillCommandInfo( + PVDM_COMMAND_INFO CommandInfo, + PBASE_GET_NEXT_VDM_COMMAND Message +); VOID NTAPI BaseInitializeVDM(VOID); #endif // __VDM_H__

1 0

[hbelusca] 63041: [CSRSRV] When the CsrProcessCreateNewGroup (~= CREATE_NEW_PROCESS_GROUP) flag is set, it means that we are creating a new process group leader, and not the reverse :P
by hbelusca＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: hbelusca Date: Mon Apr 28 23:09:09 2014 New Revision: 63041 URL: http://svn.reactos.org/svn/reactos?rev=63041&view=rev Log: [CSRSRV] When the CsrProcessCreateNewGroup (~= CREATE_NEW_PROCESS_GROUP) flag is set, it means that we are creating a new process group leader, and not the reverse :P Modified: branches/ntvdm/subsystems/win32/csrsrv/procsup.c Modified: branches/ntvdm/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win32/csrsrv/p… ============================================================================== --- branches/ntvdm/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Mon Apr 28 23:09:09 2014 @@ -605,15 +605,18 @@ } /* Check if CreateProcess got CREATE_NEW_PROCESS_GROUP */ - if ((Flags & CsrProcessCreateNewGroup) == 0) - { - /* Create new data */ + if (Flags & CsrProcessCreateNewGroup) + { + /* + * We create the process group leader of a new process group, therefore + * its process group ID and sequence number are its own ones. + */ CsrProcess->ProcessGroupId = HandleToUlong(ClientId->UniqueProcess); CsrProcess->ProcessGroupSequence = CsrProcess->SequenceNumber; } else { - /* Copy it from the current process */ + /* Inherit the process group ID and sequence number from the current process */ CsrProcess->ProcessGroupId = CurrentProcess->ProcessGroupId; CsrProcess->ProcessGroupSequence = CurrentProcess->ProcessGroupSequence; }

1 0

[dquintana] 63040: [BROWSEUI] [SHELL32] * Make use of IID_PPV_ARG (part 2).
by dquintana＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: dquintana Date: Mon Apr 28 21:59:02 2014 New Revision: 63040 URL: http://svn.reactos.org/svn/reactos?rev=63040&view=rev Log: [BROWSEUI] [SHELL32] * Make use of IID_PPV_ARG (part 2). Modified: branches/shell-experiments/dll/win32/browseui/bandproxy.cpp branches/shell-experiments/dll/win32/browseui/bandsite.cpp branches/shell-experiments/dll/win32/browseui/basebar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp branches/shell-experiments/dll/win32/shell32/folders/fs.cpp branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp branches/shell-experiments/dll/win32/shell32/shellole.cpp branches/shell-experiments/dll/win32/shell32/shlexec.cpp branches/shell-experiments/dll/win32/shell32/startmenu.cpp Modified: branches/shell-experiments/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -47,7 +47,7 @@ if (FAILED(hResult)) return hResult; hResult = serviceProvider->QueryService( - SID_IWebBrowserApp, IID_IWebBrowser2, reinterpret_cast<void **>(&webBrowser)); + SID_IWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &webBrowser)); if (FAILED(hResult)) return hResult; *browser = webBrowser.Detach(); Modified: branches/shell-experiments/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -283,16 +283,16 @@ if (punk == NULL || fRebarWindow == NULL) return E_FAIL; - hRet = punk->QueryInterface(IID_IDeskBand, reinterpret_cast<PVOID *>(&DeskBand)); + hRet = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &DeskBand)); if (!SUCCEEDED(hRet) || DeskBand == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IObjectWithSite, reinterpret_cast<PVOID *>(&ObjWithSite)); + hRet = punk->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ObjWithSite)); if (!SUCCEEDED(hRet) || ObjWithSite == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IOleWindow, reinterpret_cast<PVOID *>(&OleWindow)); + hRet = punk->QueryInterface(IID_PPV_ARG(IOleWindow, &OleWindow)); if (!SUCCEEDED(hRet) || OleWindow == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IWinEventHandler, reinterpret_cast<PVOID *>(&WndEvtHandler)); + hRet = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &WndEvtHandler)); if (!SUCCEEDED(hRet) || WndEvtHandler == NULL) goto Cleanup; @@ -627,7 +627,7 @@ fOleWindow.Release(); - hRet = pUnk->QueryInterface(IID_IOleWindow, (PVOID *)&fOleWindow); + hRet = pUnk->QueryInterface(IID_PPV_ARG(IOleWindow, &fOleWindow)); if (FAILED(hRet)) return E_FAIL; Modified: branches/shell-experiments/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -430,21 +430,6 @@ LRESULT CBaseBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { -/* CComPtr<IOleWindow> oleWindow; - RECT clientRect; - HRESULT hResult; - - if (fClientWindow == NULL && fClient.p != NULL) - { - hResult = fClient->QueryInterface(IID_IOleWindow, (void **)&oleWindow); - hResult = oleWindow->GetWindow(&fClientWindow); - } - if (fClientWindow != NULL) - { - GetClientRect(&clientRect); - ::SetWindowPos(fClientWindow, NULL, clientRect.left, clientRect.top, clientRect.right - clientRect.left - GetSystemMetrics(SM_CXFRAME), - clientRect.bottom - clientRect.top, SWP_NOOWNERZORDER | SWP_NOZORDER); - }*/ return 0; } Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -621,8 +621,7 @@ #if 1 hResult = ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); #else - hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, - reinterpret_cast<void **>(logoBar)); + hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); #endif if (FAILED(hResult)) return hResult; @@ -647,8 +646,7 @@ #if 1 hResult = ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); #else - hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, - reinterpret_cast<void **>(toolsBar)); + hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); #endif if (FAILED(hResult)) return hResult; @@ -1403,8 +1401,7 @@ case gForwardCommandID: newMenu = CreatePopupMenu(); hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, - reinterpret_cast<void **>(&browserService)); + hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_FORE); hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -743,11 +743,11 @@ return E_FAIL; #if 0 - hResult = CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)&fClientBars[BIInternetToolbar].clientBar); + hResult = CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); if (FAILED(hResult)) return hResult; #else - hResult = CreateInternetToolbar(IID_IUnknown, (void **)&fClientBars[BIInternetToolbar].clientBar); + hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); if (FAILED(hResult)) return hResult; #endif @@ -903,8 +903,7 @@ STRRET L108; HRESULT hResult; - hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, - reinterpret_cast<void **>(&parentFolder), &childPIDL); + hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_PPV_ARG(IShellFolder, &parentFolder), &childPIDL); hResult = parentFolder->GetDisplayNameOf(childPIDL, uFlags, &L108); StrRetToBufW(&L108, childPIDL, pszBuf, cchBuf); if (rgfInOut) @@ -1137,8 +1136,7 @@ hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); if (FAILED(hResult)) return hResult; - hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, - reinterpret_cast<void **>(&newBand)); + hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); if (FAILED(hResult)) return hResult; hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); @@ -1218,7 +1216,7 @@ m_PropSheet.phpage = m_psp; #if 0 - hResult = CoCreateInstance(CLSID_GlobalFolderSettings, NULL, CLSCTX_INPROC_SERVER, IID_IGlobalFolderSettings, (void **)&globalSettings); + hResult = CoCreateInstance(CLSID_GlobalFolderSettings, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IGlobalFolderSettings, &globalSettings)); if (FAILED(hResult)) return E_FAIL; hResult = globalSettings->Get(&shellState, sizeof(shellState)); @@ -1601,8 +1599,7 @@ { if (fCurrentShellView.p != NULL) { - hResult = fCurrentShellView->QueryInterface(IID_IOleCommandTarget, - reinterpret_cast<void **>(&commandTarget)); + hResult = fCurrentShellView->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (SUCCEEDED(hResult) && commandTarget.p != NULL) return commandTarget->QueryStatus(NULL, 1, prgCmds, pCmdText); } Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -1185,7 +1185,7 @@ return hr; } - hr = lpSV->GetItemObject(SVGIO_SELECTION, IID_IDataObject, (LPVOID*)&pDataObj); + hr = lpSV->GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IDataObject, &pDataObj)); if (SUCCEEDED(hr)) { hr = OleSetClipboard(pDataObj); Modified: branches/shell-experiments/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -119,7 +119,7 @@ { CLSIDFromString(szValue, &clsid); - dwResult = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (LPVOID*)&Overlay); + dwResult = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellIconOverlayIdentifier, &Overlay)); if (dwResult == S_OK) { Handlers[NumIconOverlayHandlers] = Overlay; Modified: branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -303,11 +303,15 @@ if (IsEqualIID (riid, IID_IContextMenu)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder *)this, NULL, 0, NULL, (IContextMenu **)&pObj); + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { - hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); + IDataObject * pDo = NULL; + hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, &pDo); + pObj = pDo; } else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { @@ -325,13 +329,15 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *)&pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, reinterpret_cast<LPVOID*>(&pObj)); SHFree (pidl); } else Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -651,9 +651,12 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */ - if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj))); - else - hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); + if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) + { + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; + } } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) @@ -1474,7 +1477,7 @@ if (SUCCEEDED(hr)) { IDropTarget *pDT; - hr = this->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*)&pDT); + hr = this->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &pDT)); CoTaskMemFree(pidl); if (SUCCEEDED(hr)) SHSimulateDrop(pDT, pDataObject, dwKeyState, NULL, pdwEffect); @@ -1515,7 +1518,7 @@ if (SUCCEEDED(hr)) { IShellFolder *psf; - hr = this->BindToObject(pidlNext, NULL, IID_IShellFolder, (LPVOID*)&psf); + hr = this->BindToObject(pidlNext, NULL, IID_PPV_ARG(IShellFolder, &psf)); CoTaskMemFree(pidlNext); if (SUCCEEDED(hr)) { Modified: branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -422,7 +422,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *) & pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else hr = E_NOINTERFACE; Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -474,11 +474,16 @@ { *ppvOut = NULL; - if (IsEqualIID (riid, IID_IContextMenu) && (cidl >= 1)) - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) + { + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; + } else if (IsEqualIID (riid, IID_IDataObject)) { - if (cidl >= 1) { + if (cidl >= 1) + { hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else @@ -503,9 +508,12 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files (except exe), so if we fail, rebind to root */ - if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj))); - else - hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); + if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) + { + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; + } } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) @@ -1529,7 +1537,7 @@ } else { - hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom); + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); if (FAILED(hr)) { ERR("no IShellFolder\n"); @@ -1549,7 +1557,7 @@ WCHAR wszPath[MAX_PATH]; WCHAR wszTarget[MAX_PATH]; - hr = this->QueryInterface(IID_IPersistFolder2, (LPVOID *) &ppf2); + hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (SUCCEEDED(hr)) { hr = ppf2->GetCurFolder(&targetpidl); @@ -1691,7 +1699,7 @@ return E_FAIL; } - hr = this->QueryInterface(IID_IPersistFolder2, (LPVOID *) &ppf2); + hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (SUCCEEDED(hr)) { hr = ppf2->GetCurFolder(&targetpidl); Modified: branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -462,8 +462,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, - (LPVOID *) &pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) Modified: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -115,7 +115,7 @@ if (SUCCEEDED(hr)) { - hr = psfDesktop->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*) &mFSDropTarget); + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &mFSDropTarget)); CoTaskMemFree(pidl); if (FAILED(hr)) ERR("Error Binding"); @@ -388,12 +388,15 @@ if (IsEqualIID (riid, IID_IContextMenu)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder *)this, NULL, 0, NULL, (IContextMenu**)&pObj); + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { - hr = IDataObject_Constructor( hwndOwner, - pidlRoot, apidl, cidl, (IDataObject **)&pObj); + IDataObject * pDo = NULL; + hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, &pDo); + pObj = pDo; } else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { @@ -411,7 +414,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface (IID_IDropTarget, (LPVOID *)&pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) Modified: branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -244,11 +244,15 @@ if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { - hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); + IDataObject * pDo = NULL; + hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, &pDo); + pObj = pDo; } else if (IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) { @@ -266,7 +270,9 @@ } else if (IsEqualIID(riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *) & pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else hr = E_NOINTERFACE; Modified: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -622,7 +622,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl == 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *) & pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else hr = E_NOINTERFACE; @@ -1531,7 +1533,7 @@ } else { - hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom); + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); if (FAILED(hr)) { ERR("no IShellFolder\n"); Modified: branches/shell-experiments/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellole.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -146,7 +146,7 @@ FreeLibrary( hLibrary ); hres = E_ACCESSDENIED; goto end; - } else if (! SUCCEEDED(hres = DllGetClassObject(*myclsid, IID_IClassFactory, (LPVOID*)&pcf))) { + } else if (! SUCCEEDED(hres = DllGetClassObject(*myclsid, IID_PPV_ARG(IClassFactory, &pcf)))) { TRACE("GetClassObject failed 0x%08x\n", hres); goto end; } Modified: branches/shell-experiments/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -1252,7 +1252,7 @@ TRACE("%p %p\n", obj, sei); - r = obj->QueryInterface(IID_IContextMenu, (LPVOID*) &cm); + r = obj->QueryInterface(IID_PPV_ARG(IContextMenu, &cm)); if (FAILED(r)) return r; @@ -1342,7 +1342,7 @@ if (FAILED(r)) goto end; - r = obj->QueryInterface(IID_IObjectWithSite, (LPVOID*) &ows); + r = obj->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ows)); if (FAILED(r)) goto end; Modified: branches/shell-experiments/dll/win32/shell32/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/startmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/startmenu.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -117,7 +117,7 @@ if (pBandSiteObj == NULL) return E_OUTOFMEMORY; - hr = pBandSiteObj->QueryInterface(IID_IBandSite, (VOID**)&m_pBandSite); + hr = pBandSiteObj->QueryInterface(IID_PPV_ARG(IBandSite, &m_pBandSite)); if (FAILED(hr)) return NULL;

1 0

[aandrejevic] 63039: [BASESRV] Don't update the state of the old DOS records if the DOS program executed another program.
by aandrejevic＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: aandrejevic Date: Mon Apr 28 20:51:59 2014 New Revision: 63039 URL: http://svn.reactos.org/svn/reactos?rev=63039&view=rev Log: [BASESRV] Don't update the state of the old DOS records if the DOS program executed another program. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Mon Apr 28 20:51:59 2014 @@ -850,18 +850,20 @@ GetNextVdmCommandRequest->iTask = ConsoleRecord->SessionId; GetNextVdmCommandRequest->WaitObjectForVDM = NULL; - // HACK: I'm not sure if this should happen... - for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink) - { - DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry); - if (DosRecord->State == VDM_NOT_READY) + if (!(GetNextVdmCommandRequest->VDMState & VDM_NOT_READY)) + { + for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink) { - /* If NTVDM is asking for a new command, it means these are done */ - DosRecord->State = VDM_READY; - - NtSetEvent(DosRecord->ServerEvent, NULL); - NtClose(DosRecord->ServerEvent); - DosRecord->ServerEvent = NULL; + DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry); + if (DosRecord->State == VDM_NOT_READY) + { + /* If NTVDM is asking for a new command, it means these are done */ + DosRecord->State = VDM_READY; + + NtSetEvent(DosRecord->ServerEvent, NULL); + NtClose(DosRecord->ServerEvent); + DosRecord->ServerEvent = NULL; + } } }

1 0

[pschweitzer] 63038: [FASTFAT] Fix typo.
by pschweitzer＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: pschweitzer Date: Mon Apr 28 20:33:57 2014 New Revision: 63038 URL: http://svn.reactos.org/svn/reactos?rev=63038&view=rev Log: [FASTFAT] Fix typo. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Mon Apr 28 20:33:57 2014 @@ -617,7 +617,7 @@ /* VfatOpenFile() doesn't like our name ends with \, so chomp it if there's one */ if (RelatedFileObject->FileName.Buffer[RelatedFileObject->FileName.Length / sizeof(WCHAR) - 1] == L'\\') { - Chomp = FALSE; + Chomp = TRUE; RelatedFileObject->FileName.Length -= sizeof(WCHAR); }

1 0

[hbelusca] 63037: [CMD] GetConsoleAliasesLength returns a DWORD (and the len variable *is* a DWORD). Do not check for negative values. Patch by André Guibert de Bruet. CORE-7964 #resolve #comment F...
by hbelusca＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: hbelusca Date: Mon Apr 28 20:12:07 2014 New Revision: 63037 URL: http://svn.reactos.org/svn/reactos?rev=63037&view=rev Log: [CMD] GetConsoleAliasesLength returns a DWORD (and the len variable *is* a DWORD). Do not check for negative values. Patch by André Guibert de Bruet. CORE-7964 #resolve #comment Fixed in revision 63037, cheers! Modified: trunk/reactos/base/shell/cmd/alias.c Modified: trunk/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/alias.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] Mon Apr 28 20:12:07 2014 @@ -58,7 +58,7 @@ DWORD len; len = GetConsoleAliasesLength(_T("cmd.exe")); - if (len <= 0) + if (len == 0) return; /* allocate memory for an extra \0 char to make parsing easier */

1 0

[hbelusca] 63036: [CARDLIB] Use the proper Highlight pen to highlight the cards (for any cards game using the cardlib library). Patch by Victor Martinez Calvo. CORE-8118 #resolve #comment Committed...
by hbelusca＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: hbelusca Date: Mon Apr 28 20:00:02 2014 New Revision: 63036 URL: http://svn.reactos.org/svn/reactos?rev=63036&view=rev Log: [CARDLIB] Use the proper Highlight pen to highlight the cards (for any cards game using the cardlib library). Patch by Victor Martinez Calvo. CORE-8118 #resolve #comment Committed in revision 63036, thanks! Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] Mon Apr 28 20:00:02 2014 @@ -75,7 +75,7 @@ if(fNormal) hOld = SelectObject(hdc, hhi); else - hOld = SelectObject(hdc, hhi); + hOld = SelectObject(hdc, hsh); MoveToEx(hdc, x, y+height, 0); LineTo(hdc, x, y);

1 0

[hbelusca] 63035: [CONSRV] - Fix dereferencing potential NULL pointers in ConDrvReadConsole() and ConDrvChangeScreenBufferAttributes(); - Fix a wcsncat in ConSrvOpenUserSettings() Patches by Victor...
by hbelusca＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: hbelusca Date: Mon Apr 28 19:50:27 2014 New Revision: 63035 URL: http://svn.reactos.org/svn/reactos?rev=63035&view=rev Log: [CONSRV] - Fix dereferencing potential NULL pointers in ConDrvReadConsole() and ConDrvChangeScreenBufferAttributes(); - Fix a wcsncat in ConSrvOpenUserSettings() Patches by Victor Martinez Calvo CORE-8122 CORE-8123 #resolve #comment Fixed in revision 63035, cheers ;) Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/settings.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Mon Apr 28 19:50:27 2014 @@ -246,7 +246,7 @@ NTSTATUS Status = STATUS_PENDING; PLIST_ENTRY CurrentEntry; ConsoleInput *Input; - ULONG i = ReadControl->nInitialChars; + ULONG i; if (Console == NULL || InputBuffer == NULL || /* Buffer == NULL || */ ReadControl == NULL || ReadControl->nLength != sizeof(CONSOLE_READCONSOLE_CONTROL)) @@ -260,6 +260,8 @@ (Buffer == NULL && NumCharsToRead == 0) ); /* We haven't read anything (yet) */ + + i = ReadControl->nInitialChars; if (InputBuffer->Mode & ENABLE_LINE_INPUT) { Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Mon Apr 28 19:50:27 2014 @@ -595,8 +595,8 @@ PCHAR_INFO Ptr; COORD TopLeft = {0}; - ULONG NumCodesToWrite = Buffer->ScreenBufferSize.X * Buffer->ScreenBufferSize.Y; - USHORT OldScreenAttrib = Buffer->ScreenDefaultAttrib; + ULONG NumCodesToWrite; + USHORT OldScreenAttrib; if (Console == NULL || Buffer == NULL) { @@ -605,10 +605,14 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); + + NumCodesToWrite = Buffer->ScreenBufferSize.X * Buffer->ScreenBufferSize.Y; + OldScreenAttrib = Buffer->ScreenDefaultAttrib; X = TopLeft.X; Y = (TopLeft.Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; Length = NumCodesToWrite; + // Ptr = ConioCoordToPointer(Buffer, X, Y); // Doesn't work // Ptr = &Buffer->Buffer[X + Y * Buffer->ScreenBufferSize.X]; // May work Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Mon Apr 28 19:50:27 2014 @@ -156,7 +156,7 @@ TranslateConsoleName(szBuffer2, ConsoleTitle, MAX_PATH); /* Create the registry path */ - wcsncat(szBuffer, szBuffer2, MAX_PATH); + wcsncat(szBuffer, szBuffer2, MAX_PATH - wcslen(szBuffer) - 1); /* Create or open the registry key */ if (bCreate)

1 0

[pschweitzer] 63034: [FASTFAT] Implement part 2/3 (first part was in ntoskrnl, remember ; -)) of renaming support in ReactOS. Here, we implement support for SL_OPEN_TARGET_DIRECTORY for IRP_MJ_CREAT...
by pschweitzer＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: pschweitzer Date: Mon Apr 28 19:40:26 2014 New Revision: 63034 URL: http://svn.reactos.org/svn/reactos?rev=63034&view=rev Log: [FASTFAT] Implement part 2/3 (first part was in ntoskrnl, remember ;-)) of renaming support in ReactOS. Here, we implement support for SL_OPEN_TARGET_DIRECTORY for IRP_MJ_CREATE in fastfat. The code is not the best ever, but we can't do miracles with fastfat. This fixes a few tests in KmTests:IoCreateFile and also shows failures I still don't get and that will require deeper attention. Last part will be to effectively bring support of FileRenameInformation in IRP_MJ_SET_INFORMATION. But this is yet another story. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Mon Apr 28 19:40:26 2014 @@ -352,6 +352,7 @@ PUNICODE_STRING PathNameU, PFILE_OBJECT FileObject, ULONG RequestedDisposition, + BOOLEAN OpenTargetDir, PVFATFCB *ParentFcb) { PVFATFCB Fcb; @@ -402,6 +403,14 @@ DPRINT ("Could not make a new FCB, status: %x\n", Status); return Status; } + + /* In case we're to open target, just check whether file exist, but don't open it */ + if (OpenTargetDir) + { + vfatReleaseFCB(DeviceExt, Fcb); + return STATUS_OBJECT_NAME_COLLISION; + } + if (Fcb->Flags & FCB_DELETE_PENDING) { vfatReleaseFCB(DeviceExt, Fcb); @@ -443,6 +452,7 @@ PWCHAR c, last; BOOLEAN PagingFileCreate = FALSE; BOOLEAN Dots; + BOOLEAN OpenTargetDir = FALSE; UNICODE_STRING FileNameU; UNICODE_STRING PathNameU; ULONG Attributes; @@ -452,6 +462,7 @@ RequestedDisposition = ((Stack->Parameters.Create.Options >> 24) & 0xff); RequestedOptions = Stack->Parameters.Create.Options & FILE_VALID_OPTION_FLAGS; PagingFileCreate = (Stack->Flags & SL_OPEN_PAGING_FILE) ? TRUE : FALSE; + OpenTargetDir = (Stack->Flags & SL_OPEN_TARGET_DIRECTORY) ? TRUE : FALSE; FileObject = Stack->FileObject; DeviceExt = DeviceObject->DeviceExtension; @@ -484,6 +495,11 @@ return STATUS_NOT_A_DIRECTORY; } #endif + + if (OpenTargetDir) + { + return STATUS_INVALID_PARAMETER; + } pFcb = DeviceExt->VolumeFcb; vfatAttachFCBToFileObject(DeviceExt, pFcb, FileObject); @@ -520,6 +536,13 @@ } } + /* Check if we try to open target directory of root dir */ + if (OpenTargetDir && FileObject->RelatedFileObject == NULL && PathNameU.Length == sizeof(WCHAR) && + PathNameU.Buffer[0] == L'\\') + { + return STATUS_INVALID_PARAMETER; + } + if (FileObject->RelatedFileObject && PathNameU.Length >= sizeof(WCHAR) && PathNameU.Buffer[0] == L'\\') { return STATUS_OBJECT_NAME_INVALID; @@ -531,7 +554,86 @@ } /* Try opening the file. */ - Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, &ParentFcb); + Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, OpenTargetDir, &ParentFcb); + + if (OpenTargetDir) + { + LONG idx, FileNameLen; + + if (Status == STATUS_OBJECT_NAME_COLLISION) + { + Irp->IoStatus.Information = FILE_EXISTS; + } + else + { + Irp->IoStatus.Information = FILE_DOES_NOT_EXIST; + } + + idx = FileObject->FileName.Length / sizeof(WCHAR) - 1; + + /* Skip tailing \ - if any */ + if (PathNameU.Buffer[idx] == L'\\') + { + --idx; + PathNameU.Length -= sizeof(WCHAR); + } + + /* Get file name */ + while (idx >= 0 && PathNameU.Buffer[idx] != L'\\') + { + --idx; + } + + if (idx > 0) + { + /* We don't want to include / in the name */ + FileNameLen = PathNameU.Length - ((idx + 1) * sizeof(WCHAR)); + + /* Try to open parent */ + PathNameU.Length -= (PathNameU.Length - idx * sizeof(WCHAR)); + Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, FALSE, &ParentFcb); + + /* Update FO just to keep file name */ + /* Skip first slash */ + ++idx; + PathNameU.Length = FileNameLen; + RtlMoveMemory(&PathNameU.Buffer[0], &PathNameU.Buffer[idx], PathNameU.Length); + } + else + { + /* This is a relative open and we have only the filename, so open the parent directory + * It is in RelatedFileObject + */ + BOOLEAN Chomp = FALSE; + PFILE_OBJECT RelatedFileObject = FileObject->RelatedFileObject; + + DPRINT("%wZ\n", &PathNameU); + + ASSERT(RelatedFileObject != NULL); + + DPRINT("Relative opening\n"); + DPRINT("FileObject->RelatedFileObject->FileName: %wZ\n", &RelatedFileObject->FileName); + + /* VfatOpenFile() doesn't like our name ends with \, so chomp it if there's one */ + if (RelatedFileObject->FileName.Buffer[RelatedFileObject->FileName.Length / sizeof(WCHAR) - 1] == L'\\') + { + Chomp = FALSE; + RelatedFileObject->FileName.Length -= sizeof(WCHAR); + } + + /* Tricky part - fake our FO. It's NOT relative, we want to open the complete file path */ + FileObject->RelatedFileObject = NULL; + Status = VfatOpenFile(DeviceExt, &RelatedFileObject->FileName, FileObject, RequestedDisposition, FALSE, &ParentFcb); + + /* We're done opening, restore what we broke */ + FileObject->RelatedFileObject = RelatedFileObject; + if (Chomp) RelatedFileObject->FileName.Length += sizeof(WCHAR); + + /* No need to modify the FO, it already has the name */ + } + + return Status; + } /* * If the directory containing the file to open doesn't exist then

1 0

[dquintana] 63033: [BROWSEUI] * Make use of the IID_PPV_ARG for typesafe interface return pointers, and a few other cosmetic changes. CORE-7330
by dquintana＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: dquintana Date: Mon Apr 28 15:29:38 2014 New Revision: 63033 URL: http://svn.reactos.org/svn/reactos?rev=63033&view=rev Log: [BROWSEUI] * Make use of the IID_PPV_ARG for typesafe interface return pointers, and a few other cosmetic changes. CORE-7330 Modified: branches/shell-experiments/dll/win32/browseui/aclmulti.cpp branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/bandproxy.cpp branches/shell-experiments/dll/win32/browseui/basebar.cpp branches/shell-experiments/dll/win32/browseui/basebarsite.cpp branches/shell-experiments/dll/win32/browseui/brandband.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/browseui/toolsband.cpp branches/shell-experiments/dll/win32/browseui/travellog.cpp Modified: branches/shell-experiments/dll/win32/browseui/aclmulti.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/aclmulti.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/aclmulti.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -57,9 +57,9 @@ CoTaskMemRealloc(fObjects, sizeof(fObjects[0]) * (fObjectCount + 1))); fObjects[fObjectCount].punk = punk; punk->AddRef(); - if (FAILED(punk->QueryInterface(IID_IEnumString, reinterpret_cast<void **>(&fObjects[fObjectCount].pEnum)))) + if (FAILED(punk->QueryInterface(IID_PPV_ARG(IEnumString, &fObjects[fObjectCount].pEnum)))) fObjects[fObjectCount].pEnum = NULL; - if (FAILED(punk->QueryInterface(IID_IACList, reinterpret_cast<void **>(&fObjects[fObjectCount].pACL)))) + if (FAILED(punk->QueryInterface(IID_PPV_ARG(IACList, &fObjects[fObjectCount].pACL)))) fObjects[fObjectCount].pACL = NULL; fObjectCount++; return S_OK; Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -100,8 +100,7 @@ CComPtr<IShellService> shellService; CComPtr<IUnknown> offset34; HWND parentWindow; - IOleWindow *oleWindow; - HWND toolbar; + HWND combobox; static const TBBUTTON buttonInfo[] = { {0, 1, TBSTATE_ENABLED, 0} }; HIMAGELIST normalImagelist; HIMAGELIST hotImageList; @@ -112,28 +111,24 @@ if (pUnkSite == NULL) return S_OK; - hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast<void **>(&fSite)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fSite)); if (FAILED(hResult)) return hResult; // get window handle of parent parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); - if (SUCCEEDED(hResult)) - { - oleWindow->GetWindow(&parentWindow); - oleWindow->Release(); - } + hResult = IUnknown_GetWindow(pUnkSite, &parentWindow); + if (!::IsWindow(parentWindow)) return E_FAIL; // create combo box ex - toolbar = CreateWindowEx(WS_EX_TOOLWINDOW, WC_COMBOBOXEXW, NULL, WS_CHILD | WS_VISIBLE | + combobox = CreateWindowEx(WS_EX_TOOLWINDOW, WC_COMBOBOXEXW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY, 0, 0, 500, 250, parentWindow, (HMENU)0xa205, _AtlBaseModule.GetModuleInstance(), 0); - if (toolbar == NULL) + if (combobox == NULL) return E_FAIL; - SubclassWindow(toolbar); + SubclassWindow(combobox); SendMessage(CBEM_SETEXTENDEDSTYLE, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT); @@ -142,17 +137,17 @@ fComboBox = reinterpret_cast<HWND>(SendMessage(CBEM_GETCOMBOCONTROL, 0, 0)); #if 1 hResult = CoCreateInstance(CLSID_AddressEditBox, NULL, CLSCTX_INPROC_SERVER, - IID_IAddressEditBox, reinterpret_cast<void **>(&fAddressEditBox)); + IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); if (FAILED(hResult)) return hResult; #else // instantiate new version #endif - hResult = fAddressEditBox->QueryInterface(IID_IShellService, reinterpret_cast<void **>(&shellService)); - if (FAILED(hResult)) - return hResult; - hResult = fAddressEditBox->Init(toolbar, fEditControl, 8, pUnkSite /*(IAddressBand *)this*/ ); + hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IShellService, &shellService)); + if (FAILED(hResult)) + return hResult; + hResult = fAddressEditBox->Init(combobox, fEditControl, 8, pUnkSite /*(IAddressBand *)this*/); if (FAILED(hResult)) return hResult; hResult = shellService->SetOwner(pUnkSite); @@ -239,7 +234,7 @@ CComPtr<IOleCommandTarget> oleCommandTarget; HRESULT hResult; - hResult = fAddressEditBox->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); + hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); if (FAILED(hResult)) return hResult; return oleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); @@ -272,7 +267,7 @@ if (fActivate) { - hResult = fSite->QueryInterface(IID_IInputObjectSite, reinterpret_cast<void **>(&inputObjectSite)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IInputObjectSite, &inputObjectSite)); if (FAILED(hResult)) return hResult; hResult = inputObjectSite->OnFocusChangeIS(static_cast<IDeskBand *>(this), fActivate); @@ -300,7 +295,7 @@ } break; } - hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler)); + hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); if (FAILED(hResult)) return hResult; return winEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); @@ -313,7 +308,7 @@ if (fAddressEditBox) { - hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler)); + hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); if (FAILED(hResult)) return hResult; return winEventHandler->IsWindowOwner(hWnd); @@ -326,7 +321,7 @@ CComPtr<IAddressBand> addressBand; HRESULT hResult; - hResult = fAddressEditBox->QueryInterface(IID_IAddressBand, reinterpret_cast<void **>(&addressBand)); + hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IAddressBand, &addressBand)); if (FAILED(hResult)) return hResult; return addressBand->FileSysChange(param8, paramC); @@ -337,7 +332,7 @@ CComPtr<IAddressBand> addressBand; HRESULT hResult; - hResult = fAddressEditBox->QueryInterface(IID_IAddressBand, reinterpret_cast<void **>(&addressBand)); + hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IAddressBand, &addressBand)); if (FAILED(hResult)) return hResult; return addressBand->Refresh(param8); Modified: branches/shell-experiments/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -43,7 +43,7 @@ if (browser == NULL) return E_POINTER; - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (FAILED(hResult)) return hResult; hResult = serviceProvider->QueryService( @@ -98,15 +98,15 @@ hResult = FindBrowserWindow(&webBrowserUnknown); if (FAILED(hResult)) return hResult; - hResult = webBrowserUnknown->QueryInterface(IID_IWebBrowserApp, reinterpret_cast<void **>(&webBrowser)); + hResult = webBrowserUnknown->QueryInterface(IID_PPV_ARG(IWebBrowser2, &webBrowser)); if (FAILED(hResult)) return hResult; hResult = webBrowser->put_Visible(TRUE); - hResult = webBrowser->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = webBrowser->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (SUCCEEDED(hResult)) { hResult = serviceProvider->QueryService(SID_STopLevelBrowser, - IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + IID_PPV_ARG(IOleWindow, &oleWindow)); if (SUCCEEDED(hResult)) { hResult = oleWindow->GetWindow(&browserWindow); Modified: branches/shell-experiments/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -179,7 +179,7 @@ RECT neededBorderSpace; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast<void **>(&dockingWindowSite)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &dockingWindowSite)); if (FAILED(hResult)) return hResult; hResult = dockingWindowSite->GetBorderDW(static_cast<IDeskBar *>(this), &availableBorderSpace); @@ -272,7 +272,7 @@ if (fSite == NULL) return E_FAIL; - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (FAILED(hResult)) return hResult; // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser @@ -309,10 +309,10 @@ fClient.Release(); else { - hResult = punkClient->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&fClient)); + hResult = punkClient->QueryInterface(IID_PPV_ARG(IUnknown, &fClient)); if (FAILED(hResult)) return hResult; - hResult = fSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); @@ -471,7 +471,7 @@ result = 0; if (fClient.p != NULL) { - hResult = fClient->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler)); + hResult = fClient->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); if (SUCCEEDED(hResult) && winEventHandler.p != NULL) hResult = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result); } Modified: branches/shell-experiments/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -170,19 +170,19 @@ DWORD thisBandID; HRESULT hResult; - hResult = newBar->QueryInterface(IID_IPersist, reinterpret_cast<void **>(&persist)); - if (FAILED(hResult)) - return hResult; - hResult = newBar->QueryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(&site)); - if (FAILED(hResult)) - return hResult; - hResult = newBar->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); - if (FAILED(hResult)) - return hResult; - hResult = newBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(&deskBand)); - if (FAILED(hResult)) - return hResult; - hResult = newBar->QueryInterface(IID_IDockingWindow, reinterpret_cast<void **>(&dockingWindow)); + hResult = newBar->QueryInterface(IID_PPV_ARG(IPersist, &persist)); + if (FAILED(hResult)) + return hResult; + hResult = newBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &site)); + if (FAILED(hResult)) + return hResult; + hResult = newBar->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); + if (FAILED(hResult)) + return hResult; + hResult = newBar->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); + if (FAILED(hResult)) + return hResult; + hResult = newBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); if (FAILED(hResult)) return hResult; hResult = site->SetSite(static_cast<IOleWindow *>(this)); @@ -266,7 +266,7 @@ if (fDeskBarSite == NULL) return E_FAIL; - hResult = fDeskBarSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (FAILED(hResult)) return hResult; // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser @@ -290,7 +290,7 @@ notifyHeader = (NMHDR *)lParam; if (notifyHeader->hwndFrom == m_hWnd && notifyHeader->code == RBN_AUTOSIZE) { - hResult = fDeskBarSite->QueryInterface(IID_IDeskBar, reinterpret_cast<void **>(&deskBar)); + hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); GetClientRect(&newBounds); hResult = deskBar->OnPosRectChangeDB(&newBounds); } @@ -298,7 +298,7 @@ if (fCurrentActiveBar != NULL) { hResult = fCurrentActiveBar->fTheBar->QueryInterface( - IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler)); + IID_PPV_ARG(IWinEventHandler, &winEventHandler)); if (SUCCEEDED(hResult) && winEventHandler.p != NULL) hResult = winEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); } @@ -325,10 +325,10 @@ fDeskBarSite.Release(); else { - hResult = punkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + hResult = punkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); if (FAILED(hResult)) return hResult; - hResult = punkSite->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&fDeskBarSite)); + hResult = punkSite->QueryInterface(IID_PPV_ARG(IUnknown, &fDeskBarSite)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); Modified: branches/shell-experiments/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/brandband.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -170,11 +170,11 @@ } // get window handle of parent - hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast<void **>(&fSite)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fSite)); if (FAILED(hResult)) return hResult; parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); if (SUCCEEDED(hResult)) hResult = oleWindow->GetWindow(&parentWindow); if (!::IsWindow(parentWindow)) @@ -188,16 +188,16 @@ SubclassWindow(hwnd); // take advice to watch events - hResult = pUnkSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (SUCCEEDED(hResult)) { hResult = serviceProvider->QueryService( - SID_SBrandBand, IID_IProfferService, reinterpret_cast<void **>(&profferService)); + SID_SBrandBand, IID_PPV_ARG(IProfferService, &profferService)); if (SUCCEEDED(hResult)) hResult = profferService->ProfferService(SID_SBrandBand, static_cast<IServiceProvider *>(this), &fProfferCookie); hResult = serviceProvider->QueryService(SID_SShellBrowser, - IID_IBrowserService, reinterpret_cast<void **>(&browserService)); + IID_PPV_ARG(IBrowserService, &browserService)); if (SUCCEEDED(hResult)) hResult = AtlAdvise(browserService, static_cast<IDispatch *>(this), DIID_DWebBrowserEvents, &fAdviseCookie); } @@ -355,7 +355,7 @@ if (IsEqualIID(guidService, SID_SBrandBand)) return this->QueryInterface(riid, ppvObject); - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (FAILED(hResult)) return hResult; return serviceProvider->QueryService(guidService, riid, ppvObject); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -161,13 +161,13 @@ REBARBANDINFOW bandInfo; HRESULT hResult; - hResult = containedBand->QueryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(&site)); - if (FAILED(hResult)) - return hResult; - hResult = containedBand->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); - if (FAILED(hResult)) - return hResult; - hResult = containedBand->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(&deskBand)); + hResult = containedBand->QueryInterface(IID_PPV_ARG(IObjectWithSite, &site)); + if (FAILED(hResult)) + return hResult; + hResult = containedBand->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); + if (FAILED(hResult)) + return hResult; + hResult = containedBand->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); if (FAILED(hResult)) return hResult; fContainedBand = containedBand; @@ -199,7 +199,7 @@ CComPtr<IDeskBand> deskBand; HRESULT hResult; - hResult = fContainedBand->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(&deskBand)); + hResult = fContainedBand->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); if (FAILED(hResult)) return hResult; @@ -362,7 +362,7 @@ if (fFavoritesMenu.p == NULL) { // create favorites menu - hResult = psmd->punk->QueryInterface(IID_IShellMenu, reinterpret_cast<void **>(&parentMenu)); + hResult = psmd->punk->QueryInterface(IID_PPV_ARG(IShellMenu, &parentMenu)); if (FAILED(hResult)) return hResult; hResult = parentMenu->GetMenu(&parentHMenu, &ownerWindow, NULL); @@ -382,11 +382,11 @@ else { hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_IShellMenu, reinterpret_cast<void **>(&newMenu)); + IID_PPV_ARG(IShellMenu, &newMenu)); } #else hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_IShellMenu, reinterpret_cast<void **>(&newMenu)); + IID_PPV_ARG(IShellMenu, &newMenu)); #endif if (FAILED(hResult)) return hResult; @@ -521,7 +521,7 @@ RECT neededBorderSpace; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast<void **>(&dockingWindowSite)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &dockingWindowSite)); if (FAILED(hResult)) return hResult; hResult = dockingWindowSite->GetBorderDW(static_cast<IDockingWindow *>(this), &availableBorderSpace); @@ -573,27 +573,27 @@ if (FAILED(hResult)) { hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_IShellMenu, reinterpret_cast<void **>(menuBar)); + IID_PPV_ARG(IShellMenu, menuBar)); } #else hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_IShellMenu, reinterpret_cast<void **>(menuBar)); + IID_PPV_ARG(IShellMenu, menuBar)); #endif if (FAILED(hResult)) return hResult; - hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback, reinterpret_cast<void **>(&callback)); + hResult = fMenuCallback.QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); if (FAILED(hResult)) return hResult; hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); if (FAILED(hResult)) return hResult; - hResult = fSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); if (FAILED(hResult)) return hResult; - hResult = fSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&siteCommandTarget)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &siteCommandTarget)); if (FAILED(hResult)) return hResult; hResult = siteCommandTarget->Exec(&CGID_Explorer, 0x35, 0, NULL, &menuOut); @@ -604,7 +604,7 @@ hResult = (*menuBar)->SetMenu((HMENU)V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); if (FAILED(hResult)) return hResult; - hResult = (*menuBar)->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + hResult = (*menuBar)->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return hResult; hResult = commandTarget->Exec(&CGID_MenuBand, 3, 1, NULL, NULL); @@ -619,7 +619,7 @@ HRESULT hResult; #if 1 - hResult = ::CreateBrandBand(IID_IUnknown, reinterpret_cast<void **>(logoBar)); + hResult = ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); #else hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, reinterpret_cast<void **>(logoBar)); @@ -633,7 +633,7 @@ { HRESULT hResult; - hResult = ::CreateToolsBar(IID_IUnknown, reinterpret_cast<void **>(toolsBar)); + hResult = ::CreateToolsBar(IID_PPV_ARG(IUnknown, toolsBar)); if (FAILED(hResult)) return hResult; return S_OK; @@ -645,14 +645,14 @@ HRESULT hResult; #if 1 - hResult = ::CreateAddressBand(IID_IUnknown, reinterpret_cast<void **>(toolsBar)); + hResult = ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); #else hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, reinterpret_cast<void **>(toolsBar)); #endif if (FAILED(hResult)) return hResult; - hResult = (*toolsBar)->QueryInterface(IID_IAddressBand, reinterpret_cast<void **>(&addressBand)); + hResult = (*toolsBar)->QueryInterface(IID_PPV_ARG(IAddressBand, &addressBand)); return S_OK; } @@ -719,13 +719,13 @@ CComPtr<IServiceProvider> serviceProvider; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); - if (FAILED(hResult)) - return hResult; - hResult = serviceProvider->QueryService(SID_IBandProxy, IID_IBandProxy, reinterpret_cast<void **>(&fBandProxy)); - if (FAILED(hResult)) - { - hResult = CreateBandProxy(IID_IBandProxy, reinterpret_cast<void **>(&fBandProxy)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); + if (FAILED(hResult)) + return hResult; + hResult = serviceProvider->QueryService(SID_IBandProxy, IID_PPV_ARG(IBandProxy, &fBandProxy)); + if (FAILED(hResult)) + { + hResult = CreateBandProxy(IID_PPV_ARG(IBandProxy, &fBandProxy)); if (FAILED(hResult)) return hResult; hResult = fBandProxy->SetSite(fSite); @@ -770,7 +770,7 @@ // show the bar here hResult = ReserveBorderSpace(); - hResult = fMenuBar->QueryInterface(IID_IDockingWindow, reinterpret_cast<void **>(&dockingWindow)); + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); hResult = dockingWindow->ShowDW(fShow); return S_OK; } @@ -832,7 +832,7 @@ AddDockItem(menuBar, ITBBID_MENUBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); - hResult = menuBar->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&menuOleWindow)); + hResult = menuBar->QueryInterface(IID_PPV_ARG(IOleWindow, &menuOleWindow)); hResult = menuOleWindow->GetWindow(&fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count @@ -850,7 +850,7 @@ return hResult; AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS); fControlsBar.Attach(toolsBar.Detach()); // transfer the ref count - hResult = fControlsBar->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&toolbarOleWindow)); + hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IOleWindow, &toolbarOleWindow)); if (FAILED(hResult)) return hResult; hResult = toolbarOleWindow->GetWindow(&fToolbarWindow); @@ -862,7 +862,7 @@ if (FAILED(hResult)) return hResult; AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS); - hResult = navigationBar->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&navigationOleWindow)); + hResult = navigationBar->QueryInterface(IID_PPV_ARG(IOleWindow, &navigationOleWindow)); hResult = navigationOleWindow->GetWindow(&fNavigationWindow); fNavigationBar.Attach(navigationBar.Detach()); @@ -1002,7 +1002,7 @@ HRESULT hResult; fCommandTarget.Release(); - hResult = theTarget->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&fCommandTarget)); + hResult = theTarget->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &fCommandTarget)); if (FAILED(hResult)) return hResult; fCommandCategory = *category; @@ -1109,7 +1109,7 @@ else { // get window handle of owner - hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); @@ -1135,9 +1135,9 @@ return E_FAIL; // take advice to watch events - hResult = pUnkSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_IBrowserService, reinterpret_cast<void **>(&browserService)); + SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = AtlAdvise(browserService, static_cast<IDispatch *>(this), DIID_DWebBrowserEvents, &fAdviseCookie); } return S_OK; @@ -1181,7 +1181,7 @@ if (fMenuBar) { - hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); if (menuWinEventHandler->IsWindowOwner(hWnd)) { return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult); @@ -1212,9 +1212,9 @@ if (ppstb == NULL) return E_POINTER; if (dwBandID == ITBBID_MENUBAND && fMenuBar.p != NULL) - return fMenuBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb)); + return fMenuBar->QueryInterface(IID_PPV_ARG(IDeskBand, ppstb)); //if (dwBandID == ITBBID_BRANDBAND && fLogoBar.p != NULL) - // return fLogoBar->QueryInterface(IID_IDeskBand, reinterpret_cast<void **>(ppstb)); + // return fLogoBar->QueryInterface(IID_PPV_ARG(IDeskBand, ppstb)); *ppstb = NULL; return E_FAIL; } @@ -1250,11 +1250,11 @@ CComPtr<IWebBrowser> webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (FAILED(hResult)) return 0; hResult = serviceProvider->QueryService(SID_SShellBrowser, - IID_IWebBrowser, reinterpret_cast<void **>(&webBrowser)); + IID_PPV_ARG(IWebBrowser, &webBrowser)); if (FAILED(hResult)) return 0; hResult = webBrowser->GoBack(); @@ -1267,11 +1267,11 @@ CComPtr<IWebBrowser> webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); if (FAILED(hResult)) return 0; hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_IWebBrowser, reinterpret_cast<void **>(&webBrowser)); + SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); if (FAILED(hResult)) return 0; hResult = webBrowser->GoForward(); @@ -1283,7 +1283,7 @@ CComPtr<IOleCommandTarget> oleCommandTarget; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); if (FAILED(hResult)) return hResult; hResult = oleCommandTarget->Exec(&CGID_ShellBrowser, IDM_GOTO_UPONELEVEL, 0, NULL, NULL); @@ -1307,10 +1307,10 @@ commandInfo.nShow = SW_SHOWNORMAL; hResult = CoCreateInstance(CLSID_ShellSearchExt, NULL, CLSCTX_INPROC_SERVER, - IID_IContextMenu, reinterpret_cast<void **>(&contextMenu)); + IID_PPV_ARG(IContextMenu, &contextMenu)); if (FAILED(hResult)) return 0; - hResult = contextMenu->QueryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(&objectWithSite)); + hResult = contextMenu->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); if (FAILED(hResult)) return 0; hResult = objectWithSite->SetSite(fSite); @@ -1326,7 +1326,7 @@ CComPtr<IOleCommandTarget> oleCommandTarget; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); if (FAILED(hResult)) return hResult; hResult = oleCommandTarget->Exec(&CGID_Explorer, 0x23, 0, NULL, NULL); @@ -1372,12 +1372,12 @@ { case gBackCommandID: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); hResult = serviceProvider->QueryService( - SID_SShellBrowser, IID_IBrowserService, reinterpret_cast<void **>(&browserService)); + SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_BACK); - hResult = browserService->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); commandInfo.cmdID = 0x1d; hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && @@ -1402,12 +1402,12 @@ break; case gForwardCommandID: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, reinterpret_cast<void **>(&browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_FORE); - hResult = browserService->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); commandInfo.cmdID = 0x1d; hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && @@ -1564,7 +1564,7 @@ if (nID == (UINT)gBackCommandID || nID == (UINT)gForwardCommandID) { // TODO: Should this call QueryService? - hResult = fSite->QueryInterface(IID_IBrowserService, reinterpret_cast<void **>(&browserService)); + hResult = fSite->QueryInterface(IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->GetToolTipText(browserService, (nID == (UINT)gBackCommandID) ? TLOG_BACK : TLOG_FORE, @@ -1594,7 +1594,7 @@ if (fMenuBar) { CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); if (SUCCEEDED(hResult)) { if (menuWinEventHandler->IsWindowOwner(target) == S_OK) @@ -1608,7 +1608,7 @@ if (fNavigationBar) { CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); if (SUCCEEDED(hResult)) { if (menuWinEventHandler->IsWindowOwner(target) == S_OK) @@ -1632,7 +1632,7 @@ if (fMenuBar) { CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); if (SUCCEEDED(hResult)) { if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) @@ -1646,7 +1646,7 @@ if (fNavigationBar) { CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); if (SUCCEEDED(hResult)) { if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -203,7 +203,7 @@ desktop.p->AddRef (); return S_OK; } - return desktop->BindToObject (path, NULL, IID_IShellFolder, reinterpret_cast<void **>(newFolder)); + return desktop->BindToObject (path, NULL, IID_PPV_ARG(IShellFolder, newFolder)); } static const TCHAR szCabinetWndClass[] = TEXT("CabinetWClassX"); @@ -243,7 +243,7 @@ SubclassWindow(myWindow); SetWindowPos(NULL, -32000, -32000, 0, 0, SWP_NOOWNERZORDER | SWP_NOZORDER); hResult = explorerToolbar->QueryInterface( - IID_IExplorerToolbar, reinterpret_cast<void **>(&fExplorerToolbar)); + IID_PPV_ARG(IExplorerToolbar, &fExplorerToolbar)); } } @@ -754,19 +754,19 @@ // create interfaces hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IDockingWindow, reinterpret_cast<void **>(&dockingWindow)); + IID_PPV_ARG(IDockingWindow, &dockingWindow)); if (FAILED(hResult)) return hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IPersistStreamInit, reinterpret_cast<void **>(&persistStreamInit)); + IID_PPV_ARG(IPersistStreamInit, &persistStreamInit)); if (FAILED(hResult)) return hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IObjectWithSite, reinterpret_cast<void **>(&objectSite)); + IID_PPV_ARG(IObjectWithSite, &objectSite)); if (FAILED(hResult)) return hResult; @@ -952,7 +952,7 @@ } // create view object - hResult = newShellFolder->CreateViewObject(m_hWnd, IID_IShellView, reinterpret_cast<void **>(&newShellView)); + hResult = newShellFolder->CreateViewObject(m_hWnd, IID_PPV_ARG(IShellView, &newShellView)); if (FAILED(hResult)) return hResult; previousView = fCurrentShellViewWindow; @@ -964,7 +964,7 @@ ::SendMessage(fCurrentShellViewWindow, WM_SETREDRAW, 0, 0); // set site - hResult = newShellView->QueryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(&objectWithSite)); + hResult = newShellView->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); if (SUCCEEDED(hResult) && objectWithSite.p != NULL) hResult = objectWithSite->SetSite(static_cast<IDropTarget *>(this)); @@ -1009,7 +1009,7 @@ // get command target oleCommandTarget.Release(); - hResult = newShellView->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); + hResult = newShellView->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); // no use saveCurrentShellView.Release(); @@ -1057,10 +1057,10 @@ if (fClientBars[BIInternetToolbar].clientBar.p == NULL) return E_FAIL; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); - if (FAILED(hResult)) - return hResult; - hResult = serviceProvider->QueryService(SID_IBandSite, IID_IBandSite, reinterpret_cast<void **>(&bandSite)); + IID_PPV_ARG(IServiceProvider, &serviceProvider)); + if (FAILED(hResult)) + return hResult; + hResult = serviceProvider->QueryService(SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite)); if (FAILED(hResult)) return hResult; hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); @@ -1085,15 +1085,15 @@ cache = &fClientBars[BIHorizontalBaseBar].clientBar.p; if (*cache == NULL) { - hResult = CreateBaseBar(IID_IUnknown, reinterpret_cast<void **>(&newBaseBar)); + hResult = CreateBaseBar(IID_PPV_ARG(IUnknown, &newBaseBar)); if (FAILED(hResult)) return hResult; - hResult = CreateBaseBarSite(IID_IUnknown, reinterpret_cast<void **>(&newBaseBarSite)); + hResult = CreateBaseBarSite(IID_PPV_ARG(IUnknown, &newBaseBarSite)); if (FAILED(hResult)) return hResult; // tell the new base bar about the shell browser - hResult = newBaseBar->QueryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(&objectWithSite)); + hResult = newBaseBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); if (FAILED(hResult)) return hResult; hResult = objectWithSite->SetSite(static_cast<IDropTarget *>(this)); @@ -1101,7 +1101,7 @@ return hResult; // tell the new base bar about the new base bar site - hResult = newBaseBar->QueryInterface(IID_IDeskBar, reinterpret_cast<void **>(&deskBar)); + hResult = newBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); if (FAILED(hResult)) return hResult; hResult = deskBar->SetClient(newBaseBarSite); @@ -1109,7 +1109,7 @@ return hResult; // tell the new base bar site about the new base bar - hResult = newBaseBarSite->QueryInterface(IID_IDeskBarClient, reinterpret_cast<void **>(&deskBarClient)); + hResult = newBaseBarSite->QueryInterface(IID_PPV_ARG(IDeskBarClient, &deskBarClient)); if (FAILED(hResult)) return hResult; hResult = deskBarClient->SetDeskBarSite(newBaseBar); @@ -1118,7 +1118,7 @@ *cache = newBaseBar.Detach(); } - return (*cache)->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(theBaseBar)); + return (*cache)->QueryInterface(IID_PPV_ARG(IUnknown, theBaseBar)); } HRESULT CShellBrowser::ShowBand(const CLSID &classID, bool vertical) @@ -1132,6 +1132,8 @@ VARIANT vaIn; HRESULT hResult; + __debugbreak(); + hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); if (FAILED(hResult)) return hResult; @@ -1139,16 +1141,16 @@ reinterpret_cast<void **>(&newBand)); if (FAILED(hResult)) return hResult; - hResult = theBaseBar->QueryInterface(IID_IDeskBar, reinterpret_cast<void **>(&deskBar)); + hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); if (FAILED(hResult)) return hResult; hResult = deskBar->GetClient(&baseBarSite); if (FAILED(hResult)) return hResult; - hResult = theBaseBar->QueryInterface(IID_IDockingWindow, reinterpret_cast<void **>(&dockingWindow)); - if (FAILED(hResult)) - return hResult; - hResult = baseBarSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); + hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + if (FAILED(hResult)) + return hResult; + hResult = baseBarSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); if (FAILED(hResult)) return hResult; V_VT(&vaIn) = VT_UNKNOWN; @@ -1205,12 +1207,12 @@ // create sheet object hResult = CoCreateInstance(CLSID_ShellFldSetExt, NULL, CLSCTX_INPROC_SERVER, - IID_IShellPropSheetExt, reinterpret_cast<void **>(&folderOptionsSheet)); + IID_PPV_ARG(IShellPropSheetExt, &folderOptionsSheet)); if (FAILED(hResult)) return E_FAIL; // must set site in order for Apply to all Folders on Advanced page to be enabled - hResult = folderOptionsSheet->QueryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(&objectWithSite)); + hResult = folderOptionsSheet->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); if (SUCCEEDED(hResult) && objectWithSite.p != NULL) hResult = objectWithSite->SetSite(static_cast<IDispatch *>(this)); m_PropSheet.phpage = m_psp; @@ -1263,7 +1265,7 @@ previousMessage = pThis->m_pCurrentMsg; pThis->m_pCurrentMsg = &msg; - hResult = pThis->GetMenuBand(IID_IMenuBand, reinterpret_cast<void **>(&menuBand)); + hResult = pThis->GetMenuBand(IID_PPV_ARG(IMenuBand, &menuBand)); if (SUCCEEDED(hResult) && menuBand.p != NULL) { hResult = menuBand->TranslateMenuMessage(&msg, &lResult); @@ -1366,7 +1368,7 @@ { CComPtr<IDispatch> theDispatch; - hResult = (*pp)->QueryInterface(IID_IDispatch, reinterpret_cast<void **>(&theDispatch)); + hResult = (*pp)->QueryInterface(IID_PPV_ARG(IDispatch, &theDispatch)); hResult = theDispatch->Invoke(dispIdMember, GUID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, NULL); } pp++; @@ -1378,7 +1380,7 @@ { CComPtr<IDispatch> theDispatch; - hResult = (*pp)->QueryInterface(IID_IDispatch, reinterpret_cast<void **>(&theDispatch)); + hResult = (*pp)->QueryInterface(IID_PPV_ARG(IDispatch, &theDispatch)); hResult = theDispatch->Invoke(dispIdMember, GUID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, NULL); } pp++; @@ -1499,7 +1501,7 @@ commandList[4].cmdID = ITID_CUSTOMIZEENABLED; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); + IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); if (SUCCEEDED(hResult)) hResult = oleCommandTarget->QueryStatus(&CGID_PrivCITCommands, 5, commandList, NULL); if (FAILED(hResult)) @@ -1536,10 +1538,10 @@ return true; if (int1 == NULL || int2 == NULL) return false; - hResult = int1->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&int1Retry)); + hResult = int1->QueryInterface(IID_PPV_ARG(IUnknown, &int1Retry)); if (FAILED(hResult)) return false; - hResult = int2->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&int2Retry)); + hResult = int2->QueryInterface(IID_PPV_ARG(IUnknown, &int2Retry)); if (FAILED(hResult)) return false; if (int1Retry == int2Retry) @@ -1795,7 +1797,7 @@ if (IsMenu(hmenuShared) == FALSE) return E_FAIL; - hResult = GetMenuBand(IID_IShellMenu, reinterpret_cast<void **>(&shellMenu)); + hResult = GetMenuBand(IID_PPV_ARG(IShellMenu, &shellMenu)); if (FAILED(hResult)) return hResult; hResult = shellMenu->SetMenu(hmenuShared, NULL, SMSET_DONTOWN); @@ -2006,7 +2008,7 @@ *pptl = NULL; if (fTravelLog.p == NULL) { - hResult = CreateTravelLog(IID_ITravelLog, reinterpret_cast<void **>(&fTravelLog)); + hResult = CreateTravelLog(IID_PPV_ARG(ITravelLog, &fTravelLog)); if (FAILED(hResult)) return hResult; } @@ -2527,7 +2529,7 @@ CComPtr<IOleCommandTarget> oleCommandTarget; HRESULT hResult; - hResult = fCurrentShellView->QueryInterface(IID_IOleCommandTarget, reinterpret_cast<void **>(&oleCommandTarget)); + hResult = fCurrentShellView->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); if (FAILED(hResult)) return hResult; return oleCommandTarget->Exec(NULL, 22, 1, Level, NULL); @@ -2905,7 +2907,7 @@ return E_FAIL; } hResult = CoCreateInstance(oldState.persistClass, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_INPROC_SERVER, - IID_IOleObject, reinterpret_cast<void **>(&viewHistoryObject)); + IID_PPV_ARG(IOleObject, &viewHistoryObject)); fHistoryObject = viewHistoryObject; fHistoryStream = pStream; fHistoryBindContext = pbc; @@ -2926,7 +2928,7 @@ HRESULT hResult; hResult = fCurrentShellView->GetItemObject( - SVGIO_BACKGROUND, IID_IPersistHistory, reinterpret_cast<void **>(&viewPersistHistory)); + SVGIO_BACKGROUND, IID_PPV_ARG(IPersistHistory, &viewPersistHistory)); memset(&newState, 0, sizeof(newState)); newState.dwSize = sizeof(newState); newState.browseType = 2; @@ -2985,7 +2987,7 @@ if (fClientBars[x].clientBar != NULL) { hResult = fClientBars[x].clientBar->QueryInterface( - IID_IDockingWindow, reinterpret_cast<void **>(&dockingWindow)); + IID_PPV_ARG(IDockingWindow, &dockingWindow)); if (SUCCEEDED(hResult) && dockingWindow != NULL) { hResult = dockingWindow->ResizeBorderDW( @@ -3122,7 +3124,7 @@ HRESULT hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARLOCKED, 0, NULL, NULL); @@ -3135,7 +3137,7 @@ HRESULT hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARBANDSHOWN, 0, NULL, NULL); @@ -3148,7 +3150,7 @@ HRESULT hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_ADDRESSBANDSHOWN, 0, NULL, NULL); @@ -3161,7 +3163,7 @@ HRESULT hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_LINKSBANDSHOWN, 0, NULL, NULL); @@ -3174,7 +3176,7 @@ HRESULT hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TEXTLABELS, 0, NULL, NULL); @@ -3187,7 +3189,7 @@ HRESULT hResult; hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_IOleCommandTarget, reinterpret_cast<void **>(&commandTarget)); + IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_CUSTOMIZEENABLED, 0, NULL, NULL); @@ -3246,7 +3248,7 @@ ATLTRY (theCabinet = new CComObject<CShellBrowser>); if (theCabinet == NULL) return E_OUTOFMEMORY; - hResult = theCabinet->QueryInterface(IID_IShellBrowser, reinterpret_cast<void **>(&shellBrowser)); + hResult = theCabinet->QueryInterface(IID_PPV_ARG(IShellBrowser, &shellBrowser)); if (FAILED(hResult)) { delete theCabinet; Modified: branches/shell-experiments/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -246,11 +246,11 @@ fDockSite->Release(); if (pUnkSite == NULL) return S_OK; - hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast<void **>(&fDockSite)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fDockSite)); if (FAILED(hResult)) return hResult; parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); if (SUCCEEDED(hResult)) { oleWindow->GetWindow(&parentWindow); Modified: branches/shell-experiments/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/travellog.cpp [iso-8859-1] Mon Apr 28 15:29:38 2014 @@ -142,7 +142,7 @@ CComPtr<IStream> globalStream; HRESULT hResult; - hResult = punk->QueryInterface(IID_IPersistHistory, reinterpret_cast<void **>(&persistHistory)); + hResult = punk->QueryInterface(IID_PPV_ARG(IPersistHistory, &persistHistory)); if (FAILED(hResult)) return hResult; hResult = CreateStreamOnHGlobal(fPersistState, FALSE, &globalStream); @@ -167,10 +167,10 @@ fPIDL = NULL; GlobalFree(fPersistState); fPersistState = NULL; - hResult = punk->QueryInterface(IID_ITravelLogClient, reinterpret_cast<void **>(&travelLogClient)); - if (FAILED(hResult)) - return hResult; - hResult = punk->QueryInterface(IID_IPersistHistory, reinterpret_cast<void **>(&persistHistory)); + hResult = punk->QueryInterface(IID_PPV_ARG(ITravelLogClient, &travelLogClient)); + if (FAILED(hResult)) + return hResult; + hResult = punk->QueryInterface(IID_PPV_ARG(IPersistHistory, &persistHistory)); if (FAILED(hResult)) return hResult; globalStorage = GlobalAlloc(GMEM_FIXED, 0); @@ -364,7 +364,7 @@ hResult = FindRelativeEntry(iOffset, &destinationEntry); if (FAILED(hResult)) return hResult; - return destinationEntry->QueryInterface(IID_ITravelEntry, reinterpret_cast<void **>(ppte)); + return destinationEntry->QueryInterface(IID_PPV_ARG(ITravelEntry, ppte)); } HRESULT STDMETHODCALLTYPE CTravelLog::FindTravelEntry(IUnknown *punk, LPCITEMIDLIST pidl, ITravelEntry **ppte)

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