Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 63913: [RAPPS] Fix the registry key of the Event Source.
by spetreolle＠svn.reactos.org 21 Aug '14

21 Aug '14

Author: spetreolle Date: Thu Aug 21 12:28:24 2014 New Revision: 63913 URL: http://svn.reactos.org/svn/reactos?rev=63913&view=rev Log: [RAPPS] Fix the registry key of the Event Source. Modified: trunk/reactos/base/applications/rapps/misc.c Modified: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] Thu Aug 21 12:28:24 2014 @@ -293,7 +293,7 @@ VOID InitLogs(VOID) { - WCHAR szBuf[MAX_PATH] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\ReactOS Application Manager\\ReactOS Application Manager"; + WCHAR szBuf[MAX_PATH] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\ReactOS Application Manager"; WCHAR szPath[MAX_PATH]; DWORD dwCategoryNum = 1; DWORD dwDisp, dwData;

1 0

[dquintana] 63912: [EXPLORER-NEW] * Make use of the wine debug functions and turn DbgPrints into TRACE/WARN/ERR. [SHELL32] * Turn some DbgPrints into TRACEs.
by dquintana＠svn.reactos.org 20 Aug '14

20 Aug '14

Author: dquintana Date: Wed Aug 20 16:19:00 2014 New Revision: 63912 URL: http://svn.reactos.org/svn/reactos?rev=63912&view=rev Log: [EXPLORER-NEW] * Make use of the wine debug functions and turn DbgPrints into TRACE/WARN/ERR. [SHELL32] * Turn some DbgPrints into TRACEs. Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/precomp.h branches/shell-experiments/base/shell/explorer-new/shellservice.c branches/shell-experiments/base/shell/explorer-new/startmnu.c branches/shell-experiments/base/shell/explorer-new/startup.c branches/shell-experiments/base/shell/explorer-new/taskband.c branches/shell-experiments/base/shell/explorer-new/taskswnd.c branches/shell-experiments/base/shell/explorer-new/tbsite.c branches/shell-experiments/base/shell/explorer-new/trayntfy.c branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -21,7 +21,7 @@ precomp.h) add_executable(explorer ${SOURCE} explorer.rc) -target_link_libraries(explorer uuid) +target_link_libraries(explorer uuid wine) set_module_type(explorer win32gui UNICODE) add_importlibs(explorer advapi32 Modified: branches/shell-experiments/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/precomp.h [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -28,6 +28,10 @@ #include "tmschema.h" #include "resource.h" #include "comcsup.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(explorernew); /* dynamic imports due to lack of support in msvc linker libs */ typedef INT (APIENTRY *REGSHELLHOOK)(HWND, DWORD); Modified: branches/shell-experiments/base/shell/explorer-new/shellservice.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/shellservice.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/shellservice.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -27,7 +27,7 @@ { IOleCommandTarget * pOct = pItem; HRESULT * phr = pData; - DbgPrint("Initializing SSO %p\n", pOct); + TRACE("Initializing SSO %p\n", pOct); *phr = IOleCommandTarget_Exec(pOct, &CGID_ShellServiceObject, OLECMDID_NEW, OLECMDEXECOPT_DODEFAULT, NULL, NULL); return SUCCEEDED(*phr); } @@ -35,7 +35,7 @@ static int CALLBACK ShutdownAllCallback(void* pItem, void* pData) { IOleCommandTarget * pOct = pItem; - DbgPrint("Shutting down SSO %p\n", pOct); + TRACE("Shutting down SSO %p\n", pOct); IOleCommandTarget_Exec(pOct, &CGID_ShellServiceObject, OLECMDID_SAVE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); return TRUE; } @@ -43,7 +43,7 @@ static int CALLBACK DeleteAllEnumCallback(void* pItem, void* pData) { IOleCommandTarget * pOct = pItem; - DbgPrint("Releasing SSO %p\n", pOct); + TRACE("Releasing SSO %p\n", pOct); IUnknown_Release(pOct); return TRUE; } @@ -63,13 +63,13 @@ hdpa = DPA_Create(5); - DbgPrint("Enumerating Shell Service Ojbect GUIDs...\n"); + TRACE("Enumerating Shell Service Ojbect GUIDs...\n"); if (RegOpenKey(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\ShellServiceObjectDelayLoad", &hkey)) { - DbgPrint("ERROR: RegOpenKey failed.\n"); + ERR("RegOpenKey failed.\n"); return HRESULT_FROM_WIN32(GetLastError()); } @@ -85,21 +85,21 @@ if (type != REG_SZ) { - DbgPrint("WARNING: Value type was not REG_SZ.\n"); + WARN("Value type was not REG_SZ.\n"); continue; } hr = CLSIDFromString(value, &clsid); if (FAILED(hr)) { - DbgPrint("ERROR: CLSIDFromString failed %08x.\n", hr); + ERR("CLSIDFromString failed %08x.\n", hr); goto cleanup; } hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IOleCommandTarget, (VOID**) &pOct); if (FAILED(hr)) { - DbgPrint("ERROR: CoCreateInstance failed %08x.\n", hr); + ERR("CoCreateInstance failed %08x.\n", hr); goto cleanup; } @@ -111,7 +111,7 @@ if (ret != ERROR_NO_MORE_ITEMS) { - DbgPrint("ERROR: RegEnumValueW failed %08x.\n", ret); + ERR("RegEnumValueW failed %08x.\n", ret); hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } Modified: branches/shell-experiments/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/startmnu.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -398,7 +398,7 @@ } else { - DbgPrint("IStartMenuSite::QueryInterface queried unsupported interface: " + TRACE("IStartMenuSite::QueryInterface queried unsupported interface: " "{0x%8x,0x%4x,0x%4x,{0x%2x,0x%2x,0x%2x,0x%2x,0x%2x,0x%2x,0x%2x,0x%2x}}\n", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], @@ -466,7 +466,7 @@ OUT HWND *phwnd) { IStartMenuSiteImpl *This = IStartMenuSiteImpl_from_ITrayPriv(iface); - DbgPrint("ITrayPriv::GetWindow\n"); + TRACE("ITrayPriv::GetWindow\n"); *phwnd = ITrayWindow_GetHWND(This->Tray); if (*phwnd != NULL) @@ -479,7 +479,7 @@ IStartMenuSiteImpl_ContextSensitiveHelp(IN OUT ITrayPriv *iface, IN BOOL fEnterMode) { - DbgPrint("ITrayPriv::ContextSensitiveHelp\n"); + TRACE("ITrayPriv::ContextSensitiveHelp\n"); return E_NOTIMPL; } @@ -493,7 +493,7 @@ IStartMenuSiteImpl *This = IStartMenuSiteImpl_from_ITrayPriv(iface); - DbgPrint("ITrayPriv::Execute\n"); + TRACE("ITrayPriv::Execute\n"); hShlwapi = GetModuleHandle(TEXT("SHLWAPI.DLL")); if (hShlwapi != NULL) @@ -521,14 +521,14 @@ IN PVOID Unknown3, IN PVOID Unknown4) { - DbgPrint("ITrayPriv::Unknown(0x%p,0x%p,0x%p,0x%p)\n", Unknown1, Unknown2, Unknown3, Unknown4); + TRACE("ITrayPriv::Unknown(0x%p,0x%p,0x%p,0x%p)\n", Unknown1, Unknown2, Unknown3, Unknown4); return E_NOTIMPL; } static BOOL ShowUndockMenuItem(VOID) { - DbgPrint("ShowUndockMenuItem() not implemented!\n"); + TRACE("ShowUndockMenuItem() not implemented!\n"); /* FIXME: How do we detect this?! */ return FALSE; } @@ -536,7 +536,7 @@ static BOOL ShowSynchronizeMenuItem(VOID) { - DbgPrint("ShowSynchronizeMenuItem() not implemented!\n"); + TRACE("ShowSynchronizeMenuItem() not implemented!\n"); /* FIXME: How do we detect this?! */ return FALSE; } @@ -551,7 +551,7 @@ UINT uLastItemsCount = 5; /* 5 menu items below the last separator */ TCHAR szUser[128]; - DbgPrint("ITrayPriv::AppendMenu\n"); + TRACE("ITrayPriv::AppendMenu\n"); hMenu = LoadPopupMenu(hExplorerInstance, MAKEINTRESOURCE(IDM_STARTMENU)); @@ -968,7 +968,7 @@ #endif if (FAILED(hr)) { - DbgPrint("CoCreateInstance failed: %x\n", hr); + TRACE("CoCreateInstance failed: %x\n", hr); goto cleanup; } @@ -977,7 +977,7 @@ (PVOID *)&pOws); if (FAILED(hr)) { - DbgPrint("IMenuPopup_QueryInterface failed: %x\n", hr); + TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); goto cleanup; } @@ -985,7 +985,7 @@ hr = IObjectWithSite_SetSite(pOws, (IUnknown *)pSms); if (FAILED(hr)) { - DbgPrint("IObjectWithSite_SetSite failed: %x\n", hr); + TRACE("IObjectWithSite_SetSite failed: %x\n", hr); goto cleanup; } @@ -1002,21 +1002,21 @@ /* Everything is initialized now. Let's get the IMenuBand interface. */ if (FAILED(hr)) { - DbgPrint("IMenuPopup_QueryInterface failed: %x\n", hr); + TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); goto cleanup; } hr = IMenuPopup_GetClient(pMp, &pUnk); if (FAILED(hr)) { - DbgPrint("IMenuPopup_GetClient failed: %x\n", hr); + TRACE("IMenuPopup_GetClient failed: %x\n", hr); goto cleanup; } hr = IUnknown_QueryInterface(pUnk, &IID_IBandSite, (PVOID *)&pBs); if (FAILED(hr)) { - DbgPrint("IUnknown_QueryInterface pBs failed: %x\n", hr); + TRACE("IUnknown_QueryInterface pBs failed: %x\n", hr); goto cleanup; } @@ -1025,14 +1025,14 @@ hr = IBandSite_EnumBands(pBs, 0, &dwBandId); if (FAILED(hr)) { - DbgPrint("IBandSite_EnumBands failed: %x\n", hr); + TRACE("IBandSite_EnumBands failed: %x\n", hr); goto cleanup; } hr = IBandSite_GetBandObject(pBs, dwBandId, &IID_IMenuBand, (PVOID *)&pMb); if (FAILED(hr)) { - DbgPrint("IBandSite_GetBandObject failed: %x\n", hr); + TRACE("IBandSite_GetBandObject failed: %x\n", hr); goto cleanup; } Modified: branches/shell-experiments/base/shell/explorer-new/startup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/startup.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/startup.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -75,12 +75,12 @@ if (!CreateProcessW(NULL, szCmdLineExp, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) { - DbgPrint("Failed to run command (%lu)\n", GetLastError()); + TRACE("Failed to run command (%lu)\n", GetLastError()); return INVALID_RUNCMD_RETURN; } - DbgPrint("Successfully ran command\n"); + TRACE("Successfully ran command\n"); if (wait) { /* wait for the process to exit */ @@ -114,9 +114,9 @@ WCHAR *szValue = NULL; if (hkRoot == HKEY_LOCAL_MACHINE) - DbgPrint("processing %ls entries under HKLM\n", szKeyName); + TRACE("processing %ls entries under HKLM\n", szKeyName); else - DbgPrint("processing %ls entries under HKCU\n", szKeyName); + TRACE("processing %ls entries under HKCU\n", szKeyName); res = RegOpenKeyExW(hkRoot, L"Software\\Microsoft\\Windows\\CurrentVersion", @@ -125,7 +125,7 @@ &hkWin); if (res != ERROR_SUCCESS) { - DbgPrint("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", res); + TRACE("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", res); goto end; } @@ -139,12 +139,12 @@ { if (res == ERROR_FILE_NOT_FOUND) { - DbgPrint("Key doesn't exist - nothing to be done\n"); + TRACE("Key doesn't exist - nothing to be done\n"); res = ERROR_SUCCESS; } else - DbgPrint("RegOpenKeyEx failed on run key (%ld)\n", res); + TRACE("RegOpenKeyEx failed on run key (%ld)\n", res); goto end; } @@ -163,14 +163,14 @@ NULL); if (res != ERROR_SUCCESS) { - DbgPrint("Couldn't query key info (%ld)\n", res); + TRACE("Couldn't query key info (%ld)\n", res); goto end; } if (i == 0) { - DbgPrint("No commands to execute.\n"); + TRACE("No commands to execute.\n"); res = ERROR_SUCCESS; goto end; @@ -181,7 +181,7 @@ cbMaxCmdLine); if (szCmdLine == NULL) { - DbgPrint("Couldn't allocate memory for the commands to be executed\n"); + TRACE("Couldn't allocate memory for the commands to be executed\n"); res = ERROR_NOT_ENOUGH_MEMORY; goto end; @@ -193,7 +193,7 @@ cchMaxValue * sizeof(*szValue)); if (szValue == NULL) { - DbgPrint("Couldn't allocate memory for the value names\n"); + TRACE("Couldn't allocate memory for the value names\n"); res = ERROR_NOT_ENOUGH_MEMORY; goto end; @@ -216,7 +216,7 @@ &cbDataLength); if (res != ERROR_SUCCESS) { - DbgPrint("Couldn't read in value %lu - %ld\n", i, res); + TRACE("Couldn't read in value %lu - %ld\n", i, res); continue; } @@ -226,12 +226,12 @@ if (bDelete && (res = RegDeleteValueW(hkRun, szValue)) != ERROR_SUCCESS) { - DbgPrint("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res); + TRACE("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res); } if (type != REG_SZ) { - DbgPrint("Incorrect type of value #%lu (%lu)\n", i, type); + TRACE("Incorrect type of value #%lu (%lu)\n", i, type); continue; } @@ -239,10 +239,10 @@ res = runCmd(szCmdLine, NULL, bSynchronous, FALSE); if (res == INVALID_RUNCMD_RETURN) { - DbgPrint("Error running cmd #%lu (%lu)\n", i, GetLastError()); - } - - DbgPrint("Done processing cmd #%lu\n", i); + TRACE("Error running cmd #%lu (%lu)\n", i, GetLastError()); + } + + TRACE("Done processing cmd #%lu\n", i); } res = ERROR_SUCCESS; @@ -256,7 +256,7 @@ if (hkWin != NULL) RegCloseKey(hkWin); - DbgPrint("done\n"); + TRACE("done\n"); return res == ERROR_SUCCESS ? TRUE : FALSE; } @@ -276,14 +276,14 @@ res = GetWindowsDirectoryW(gen_path, sizeof(gen_path) / sizeof(gen_path[0])); if (res == 0) { - DbgPrint("Couldn't get the windows directory - error %lu\n", GetLastError()); + TRACE("Couldn't get the windows directory - error %lu\n", GetLastError()); return 100; } if (!SetCurrentDirectoryW(gen_path)) { - DbgPrint("Cannot set the dir to %ls (%lu)\n", gen_path, GetLastError()); + TRACE("Cannot set the dir to %ls (%lu)\n", gen_path, GetLastError()); return 100; } @@ -330,7 +330,7 @@ if (res && bNormalBoot && (SHRestricted(REST_NOCURRENTUSERRUNONCE) == 0)) res = ProcessRunKeys(HKEY_CURRENT_USER, L"RunOnce", TRUE, FALSE); - DbgPrint("Operation done\n"); + TRACE("Operation done\n"); return res ? 0 : 101; } Modified: branches/shell-experiments/base/shell/explorer-new/taskband.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/taskband.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/taskband.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -218,7 +218,7 @@ else *phwnd = ITrayWindow_GetHWND(This->Tray); - DbgPrint("ITaskBand::GetWindow(0x%p->0x%p)\n", phwnd, *phwnd); + TRACE("ITaskBand::GetWindow(0x%p->0x%p)\n", phwnd, *phwnd); if (*phwnd != NULL) return S_OK; @@ -267,7 +267,7 @@ IN OUT DESKBANDINFO *pdbi) { ITaskBandImpl *This = ITaskBandImpl_from_IDeskBand(iface); - DbgPrint("ITaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, This->hWnd); + TRACE("ITaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, This->hWnd); /* NOTE: We could save dwBandID in the instance in case we need it later... */ @@ -310,7 +310,7 @@ is the task band */ This->dwBandID = dwBandID; - DbgPrint("H: %d, Min: %d,%d, Integral.y: %d Actual: %d,%d\n", (dwViewMode & DBIF_VIEWMODE_VERTICAL) == 0, + TRACE("H: %d, Min: %d,%d, Integral.y: %d Actual: %d,%d\n", (dwViewMode & DBIF_VIEWMODE_VERTICAL) == 0, pdbi->ptMinSize.x, pdbi->ptMinSize.y, pdbi->ptIntegral.y, pdbi->ptActual.x,pdbi->ptActual.y); @@ -371,7 +371,7 @@ IDeskBarImpl_SetClient(IN OUT IDeskBar *iface, IN IUnknown *punkClient) { - DbgPrint("IDeskBar::SetClient(0x%p)\n", punkClient); + TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); return E_NOTIMPL; } @@ -379,7 +379,7 @@ IDeskBarImpl_GetClient(IN OUT IDeskBar *iface, OUT IUnknown **ppunkClient) { - DbgPrint("IDeskBar::GetClient(0x%p)\n", ppunkClient); + TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); return E_NOTIMPL; } @@ -387,7 +387,7 @@ IDeskBarImpl_OnPosRectChangeDB(IN OUT IDeskBar *iface, IN RECT *prc) { - DbgPrint("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); + TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); if (prc->bottom - prc->top == 0) return S_OK; @@ -419,7 +419,7 @@ ITaskBandImpl_GetClassID(IN OUT IPersistStream *iface, OUT CLSID *pClassID) { - DbgPrint("ITaskBand::GetClassID(0x%p)\n", pClassID); + TRACE("ITaskBand::GetClassID(0x%p)\n", pClassID); /* We're going to return the (internal!) CLSID of the task band interface */ *pClassID = CLSID_ITaskBand; return S_OK; @@ -436,7 +436,7 @@ ITaskBandImpl_Load(IN OUT IPersistStream *iface, IN IStream *pStm) { - DbgPrint("ITaskBand::Load called\n"); + TRACE("ITaskBand::Load called\n"); /* Nothing to do */ return S_OK; } @@ -454,7 +454,7 @@ ITaskBandImpl_GetSizeMax(IN OUT IPersistStream *iface, OUT ULARGE_INTEGER *pcbSize) { - DbgPrint("ITaskBand::GetSizeMax called\n"); + TRACE("ITaskBand::GetSizeMax called\n"); /* We don't need any space for the task band */ pcbSize->QuadPart = 0; return S_OK; @@ -488,7 +488,7 @@ ITaskBandImpl *This = ITaskBandImpl_from_IObjectWithSite(iface); HRESULT hRet = E_FAIL; - DbgPrint("ITaskBand::SetSite(0x%p)\n", pUnkSite); + TRACE("ITaskBand::SetSite(0x%p)\n", pUnkSite); /* Release the current site */ if (This->punkSite != NULL) @@ -517,7 +517,7 @@ { /* Attempt to create the task switch window */ - DbgPrint("CreateTaskSwitchWnd(Parent: 0x%p)\n", hWndParent); + TRACE("CreateTaskSwitchWnd(Parent: 0x%p)\n", hWndParent); This->hWnd = CreateTaskSwitchWnd(hWndParent, This->Tray); if (This->hWnd != NULL) @@ -527,7 +527,7 @@ } else { - DbgPrint("CreateTaskSwitchWnd() failed!\n"); + TRACE("CreateTaskSwitchWnd() failed!\n"); IUnknown_Release(OleWindow); hRet = E_FAIL; } @@ -536,7 +536,7 @@ IUnknown_Release(OleWindow); } else - DbgPrint("Querying IOleWindow failed: 0x%x\n", hRet); + TRACE("Querying IOleWindow failed: 0x%x\n", hRet); } return hRet; @@ -548,7 +548,7 @@ OUT VOID **ppvSite) { ITaskBandImpl *This = ITaskBandImpl_from_IObjectWithSite(iface); - DbgPrint("ITaskBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + TRACE("ITaskBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); if (This->punkSite != NULL) { @@ -587,7 +587,7 @@ IN LPARAM lParam, OUT LRESULT *plrResult) { - DbgPrint("ITaskBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); + TRACE("ITaskBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); return E_NOTIMPL; } @@ -600,7 +600,7 @@ if (This->hWnd == hWnd || IsChild(This->hWnd, hWnd)) { - DbgPrint("ITaskBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); + TRACE("ITaskBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); return S_OK; } Modified: branches/shell-experiments/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/taskswnd.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -142,13 +142,13 @@ PTASK_GROUP CurrentGroup; PTASK_ITEM CurrentTaskItem, LastTaskItem; - DbgPrint("Tasks dump:\n"); + TRACE("Tasks dump:\n"); if (This->IsGroupingEnabled) { CurrentGroup = This->TaskGroups; while (CurrentGroup != NULL) { - DbgPrint("- Group PID: 0x%p Tasks: %d Index: %d\n", CurrentGroup->dwProcessId, CurrentGroup->dwTaskCount, CurrentGroup->Index); + TRACE("- Group PID: 0x%p Tasks: %d Index: %d\n", CurrentGroup->dwProcessId, CurrentGroup->dwTaskCount, CurrentGroup->Index); CurrentTaskItem = This->TaskItems; LastTaskItem = CurrentTaskItem + This->TaskItemCount; @@ -156,7 +156,7 @@ { if (CurrentTaskItem->Group == CurrentGroup) { - DbgPrint(" + Task hwnd: 0x%p Index: %d\n", CurrentTaskItem->hWnd, CurrentTaskItem->Index); + TRACE(" + Task hwnd: 0x%p Index: %d\n", CurrentTaskItem->hWnd, CurrentTaskItem->Index); } CurrentTaskItem++; } @@ -170,7 +170,7 @@ { if (CurrentTaskItem->Group == NULL) { - DbgPrint("- Task hwnd: 0x%p Index: %d\n", CurrentTaskItem->hWnd, CurrentTaskItem->Index); + TRACE("- Task hwnd: 0x%p Index: %d\n", CurrentTaskItem->hWnd, CurrentTaskItem->Index); } CurrentTaskItem++; } @@ -181,7 +181,7 @@ LastTaskItem = CurrentTaskItem + This->TaskItemCount; while (CurrentTaskItem != LastTaskItem) { - DbgPrint("- Task hwnd: 0x%p Index: %d\n", CurrentTaskItem->hWnd, CurrentTaskItem->Index); + TRACE("- Task hwnd: 0x%p Index: %d\n", CurrentTaskItem->hWnd, CurrentTaskItem->Index); CurrentTaskItem++; } } @@ -445,7 +445,7 @@ return -1; } - DbgPrint("Updated button %d for hwnd 0x%p\n", TaskItem->Index, TaskItem->hWnd); + TRACE("Updated button %d for hwnd 0x%p\n", TaskItem->Index, TaskItem->hWnd); return TaskItem->Index; } @@ -620,7 +620,7 @@ TaskSwitchWnd_UpdateIndexesAfterButtonInserted(This, iIndex); - DbgPrint("Added button %d for hwnd 0x%p\n", iIndex, TaskItem->hWnd); + TRACE("Added button %d for hwnd 0x%p\n", iIndex, TaskItem->hWnd); TaskItem->Index = iIndex; This->ToolbarBtnCount++; @@ -688,7 +688,7 @@ if (!GetWindowThreadProcessId(hWnd, &dwProcessId)) { - DbgPrint("Cannot get process id of hwnd 0x%p\n", hWnd); + TRACE("Cannot get process id of hwnd 0x%p\n", hWnd); return NULL; } @@ -986,7 +986,7 @@ } else if (TaskItem == NULL) { - DbgPrint("Active TaskItem now NULL\n"); + TRACE("Active TaskItem now NULL\n"); } } @@ -1040,7 +1040,7 @@ hWnd); if (TaskItem == NULL) { - DbgPrint("Add window 0x%p\n", hWnd); + TRACE("Add window 0x%p\n", hWnd); TaskItem = TaskSwitchWnd_AllocTaskItem(This); if (TaskItem != NULL) { @@ -1068,7 +1068,7 @@ { if (TaskItem != NULL) { - DbgPrint("Activate window 0x%p on button %d\n", TaskItem->hWnd, TaskItem->Index); + TRACE("Activate window 0x%p on button %d\n", TaskItem->hWnd, TaskItem->Index); } TaskSwitchWnd_CheckActivateTaskItem(This, TaskItem); @@ -1097,7 +1097,7 @@ if (TaskItem == NULL) { - DbgPrint("Activate window 0x%p, could not find task\n", hWnd); + TRACE("Activate window 0x%p, could not find task\n", hWnd); } return TaskSwitchWnd_ActivateTaskItem(This, TaskItem); @@ -1113,13 +1113,13 @@ hWnd); if (TaskItem != NULL) { - DbgPrint("Delete window 0x%p on button %d\n", hWnd, TaskItem->Index); + TRACE("Delete window 0x%p on button %d\n", hWnd, TaskItem->Index); TaskSwitchWnd_DeleteTaskItem(This, TaskItem); return TRUE; } //else - //DbgPrint("Failed to delete window 0x%p\n", hWnd); + //TRACE("Failed to delete window 0x%p\n", hWnd); return FALSE; } @@ -1159,7 +1159,7 @@ hWnd); if (TaskItem != NULL) { - DbgPrint("Flashing window 0x%p on button %d\n", hWnd, TaskItem->Index); + TRACE("Flashing window 0x%p on button %d\n", hWnd, TaskItem->Index); TaskSwitchWnd_FlashTaskItem(This, TaskItem); return TRUE; @@ -1573,7 +1573,7 @@ case APPCOMMAND_BROWSER_HOME: case APPCOMMAND_LAUNCH_MAIL: default: - DbgPrint("Shell app command %d unhandled!\n", (INT)GET_APPCOMMAND_LPARAM(lParam)); + TRACE("Shell app command %d unhandled!\n", (INT)GET_APPCOMMAND_LPARAM(lParam)); break; } @@ -1671,14 +1671,14 @@ { if (hshell_msg[i].msg == (INT)wParam) { - DbgPrint("Shell message %ws unhandled (lParam = 0x%p)!\n", hshell_msg[i].msg_name, lParam); + TRACE("Shell message %ws unhandled (lParam = 0x%p)!\n", hshell_msg[i].msg_name, lParam); found = 1; break; } } if (!found) { - DbgPrint("Shell message %d unhandled (lParam = 0x%p)!\n", (INT)wParam, lParam); + TRACE("Shell message %d unhandled (lParam = 0x%p)!\n", (INT)wParam, lParam); } break; } @@ -1710,11 +1710,11 @@ bIsMinimized = IsIconic(TaskItem->hWnd); bIsActive = (TaskItem == This->ActiveTaskItem); - DbgPrint("Active TaskItem %p, selected TaskItem %p\n", This->ActiveTaskItem, TaskItem); + TRACE("Active TaskItem %p, selected TaskItem %p\n", This->ActiveTaskItem, TaskItem); if (This->ActiveTaskItem) - DbgPrint("Active TaskItem hWnd=%p, TaskItem hWnd %p\n", This->ActiveTaskItem->hWnd, TaskItem->hWnd); - - DbgPrint("Valid button clicked. HWND=%p, IsMinimized=%s, IsActive=%s...\n", + TRACE("Active TaskItem hWnd=%p, TaskItem hWnd %p\n", This->ActiveTaskItem->hWnd, TaskItem->hWnd); + + TRACE("Valid button clicked. HWND=%p, IsMinimized=%s, IsActive=%s...\n", TaskItem->hWnd, bIsMinimized ? "Yes" : "No", bIsActive ? "Yes" : "No"); if (!bIsMinimized && bIsActive) @@ -1723,7 +1723,7 @@ WM_SYSCOMMAND, SC_MINIMIZE, 0); - DbgPrint("Valid button clicked. App window Minimized.\n"); + TRACE("Valid button clicked. App window Minimized.\n"); } else { @@ -1733,11 +1733,11 @@ WM_SYSCOMMAND, SC_RESTORE, 0); - DbgPrint("Valid button clicked. App window Restored.\n"); + TRACE("Valid button clicked. App window Restored.\n"); } SetForegroundWindow(TaskItem->hWnd); - DbgPrint("Valid button clicked. App window Activated.\n"); + TRACE("Valid button clicked. App window Activated.\n"); } } } Modified: branches/shell-experiments/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/tbsite.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/tbsite.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -152,7 +152,7 @@ else if (IsEqualIID(riid, &IID_IWinEventHandler)) { - DbgPrint("ITaskBandSite: IWinEventHandler queried!\n"); + TRACE("ITaskBandSite: IWinEventHandler queried!\n"); *ppvObj = NULL; return E_NOINTERFACE; } @@ -231,7 +231,7 @@ if (SUCCEEDED(hRet)) { /* Load the stream */ - DbgPrint("IBandSiteStreamCallback::OnLoad intercepted the task band CLSID!\n"); + TRACE("IBandSiteStreamCallback::OnLoad intercepted the task band CLSID!\n"); } return hRet; @@ -254,7 +254,7 @@ if (!SUCCEEDED(hRet)) { - DbgPrint("IBandSiteStreamCallback::OnLoad(0x%p, 0x%p, 0x%p) returns 0x%x\n", pStm, riid, pvObj, hRet); + TRACE("IBandSiteStreamCallback::OnLoad(0x%p, 0x%p, 0x%p) returns 0x%x\n", pStm, riid, pvObj, hRet); } return hRet; @@ -269,7 +269,7 @@ stream. We use it to intercept the default behavior when the task band is saved to the stream */ /* FIXME: Implement */ - DbgPrint("IBandSiteStreamCallback::OnSave(0x%p, 0x%p) returns E_NOTIMPL\n", pUnk, pStm); + TRACE("IBandSiteStreamCallback::OnSave(0x%p, 0x%p) returns E_NOTIMPL\n", pUnk, pStm); return E_NOTIMPL; } @@ -353,7 +353,7 @@ } } - //DbgPrint("ITrayBandSite::ProcessMessage: WM_NOTIFY for 0x%p, From: 0x%p, Code: NM_FIRST-%u...\n", hWnd, nmh->hwndFrom, NM_FIRST - nmh->code); + //TRACE("ITrayBandSite::ProcessMessage: WM_NOTIFY for 0x%p, From: 0x%p, Code: NM_FIRST-%u...\n", hWnd, nmh->hwndFrom, NM_FIRST - nmh->code); break; } }; @@ -362,7 +362,7 @@ shell behavior! */ if (This->WindowEventHandler != NULL) { - /*DbgPrint("Calling IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p) This->hWndRebar=0x%p\n", hWnd, uMsg, wParam, lParam, plResult, This->hWndRebar);*/ + /*TRACE("Calling IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p) This->hWndRebar=0x%p\n", hWnd, uMsg, wParam, lParam, plResult, This->hWndRebar);*/ hRet = IWinEventHandler_OnWinEvent(This->WindowEventHandler, hWnd, uMsg, @@ -374,11 +374,11 @@ if (uMsg == WM_NOTIFY) { const NMHDR *nmh = (const NMHDR *)lParam; - DbgPrint("ITrayBandSite->IWinEventHandler::ProcessMessage: WM_NOTIFY for 0x%p, From: 0x%p, Code: NM_FIRST-%u returned 0x%x\n", hWnd, nmh->hwndFrom, NM_FIRST - nmh->code, hRet); + TRACE("ITrayBandSite->IWinEventHandler::ProcessMessage: WM_NOTIFY for 0x%p, From: 0x%p, Code: NM_FIRST-%u returned 0x%x\n", hWnd, nmh->hwndFrom, NM_FIRST - nmh->code, hRet); } else { - DbgPrint("ITrayBandSite->IWinEventHandler::ProcessMessage(0x%p,0x%x,0x%p,0x%p,0x%p->0x%p) returned: 0x%x\n", hWnd, uMsg, wParam, lParam, plResult, *plResult, hRet); + TRACE("ITrayBandSite->IWinEventHandler::ProcessMessage(0x%p,0x%x,0x%p,0x%p,0x%p->0x%p) returned: 0x%x\n", hWnd, uMsg, wParam, lParam, plResult, *plResult, hRet); } } } @@ -409,7 +409,7 @@ CLSCTX_INPROC_SERVER, &IID_IShellService, (PVOID*)&pSs); - DbgPrint("CoCreateInstance(CLSID_IShellBandSiteMenu) for IShellService returned: 0x%x\n", hRet); + TRACE("CoCreateInstance(CLSID_IShellBandSiteMenu) for IShellService returned: 0x%x\n", hRet); if (!SUCCEEDED(hRet)) return hRet; @@ -810,7 +810,7 @@ { hRet = IPersistStream_Load(pPStm, pStm); - DbgPrint("IPersistStream_Load() returned 0x%x\n", hRet); + TRACE("IPersistStream_Load() returned 0x%x\n", hRet); IPersistStream_Release(pPStm); } @@ -872,7 +872,7 @@ hRet = ITrayBandSiteImpl_LoadFromStream(This, pStm); - DbgPrint("Loaded user bands settings: 0x%x\n", hRet); + TRACE("Loaded user bands settings: 0x%x\n", hRet); IStream_Release(pStm); } else @@ -889,7 +889,7 @@ hRet = ITrayBandSiteImpl_LoadFromStream(This, pStm); - DbgPrint("Loaded default user bands settings: 0x%x\n", hRet); + TRACE("Loaded default user bands settings: 0x%x\n", hRet); IStream_Release(pStm); } else Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -478,7 +478,7 @@ break; } default: - DbgPrint("NotifyMessage received with unknown code %d.\n", data->notify_code); + TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code); break; } SendMessage(parentHWND, Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -719,7 +719,7 @@ RECT rcTray; rcTray = This->rcTrayWnd[This->Position]; -// DbgPrint("CheckTray: %d: %d,%d,%d,%d\n", This->Position, rcTray.left, rcTray.top, rcTray.right, rcTray.bottom); +// TRACE("CheckTray: %d: %d,%d,%d,%d\n", This->Position, rcTray.left, rcTray.top, rcTray.right, rcTray.bottom); /* Move the tray window */ SetWindowPos(This->hWnd, @@ -850,7 +850,7 @@ &rcScreen, &This->TraySize, &This->rcTrayWnd[Pos]); -// DbgPrint("rcTrayWnd[%d(%d)]: %d,%d,%d,%d\n", Pos, This->Position, This->rcTrayWnd[Pos].left, This->rcTrayWnd[Pos].top, This->rcTrayWnd[Pos].right, This->rcTrayWnd[Pos].bottom); +// TRACE("rcTrayWnd[%d(%d)]: %d,%d,%d,%d\n", Pos, This->Position, This->rcTrayWnd[Pos].left, This->rcTrayWnd[Pos].top, This->rcTrayWnd[Pos].right, This->rcTrayWnd[Pos].bottom); } /* Determine which monitor we are on. It shouldn't matter which docked @@ -1914,7 +1914,7 @@ break; default: - DbgPrint("ITrayWindow::ExecContextMenuCmd(%u): Unhandled Command ID!\n", uiCmd); + TRACE("ITrayWindow::ExecContextMenuCmd(%u): Unhandled Command ID!\n", uiCmd); bHandled = FALSE; break; } @@ -2769,7 +2769,7 @@ CMF_NORMAL, &pcm))) { - DbgPrint("ITrayBandSite::AddContextMenus succeeded!\n"); + TRACE("ITrayBandSite::AddContextMenus succeeded!\n"); *(IContextMenu **)ppcmContext = pcm; } } @@ -2970,7 +2970,7 @@ ITrayWindowImpl *This = impl_from_IShellDesktopTray(iface); ITrayWindow *tray = ITrayWindow_from_impl(This); - DbgPrint("IShellDesktopTray::QueryInterface(0x%p, 0x%p)\n", riid, ppvObj); + TRACE("IShellDesktopTray::QueryInterface(0x%p, 0x%p)\n", riid, ppvObj); return ITrayWindowImpl_QueryInterface(tray, riid, ppvObj); @@ -2982,7 +2982,7 @@ ITrayWindowImpl *This = impl_from_IShellDesktopTray(iface); ITrayWindow *tray = ITrayWindow_from_impl(This); - DbgPrint("IShellDesktopTray::Release()\n"); + TRACE("IShellDesktopTray::Release()\n"); return ITrayWindowImpl_Release(tray); } @@ -2992,7 +2992,7 @@ ITrayWindowImpl *This = impl_from_IShellDesktopTray(iface); ITrayWindow *tray = ITrayWindow_from_impl(This); - DbgPrint("IShellDesktopTray::AddRef()\n"); + TRACE("IShellDesktopTray::AddRef()\n"); return ITrayWindowImpl_AddRef(tray); } @@ -3000,7 +3000,7 @@ ITrayWindowImpl_IShellDesktopTray_GetState(IN OUT IShellDesktopTray *iface) { /* FIXME: Return ABS_ flags? */ - DbgPrint("IShellDesktopTray::GetState() unimplemented!\n"); + TRACE("IShellDesktopTray::GetState() unimplemented!\n"); return 0; } @@ -3009,7 +3009,7 @@ OUT HWND *phWndTray) { ITrayWindowImpl *This = impl_from_IShellDesktopTray(iface); - DbgPrint("IShellDesktopTray::GetTrayWindow(0x%p)\n", phWndTray); + TRACE("IShellDesktopTray::GetTrayWindow(0x%p)\n", phWndTray); *phWndTray = This->hWnd; return S_OK; } @@ -3019,7 +3019,7 @@ IN HWND hWndDesktop) { ITrayWindowImpl *This = impl_from_IShellDesktopTray(iface); - DbgPrint("IShellDesktopTray::RegisterDesktopWindow(0x%p)\n", hWndDesktop); + TRACE("IShellDesktopTray::RegisterDesktopWindow(0x%p)\n", hWndDesktop); This->hWndDesktop = hWndDesktop; return S_OK; @@ -3030,7 +3030,7 @@ IN DWORD dwUnknown1, IN DWORD dwUnknown2) { - DbgPrint("IShellDesktopTray::Unknown(%u,%u) unimplemented!\n", dwUnknown1, dwUnknown2); + TRACE("IShellDesktopTray::Unknown(%u,%u) unimplemented!\n", dwUnknown1, dwUnknown2); return S_OK; } Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed Aug 20 16:19:00 2014 @@ -1080,7 +1080,7 @@ mii.cch = _countof(label); ::GetMenuItemInfoW(menubase, i, TRUE, &mii); - DbgPrint("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); + TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); mii.fType |= MFT_RADIOCHECK; @@ -1419,7 +1419,7 @@ mii.cch = _countof(label); ::GetMenuItemInfoW(menubase, i, TRUE, &mii); - DbgPrint("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); + TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); mii.fType |= MFT_RADIOCHECK; @@ -1452,7 +1452,7 @@ mii.cch = _countof(label); ::GetMenuItemInfoW(menubase, i, TRUE, &mii); - DbgPrint("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); + TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); mii.fType |= MFT_RADIOCHECK;

