Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[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

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)

10 years, 4 months

[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

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

10 years, 4 months

[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

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)

10 years, 4 months

[tfaber] 63032: [NETCFGX] - Use correct parent key instead of an uninitialized handle in INetCfgComponentControl_fnApplyRegistryChanges CORE-8115 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 28 08:27:57 2014 New Revision: 63032 URL: http://svn.reactos.org/svn/reactos?rev=63032&view=rev Log: [NETCFGX] - Use correct parent key instead of an uninitialized handle in INetCfgComponentControl_fnApplyRegistryChanges CORE-8115 #resolve Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Mon Apr 28 08:27:57 2014 @@ -3141,7 +3141,7 @@ //MessageBoxW(NULL, L"INetCfgComponentControl_fnApplyRegistryChanges", NULL, MB_OK); - if (RegCreateKeyExW(hKey, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { if (pCurrentConfig->pDNS) {

10 years, 4 months

[tfaber] 63031: [EVENTVWR] - Remove dead code in GetEventCategory - Fix buffer overflows in DisplayEvent - Patch by Víctor Martínez CORE-8111 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 28 08:15:28 2014 New Revision: 63031 URL: http://svn.reactos.org/svn/reactos?rev=63031&view=rev Log: [EVENTVWR] - Remove dead code in GetEventCategory - Fix buffer overflows in DisplayEvent - Patch by Víctor Martínez CORE-8111 #resolve Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Mon Apr 28 08:15:28 2014 @@ -261,18 +261,11 @@ EVENT_MESSAGE_FILE_BUFFER, NULL) != 0) { - if (lpMsgBuf) - { - /* Trim the string */ - TrimNulls((LPWSTR)lpMsgBuf); - - /* Copy the category name */ - wcscpy(CategoryName, (LPCWSTR)lpMsgBuf); - } - else - { - wcscpy(CategoryName, (LPCWSTR)lpMsgBuf); - } + /* Trim the string */ + TrimNulls(lpMsgBuf); + + /* Copy the category name */ + wcscpy(CategoryName, lpMsgBuf); } else { @@ -1118,14 +1111,14 @@ if (iIndex != -1) { - ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer) / sizeof(WCHAR)); bEventData = !(pevlr->DataLength == 0);

10 years, 4 months

[tfaber] 63030: [FIND] - Avoid printf on a non-format string. Spotted by Víctor - Remove broken pseudo-TCHAR usage CORE-8112 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 28 08:06:52 2014 New Revision: 63030 URL: http://svn.reactos.org/svn/reactos?rev=63030&view=rev Log: [FIND] - Avoid printf on a non-format string. Spotted by Víctor - Remove broken pseudo-TCHAR usage CORE-8112 #resolve Modified: trunk/reactos/base/applications/cmdutils/find/find.c Modified: trunk/reactos/base/applications/cmdutils/find/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] Mon Apr 28 08:06:52 2014 @@ -125,11 +125,11 @@ void usage (void) { - TCHAR lpUsage[4096]; - - LoadString( GetModuleHandle(NULL), IDS_USAGE, (LPTSTR)lpUsage, 4096); - CharToOem(lpUsage, lpUsage); - printf( lpUsage ); + char szUsage[4096]; + + LoadStringA (GetModuleHandle (NULL), IDS_USAGE, szUsage, sizeof(szUsage) / sizeof(szUsage[0])); + CharToOemA (szUsage, szUsage); + fputs (szUsage, stdout); } @@ -139,7 +139,7 @@ { char *opt, *needle = NULL; int ret = 0; - TCHAR lpMessage[4096]; + char szMessage[4096]; int invert_search = 0; /* flag to invert the search */ int count_lines = 0; /* flag to whether/not count lines */ @@ -216,9 +216,9 @@ { /* We were not able to find a file. Display a message and set the exit status. */ - LoadString( GetModuleHandle(NULL), IDS_NO_SUCH_FILE, (LPTSTR)lpMessage, 4096); - CharToOem(lpMessage, lpMessage); - fprintf (stderr, lpMessage, *argv);// + LoadStringA (GetModuleHandle (NULL), IDS_NO_SUCH_FILE, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); + CharToOemA (szMessage, szMessage); + fprintf (stderr, szMessage, *argv); } else { @@ -235,9 +235,9 @@ } else { - LoadString(GetModuleHandle(NULL), IDS_CANNOT_OPEN, (LPTSTR)lpMessage, 4096); - CharToOem(lpMessage, lpMessage); - fprintf (stderr, lpMessage, + LoadString (GetModuleHandle (NULL), IDS_CANNOT_OPEN, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); + CharToOemA (szMessage, szMessage); + fprintf (stderr, szMessage, finddata.name); } }

10 years, 4 months

[tfaber] 63029: [DWNL] - Fix a format specifier. Patch by Víctor Martínez CORE-8113 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 28 08:04:14 2014 New Revision: 63029 URL: http://svn.reactos.org/svn/reactos?rev=63029&view=rev Log: [DWNL] - Fix a format specifier. Patch by Víctor Martínez CORE-8113 #resolve Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] Mon Apr 28 08:04:14 2014 @@ -225,7 +225,7 @@ if (This->szMimeType[0] != _T('\0')) _tprintf(_T("Length: %I64u [%s]\n"), This->Size, This->szMimeType); else - _tprintf(_T("Length: %ull\n"), This->Size); + _tprintf(_T("Length: %I64u\n"), This->Size); } _tprintf(_T("\n"));

10 years, 4 months

[jimtabor] 63028: [Win32k] - Goodbye to menu ntuser bad functions.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Apr 28 05:54:43 2014 New Revision: 63028 URL: http://svn.reactos.org/svn/reactos?rev=63028&view=rev Log: [Win32k] - Goodbye to menu ntuser bad functions. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/w32ksvc.db trunk/reactos/win32ss/w32ksvc.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -3390,21 +3390,6 @@ #define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 #define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005 -DWORD -NTAPI -NtUserBuildMenuItemList( - HMENU hMenu, - PVOID Buffer, - ULONG nBufSize, - DWORD Reserved); - -UINT -NTAPI -NtUserGetMenuDefaultItem( - HMENU hMenu, - UINT fByPos, - UINT gmdiFlags); - BOOL NTAPI NtUserGetMonitorInfo( @@ -3443,14 +3428,6 @@ BOOL TimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ } ROSMENUINFO, *PROSMENUINFO; -BOOL -NTAPI -NtUserMenuInfo( - HMENU hmenu, - PROSMENUINFO lpmi, - BOOL fsog -); - typedef struct tagROSMENUITEMINFO { /* ----------- MENUITEMINFOW ----------- */ @@ -3473,16 +3450,6 @@ SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP state */ } ROSMENUITEMINFO, *PROSMENUITEMINFO; -BOOL -NTAPI -NtUserMenuItemInfo( - HMENU hMenu, - UINT uItem, - BOOL fByPosition, - PROSMENUITEMINFO lpmii, - BOOL fsog -); - HMONITOR NTAPI NtUserMonitorFromPoint( Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -2724,139 +2724,4 @@ END_CLEANUP; } -////// ReactOS NtUserBad is unpluged! - -DWORD -APIENTRY -NtUserBuildMenuItemList( - HMENU hMenu, - VOID* Buffer, - ULONG nBufSize, - DWORD Reserved) -{ -/* DWORD res = -1; - PMENU Menu; - DECLARE_RETURN(DWORD); - - TRACE("Enter NtUserBuildMenuItemList\n"); - UserEnterExclusive(); - - if(!(Menu = UserGetMenuObject(hMenu))) - { - RETURN( (DWORD)-1); - } - - if(Buffer) - { - res = IntBuildMenuItemList(Menu, Buffer, nBufSize); - } - else - { - res = Menu->cItems; - } - - RETURN( res); - -CLEANUP: - TRACE("Leave NtUserBuildMenuItemList, ret=%lu\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - -UINT APIENTRY -NtUserGetMenuDefaultItem( - HMENU hMenu, - UINT fByPos, - UINT gmdiFlags) -{ -/* PMENU Menu; - DWORD gismc = 0; - DECLARE_RETURN(UINT); - - TRACE("Enter NtUserGetMenuDefaultItem\n"); - UserEnterExclusive(); - - if(!(Menu = UserGetMenuObject(hMenu))) - { - RETURN(-1); - } - - RETURN( IntGetMenuDefaultItem(Menu, fByPos, gmdiFlags, &gismc)); - -CLEANUP: - TRACE("Leave NtUserGetMenuDefaultItem, ret=%u\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserMenuInfo( - HMENU hMenu, - PROSMENUINFO UnsafeMenuInfo, - BOOL SetOrGet) -{ -/* PMENU Menu; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserMenuInfo\n"); - UserEnterShared(); - - if (!(Menu = UserGetMenuObject(hMenu))) - { - RETURN(FALSE); - } - - RETURN(UserMenuInfo(Menu, UnsafeMenuInfo, SetOrGet)); - -CLEANUP: - TRACE("Leave NtUserMenuInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserMenuItemInfo( - HMENU hMenu, - UINT Item, - BOOL ByPosition, - PROSMENUITEMINFO UnsafeItemInfo, - BOOL SetOrGet) -{ -/* PMENU Menu; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserMenuItemInfo\n"); - UserEnterExclusive(); - - if (!(Menu = UserGetMenuObject(hMenu))) - { - RETURN(FALSE); - } - - RETURN( UserMenuItemInfo(Menu, Item, ByPosition, UnsafeItemInfo, SetOrGet)); - -CLEANUP: - TRACE("Leave NtUserMenuItemInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - /* EOF */ Modified: trunk/reactos/win32ss/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.db?rev=630… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -681,11 +681,7 @@ NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 # -NtUserBuildMenuItemList 4 -NtUserGetMenuDefaultItem 3 NtUserGetMonitorInfo 2 -NtUserMenuInfo 3 -NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3 NtUserMonitorFromRect 2 NtUserMonitorFromWindow 2 Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6302… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -688,11 +688,7 @@ SVC_(GdiOffsetViewportOrgEx, 4) SVC_(GdiOffsetWindowOrgEx, 4) -SVC_(UserBuildMenuItemList, 4) -SVC_(UserGetMenuDefaultItem, 3) SVC_(UserGetMonitorInfo, 2) -SVC_(UserMenuInfo, 3) -SVC_(UserMenuItemInfo, 5) SVC_(UserMonitorFromPoint, 3) SVC_(UserMonitorFromRect, 2) SVC_(UserMonitorFromWindow, 2)

10 years, 4 months

[jimtabor] 63027: [Win32k] - Moved to new menu structures, synced in wine code and started first phase to server side. Resulting that more tests are running and failing less. Unplugged ntuser bad f...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Apr 28 03:55:23 2014 New Revision: 63027 URL: http://svn.reactos.org/svn/reactos?rev=63027&view=rev Log: [Win32k] - Moved to new menu structures, synced in wine code and started first phase to server side. Resulting that more tests are running and failing less. Unplugged ntuser bad functions. - See CORE-5605, CORE-7447, CORE-7967, CORE-8098 and CORE-8107 Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/accelerator.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/menu.h trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/windows/menu.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… Modified: trunk/reactos/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/accele… Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… Modified: trunk/reactos/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.h… Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…

10 years, 4 months

[jimtabor] 63026: - Disable insert menu test for now. Part II.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Apr 28 03:51:52 2014 New Revision: 63026 URL: http://svn.reactos.org/svn/reactos?rev=63026&view=rev Log: - Disable insert menu test for now. Part II. Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Mon Apr 28 03:51:52 2014 @@ -3632,7 +3632,10 @@ test_menu_search_bycommand(); test_CheckMenuRadioItem(); test_menu_resource_layout(); - //test_InsertMenu(); //// need more time... + if(!winetest_interactive) + skip("WIP turn off test for now.\n"); + else + test_InsertMenu(); //// need more time... test_menualign(); }

10 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014