1 0

[dquintana] 63911: [SHELL32] * Unbreak context menus.
by dquintana＠svn.reactos.org 20 Aug '14

20 Aug '14

Author: dquintana Date: Wed Aug 20 15:39:13 2014 New Revision: 63911 URL: http://svn.reactos.org/svn/reactos?rev=63911&view=rev Log: [SHELL32] * Unbreak context menus. Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp 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] Wed Aug 20 15:39:13 2014 @@ -393,7 +393,7 @@ pEntry->iIdCmdFirst = 0; pEntry->pNext = NULL; pEntry->NumIds = 0; - pEntry->pCM = pcm; + pEntry->pCM = pcm.Detach(); memcpy(&pEntry->ClassID, pclsid, sizeof(CLSID)); if (m_pDynamicEntries)

1 0

[tfaber] 63910: [PSDK] - Fix __drv_functionClass dummy. By Alex Radocea
by tfaber＠svn.reactos.org 20 Aug '14

20 Aug '14

Author: tfaber Date: Wed Aug 20 13:23:11 2014 New Revision: 63910 URL: http://svn.reactos.org/svn/reactos?rev=63910&view=rev Log: [PSDK] - Fix __drv_functionClass dummy. By Alex Radocea Modified: trunk/reactos/include/psdk/driverspecs.h Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Wed Aug 20 13:23:11 2014 @@ -207,7 +207,7 @@ #define __drv_formatString(kind) #define __drv_freesMem(kind) #define __drv_fun(annotes) -#define __drv_functionClass +#define __drv_functionClass(x) #define __drv_holdsCancelSpinLock() #define __drv_holdsCriticalRegion() #define __drv_holdsPriorityRegion()

1 0

[dquintana] 63909: [SHELL32] * Another batch of interface pointers converted to CComPtr.
by dquintana＠svn.reactos.org 20 Aug '14

20 Aug '14

Author: dquintana Date: Wed Aug 20 12:25:09 2014 New Revision: 63909 URL: http://svn.reactos.org/svn/reactos?rev=63909&view=rev Log: [SHELL32] * Another batch of interface pointers converted to CComPtr. Modified: branches/shell-experiments/dll/win32/shell32/brsfolder.cpp branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/newmenu.cpp branches/shell-experiments/dll/win32/shell32/newmenu.h branches/shell-experiments/dll/win32/shell32/pidl.cpp branches/shell-experiments/dll/win32/shell32/shelllink.h branches/shell-experiments/dll/win32/shell32/shellord.cpp branches/shell-experiments/dll/win32/shell32/shlexec.cpp branches/shell-experiments/dll/win32/shell32/shlfolder.cpp branches/shell-experiments/dll/win32/shell32/shlmenu.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/brsfolder.cpp [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -177,8 +177,9 @@ LPITEMIDLIST pidlParent, pidlChild; HIMAGELIST hImageList; HRESULT hr; - IShellFolder *lpsfParent, *lpsfRoot; - IEnumIDList * pEnumChildren = NULL; + CComPtr<IShellFolder> lpsfParent; + CComPtr<IShellFolder> lpsfRoot; + CComPtr<IEnumIDList> pEnumChildren; HTREEITEM item; DWORD flags; LPCITEMIDLIST root = info->lpBrowseInfo->pidlRoot; @@ -232,12 +233,10 @@ hr = lpsfParent->BindToObject(pidlChild, 0, IID_PPV_ARG(IShellFolder, &lpsfRoot)); } else { lpsfRoot = lpsfParent; - hr = lpsfParent->AddRef(); } if (FAILED(hr)) { WARN("Could not bind to root shell folder! hr = %08x\n", hr); - lpsfParent->Release(); ILFree(pidlChild); ILFree(pidlParent); return; @@ -247,8 +246,6 @@ hr = lpsfRoot->EnumObjects(info->hWnd, flags, &pEnumChildren ); if (FAILED(hr)) { WARN("Could not get child iterator! hr = %08x\n", hr); - lpsfParent->Release(); - lpsfRoot->Release(); ILFree(pidlChild); ILFree(pidlParent); return; @@ -261,8 +258,6 @@ ILFree(pidlChild); ILFree(pidlParent); - lpsfRoot->Release(); - lpsfParent->Release(); } static int GetIcon(LPCITEMIDLIST lpi, UINT uFlags) @@ -366,6 +361,7 @@ tvi.lParam = (LPARAM)lptvid; lpsf->AddRef(); + pEnumIL->AddRef(); lptvid->lpsfParent = lpsf; lptvid->lpi = ILClone(pidl); lptvid->lpifq = pidlParent ? ILCombine(pidlParent, pidl) : ILClone(pidl); @@ -411,8 +407,8 @@ while (S_OK == lpe->Next(1,&pidlTemp,&ulFetched)) { ULONG ulAttrs = SFGAO_HASSUBFOLDER | SFGAO_FOLDER; - IEnumIDList* pEnumIL = NULL; - IShellFolder* pSFChild = NULL; + CComPtr<IEnumIDList> pEnumIL; + CComPtr<IShellFolder> pSFChild; lpsf->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlTemp, &ulAttrs); if (ulAttrs & SFGAO_FOLDER) { @@ -426,11 +422,9 @@ if ((pEnumIL->Skip(1) != S_OK) || FAILED(pEnumIL->Reset())) { - pEnumIL->Release(); pEnumIL = NULL; } } - pSFChild->Release(); } } @@ -508,7 +502,7 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv ) { - IShellFolder *lpsf2 = NULL; + CComPtr<IShellFolder> lpsf2; LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; HRESULT r; 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] Wed Aug 20 12:25:09 2014 @@ -308,7 +308,7 @@ STGMEDIUM medium; FORMATETC formatetc; - TRACE("pDataObj=%p\n", pDataObj); + TRACE("pDataObj=%p\n", pDataObj.p); /* Set the FORMATETC structure*/ InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); @@ -933,15 +933,13 @@ if (!lpSB) return E_FAIL; - IShellView * lpSV = NULL; + CComPtr<IShellView> lpSV; if (FAILED(lpSB->QueryActiveShellView(&lpSV))) return E_FAIL; HWND hwndSV = NULL; if (SUCCEEDED(lpSV->GetWindow(&hwndSV))) SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); - - lpSV->Release(); return S_OK; } 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] Wed Aug 20 12:25:09 2014 @@ -241,11 +241,11 @@ { static const WCHAR szFull[] = {'F','u','l','l',0}; static const WCHAR szEmpty[] = {'E','m','p','t','y',0}; - IEnumIDList *EnumIDList = NULL; + CComPtr<IEnumIDList> EnumIDList; CoInitialize(NULL); - IShellFolder2 *psfRecycleBin = NULL; - IShellFolder *psfDesktop = NULL; + CComPtr<IShellFolder2> psfRecycleBin; + CComPtr<IShellFolder> psfDesktop; hr = SHGetDesktopFolder(&psfDesktop); if (SUCCEEDED(hr)) @@ -262,13 +262,6 @@ } else { iconname = szEmpty; } - - if (psfDesktop) - psfDesktop->Release(); - if (psfRecycleBin) - psfRecycleBin->Release(); - if (EnumIDList) - EnumIDList->Release(); } if (HCR_GetIconW(xriid, wTemp, iconname, MAX_PATH, &icon_idx)) Modified: branches/shell-experiments/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/newmenu.cpp [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -544,12 +544,7 @@ HRESULT STDMETHODCALLTYPE CNewMenu::GetSite(REFIID riid, void **ppvSite) { - if (ppvSite == NULL) - return E_POINTER; - *ppvSite = m_pSite; - if (m_pSite != NULL) - m_pSite->AddRef(); - return S_OK; + return m_pSite->QueryInterface(riid, ppvSite); } HRESULT @@ -596,8 +591,8 @@ WINAPI CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - IShellBrowser *lpSB = NULL; - CComPtr<IShellView> lpSV = NULL; + CComPtr<IShellBrowser> lpSB; + CComPtr<IShellView> lpSV; HRESULT hr = E_FAIL; /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ Modified: branches/shell-experiments/dll/win32/shell32/newmenu.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/newmenu.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/newmenu.h [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -54,7 +54,7 @@ LPWSTR m_wszPath; SHELLNEW_ITEM *m_pItems; SHELLNEW_ITEM *m_pLinkItem; - IUnknown *m_pSite; + CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; HBITMAP m_hbmFolder, m_hbmLink; Modified: branches/shell-experiments/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -71,7 +71,7 @@ BOOL WINAPI ILGetDisplayNameExW(IShellFolder * psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) { CComPtr<IShellFolder> psfParent; - IShellFolder * lsf = psf; + CComPtr<IShellFolder> lsf = psf; HRESULT ret = NO_ERROR; LPCITEMIDLIST pidllast; STRRET strret; @@ -133,8 +133,6 @@ TRACE("%p %p %s\n", psf, pidl, debugstr_w(path)); - if (!psf) - lsf->Release(); return SUCCEEDED(ret); } Modified: branches/shell-experiments/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shelllink.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shelllink.h [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -76,7 +76,7 @@ BOOL bDirty; INT iIdOpen; /* id of the "Open" entry in the context menu */ CComPtr<IUnknown> site; - IDropTarget *mDropTarget; + CComPtr<IDropTarget> mDropTarget; public: CShellLink(); ~CShellLink(); Modified: branches/shell-experiments/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellord.cpp [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -2275,10 +2275,11 @@ /* Get the interface for the new image list */ if (hNew) { - IImageList *imageList = (IImageList*) hNew; + IImageList *imageList = reinterpret_cast<IImageList*>(hNew); ret = imageList->QueryInterface(riid, ppv); - ImageList_Destroy(hNew); + // Since we are not duplicating, destroying makes no sense. + /* ImageList_Destroy(hNew); */ } return ret; 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] Wed Aug 20 12:25:09 2014 @@ -1274,8 +1274,8 @@ static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) { LPCITEMIDLIST pidllast = NULL; - IDataObject *dataobj = NULL; - IShellFolder *shf = NULL; + CComPtr<IDataObject> dataobj; + CComPtr<IShellFolder> shf; LPITEMIDLIST pidl = NULL; HRESULT r; @@ -1303,15 +1303,13 @@ end: if (pidl != sei->lpIDList) ILFree(pidl); - if (shf) - shf->Release(); - return dataobj; + return dataobj.Detach(); } static HRESULT shellex_run_context_menu_default(IShellExtInit *obj, LPSHELLEXECUTEINFOW sei) { - IContextMenu *cm = NULL; + CComPtr<IContextMenu> cm = NULL; CMINVOKECOMMANDINFOEX ici; MENUITEMINFOW info; WCHAR string[0x80]; @@ -1374,13 +1372,12 @@ end: if (hmenu) DestroyMenu( hmenu ); - if (cm) - cm->Release(); return r; } static HRESULT shellex_load_object_and_run(HKEY hkey, LPCGUID guid, LPSHELLEXECUTEINFOW sei) { + // Can not use CComPtr here because of CoUninitialize at the end, before the destructors would run. IDataObject *dataobj = NULL; IObjectWithSite *ows = NULL; IShellExtInit *obj = NULL; Modified: branches/shell-experiments/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -204,7 +204,7 @@ LPCITEMIDLIST pidlChild, REFCLSID clsid, LPVOID * ppvOut) { HRESULT hr; - IShellFolder* pShellFolder = NULL; + CComPtr<IShellFolder> pShellFolder; TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); @@ -250,7 +250,7 @@ ILFree (pidlAbsolute); } - *ppvOut = pShellFolder; + *ppvOut = pShellFolder.Detach(); TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); @@ -490,12 +490,11 @@ CComPtr<IShellFolder> psf2; if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) { - IEnumIDList *pEnumIL = NULL; + CComPtr<IEnumIDList> pEnumIL; if (SUCCEEDED(psf2->EnumObjects(0, SHCONTF_FOLDERS, &pEnumIL))) { if (pEnumIL->Skip(1) != S_OK) *pdwAttributes &= ~SFGAO_HASSUBFOLDER; - pEnumIL->Release(); } } } Modified: branches/shell-experiments/dll/win32/shell32/shlmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlmenu.cpp [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -114,7 +114,9 @@ * */ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) -{ IShellFolder *lpsf, *lpsf2; +{ + CComPtr<IShellFolder> lpsf; + CComPtr<IShellFolder> lpsf2; ULONG ulItemAttr = SFGAO_FOLDER; UINT uID, uEnumFlags; LPFNFMCALLBACK lpfnCallback; @@ -129,23 +131,23 @@ MenuInfo.cbSize = sizeof(MENUINFO); MenuInfo.fMask = MIM_MENUDATA; - if (! GetMenuInfo(hmenu, &MenuInfo)) - return FALSE; - - menudata = (LPFMINFO)MenuInfo.dwMenuData; + if (!GetMenuInfo(hmenu, &MenuInfo)) + return FALSE; + + menudata = (LPFMINFO) MenuInfo.dwMenuData; if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); - return 0; + ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); + return 0; } if (menudata->bInitialized) - return 0; - - pidl = (pAlternatePidl? pAlternatePidl: menudata->pidl); + return 0; + + pidl = (pAlternatePidl ? pAlternatePidl : menudata->pidl); if (!pidl) - return 0; + return 0; uID = menudata->uID; uEnumFlags = menudata->uEnumFlags; @@ -154,73 +156,70 @@ SetMenuInfo(hmenu, &MenuInfo); - if (SUCCEEDED (SHGetDesktopFolder(&lpsf))) - { - if (SUCCEEDED(lpsf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &lpsf2)))) - { - IEnumIDList *lpe = NULL; - - if (SUCCEEDED (lpsf2->EnumObjects(0, uEnumFlags, &lpe ))) + if (SUCCEEDED(SHGetDesktopFolder(&lpsf))) + { + if (SUCCEEDED(lpsf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &lpsf2)))) { - - LPITEMIDLIST pidlTemp = NULL; - ULONG ulFetched; - - while ((!bAbortInit) && (S_OK == lpe->Next(1,&pidlTemp,&ulFetched))) - { - if (SUCCEEDED (lpsf->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlTemp, &ulItemAttr))) - { - ILGetDisplayNameExW(NULL, pidlTemp, sTemp, ILGDN_FORPARSING); - if (! (PidlToSicIndex(lpsf, pidlTemp, FALSE, 0, &iIcon))) - iIcon = FM_BLANK_ICON; - if ( SFGAO_FOLDER & ulItemAttr) - { - LPFMINFO lpFmMi; - MENUINFO MenuInfo; - HMENU hMenuPopup = CreatePopupMenu(); - - lpFmMi = (LPFMINFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); - - lpFmMi->pidl = ILCombine(pidl, pidlTemp); - lpFmMi->uEnumFlags = SHCONTF_FOLDERS | SHCONTF_NONFOLDERS; - - MenuInfo.cbSize = sizeof(MENUINFO); - MenuInfo.fMask = MIM_MENUDATA; - MenuInfo.dwMenuData = (ULONG_PTR) lpFmMi; - SetMenuInfo (hMenuPopup, &MenuInfo); - - FileMenu_AppendItemW (hmenu, sTemp, uID, iIcon, hMenuPopup, FM_DEFAULT_HEIGHT); - } - else - { - LPWSTR pExt = PathFindExtensionW(sTemp); - if (pExt) - *pExt = 0; - FileMenu_AppendItemW (hmenu, sTemp, uID, iIcon, 0, FM_DEFAULT_HEIGHT); - } + CComPtr<IEnumIDList> lpe; + + if (SUCCEEDED(lpsf2->EnumObjects(0, uEnumFlags, &lpe))) + { + + LPITEMIDLIST pidlTemp = NULL; + ULONG ulFetched; + + while ((!bAbortInit) && (S_OK == lpe->Next(1, &pidlTemp, &ulFetched))) + { + if (SUCCEEDED(lpsf->GetAttributesOf(1, (LPCITEMIDLIST*) &pidlTemp, &ulItemAttr))) + { + ILGetDisplayNameExW(NULL, pidlTemp, sTemp, ILGDN_FORPARSING); + if (!(PidlToSicIndex(lpsf, pidlTemp, FALSE, 0, &iIcon))) + iIcon = FM_BLANK_ICON; + if (SFGAO_FOLDER & ulItemAttr) + { + LPFMINFO lpFmMi; + MENUINFO MenuInfo; + HMENU hMenuPopup = CreatePopupMenu(); + + lpFmMi = (LPFMINFO) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); + + lpFmMi->pidl = ILCombine(pidl, pidlTemp); + lpFmMi->uEnumFlags = SHCONTF_FOLDERS | SHCONTF_NONFOLDERS; + + MenuInfo.cbSize = sizeof(MENUINFO); + MenuInfo.fMask = MIM_MENUDATA; + MenuInfo.dwMenuData = (ULONG_PTR) lpFmMi; + SetMenuInfo(hMenuPopup, &MenuInfo); + + FileMenu_AppendItemW(hmenu, sTemp, uID, iIcon, hMenuPopup, FM_DEFAULT_HEIGHT); + } + else + { + LPWSTR pExt = PathFindExtensionW(sTemp); + if (pExt) + *pExt = 0; + FileMenu_AppendItemW(hmenu, sTemp, uID, iIcon, 0, FM_DEFAULT_HEIGHT); + } + } + + if (lpfnCallback) + { + TRACE("enter callback\n"); + lpfnCallback(pidl, pidlTemp); + TRACE("leave callback\n"); + } + + NumberOfItems++; + } + } } - - if (lpfnCallback) - { - TRACE("enter callback\n"); - lpfnCallback ( pidl, pidlTemp); - TRACE("leave callback\n"); - } - + } + + if (GetMenuItemCount(hmenu) == 0) + { + static const WCHAR szEmpty [] = { '(', 'e', 'm', 'p', 't', 'y', ')', 0 }; + FileMenu_AppendItemW(hmenu, szEmpty, uID, FM_BLANK_ICON, 0, FM_DEFAULT_HEIGHT); NumberOfItems++; - } - lpe->Release(); - } - lpsf2->Release(); - } - lpsf->Release(); - } - - if ( GetMenuItemCount (hmenu) == 0 ) - { - static const WCHAR szEmpty[] = { '(','e','m','p','t','y',')',0 }; - FileMenu_AppendItemW (hmenu, szEmpty, uID, FM_BLANK_ICON, 0, FM_DEFAULT_HEIGHT); - NumberOfItems++; } menudata->bInitialized = TRUE; @@ -228,6 +227,7 @@ return NumberOfItems; } + /************************************************************************* * FileMenu_Create [SHELL32.114] * Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed Aug 20 12:25:09 2014 @@ -1761,7 +1761,7 @@ if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_NULL_PPV_ARG(IDataObject, &pda)))) { - IDropSource * pds = (IDropSource *)this; /* own DropSource interface */ + CComPtr<IDropSource> pds = static_cast<IDropSource *>(this); /* own DropSource interface */ if (SUCCEEDED(m_pSFParent->GetAttributesOf(m_cidl, (LPCITEMIDLIST*)m_apidl, &dwAttributes))) {

1 0

[dquintana] 63908: [SHELL32] * Stop using the C defines LPSHELLFOLDER, LPSHELLVIEW and LPUNKNOWN, and use the respective C++ interfaces instead. * Change one batch of COM interface pointers into CC...
by dquintana＠svn.reactos.org 20 Aug '14

20 Aug '14

Author: dquintana Date: Wed Aug 20 00:39:40 2014 New Revision: 63908 URL: http://svn.reactos.org/svn/reactos?rev=63908&view=rev Log: [SHELL32] * Stop using the C defines LPSHELLFOLDER, LPSHELLVIEW and LPUNKNOWN, and use the respective C++ interfaces instead. * Change one batch of COM interface pointers into CComPtr-based pointers, and remove associated Release calls (including at least one that was not supposed to be there at all). * Remove a couple (repeated multiple times) pointless casts. Modified: branches/shell-experiments/dll/win32/shell32/CMenuDeskBar.cpp branches/shell-experiments/dll/win32/shell32/brsfolder.cpp branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/desktop.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/cpanel.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/printers.cpp branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp branches/shell-experiments/dll/win32/shell32/pidl.cpp branches/shell-experiments/dll/win32/shell32/shellitem.cpp branches/shell-experiments/dll/win32/shell32/shelllink.cpp branches/shell-experiments/dll/win32/shell32/shellole.cpp branches/shell-experiments/dll/win32/shell32/shellord.cpp branches/shell-experiments/dll/win32/shell32/shlexec.cpp branches/shell-experiments/dll/win32/shell32/shlfolder.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/dll/win32/shell32/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -116,7 +116,7 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(THIS_ LPUNKNOWN lpUnknown, BOOL bFocus) +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(THIS_ IUnknown * lpUnknown, BOOL bFocus) { return S_OK; } Modified: branches/shell-experiments/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/brsfolder.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -46,7 +46,7 @@ typedef struct tagTV_ITEMDATA { - LPSHELLFOLDER lpsfParent; /* IShellFolder of the parent */ + IShellFolder* lpsfParent; /* IShellFolder of the parent */ LPITEMIDLIST lpi; /* PIDL relative to parent */ LPITEMIDLIST lpifq; /* Fully qualified PIDL */ IEnumIDList* pEnumIL; /* Children iterator */ @@ -81,9 +81,9 @@ BIF_NEWDIALOGSTYLE | \ BIF_BROWSEINCLUDEFILES) -static void FillTreeView(browse_info*, LPSHELLFOLDER, +static void FillTreeView(browse_info*, IShellFolder*, LPITEMIDLIST, HTREEITEM, IEnumIDList*); -static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder *, +static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder*, LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM); static const WCHAR szBrowseFolderInfo[] = L"__WINE_BRSFOLDERDLG_INFO"; @@ -206,10 +206,11 @@ ILRemoveLastID(pidlParent); pidlChild = ILClone(ILFindLastID(root)); - if (_ILIsDesktop(pidlParent)) { + if (_ILIsDesktop(pidlParent)) + { hr = SHGetDesktopFolder(&lpsfParent); } else { - IShellFolder *lpsfDesktop; + CComPtr<IShellFolder> lpsfDesktop; hr = SHGetDesktopFolder(&lpsfDesktop); if (FAILED(hr)) { WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); @@ -218,7 +219,6 @@ return; } hr = lpsfDesktop->BindToObject(pidlParent, 0, IID_PPV_ARG(IShellFolder, &lpsfParent)); - lpsfDesktop->Release(); } if (FAILED(hr)) { @@ -310,7 +310,7 @@ * Success: TRUE * Failure: FALSE */ -static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR lpFriendlyName) +static BOOL GetName(IShellFolder * lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR lpFriendlyName) { BOOL bSuccess=TRUE; STRRET str; @@ -714,8 +714,9 @@ static HRESULT BrsFolder_NewFolder(browse_info *info) { DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); - IShellFolder *desktop, *cur; - ISFHelper *sfhelper; + CComPtr<IShellFolder> desktop; + CComPtr<IShellFolder> cur; + CComPtr<ISFHelper> sfhelper; WCHAR name[MAX_PATH]; HTREEITEM parent, added; LPTV_ITEMDATA item_data; @@ -734,7 +735,6 @@ if(FAILED(hr)) return hr; hr = desktop->BindToObject(info->pidlRet, 0, IID_PPV_ARG(IShellFolder, &cur)); - desktop->Release(); if(FAILED(hr)) return hr; @@ -750,7 +750,6 @@ if(len<MAX_PATH) name[len++] = '\\'; hr = sfhelper->GetUniqueName(&name[len], MAX_PATH-len); - sfhelper->Release(); if(FAILED(hr)) goto cleanup; @@ -792,7 +791,6 @@ goto cleanup; added = InsertTreeViewItem(info, cur, new_item, item_data->lpifq, NULL, parent); - cur->Release(); SHFree(new_item); SendMessageW(info->hwndTreeView, TVM_SORTCHILDREN, FALSE, (LPARAM)parent); @@ -842,7 +840,7 @@ /* If 'selection' is a string, convert to a Shell ID List. */ if (is_str) { - IShellFolder *psfDesktop; + CComPtr<IShellFolder> psfDesktop; HRESULT hr; hr = SHGetDesktopFolder(&psfDesktop); @@ -851,7 +849,6 @@ hr = psfDesktop->ParseDisplayName(NULL, NULL, (LPOLESTR)selection, NULL, &pidlSelection, NULL); - psfDesktop->Release(); if (FAILED(hr)) goto done; } 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] Wed Aug 20 00:39:40 2014 @@ -37,10 +37,10 @@ public IContextMenu2 { private: - IShellFolder *m_psf; + CComPtr<IShellFolder> m_psf; UINT m_cidl; PCUITEMID_CHILD_ARRAY m_apidl; - IDataObject *m_pDataObj; + CComPtr<IDataObject> m_pDataObj; PIDLIST_ABSOLUTE m_pidlFolder; DWORD m_bGroupPolicyActive; PDynamicShellEntry m_pDynamicEntries; /* first dynamic shell extension entry */ @@ -135,16 +135,12 @@ if (m_pidlFolder) CoTaskMemFree(m_pidlFolder); - if (m_pDataObj) - m_pDataObj->Release(); _ILFreeaPidl(const_cast<PITEMID_CHILD *>(m_apidl), m_cidl); - if (m_psf) - m_psf->Release(); } HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm) { - IDataObject *pDataObj; + CComPtr<IDataObject> pDataObj; TRACE("cidl %u\n", pdcm->cidl); @@ -153,7 +149,6 @@ if (m_cidl && !m_apidl) return E_OUTOFMEMORY; m_psf = pdcm->psf; - m_psf->AddRef(); if (SUCCEEDED(SHCreateDataObject(pdcm->pidlFolder, pdcm->cidl, pdcm->apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) m_pDataObj = pDataObj; @@ -164,12 +159,11 @@ } else { - IPersistFolder2 *pf = NULL; + CComPtr<IPersistFolder2> pf = NULL; if (SUCCEEDED(m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) { if (FAILED(pf->GetCurFolder(reinterpret_cast<LPITEMIDLIST*>(&m_pidlFolder)))) ERR("GetCurFolder failed\n"); - pf->Release(); } TRACE("pidlFolder %p\n", m_pidlFolder); } @@ -307,7 +301,7 @@ HasClipboardData() { BOOL bRet = FALSE; - IDataObject *pDataObj; + CComPtr<IDataObject> pDataObj; if(SUCCEEDED(OleGetClipboard(&pDataObj))) { @@ -323,8 +317,6 @@ bRet = TRUE; ReleaseStgMedium(&medium); } - - pDataObj->Release(); } return bRet; @@ -369,7 +361,7 @@ if (IsShellExtensionAlreadyLoaded(pclsid)) return S_OK; - IContextMenu *pcm; + CComPtr<IContextMenu> pcm; hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IContextMenu, &pcm)); if (hr != S_OK) { @@ -377,28 +369,24 @@ return hr; } - IShellExtInit *pExtInit; + CComPtr<IShellExtInit> pExtInit; hr = pcm->QueryInterface(IID_PPV_ARG(IShellExtInit, &pExtInit)); if (hr != S_OK) { ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); - pcm->Release(); return hr; } hr = pExtInit->Initialize(m_pidlFolder, m_pDataObj, hKey); - pExtInit->Release(); if (hr != S_OK) { TRACE("Failed to initialize shell extension error %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); - pcm->Release(); return hr; } PDynamicShellEntry pEntry = (DynamicShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(DynamicShellEntry)); if (!pEntry) { - pcm->Release(); return E_OUTOFMEMORY; } @@ -945,7 +933,7 @@ if (!lpSB) return E_FAIL; - LPSHELLVIEW lpSV = NULL; + IShellView * lpSV = NULL; if (FAILED(lpSB->QueryActiveShellView(&lpSV))) return E_FAIL; @@ -1060,7 +1048,7 @@ dwKey = MK_CONTROL|MK_SHIFT; } - IDropTarget *pdrop; + CComPtr<IDropTarget> pdrop; hr = psfTarget->QueryInterface(IID_PPV_ARG(IDropTarget, &pdrop)); if (FAILED(hr)) { @@ -1086,8 +1074,8 @@ CDefaultContextMenu::DoCreateLink( LPCMINVOKECOMMANDINFO lpcmi) { - LPDATAOBJECT pDataObj; - IDropTarget *pDT; + CComPtr<IDataObject> pDataObj; + CComPtr<IDropTarget> pDT; HRESULT hr; CComPtr<IPersistFolder2> ppf2 = NULL; LPITEMIDLIST pidl; @@ -1143,13 +1131,11 @@ HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) { TRACE("(%p) Deleting\n", this); - LPDATAOBJECT pDataObj; + CComPtr<IDataObject> pDataObj; if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) { - pDataObj->AddRef(); SHCreateThread(DoDeleteThreadProc, pDataObj, NULL, NULL); - pDataObj->Release(); } else return E_FAIL; @@ -1162,7 +1148,7 @@ LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy) { - LPDATAOBJECT pDataObj; + CComPtr<IDataObject> pDataObj; HRESULT hr; if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) @@ -1181,7 +1167,6 @@ } hr = OleSetClipboard(pDataObj); - pDataObj->Release(); return hr; } @@ -1193,7 +1178,7 @@ return E_FAIL; } - LPSHELLVIEW lpSV; + CComPtr<IShellView> lpSV; hr = lpSB->QueryActiveShellView(&lpSV); if (FAILED(hr)) { @@ -1211,7 +1196,6 @@ } else ERR("failed to get item object\n"); - lpSV->Release(); return hr; } @@ -1236,7 +1220,7 @@ (void)TreeView_EditLabel(hwnd, hItem); } - LPSHELLVIEW lpSV; + CComPtr<IShellView> lpSV; HRESULT hr = lpSB->QueryActiveShellView(&lpSV); if (FAILED(hr)) { @@ -1244,9 +1228,8 @@ return hr; } - lpSV->SelectItem(m_apidl[0], - SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); - lpSV->Release(); + SVSIF selFlags = SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; + lpSV->SelectItem(m_apidl[0], selFlags); return S_OK; } @@ -1259,13 +1242,12 @@ if (!pidlParent) { - IPersistFolder2 *pf; + CComPtr<IPersistFolder2> pf; /* pidlFolder is optional */ if (SUCCEEDED(m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) { pf->GetCurFolder((_ITEMIDLIST**)&pidlParent); - pf->Release(); } } Modified: branches/shell-experiments/dll/win32/shell32/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/desktop.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -45,7 +45,7 @@ HWND hWndDesktopListView; CComPtr<IShellDesktopTray> ShellDesk; CComPtr<IShellView> DesktopView; - IShellBrowser *DefaultShellBrowser; + CComPtr<IShellBrowser> DefaultShellBrowser; LPITEMIDLIST pidlDesktopDirectory; LPITEMIDLIST pidlDesktop; public: @@ -159,7 +159,7 @@ static CDesktopBrowser *SHDESK_Create(HWND hWnd, LPCREATESTRUCT lpCreateStruct) { - IShellDesktopTray *ShellDesk; + CComPtr<IShellDesktopTray> ShellDesk; CComObject<CDesktopBrowser> *pThis; HRESULT hRet; 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] Wed Aug 20 00:39:40 2014 @@ -96,7 +96,6 @@ WCHAR szName[MAX_PATH]; WCHAR szValue[100]; CLSID clsid; - IShellIconOverlayIdentifier * Overlay; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers", 0, KEY_READ, &hKey) != ERROR_SUCCESS) return; @@ -131,12 +130,13 @@ dwSize = sizeof(szValue) / sizeof(WCHAR); if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szValue, &dwSize) == ERROR_SUCCESS) { + CComPtr<IShellIconOverlayIdentifier> Overlay; CLSIDFromString(szValue, &clsid); dwResult = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellIconOverlayIdentifier, &Overlay)); if (dwResult == S_OK) { - Handlers[NumIconOverlayHandlers] = Overlay; + Handlers[NumIconOverlayHandlers] = Overlay.Detach(); NumIconOverlayHandlers++; } } @@ -200,7 +200,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) { CComPtr<IDefaultExtractIconInit> initIcon; - IExtractIconW *extractIcon; + CComPtr<IExtractIconW> extractIcon; GUID const * riid; int icon_idx; UINT flags; @@ -418,7 +418,7 @@ initIcon->SetNormalIcon(wTemp, icon_idx); } - return extractIcon; + return extractIcon.Detach(); } /************************************************************************** @@ -426,8 +426,8 @@ */ IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) { - IExtractIconW *extractIconW; - IExtractIconA *extractIconA; + CComPtr<IExtractIconW> extractIconW; + CComPtr<IExtractIconA> extractIconA; HRESULT hr; extractIconW = IExtractIconW_Constructor(pidl); @@ -435,8 +435,7 @@ return NULL; hr = extractIconW->QueryInterface(IID_PPV_ARG(IExtractIconA, &extractIconA)); - extractIconW->Release(); if (FAILED(hr)) return NULL; - return extractIconA; + return extractIconA.Detach(); } 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] Wed Aug 20 00:39:40 2014 @@ -316,14 +316,14 @@ else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + pObj = IExtractIconA_Constructor (pidl); SHFree (pidl); hr = S_OK; } else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + pObj = IExtractIconW_Constructor (pidl); SHFree (pidl); hr = S_OK; } Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -547,12 +547,12 @@ hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else if (IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine(pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor(pidl); + pObj = IExtractIconA_Constructor(pidl); SHFree(pidl); hr = S_OK; } else if (IsEqualIID(riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine(pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor(pidl); + pObj = IExtractIconW_Constructor(pidl); SHFree(pidl); hr = S_OK; } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) 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] Wed Aug 20 00:39:40 2014 @@ -637,14 +637,14 @@ else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + pObj = IExtractIconA_Constructor (pidl); SHFree (pidl); hr = S_OK; } else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + pObj = IExtractIconW_Constructor (pidl); SHFree (pidl); hr = S_OK; } @@ -1476,7 +1476,7 @@ if (SUCCEEDED(hr)) { - IDropTarget *pDT; + CComPtr<IDropTarget> pDT; hr = this->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &pDT)); CoTaskMemFree(pidl); if (SUCCEEDED(hr)) @@ -1517,13 +1517,12 @@ if (SUCCEEDED(hr)) { - IShellFolder *psf; + CComPtr<IShellFolder> psf; hr = this->BindToObject(pidlNext, NULL, IID_PPV_ARG(IShellFolder, &psf)); CoTaskMemFree(pidlNext); if (SUCCEEDED(hr)) { hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_IDropTarget, NULL, ppvOut); - psf->Release(); if (FAILED(hr)) ERR("FS GetUIObjectOf failed: %x\n", 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] Wed Aug 20 00:39:40 2014 @@ -409,14 +409,14 @@ else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + pObj = IExtractIconA_Constructor (pidl); SHFree (pidl); hr = S_OK; } else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + pObj = IExtractIconW_Constructor (pidl); SHFree (pidl); hr = S_OK; } 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] Wed Aug 20 00:39:40 2014 @@ -350,7 +350,7 @@ HRESULT WINAPI CFSFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID * ppvOut) { - LPSHELLVIEW pShellView; + CComPtr<IShellView> pShellView; HRESULT hr = E_INVALIDARG; TRACE ("(%p)->(hwnd=%p,%s,%p)\n", this, hwndOwner, shdebugstr_guid (&riid), @@ -373,7 +373,6 @@ if (pShellView) { hr = pShellView->QueryInterface(riid, ppvOut); - pShellView->Release(); } } } @@ -494,14 +493,14 @@ else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + pObj = IExtractIconA_Constructor (pidl); SHFree (pidl); hr = S_OK; } else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + pObj = IExtractIconW_Constructor (pidl); SHFree (pidl); hr = S_OK; } @@ -862,7 +861,7 @@ HRESULT WINAPI CFSFolder::GetUniqueName(LPWSTR pwszName, UINT uLen) { - IEnumIDList *penum; + CComPtr<IEnumIDList> penum; HRESULT hr; WCHAR wszText[MAX_PATH]; WCHAR wszNewFolder[25]; @@ -900,8 +899,6 @@ goto next; } } - - penum->Release(); } return hr; } @@ -1749,8 +1746,8 @@ DWORD WINAPI CFSFolder::_DoDropThreadProc(LPVOID lpParameter) { CoInitialize(NULL); _DoDropData *data = static_cast<_DoDropData*>(lpParameter); - IDataObject *pDataObject; - HRESULT hr = CoGetInterfaceAndReleaseStream (data->pStream, IID_IDataObject, (void**) &pDataObject); + CComPtr<IDataObject> pDataObject; + HRESULT hr = CoGetInterfaceAndReleaseStream (data->pStream, IID_PPV_ARG(IDataObject, &pDataObject)); if (SUCCEEDED(hr)) { @@ -1760,7 +1757,6 @@ { pAsyncOperation->EndOperation(hr, NULL, data->pdwEffect); } - pDataObject->Release(); } //Release the CFSFolder and data object holds in the copying thread. data->This->Release(); @@ -1861,7 +1857,7 @@ TRACE("CFSFolder::_LoadDynamicDropTargetHandler entered\n"); HRESULT hr; - IPersistFile *pp; + CComPtr<IPersistFile> pp; hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IPersistFile, &pp)); if (hr != S_OK) { @@ -1875,6 +1871,5 @@ ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); return hr; } - pp->Release(); return hr; } 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] Wed Aug 20 00:39:40 2014 @@ -326,7 +326,7 @@ */ HRESULT WINAPI CDrivesFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID * ppvOut) { - LPSHELLVIEW pShellView; + CComPtr<IShellView> pShellView; HRESULT hr = E_INVALIDARG; TRACE("(%p)->(hwnd=%p,%s,%p)\n", this, @@ -353,7 +353,6 @@ if (pShellView) { hr = pShellView->QueryInterface(riid, ppvOut); - pShellView->Release(); } } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut); @@ -449,14 +448,14 @@ else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + pObj = IExtractIconA_Constructor (pidl); SHFree (pidl); hr = S_OK; } else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + pObj = IExtractIconW_Constructor (pidl); SHFree (pidl); hr = S_OK; } 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] Wed Aug 20 00:39:40 2014 @@ -283,7 +283,7 @@ */ HRESULT WINAPI CMyDocsFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) { - LPSHELLVIEW pShellView; + CComPtr<IShellView> pShellView; HRESULT hr = E_INVALIDARG; TRACE ("(%p)->(hwnd=%p,%s,%p)\n", @@ -309,7 +309,6 @@ if (pShellView) { hr = pShellView->QueryInterface(riid, ppvOut); - pShellView->Release(); } } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut); @@ -401,14 +400,14 @@ else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + pObj = IExtractIconA_Constructor (pidl); SHFree (pidl); hr = S_OK; } else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + pObj = IExtractIconW_Constructor (pidl); SHFree (pidl); hr = S_OK; } 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] Wed Aug 20 00:39:40 2014 @@ -140,7 +140,7 @@ */ HRESULT WINAPI CNetFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) { - LPSHELLVIEW pShellView; + CComPtr<IShellView> pShellView; HRESULT hr = E_INVALIDARG; TRACE("(%p)->(hwnd=%p,%s,%p)\n", this, @@ -167,7 +167,6 @@ if (pShellView) { hr = pShellView->QueryInterface(riid, ppvOut); - pShellView->Release(); } } TRACE("-- (%p)->(interface=%p)\n", this, ppvOut); @@ -257,14 +256,14 @@ else if (IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + pObj = IExtractIconA_Constructor (pidl); SHFree (pidl); hr = S_OK; } else if (IsEqualIID(riid, IID_IExtractIconW) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + pObj = IExtractIconW_Constructor (pidl); SHFree (pidl); hr = S_OK; } Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -448,7 +448,7 @@ */ HRESULT WINAPI CPrinterFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID * ppvOut) { - LPSHELLVIEW pShellView; + CComPtr<IShellView> pShellView; HRESULT hr = E_INVALIDARG; TRACE("(%p)->(hwnd=%p,%s,%p)\n", this, 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] Wed Aug 20 00:39:40 2014 @@ -560,7 +560,7 @@ HRESULT WINAPI CRecycleBin::CreateViewObject(HWND hwndOwner, REFIID riid, void **ppv) { - LPSHELLVIEW pShellView; + CComPtr<IShellView> pShellView; HRESULT hr = E_NOINTERFACE; TRACE("(%p, %p, %s, %p)\n", this, hwndOwner, debugstr_guid(&riid), ppv); @@ -584,7 +584,6 @@ if (pShellView) { hr = pShellView->QueryInterface(riid, ppv); - pShellView->Release(); } } else @@ -855,7 +854,7 @@ { HRESULT hr; LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV = NULL; + IShellView * lpSV = NULL; TRACE("%p %p verb %p\n", this, lpcmi, lpcmi->lpVerb); Modified: branches/shell-experiments/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -51,7 +51,7 @@ * RETURNS * True if the display name could be retrieved successfully, False otherwise */ -static BOOL ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) +static BOOL ILGetDisplayNameExA(IShellFolder * psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) { BOOL ret = FALSE; WCHAR wPath[MAX_PATH]; @@ -68,10 +68,10 @@ return ret; } -BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) +BOOL WINAPI ILGetDisplayNameExW(IShellFolder * psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) { CComPtr<IShellFolder> psfParent; - LPSHELLFOLDER lsf = psf; + IShellFolder * lsf = psf; HRESULT ret = NO_ERROR; LPCITEMIDLIST pidllast; STRRET strret; @@ -141,7 +141,7 @@ /************************************************************************* * ILGetDisplayNameEx [SHELL32.186] */ -BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) +BOOL WINAPI ILGetDisplayNameEx(IShellFolder * psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) { TRACE_(shell)("%p %p %p %d\n", psf, pidl, path, type); @@ -681,7 +681,7 @@ * * NOTES */ -HRESULT WINAPI SHGetRealIDL(LPSHELLFOLDER lpsf, LPCITEMIDLIST pidlSimple, LPITEMIDLIST *pidlReal) +HRESULT WINAPI SHGetRealIDL(IShellFolder * lpsf, LPCITEMIDLIST pidlSimple, LPITEMIDLIST *pidlReal) { CComPtr<IDataObject> pDataObj; HRESULT hr; @@ -1063,7 +1063,7 @@ * the pidl can be a simple one. since we can't get the path out of the pidl * we have to take all data from the pidl */ -HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, +HRESULT WINAPI SHGetDataFromIDListA(IShellFolder * psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len) { LPSTR filename, shortname; @@ -1121,7 +1121,7 @@ * SHGetDataFromIDListW [SHELL32.248] * */ -HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, +HRESULT WINAPI SHGetDataFromIDListW(IShellFolder * psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len) { LPSTR filename, shortname; Modified: branches/shell-experiments/dll/win32/shell32/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellitem.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellitem.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -244,7 +244,7 @@ IShellFolder *psfParent, LPCITEMIDLIST pidl, IShellItem **ppsi) { HRESULT hr; - IShellItem *newShellItem; + CComPtr<IShellItem> newShellItem; LPITEMIDLIST new_pidl; CComPtr<IPersistIDList> newPersistIDList; @@ -308,6 +308,8 @@ return hr; } ILFree(new_pidl); - *ppsi = newShellItem; - return hr; -} + + *ppsi = newShellItem.Detach(); + + return hr; +} Modified: branches/shell-experiments/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shelllink.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -2173,7 +2173,7 @@ { TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); LPCITEMIDLIST pidlLast; - IShellFolder *psf; + CComPtr<IShellFolder> psf; HRESULT hr = SHBindToParent(pPidl, IID_PPV_ARG(IShellFolder, &psf), &pidlLast); @@ -2185,8 +2185,6 @@ hr = mDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect); else *pdwEffect = DROPEFFECT_NONE; - - psf->Release(); } else *pdwEffect = DROPEFFECT_NONE; 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] Wed Aug 20 00:39:40 2014 @@ -68,7 +68,7 @@ HRESULT WINAPI SHCoCreateInstance( LPCWSTR aclsid, const CLSID *clsid, - LPUNKNOWN pUnkOuter, + IUnknown * pUnkOuter, REFIID refiid, LPVOID *ppv) { @@ -314,7 +314,7 @@ HRESULT Initialize(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, const IID *riidInstx); // IClassFactory - virtual HRESULT WINAPI CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject); + virtual HRESULT WINAPI CreateInstance(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppvObject); virtual HRESULT WINAPI LockServer(BOOL fLock); BEGIN_COM_MAP(IDefClFImpl) @@ -346,7 +346,7 @@ /****************************************************************************** * IDefClF_fnCreateInstance */ -HRESULT WINAPI IDefClFImpl::CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) +HRESULT WINAPI IDefClFImpl::CreateInstance(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppvObject) { TRACE("%p->(%p,%s,%p)\n", this, pUnkOuter, shdebugstr_guid(&riid), ppvObject); Modified: branches/shell-experiments/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellord.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -484,13 +484,13 @@ */ HRESULT WINAPI SHDoDragDrop( HWND hWnd, - LPDATAOBJECT lpDataObject, + IDataObject * lpDataObject, LPDROPSOURCE lpDropSource, DWORD dwOKEffect, LPDWORD pdwEffect) { FIXME("(%p %p %p 0x%08x %p):stub.\n", - hWnd, lpDataObject, lpDropSource, dwOKEffect, pdwEffect); + hWnd, lpDataObject, lpDropSource, dwOKEffect, pdwEffect); return DoDragDrop(lpDataObject, lpDropSource, dwOKEffect, pdwEffect); } @@ -1015,7 +1015,7 @@ LPCSFV psvcbi, /* [in] shelltemplate struct */ IShellView **ppv) /* [out] IShellView pointer */ { - IShellView *psf; + CComPtr<IShellView> psf; HRESULT hRes; TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=%p\n", @@ -1028,7 +1028,6 @@ return hRes; hRes = psf->QueryInterface(IID_PPV_ARG(IShellView, ppv)); - psf->Release(); return hRes; } @@ -1050,14 +1049,14 @@ return 0; } -static LPUNKNOWN SHELL32_IExplorerInterface=0; +static IUnknown * SHELL32_IExplorerInterface=0; /************************************************************************* * SHSetInstanceExplorer [SHELL32.176] * * NOTES * Sets the interface */ -VOID WINAPI SHSetInstanceExplorer (LPUNKNOWN lpUnknown) +VOID WINAPI SHSetInstanceExplorer (IUnknown * lpUnknown) { TRACE("%p\n", lpUnknown); SHELL32_IExplorerInterface = lpUnknown; } @@ -1897,7 +1896,7 @@ const FORMATETC *lpFormats, LPENUMFORMATETC *ppenumFormatetc) { - IEnumFORMATETC *pef; + CComPtr<IEnumFORMATETC> pef; HRESULT hRes; TRACE("cf=%d fe=%p pef=%p\n", cFormats, lpFormats, ppenumFormatetc); @@ -1907,7 +1906,6 @@ pef->AddRef(); hRes = pef->QueryInterface(IID_PPV_ARG(IEnumFORMATETC, ppenumFormatetc)); - pef->Release(); return hRes; } @@ -1918,7 +1916,7 @@ */ HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, IShellView **ppsv) { - IShellView *psf; + CComPtr<IShellView> psf; HRESULT hRes; *ppsv = NULL; @@ -1933,7 +1931,6 @@ return hRes; hRes = psf->QueryInterface(IID_PPV_ARG(IShellView, ppsv)); - psf->Release(); return hRes; } 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] Wed Aug 20 00:39:40 2014 @@ -404,7 +404,7 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize) { STRRET strret; - IShellFolder *desktop; + CComPtr<IShellFolder> desktop; HRESULT hr = SHGetDesktopFolder(&desktop); @@ -414,8 +414,6 @@ if (SUCCEEDED(hr)) StrRetToStrNW(pszPath, uOutSize, &strret, pidl); - - desktop->Release(); } return hr; @@ -1782,15 +1780,13 @@ /* process the IDList */ if (sei_tmp.fMask & SEE_MASK_IDLIST) { - IShellExecuteHookW* pSEH; + CComPtr<IShellExecuteHookW> pSEH; HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL); if (SUCCEEDED(hr)) { hr = pSEH->Execute(&sei_tmp); - - pSEH->Release(); if (hr == S_OK) { Modified: branches/shell-experiments/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -212,11 +212,11 @@ if (SUCCEEDED (hr)) { LPITEMIDLIST pidlAbsolute = ILCombine (pidlRoot, pidlChild); - IPersistFolder *pPF; - IPersistFolder3 *ppf; + CComPtr<IPersistFolder> ppf; + CComPtr<IPersistFolder3> ppf3; if (_ILIsFolder(pidlChild) && - SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf)))) + SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)))) { PERSIST_FOLDER_TARGET_INFO ppfti; @@ -241,13 +241,11 @@ hr = E_INVALIDARG; } - ppf->InitializeEx(NULL, pidlAbsolute, &ppfti); - ppf->Release(); - } - else if (SUCCEEDED((hr = pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder, &pPF))))) + ppf3->InitializeEx(NULL, pidlAbsolute, &ppfti); + } + else if (SUCCEEDED((hr = pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder, &ppf))))) { - pPF->Initialize(pidlAbsolute); - pPF->Release(); + ppf->Initialize(pidlAbsolute); } ILFree (pidlAbsolute); } @@ -280,7 +278,7 @@ LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) { GUID const *clsid; - IShellFolder *pSF; + CComPtr<IShellFolder> pSF; HRESULT hr; LPITEMIDLIST pidlChild; @@ -325,7 +323,6 @@ /* go deeper */ hr = pSF->BindToObject(ILGetNext (pidlComplete), NULL, riid, ppvOut); } - pSF->Release(); } TRACE ("-- returning (%p) %08x\n", *ppvOut, hr); @@ -359,7 +356,7 @@ pidlFirst = ILCloneFirst(pidl); if (pidlFirst) { - IShellFolder *psfChild; + CComPtr<IShellFolder> psfChild; hr = psf->BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); if (SUCCEEDED (hr)) @@ -373,7 +370,6 @@ if(!StrRetToStrNW (szOut, dwOutLen, &strTemp, pidlNext)) hr = E_FAIL; } - psfChild->Release(); } ILFree (pidlFirst); } else @@ -491,7 +487,7 @@ if (SFGAO_HASSUBFOLDER & *pdwAttributes) { - IShellFolder *psf2; + CComPtr<IShellFolder> psf2; if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) { IEnumIDList *pEnumIL = NULL; @@ -501,7 +497,6 @@ *pdwAttributes &= ~SFGAO_HASSUBFOLDER; pEnumIL->Release(); } - psf2->Release(); } } } else @@ -514,68 +509,73 @@ /*********************************************************************** * SHELL32_CompareIDs */ -HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT SHELL32_CompareIDs(IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { int type1, - type2; + type2; char szTemp1[MAX_PATH]; char szTemp2[MAX_PATH]; HRESULT nReturn; - LPITEMIDLIST firstpidl, - nextpidl1, - nextpidl2; - IShellFolder *psf; + LPITEMIDLIST firstpidl; + LPITEMIDLIST nextpidl1; + LPITEMIDLIST nextpidl2; + CComPtr<IShellFolder> psf; /* test for empty pidls */ - BOOL isEmpty1 = _ILIsDesktop (pidl1); - BOOL isEmpty2 = _ILIsDesktop (pidl2); + BOOL isEmpty1 = _ILIsDesktop(pidl1); + BOOL isEmpty2 = _ILIsDesktop(pidl2); if (isEmpty1 && isEmpty2) - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 0 ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); if (isEmpty1) - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); if (isEmpty2) - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); /* test for different types. Sort order is the PT_* constant */ - type1 = _ILGetDataPointer (pidl1)->type; - type2 = _ILGetDataPointer (pidl2)->type; + type1 = _ILGetDataPointer(pidl1)->type; + type2 = _ILGetDataPointer(pidl2)->type; if (type1 < type2) - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); else if (type1 > type2) - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); /* test for name of pidl */ - _ILSimpleGetText (pidl1, szTemp1, MAX_PATH); - _ILSimpleGetText (pidl2, szTemp2, MAX_PATH); - nReturn = lstrcmpiA (szTemp1, szTemp2); + _ILSimpleGetText(pidl1, szTemp1, MAX_PATH); + _ILSimpleGetText(pidl2, szTemp2, MAX_PATH); + nReturn = lstrcmpiA(szTemp1, szTemp2); if (nReturn < 0) - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); else if (nReturn > 0) - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); /* test of complex pidls */ - firstpidl = ILCloneFirst (pidl1); - nextpidl1 = ILGetNext (pidl1); - nextpidl2 = ILGetNext (pidl2); + firstpidl = ILCloneFirst(pidl1); + nextpidl1 = ILGetNext(pidl1); + nextpidl2 = ILGetNext(pidl2); /* optimizing: test special cases and bind not deeper */ /* the deeper shellfolder would do the same */ - isEmpty1 = _ILIsDesktop (nextpidl1); - isEmpty2 = _ILIsDesktop (nextpidl2); - - if (isEmpty1 && isEmpty2) { - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 0 ); - } else if (isEmpty1) { - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 ); - } else if (isEmpty2) { - return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); - /* optimizing end */ - } else if (SUCCEEDED (iface->BindToObject(firstpidl, NULL, IID_PPV_ARG(IShellFolder, &psf)))) { - nReturn = psf->CompareIDs(lParam, nextpidl1, nextpidl2); - psf->Release(); - } - ILFree (firstpidl); + isEmpty1 = _ILIsDesktop(nextpidl1); + isEmpty2 = _ILIsDesktop(nextpidl2); + + if (isEmpty1 && isEmpty2) + { + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + } + else if (isEmpty1) + { + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); + } + else if (isEmpty2) + { + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); + /* optimizing end */ + } + else if (SUCCEEDED(iface->BindToObject(firstpidl, NULL, IID_PPV_ARG(IShellFolder, &psf)))) { + nReturn = psf->CompareIDs(lParam, nextpidl1, nextpidl2); + } + ILFree(firstpidl); return nReturn; } @@ -584,10 +584,10 @@ * * Undocumented. */ -HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObject, +HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, IDataObject * lpDataObject, UINT uFlags, LPITEMIDLIST *lppidlLinks) { - FIXME("%p %s %p %08x %p\n",hWnd,lpszDir,lpDataObject,uFlags,lppidlLinks); + FIXME("%p %s %p %08x %p\n", hWnd, lpszDir, lpDataObject, uFlags, lppidlLinks); return E_NOTIMPL; } Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed Aug 20 00:39:40 2014 @@ -1755,7 +1755,7 @@ if (GetSelections()) { - IDataObject * pda; + CComPtr<IDataObject> pda; DWORD dwAttributes = SFGAO_CANLINK; DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE; @@ -1775,14 +1775,12 @@ if (SUCCEEDED(pda->QueryInterface(IID_PPV_ARG(IAsyncOperation, &piaso)))) { piaso->SetAsyncMode(TRUE); - piaso->Release(); } if (pds) { DWORD dwEffect2; DoDragDrop(pda, pds, dwEffect, &dwEffect2); } - pda->Release(); } } break;

1 0

[dquintana] 63907: [SHELL32] * Giannis found another similar case of double-releasing.
by dquintana＠svn.reactos.org 19 Aug '14

19 Aug '14

Author: dquintana Date: Tue Aug 19 22:30:12 2014 New Revision: 63907 URL: http://svn.reactos.org/svn/reactos?rev=63907&view=rev Log: [SHELL32] * Giannis found another similar case of double-releasing. Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.cpp 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] Tue Aug 19 22:30:12 2014 @@ -1058,7 +1058,7 @@ HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, bool bCopy) { - IPersistFolder2 *ppf2 = NULL; + CComPtr<IPersistFolder2> ppf2 = NULL; WCHAR szSrcPath[MAX_PATH]; WCHAR szTargetPath[MAX_PATH]; SHFILEOPSTRUCTW op; @@ -1076,10 +1076,8 @@ hr = ppf2->GetCurFolder(&pidl); if (FAILED(hr)) { - ppf2->Release(); return hr; } - ppf2->Release(); hr = pSFFrom->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strRet); if (FAILED(hr)) @@ -1113,7 +1111,6 @@ HeapFree(GetProcessHeap(), 0, pszTargetList); SHFree(pidl); - ppf2->Release(); return E_OUTOFMEMORY; }

1 0

[dquintana] 63906: [SHELL32] * Fix a CComPtr double-release.
by dquintana＠svn.reactos.org 19 Aug '14

19 Aug '14

Author: dquintana Date: Tue Aug 19 22:25:40 2014 New Revision: 63906 URL: http://svn.reactos.org/svn/reactos?rev=63906&view=rev Log: [SHELL32] * Fix a CComPtr double-release. Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp 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] Tue Aug 19 22:25:40 2014 @@ -972,7 +972,6 @@ SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_IDLIST, pidl, NULL); ILFree(pidl); } - ppf2->Release(); } return hr; }

1 0

[dquintana] 63905: [BROWSEUI] [SHELL32] * Fix accelerator handling. * Disallow accelerators if renaming.
by dquintana＠svn.reactos.org 19 Aug '14

19 Aug '14

Author: dquintana Date: Tue Aug 19 21:30:04 2014 New Revision: 63905 URL: http://svn.reactos.org/svn/reactos?rev=63905&view=rev Log: [BROWSEUI] [SHELL32] * Fix accelerator handling. * Disallow accelerators if renaming. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp 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] Tue Aug 19 21:30:04 2014 @@ -2563,13 +2563,7 @@ return S_OK; } - if (fCurrentShellView->TranslateAcceleratorW(pmsg) != S_OK) - { - if (TranslateAcceleratorSB(pmsg, 0) != S_OK) - return S_FALSE; - return S_OK; - } - return S_OK; + return fCurrentShellView->TranslateAcceleratorW(pmsg); } HRESULT STDMETHODCALLTYPE CShellBrowser::_GetBorderDWHelper(IUnknown *punkSrc, LPRECT lprectBorder, BOOL bUseHmonitor) Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Aug 19 21:30:04 2014 @@ -105,6 +105,8 @@ POINT m_ptLastMousePos; /* Mouse position at last DragOver call */ // CComPtr<IContextMenu> m_pCM; + + BOOL m_isEditing; public: CDefView(); ~CDefView(); @@ -173,7 +175,6 @@ virtual HRESULT STDMETHODCALLTYPE GetArrangeParam(LPARAM *sort); virtual HRESULT STDMETHODCALLTYPE ArrangeGrid(); virtual HRESULT STDMETHODCALLTYPE AutoArrange(); - virtual HRESULT STDMETHODCALLTYPE IShellFolderView_GetAutoArrange(); virtual HRESULT STDMETHODCALLTYPE AddObject(PITEMID_CHILD pidl, UINT *item); virtual HRESULT STDMETHODCALLTYPE GetObject(PITEMID_CHILD *pidl, UINT item); virtual HRESULT STDMETHODCALLTYPE RemoveObject(PITEMID_CHILD pidl, UINT *item); @@ -376,6 +377,7 @@ m_cScrollDelay = 0; m_ptLastMousePos.x = 0; m_ptLastMousePos.y = 0; + m_isEditing = FALSE; } CDefView::~CDefView() @@ -1795,6 +1797,7 @@ m_pSFParent->GetAttributesOf(1, (LPCITEMIDLIST*)&pidl, &dwAttr); if (SFGAO_CANRENAME & dwAttr) { + m_isEditing = TRUE; return FALSE; } return TRUE; @@ -1803,6 +1806,9 @@ case LVN_ENDLABELEDITW: { TRACE("-- LVN_ENDLABELEDITW %p\n", this); + + m_isEditing = FALSE; + if (lpdi->item.pszText) { HRESULT hr; @@ -1991,6 +1997,9 @@ */ HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg) { + if (m_isEditing) + return S_FALSE; + if (lpmsg->message >= WM_KEYFIRST && lpmsg->message <= WM_KEYLAST) { if (::TranslateAcceleratorW(m_hWnd, m_hAccel, lpmsg) != 0) @@ -1999,7 +2008,7 @@ TRACE("-- key=0x04%lx\n", lpmsg->wParam) ; } - return S_FALSE; /* not handled */ + return m_pShellBrowser->TranslateAcceleratorSB(lpmsg, 0); } HRESULT WINAPI CDefView::EnableModeless(BOOL fEnable) @@ -2454,12 +2463,6 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CDefView::IShellFolderView_GetAutoArrange() -{ - TRACE("(%p)\n", this); - return GetAutoArrange(); -} - HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item) { FIXME("(%p)->(%p %p) stub\n", this, pidl, item);

1 0

[hbelusca] 63904: [NPFS]: The third argument of ObLogSecurityDescriptor is an integer, not a boolean.
by hbelusca＠svn.reactos.org 18 Aug '14

18 Aug '14

Author: hbelusca Date: Mon Aug 18 17:45:26 2014 New Revision: 63904 URL: http://svn.reactos.org/svn/reactos?rev=63904&view=rev Log: [NPFS]: The third argument of ObLogSecurityDescriptor is an integer, not a boolean. Modified: trunk/reactos/drivers/filesystems/npfs/seinfo.c Modified: trunk/reactos/drivers/filesystems/npfs/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] Mon Aug 18 17:45:26 2014 @@ -84,7 +84,7 @@ IoGetFileObjectGenericMapping()); if (!NT_SUCCESS(Status)) return Status; - Status = ObLogSecurityDescriptor(TempSecurityDescriptor, &NewSecurityDescriptor, TRUE); + Status = ObLogSecurityDescriptor(TempSecurityDescriptor, &NewSecurityDescriptor, 1); ExFreePool(TempSecurityDescriptor); if (!NT_SUCCESS(Status)) return Status;

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