Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[gadamopoulos] 75616: [WIN32K] -NtUserEmptyClipboard: Change its behaviour to wait for WM_DESTROYCLIPBOARD to return so it behaves like windows and our ole32 doesn't trip on its assumptions that ev...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 18 17:18:17 2017 New Revision: 75616 URL: http://svn.reactos.org/svn/reactos?rev=75616&view=rev Log: [WIN32K] -NtUserEmptyClipboard: Change its behaviour to wait for WM_DESTROYCLIPBOARD to return so it behaves like windows and our ole32 doesn't trip on its assumptions that everything works fine. A test will be written soon to prove that this is correct. CORE-12302 Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Fri Aug 18 17:18:17 2017 @@ -680,7 +680,7 @@ { TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n", pWinStaObj->spwndClipOwner->head.h); // For 32-bit applications this message is sent as a notification - co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); + co_IntSendMessage(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); } pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen;

7 years, 1 month

[bfreisen] 75615: [MSPAINT] Use Gdiplus::Bitmap in place of ATL::CImage to load pictures -- this un-breaks loading a picture's resolution from file

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Fri Aug 18 17:01:01 2017 New Revision: 75615 URL: http://svn.reactos.org/svn/reactos?rev=75615&view=rev Log: [MSPAINT] Use Gdiplus::Bitmap in place of ATL::CImage to load pictures -- this un-breaks loading a picture's resolution from file Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mspaint/dib.cpp Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] Fri Aug 18 17:01:01 2017 @@ -34,6 +34,6 @@ add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) target_link_libraries(mspaint atlnew uuid) -add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) +add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 gdiplus advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) add_pch(mspaint precomp.h SOURCE) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mspaint/dib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.cpp [iso-8859-1] Fri Aug 18 17:01:01 2017 @@ -83,8 +83,8 @@ void LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) { - CImage img; - img.Load(name); // TODO: error handling + using namespace Gdiplus; + Bitmap img(CStringW(name), FALSE); // always use WCHAR string if (!hBitmap) { @@ -92,7 +92,7 @@ return; } - *hBitmap = img.Detach(); + img.GetHBITMAP(Color(255, 255, 255), hBitmap); // update time and size HANDLE hFile = @@ -112,7 +112,9 @@ if (size) *size = GetFileSize(hFile, NULL); - // TODO: update hRes and vRes + // update hRes and vRes + *hRes = (int) (img.GetHorizontalResolution() * 1000 / 25.4); + *vRes = (int) (img.GetVerticalResolution() * 1000 / 25.4); CloseHandle(hFile); }

7 years, 1 month

[ashaposhnikov] 75614: [RAPPS] - Correct the build process

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Fri Aug 18 16:38:28 2017 New Revision: 75614 URL: http://svn.reactos.org/svn/reactos?rev=75614&view=rev Log: [RAPPS] - Correct the build process Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Fri Aug 18 16:38:28 2017 @@ -38,7 +38,7 @@ add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps atlnew uuid wine) -add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll setupapi) +add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi msvcrt kernel32 ntdll) add_pch(rapps include/rapps.h SOURCE) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc)

7 years, 1 month

[tkreuzer] 75613: [FTFD] Ignore NULL objects in free() wrapper

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 18 15:02:05 2017 New Revision: 75613 URL: http://svn.reactos.org/svn/reactos?rev=75613&view=rev Log: [FTFD] Ignore NULL objects in free() wrapper Modified: trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c Modified: trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c [iso-8859-1] Fri Aug 18 15:02:05 2017 @@ -79,7 +79,10 @@ void free(void *Object) { - EngFreeMem((size_t *)Object - 1); + if (Object != NULL) + { + EngFreeMem((size_t *)Object - 1); + } } /*

7 years, 1 month

[tkreuzer] 75612: [FTFD] Fix indentation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 18 15:02:01 2017 New Revision: 75612 URL: http://svn.reactos.org/svn/reactos?rev=75612&view=rev Log: [FTFD] Fix indentation Modified: trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c Modified: trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c [iso-8859-1] Fri Aug 18 15:02:01 2017 @@ -41,45 +41,45 @@ void * malloc(size_t Size) { - void *Object; + void *Object; - Object = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE); - if (NULL != Object) + Object = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE); + if (Object != NULL) { - *((size_t *) Object) = Size; - Object = (void *)((size_t *) Object + 1); + *((size_t *)Object) = Size; + Object = (void *)((size_t *)Object + 1); } - return Object; + return Object; } void * realloc(void *Object, size_t Size) { - void *NewObject; - size_t CopySize; + void *NewObject; + size_t CopySize; - NewObject = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE); - if (NULL != NewObject) + NewObject = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE); + if (NewObject != NULL) { - *((size_t *) NewObject) = Size; - NewObject = (void *)((size_t *) NewObject + 1); - CopySize = *((size_t *) Object - 1); - if (Size < CopySize) - { - CopySize = Size; - } - memcpy(NewObject, Object, CopySize); - EngFreeMem((size_t *) Object - 1); + *((size_t *)NewObject) = Size; + NewObject = (void *)((size_t *)NewObject + 1); + CopySize = *((size_t *)Object - 1); + if (Size < CopySize) + { + CopySize = Size; + } + memcpy(NewObject, Object, CopySize); + EngFreeMem((size_t *)Object - 1); } - return NewObject; + return NewObject; } void free(void *Object) { - EngFreeMem((size_t *) Object - 1); + EngFreeMem((size_t *)Object - 1); } /* @@ -93,39 +93,34 @@ FILE * fopen(const char *FileName, const char *Mode) { - DPRINT1("Freetype tries to open file %s\n", FileName); - - return NULL; + DPRINT1("Freetype tries to open file %s\n", FileName); + return NULL; } int fseek(FILE *Stream, long Offset, int Origin) { - DPRINT1("Doubleplus ungood: freetype shouldn't fseek!\n"); - - return -1; + DPRINT1("Doubleplus ungood: freetype shouldn't fseek!\n"); + return -1; } long ftell(FILE *Stream) { - DPRINT1("Doubleplus ungood: freetype shouldn't ftell!\n"); - - return -1; + DPRINT1("Doubleplus ungood: freetype shouldn't ftell!\n"); + return -1; } size_t fread(void *Buffer, size_t Size, size_t Count, FILE *Stream) { - DPRINT1("Doubleplus ungood: freetype shouldn't fread!\n"); - - return 0; + DPRINT1("Doubleplus ungood: freetype shouldn't fread!\n"); + return 0; } int fclose(FILE *Stream) { - DPRINT1("Doubleplus ungood: freetype shouldn't fclose!\n"); - - return EOF; + DPRINT1("Doubleplus ungood: freetype shouldn't fclose!\n"); + return EOF; }

7 years, 1 month

[ekohl] 75611: [STOBJECT] - Add support for the hotplug icon. - Set default menu items in the context menus. - Use a timer to properly distinguish between a single and a double click on an icon. - ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Aug 18 14:49:11 2017 New Revision: 75611 URL: http://svn.reactos.org/svn/reactos?rev=75611&view=rev Log: [STOBJECT] - Add support for the hotplug icon. - Set default menu items in the context menus. - Use a timer to properly distinguish between a single and a double click on an icon. - Some code cleanup. Added: trunk/reactos/dll/shellext/stobject/hotplug.cpp (with props) Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt trunk/reactos/dll/shellext/stobject/csystray.cpp trunk/reactos/dll/shellext/stobject/power.cpp trunk/reactos/dll/shellext/stobject/precomp.h trunk/reactos/dll/shellext/stobject/stobject.cpp trunk/reactos/dll/shellext/stobject/volume.cpp Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/CMak… ============================================================================== --- trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] Fri Aug 18 14:49:11 2017 @@ -21,6 +21,7 @@ csystray.cpp stobject.cpp stobject.rc + hotplug.cpp power.cpp volume.cpp ${CMAKE_CURRENT_BINARY_DIR}/stobject.def) Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Fri Aug 18 14:49:11 2017 @@ -12,6 +12,7 @@ SysTrayIconHandlers_t g_IconHandlers [] = { { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message }, + { Hotplug_Init, Hotplug_Shutdown, Hotplug_Update, Hotplug_Message }, { Power_Init, Power_Shutdown, Power_Update, Power_Message } }; const int g_NumIcons = _countof(g_IconHandlers); @@ -211,13 +212,37 @@ case WM_NCCREATE: case WM_NCDESTROY: return FALSE; + case WM_CREATE: InitIcons(); SetTimer(1, 2000, NULL); return TRUE; + case WM_TIMER: - UpdateIcons(); - return TRUE; + switch (wParam) + { + case 1: + UpdateIcons(); + return TRUE; + + case POWER_TIMER_ID: + Power_OnTimer(hWnd); + break; + + case VOLUME_TIMER_ID: + Volume_OnTimer(hWnd); + break; + + case HOTPLUG_TIMER_ID: + Hotplug_OnTimer(hWnd); + break; + } + break; + + case WM_DEVICECHANGE: + ERR("WM_DEVICECHANGE\n"); + break; + case WM_DESTROY: KillTimer(1); ShutdownIcons(); Added: trunk/reactos/dll/shellext/stobject/hotplug.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/hotp… ============================================================================== --- trunk/reactos/dll/shellext/stobject/hotplug.cpp (added) +++ trunk/reactos/dll/shellext/stobject/hotplug.cpp [iso-8859-1] Fri Aug 18 14:49:11 2017 @@ -0,0 +1,184 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/stobject/hotplug.cpp + * PURPOSE: Hotplug notification icon handler + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + * David Quintana <gigaherz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(stobject); + +static HICON g_hIconHotplug = NULL; +static BOOL g_IsRunning = FALSE; + + +HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray) +{ + WCHAR strTooltip[128]; + + TRACE("Hotplug_Init\n"); + + g_hIconHotplug = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_EXTRACT)); + + LoadStringW(g_hInstance, IDS_HOTPLUG_REMOVE_1, strTooltip, _countof(strTooltip)); + + g_IsRunning = TRUE; + + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, strTooltip); +} + +HRESULT STDMETHODCALLTYPE Hotplug_Update(_In_ CSysTray * pSysTray) +{ + TRACE("Hotplug_Update\n"); + return S_OK; +} + +HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray) +{ + TRACE("Hotplug_Shutdown\n"); + + g_IsRunning = FALSE; + + return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_HOTPLUG, NULL, NULL); +} + +static void RunHotplug() +{ + ShellExecuteW(NULL, NULL, L"rundll32.exe", L"shell32.dll,Control_RunDLL hotplug.dll", NULL, SW_SHOWNORMAL); +} + +static void ShowContextMenu(CSysTray *pSysTray) +{ + WCHAR szBuffer[128]; + DWORD id, msgPos; + HMENU hPopup; + + LoadStringW(g_hInstance, IDS_HOTPLUG_REMOVE_2, szBuffer, _countof(szBuffer)); + + hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, 1, szBuffer); + + msgPos = GetMessagePos(); + + SetForegroundWindow(pSysTray->GetHWnd()); + id = TrackPopupMenuEx(hPopup, + TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, + GET_X_LPARAM(msgPos), + GET_Y_LPARAM(msgPos), + pSysTray->GetHWnd(), + NULL); + + DestroyMenu(hPopup); + + if (id == 1) + RunHotplug(); +} + +static +VOID +ShowHotplugPopupMenu( + HWND hWnd) +{ +#if 0 + DWORD id, msgPos; + + HMENU hPopup = CreatePopupMenu(); + + // FIXME + AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); + + msgPos = GetMessagePos(); + + SetForegroundWindow(hWnd); + id = TrackPopupMenuEx(hPopup, + TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, + GET_X_LPARAM(msgPos), + GET_Y_LPARAM(msgPos), + hWnd, + NULL); + + DestroyMenu(hPopup); + + if (id != 0) + { + // FIXME + } +#endif +} + +HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray *pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) +{ + TRACE("Hotplug_Message uMsg=%d, wParam=%x, lParam=%x\n", uMsg, wParam, lParam); + + switch (uMsg) + { + case WM_USER + 220: + TRACE("Hotplug_Message: WM_USER+220\n"); + if (wParam == 2) + { + if (lParam == FALSE) + return Hotplug_Init(pSysTray); + else + return Hotplug_Shutdown(pSysTray); + } + return S_FALSE; + + case WM_USER + 221: + TRACE("Hotplug_Message: WM_USER+221\n"); + if (wParam == 2) + { + lResult = (LRESULT)g_IsRunning; + return S_OK; + } + return S_FALSE; + + case ID_ICON_HOTPLUG: + Hotplug_Update(pSysTray); + + switch (lParam) + { + case WM_LBUTTONDOWN: + SetTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID, 500, NULL); + break; + + case WM_LBUTTONUP: + break; + + case WM_LBUTTONDBLCLK: + KillTimer(pSysTray->GetHWnd(), HOTPLUG_TIMER_ID); + RunHotplug(); + break; + + case WM_RBUTTONDOWN: + break; + + case WM_RBUTTONUP: + ShowContextMenu(pSysTray); + break; + + case WM_RBUTTONDBLCLK: + break; + + case WM_MOUSEMOVE: + break; + } + return S_OK; + + default: + TRACE("Hotplug_Message received for unknown ID %d, ignoring.\n"); + return S_FALSE; + } + + return S_FALSE; +} + +VOID +Hotplug_OnTimer(HWND hWnd) +{ + TRACE("Hotplug_OnTimer\n!"); + KillTimer(hWnd, HOTPLUG_TIMER_ID); + ShowHotplugPopupMenu(hWnd); +} Propchange: trunk/reactos/dll/shellext/stobject/hotplug.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/stobject/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/powe… ============================================================================== --- trunk/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] Fri Aug 18 14:49:11 2017 @@ -10,12 +10,6 @@ #include "precomp.h" #include "powrprof.h" -#include <mmsystem.h> -#include <mmddk.h> - -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) - WINE_DEFAULT_DEBUG_CHANNEL(stobject); typedef struct _PWRSCHEMECONTEXT @@ -25,9 +19,7 @@ UINT uiLast; } PWRSCHEMECONTEXT, *PPWRSCHEMECONTEXT; -//static HICON g_hIconBattery = NULL; -static HICON g_hIconAC = NULL; - +static HICON g_hIconBattery = NULL; static BOOL g_IsRunning = FALSE; @@ -37,53 +29,18 @@ TRACE("Power_Init\n"); -// g_hIconBattery = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); - g_hIconAC = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); - - - HICON icon; -// if (g_IsMute) -// icon = g_hIconBattery; -// else - icon = g_hIconAC; + g_hIconBattery = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); LoadStringW(g_hInstance, IDS_PWR_AC, strTooltip, _countof(strTooltip)); g_IsRunning = TRUE; - return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, icon, strTooltip); + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, g_hIconBattery, strTooltip); } HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray) { -// BOOL PrevState; - TRACE("Power_Update\n"); - -#if 0 - PrevState = g_IsMute; - Volume_IsMute(); - - if (PrevState != g_IsMute) - { - WCHAR strTooltip[128]; - HICON icon; - if (g_IsMute) { - icon = g_hIconMute; - LoadStringW(g_hInstance, IDS_VOL_MUTED, strTooltip, _countof(strTooltip)); - } - else { - icon = g_hIconVolume; - LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip)); - } - - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_POWER, icon, strTooltip); - } - else - { - return S_OK; - } -#endif return S_OK; } @@ -96,36 +53,37 @@ return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_POWER, NULL, NULL); } -static void _RunPower() -{ - ShellExecuteW(NULL, NULL, L"powercfg.cpl", NULL, NULL, SW_SHOWNORMAL); -} - -static void _ShowContextMenu(CSysTray * pSysTray) -{ - WCHAR strOpen[128]; - - LoadStringW(g_hInstance, IDS_PWR_PROPERTIES, strOpen, _countof(strOpen)); - - HMENU hPopup = CreatePopupMenu(); - AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, strOpen); - - DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; - DWORD msgPos = GetMessagePos(); +static void RunPower() +{ + ShellExecuteW(NULL, NULL, L"rundll32.exe", L"shell32.dll,Control_RunDLL powercfg.cpl", NULL, SW_SHOWNORMAL); +} + +static void ShowContextMenu(CSysTray * pSysTray) +{ + WCHAR szBuffer[128]; + DWORD id, msgPos; + HMENU hPopup; + + LoadStringW(g_hInstance, IDS_PWR_PROPERTIES, szBuffer, _countof(szBuffer)); + + hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, szBuffer); + SetMenuDefaultItem(hPopup, IDS_PWR_PROPERTIES, FALSE); + + msgPos = GetMessagePos(); SetForegroundWindow(pSysTray->GetHWnd()); - DWORD id = TrackPopupMenuEx(hPopup, flags, - GET_X_LPARAM(msgPos), GET_Y_LPARAM(msgPos), - pSysTray->GetHWnd(), NULL); + id = TrackPopupMenuEx(hPopup, + TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, + GET_X_LPARAM(msgPos), + GET_Y_LPARAM(msgPos), + pSysTray->GetHWnd(), + NULL); DestroyMenu(hPopup); - switch (id) - { - case IDS_PWR_PROPERTIES: - _RunPower(); - break; - } + if (id == IDS_PWR_PROPERTIES) + RunPower(); } static @@ -156,7 +114,7 @@ static VOID ShowPowerSchemesPopupMenu( - CSysTray *pSysTray) + HWND hWnd) { PWRSCHEMECONTEXT PowerSchemeContext = {NULL, 0, 0}; UINT uiActiveScheme; @@ -176,12 +134,12 @@ msgPos = GetMessagePos(); - SetForegroundWindow(pSysTray->GetHWnd()); + SetForegroundWindow(hWnd); id = TrackPopupMenuEx(PowerSchemeContext.hPopup, TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, GET_X_LPARAM(msgPos), GET_Y_LPARAM(msgPos), - pSysTray->GetHWnd(), + hWnd, NULL); DestroyMenu(PowerSchemeContext.hPopup); @@ -222,21 +180,22 @@ switch (lParam) { case WM_LBUTTONDOWN: + SetTimer(pSysTray->GetHWnd(), POWER_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: - ShowPowerSchemesPopupMenu(pSysTray); break; case WM_LBUTTONDBLCLK: - _RunPower(); + KillTimer(pSysTray->GetHWnd(), POWER_TIMER_ID); + RunPower(); break; case WM_RBUTTONDOWN: break; case WM_RBUTTONUP: - _ShowContextMenu(pSysTray); + ShowContextMenu(pSysTray); break; case WM_RBUTTONDBLCLK: @@ -254,3 +213,11 @@ return S_FALSE; } + +VOID +Power_OnTimer(HWND hWnd) +{ + TRACE("Power_OnTimer\n!"); + KillTimer(hWnd, POWER_TIMER_ID); + ShowPowerSchemesPopupMenu(hWnd); +} Modified: trunk/reactos/dll/shellext/stobject/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/prec… ============================================================================== --- trunk/reactos/dll/shellext/stobject/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/precomp.h [iso-8859-1] Fri Aug 18 14:49:11 2017 @@ -38,8 +38,12 @@ extern HINSTANCE g_hInstance; -#define ID_ICON_VOLUME (WM_APP + 0x4CB) -#define ID_ICON_POWER (WM_APP + 0x4CC) +#define ID_ICON_VOLUME (WM_APP + 0x4CB) +#define ID_ICON_HOTPLUG (WM_APP + 0x4CC) +#define ID_ICON_POWER (WM_APP + 0x4CD) + +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) #include "csystray.h" @@ -65,8 +69,20 @@ extern HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); +extern VOID Volume_OnTimer(HWND hWnd); + +extern HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE Hotplug_Update(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); +extern VOID Hotplug_OnTimer(HWND hWnd); extern HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); +extern VOID Power_OnTimer(HWND hWnd); + +#define POWER_TIMER_ID 2 +#define VOLUME_TIMER_ID 3 +#define HOTPLUG_TIMER_ID 4 Modified: trunk/reactos/dll/shellext/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] Fri Aug 18 14:49:11 2017 @@ -4,7 +4,7 @@ * FILE: dll/shellext/stobject/stobject.cpp * PURPOSE: COM registration services for STobject.dll * PROGRAMMERS: Robert Naumann - David Quintana <gigaherz(a)gmail.com> + * David Quintana <gigaherz(a)gmail.com> */ #include "precomp.h" Modified: trunk/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volu… ============================================================================== --- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Fri Aug 18 14:49:11 2017 @@ -10,9 +10,6 @@ #include <mmsystem.h> #include <mmddk.h> - -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) WINE_DEFAULT_DEBUG_CHANNEL(stobject); @@ -116,7 +113,7 @@ return S_OK; } -HRESULT Volume_IsMute() +HRESULT Volume_IsMute(VOID) { #if 0 MIXERCONTROLDETAILS mixerControlDetails; @@ -220,10 +217,10 @@ return Volume_FindMixerControl(pSysTray); } -static void _RunVolume() +static void _RunVolume(BOOL bSmall) { // FIXME: ensure we are loading the right one - ShellExecuteW(NULL, NULL, L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); + ShellExecuteW(NULL, NULL, L"sndvol32.exe", bSmall ? L"/t" : NULL, NULL, SW_SHOWNORMAL); } static void _RunMMCpl() @@ -241,6 +238,7 @@ HMENU hPopup = CreatePopupMenu(); AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); AppendMenuW(hPopup, MF_STRING, IDS_VOL_ADJUST, strAdjust); + SetMenuDefaultItem(hPopup, IDS_VOL_OPEN, FALSE); DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; DWORD msgPos = GetMessagePos(); @@ -255,7 +253,7 @@ switch (id) { case IDS_VOL_OPEN: - _RunVolume(); + _RunVolume(FALSE); break; case IDS_VOL_ADJUST: _RunMMCpl(); @@ -298,14 +296,15 @@ switch (lParam) { case WM_LBUTTONDOWN: + SetTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID, 500, NULL); break; case WM_LBUTTONUP: - TRACE("TODO: display volume slider\n"); break; case WM_LBUTTONDBLCLK: - _RunVolume(); + KillTimer(pSysTray->GetHWnd(), VOLUME_TIMER_ID); + _RunVolume(FALSE); break; case WM_RBUTTONDOWN: @@ -330,3 +329,11 @@ return S_FALSE; } + +VOID +Volume_OnTimer(HWND hWnd) +{ + TRACE("Volume_OnTimer\n!"); + KillTimer(hWnd, VOLUME_TIMER_ID); + _RunVolume(TRUE); +}

7 years, 1 month

[tkreuzer] 75610: [NTOSKRNL] Fix 64 bit warnings about conversion in PsExitSpecialApc and PspTerminateThreadByPointer

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 18 12:31:19 2017 New Revision: 75610 URL: http://svn.reactos.org/svn/reactos?rev=75610&view=rev Log: [NTOSKRNL] Fix 64 bit warnings about conversion in PsExitSpecialApc and PspTerminateThreadByPointer Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=756… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Fri Aug 18 12:31:19 2017 @@ -933,7 +933,7 @@ if (Apc->SystemArgument2) { /* Free the APC */ - Status = (NTSTATUS)Apc->NormalContext; + Status = PtrToUlong(Apc->NormalContext); PspExitApcRundown(Apc); /* Terminate the Thread */ @@ -1039,7 +1039,7 @@ PspExitApcRundown, PspExitNormalApc, KernelMode, - (PVOID)ExitStatus); + UlongToPtr(ExitStatus)); /* Insert it into the APC Queue */ if (!KeInsertQueueApc(Apc, Apc, NULL, 2))

7 years, 1 month

[tkreuzer] 75609: Revert "[WIN32K] Fix probing and parameter validation in NtGdiPolyPolyDraw"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 18 12:18:41 2017 New Revision: 75609 URL: http://svn.reactos.org/svn/reactos?rev=75609&view=rev Log: Revert "[WIN32K] Fix probing and parameter validation in NtGdiPolyPolyDraw" Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri Aug 18 12:18:41 2017 @@ -383,56 +383,56 @@ PVOID pTemp; LPPOINT SafePoints; PULONG SafeCounts; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = TRUE; - ULONG nPoints = 0, nMaxPoints = 0, i; - - /* Validate parameters */ - if ((UnsafePoints == NULL) || - (UnsafeCounts == NULL) || - (Count == 0) || - (Count > ULONG_MAX / sizeof(ULONG)) || - (iFunc == 0) || - (iFunc > GdiPolyPolyRgn)) - { - DPRINT1("NtGdiPolyPolyDraw - Invalid parameter!\n"); + ULONG nPoints = 0, nMaxPoints = 0, nInvalid = 0, i; + + if (!UnsafePoints || !UnsafeCounts || + Count == 0 || iFunc == 0 || iFunc > GdiPolyPolyRgn) + { /* Windows doesn't set last error */ return FALSE; } _SEH2_TRY { - /* Probe the buffer of counts for each polygon */ + ProbeForRead(UnsafePoints, Count * sizeof(POINT), 1); ProbeForRead(UnsafeCounts, Count * sizeof(ULONG), 1); - /* Count points. Note: We are not copying the buffer, so it can be - changed by usermode. This is ok, since the content is validated - again later. */ + /* Count points and validate poligons */ for (i = 0; i < Count; i++) { - Status = RtlULongAdd(nMaxPoints, UnsafeCounts[i], &nMaxPoints); - if (!NT_SUCCESS(Status)) + if (UnsafeCounts[i] < 2) { - DPRINT1("Overflow when counting points!\n"); - return FALSE; + nInvalid++; } + nPoints += UnsafeCounts[i]; + nMaxPoints = max(nMaxPoints, UnsafeCounts[i]); } - - ProbeForRead(UnsafePoints, nMaxPoints * sizeof(POINT), 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - DPRINT1("Got exception!\n"); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { /* Windows doesn't set last error */ return FALSE; } - _SEH2_END; - - if (nMaxPoints == 0) - { - /* If all polygon counts are zero, return FALSE - without setting a last error code. */ - DPRINT1("nMaxPoints == 0!\n"); + + if (nPoints == 0 || nPoints < nMaxPoints) + { + /* If all polygon counts are zero, or we have overflow, + return without setting a last error code. */ + return FALSE; + } + + if (nInvalid != 0) + { + /* If at least one poly count is 0 or 1, fail */ + EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -442,16 +442,12 @@ TAG_SHAPE); if (!pTemp) { - DPRINT1("Failed to allocate %lu bytes (Count = %lu, nPoints = %u).\n", - Count * sizeof(ULONG) + nPoints * sizeof(POINT), - Count, - nPoints); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } SafeCounts = pTemp; - SafePoints = (PPOINT)&SafeCounts[Count]; + SafePoints = (PVOID)(SafeCounts + Count); _SEH2_TRY { @@ -461,37 +457,12 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - DPRINT1("Got exception!\n"); - ExFreePoolWithTag(pTemp, TAG_SHAPE); - return FALSE; + Status = _SEH2_GetExceptionCode(); } _SEH2_END; - /* Now that the buffers are copied, validate them again */ - for (i = 0; i < Count; i++) - { - /* If any poly count is 0 or 1, fail */ - if (SafeCounts[i] < 2) - { - DPRINT1("Invalid: UnsafeCounts[%lu] == %lu\n", i, SafeCounts[i]); - ExFreePoolWithTag(pTemp, TAG_SHAPE); - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Status = RtlULongAdd(nPoints, SafeCounts[i], &nPoints); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Overflow when counting points!\n"); - return FALSE; - } - } - - /* If the 2nd count does not match the 1st, someone changed the buffer - behind our back! */ - if (nPoints != nMaxPoints) - { - DPRINT1("Polygon count mismatch: %lu != %lu\n", nPoints, nMaxPoints); + if (!NT_SUCCESS(Status)) + { ExFreePoolWithTag(pTemp, TAG_SHAPE); return FALSE; }

7 years, 1 month

[tkreuzer] 75608: [WIN32K] Fix probing and parameter validation in NtGdiPolyPolyDraw

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 18 11:15:54 2017 New Revision: 75608 URL: http://svn.reactos.org/svn/reactos?rev=75608&view=rev Log: [WIN32K] Fix probing and parameter validation in NtGdiPolyPolyDraw Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri Aug 18 11:15:54 2017 @@ -383,56 +383,56 @@ PVOID pTemp; LPPOINT SafePoints; PULONG SafeCounts; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; BOOL Ret = TRUE; - ULONG nPoints = 0, nMaxPoints = 0, nInvalid = 0, i; - - if (!UnsafePoints || !UnsafeCounts || - Count == 0 || iFunc == 0 || iFunc > GdiPolyPolyRgn) - { + ULONG nPoints = 0, nMaxPoints = 0, i; + + /* Validate parameters */ + if ((UnsafePoints == NULL) || + (UnsafeCounts == NULL) || + (Count == 0) || + (Count > ULONG_MAX / sizeof(ULONG)) || + (iFunc == 0) || + (iFunc > GdiPolyPolyRgn)) + { + DPRINT1("NtGdiPolyPolyDraw - Invalid parameter!\n"); /* Windows doesn't set last error */ return FALSE; } _SEH2_TRY { - ProbeForRead(UnsafePoints, Count * sizeof(POINT), 1); + /* Probe the buffer of counts for each polygon */ ProbeForRead(UnsafeCounts, Count * sizeof(ULONG), 1); - /* Count points and validate poligons */ + /* Count points. Note: We are not copying the buffer, so it can be + changed by usermode. This is ok, since the content is validated + again later. */ for (i = 0; i < Count; i++) { - if (UnsafeCounts[i] < 2) + Status = RtlULongAdd(nMaxPoints, UnsafeCounts[i], &nMaxPoints); + if (!NT_SUCCESS(Status)) { - nInvalid++; + DPRINT1("Overflow when counting points!\n"); + return FALSE; } - nPoints += UnsafeCounts[i]; - nMaxPoints = max(nMaxPoints, UnsafeCounts[i]); - } + } + + ProbeForRead(UnsafePoints, nMaxPoints * sizeof(POINT), 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + DPRINT1("Got exception!\n"); + /* Windows doesn't set last error */ + return FALSE; } _SEH2_END; - if (!NT_SUCCESS(Status)) - { - /* Windows doesn't set last error */ - return FALSE; - } - - if (nPoints == 0 || nPoints < nMaxPoints) - { - /* If all polygon counts are zero, or we have overflow, - return without setting a last error code. */ - return FALSE; - } - - if (nInvalid != 0) - { - /* If at least one poly count is 0 or 1, fail */ - EngSetLastError(ERROR_INVALID_PARAMETER); + if (nMaxPoints == 0) + { + /* If all polygon counts are zero, return FALSE + without setting a last error code. */ + DPRINT1("nMaxPoints == 0!\n"); return FALSE; } @@ -442,12 +442,16 @@ TAG_SHAPE); if (!pTemp) { + DPRINT1("Failed to allocate %lu bytes (Count = %lu, nPoints = %u).\n", + Count * sizeof(ULONG) + nPoints * sizeof(POINT), + Count, + nPoints); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } SafeCounts = pTemp; - SafePoints = (PVOID)(SafeCounts + Count); + SafePoints = (PPOINT)&SafeCounts[Count]; _SEH2_TRY { @@ -457,12 +461,37 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + DPRINT1("Got exception!\n"); + ExFreePoolWithTag(pTemp, TAG_SHAPE); + return FALSE; } _SEH2_END; - if (!NT_SUCCESS(Status)) - { + /* Now that the buffers are copied, validate them again */ + for (i = 0; i < Count; i++) + { + /* If any poly count is 0 or 1, fail */ + if (SafeCounts[i] < 2) + { + DPRINT1("Invalid: UnsafeCounts[%lu] == %lu\n", i, SafeCounts[i]); + ExFreePoolWithTag(pTemp, TAG_SHAPE); + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Status = RtlULongAdd(nPoints, SafeCounts[i], &nPoints); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Overflow when counting points!\n"); + return FALSE; + } + } + + /* If the 2nd count does not match the 1st, someone changed the buffer + behind our back! */ + if (nPoints != nMaxPoints) + { + DPRINT1("Polygon count mismatch: %lu != %lu\n", nPoints, nMaxPoints); ExFreePoolWithTag(pTemp, TAG_SHAPE); return FALSE; }

7 years, 1 month

[gadamopoulos] 75607: [SHELL32] Shell extension support for files. - CFSFolder: Implement binding to files, implement loading arbitrary extensions for GetUIObjectOf from the registry, implement loa...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 18 09:11:59 2017 New Revision: 75607 URL: http://svn.reactos.org/svn/reactos?rev=75607&view=rev Log: [SHELL32] Shell extension support for files. - CFSFolder: Implement binding to files, implement loading arbitrary extensions for GetUIObjectOf from the registry, implement loading IconHandler shell extensions. Use the new helper routines to simplify getting the drop target. - Improve the shortcut icons hack. Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.h trunk/reactos/dll/win32/shell32/iconcache.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Aug 18 09:11:59 2017 @@ -24,6 +24,97 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +HKEY OpenKeyFromFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName) +{ + HKEY hkey; + + if (!_ILIsValue(pidl)) + { + ERR("Invalid pidl!\n"); + return NULL; + } + + FileStructW* pDataW = _ILGetFileStructW(pidl); + if (!pDataW) + { + ERR("Invalid pidl!\n"); + return NULL; + } + + LPWSTR pExtension = PathFindExtensionW(pDataW->wszName); + if (!pExtension || *pExtension == NULL) + { + WARN("No extension for %S!\n", pDataW->wszName); + return NULL; + } + + WCHAR FullName[MAX_PATH]; + DWORD dwSize = sizeof(FullName); + wsprintf(FullName, L"%s\\%s", pExtension, KeyName); + + LONG res = RegOpenKeyExW(HKEY_CLASSES_ROOT, FullName, 0, KEY_READ, &hkey); + if (!res) + return hkey; + + res = RegGetValueW(HKEY_CLASSES_ROOT, pExtension, NULL, RRF_RT_REG_SZ, NULL, FullName, &dwSize); + if (res) + { + WARN("Failed to get progid for file %S, extension %S (%x), address %x, pidl: %x, error %d\n", pDataW->wszName, pExtension, pExtension, &dwSize, pidl, res); + return NULL; + } + + wcscat(FullName, L"\\"); + wcscat(FullName, KeyName); + + hkey = NULL; + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, FullName, 0, KEY_READ, &hkey); + if (res) + WARN("Could not open key %S for extension %S\n", KeyName, pExtension); + + return hkey; +} + +HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pclsid) +{ + HKEY hkeyProgId = OpenKeyFromFileType(pidl, KeyName); + if (!hkeyProgId) + { + WARN("OpenKeyFromFileType failed for key %S\n", KeyName); + return S_FALSE; + } + + WCHAR wszCLSIDValue[CHARS_IN_GUID]; + DWORD dwSize = sizeof(wszCLSIDValue); + if (RegGetValueW(hkeyProgId, NULL, NULL, RRF_RT_REG_SZ, NULL, wszCLSIDValue, &dwSize)) + { + ERR("OpenKeyFromFileType succeeded but RegGetValueW failed\n"); + return S_FALSE; + } + +#if 0 + { + res = RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + wszCLSIDValue, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL); + if (res != ERROR_SUCCESS) + { + ERR("DropHandler extension %S not approved\n", wszName); + return E_ACCESSDENIED; + } + } +#endif + + HRESULT hres = CLSIDFromString (wszCLSIDValue, pclsid); + if (FAILED_UNEXPECTEDLY(hres)) + return hres; + + return S_OK; +} + static HRESULT getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { @@ -93,7 +184,6 @@ HRESULT hr; int icon_idx = 0; UINT flags = 0; // FIXME: Use it! - CHAR sTemp[MAX_PATH] = ""; WCHAR wTemp[MAX_PATH] = L""; hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); @@ -137,57 +227,33 @@ } else { - BOOL found = FALSE; - - if (_ILGetExtension(pidl, sTemp, _countof(sTemp))) - { - if (HCR_MapTypeToValueA(sTemp, sTemp, _countof(sTemp), TRUE) - && HCR_GetIconA(sTemp, sTemp, NULL, _countof(sTemp), &icon_idx)) + HKEY hkey = OpenKeyFromFileType(pidl, L"DefaultIcon"); + if (!hkey) + WARN("Could not open DefaultIcon key!\n"); + + DWORD dwSize = sizeof(wTemp); + if (hkey && !SHQueryValueExW(hkey, NULL, NULL, NULL, wTemp, &dwSize)) + { + WCHAR sNum[5]; + if (ParseFieldW (wTemp, 2, sNum, 5)) + icon_idx = _wtoi(sNum); + else + icon_idx = 0; /* sometimes the icon number is missing */ + ParseFieldW (wTemp, 1, wTemp, MAX_PATH); + PathUnquoteSpacesW(wTemp); + + if (!wcscmp(L"%1", wTemp)) /* icon is in the file */ { - if (!lstrcmpA("%1", sTemp)) /* icon is in the file */ - { - ILGetDisplayNameExW(psf, pidl, wTemp, 0); - icon_idx = 0; - } - else - { - MultiByteToWideChar(CP_ACP, 0, sTemp, -1, wTemp, _countof(wTemp)); - } - - found = TRUE; + ILGetDisplayNameExW(psf, pidl, wTemp, 0); + icon_idx = 0; } - else if (!lstrcmpiA(sTemp, "lnkfile")) - { - /* extract icon from shell shortcut */ - CComPtr<IShellLinkW> psl; - CComPtr<IExtractIconW> pei; - - HRESULT hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); - if (SUCCEEDED(hr)) - { - hr = psl->GetIconLocation(wTemp, _countof(wTemp), &icon_idx); - if (FAILED(hr) || !*wTemp) - { - /* The icon was not found directly, try to retrieve it from the shell link target */ - hr = psl->QueryInterface(IID_PPV_ARG(IExtractIconW, &pei)); - if (FAILED(hr) || !pei) - TRACE("No IExtractIconW interface!\n"); - else - hr = pei->GetIconLocation(GIL_FORSHELL, wTemp, _countof(wTemp), &icon_idx, &flags); - } - - if (SUCCEEDED(hr) && *wTemp) - found = TRUE; - } - } - } - - /* FIXME: We should normally use the correct icon format according to 'flags' */ - if (!found) - /* default icon */ + + initIcon->SetNormalIcon(wTemp, icon_idx); + } + else + { initIcon->SetNormalIcon(swShell32Name, 0); - else - initIcon->SetNormalIcon(wTemp, icon_idx); + } } return initIcon->QueryInterface(iid, ppvOut); @@ -607,24 +673,28 @@ HRESULT hr; if (!pidlRoot || !ppvOut || !pidl || !pidl->mkid.cb) + { + ERR("CFSFolder::BindToObject: Invalid parameters\n"); return E_INVALIDARG; - - if (_ILIsValue(pidl)) - { - ERR("Binding to file is unimplemented\n"); - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - } - if (!_ILIsFolder(pidl)) - { - ERR("Got an unknown type of pidl!\n"); - return E_FAIL; - } - - *ppvOut = NULL; + } + + if (!_ILIsFolder(pidl) && !_ILIsValue(pidl)) + { + ERR("CFSFolder::BindToObject: Invalid pidl!\n"); + return E_INVALIDARG; + } /* Get the pidl data */ FileStruct* pData = &_ILGetDataPointer(pidl)->u.file; FileStructW* pDataW = _ILGetFileStructW(pidl); + + if (!pDataW) + { + ERR("CFSFolder::BindToObject: Invalid pidl!\n"); + return E_INVALIDARG; + } + + *ppvOut = NULL; /* Create the target folder info */ PERSIST_FOLDER_TARGET_INFO pfti = {0}; @@ -633,9 +703,22 @@ PathCombineW(pfti.szTargetParsingName, sPathTarget, pDataW->wszName); /* Get the CLSID to bind to */ - CLSID clsidFolder = CLSID_ShellFSFolder; - if ((pData->uFileAttribs & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0) - SHELL32_GetCLSIDForDirectory(pfti.szTargetParsingName, &clsidFolder); + CLSID clsidFolder; + if (_ILIsFolder(pidl)) + { + clsidFolder = CLSID_ShellFSFolder; + + if ((pData->uFileAttribs & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0) + SHELL32_GetCLSIDForDirectory(pfti.szTargetParsingName, &clsidFolder); + } + else + { + hr = GetCLSIDForFileType(pidl, L"CLSID", &clsidFolder); + if (hr == S_FALSE) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + if (hr != S_OK) + return hr; + } hr = SHELL32_BindToSF(pidlRoot, &pfti, pidl, &clsidFolder, riid, ppvOut); if (FAILED_UNEXPECTEDLY(hr)) @@ -875,6 +958,13 @@ { *ppvOut = NULL; + if (cidl == 1) + { + hr = _CreateExtensionUIObject(apidl[0], riid, ppvOut); + if(hr != S_FALSE) + return hr; + } + if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { HKEY hKeys[16]; @@ -906,22 +996,17 @@ } else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) { - hr = CFSExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + hr = _GetIconHandler(apidl[0], riid, (LPVOID*)&pObj); + if (hr != S_OK) + hr = CFSExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); } else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files (except exe), so if we fail, rebind to root */ if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) { - IDropTarget * pDt = NULL; - hr = CFSDropTarget_CreateInstance(sPathTarget, riid, ppvOut); - pObj = pDt; + hr = CFSDropTarget_CreateInstance(sPathTarget, riid, (LPVOID*) &pObj); } - } - else if ((IsEqualIID(riid, IID_IShellLinkW) || - IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) - { - hr = IShellLink_ConstructFromFile(this, apidl[0], riid, &pObj); } else hr = E_NOINTERFACE; @@ -1373,8 +1458,34 @@ return E_NOTIMPL; } -HRESULT WINAPI CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { - HKEY hKey; +HRESULT CFSFolder::_CreateExtensionUIObject(PCUIDLIST_RELATIVE pidl, REFIID riid, LPVOID *ppvOut) +{ + static const WCHAR formatW[] = {'S','h','e','l','l','E','x','\\', + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; + WCHAR buf[MAX_PATH]; + + sprintfW(buf, formatW, riid.Data1, riid.Data2, riid.Data3, + riid.Data4[0], riid.Data4[1], riid.Data4[2], riid.Data4[3], + riid.Data4[4], riid.Data4[5], riid.Data4[6], riid.Data4[7]); + + CLSID clsid; + HRESULT hr; + + hr = GetCLSIDForFileType(pidl, buf, &clsid); + if (hr != S_OK) + return hr; + + hr = _CreateShellExtInstance(&clsid, pidl, riid, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +HRESULT CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) +{ HRESULT hr; TRACE("CFSFolder::_GetDropTarget entered\n"); @@ -1389,101 +1500,56 @@ return psfChild->CreateViewObject(NULL, IID_IDropTarget, ppvOut); } - STRRET strFile; - hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); - if (hr == S_OK) - { - WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strFile, pidl, wszPath, _countof(wszPath)); - - if (hr == S_OK) - { - LPCWSTR pwszExt = PathFindExtensionW(wszPath); - if (pwszExt[0]) - { - /* enumerate dynamic/static for a given file class */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* load dynamic extensions from file extension key, for example .jpg */ - _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut); - RegCloseKey(hKey); - } - - WCHAR wszTemp[40]; - DWORD dwSize = sizeof(wszTemp); - if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, NULL, RRF_RT_REG_SZ, NULL, wszTemp, &dwSize) == ERROR_SUCCESS) - { - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTemp, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* load dynamic extensions from progid key, for example jpegfile */ - _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut); - RegCloseKey(hKey); - } - } - } - } - } - else - ERR("GetDisplayNameOf failed: %x\n", hr); - - return hr; -} - -HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut) -{ - TRACE("CFSFolder::_LoadDynamicDropTargetHandlerForKey entered\n"); - - WCHAR wszName[MAX_PATH]; - DWORD dwSize = sizeof(wszName); + CLSID clsid; + hr = GetCLSIDForFileType(pidl, L"shellex\\DropHandler", &clsid); + if (hr != S_OK) + return hr; + + hr = _CreateShellExtInstance(&clsid, pidl, IID_IDropTarget, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) + return S_FALSE; + + return S_OK; +} + +HRESULT CFSFolder::_GetIconHandler(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut) +{ + CLSID clsid; HRESULT hr; - LRESULT res; - - res = RegGetValueW(hRootKey, L"shellex\\DropHandler", NULL, RRF_RT_REG_SZ, NULL, wszName, &dwSize); - if (res != ERROR_SUCCESS) + + hr = GetCLSIDForFileType(pidl, L"shellex\\IconHandler", &clsid); + if (hr != S_OK) + return hr; + + hr = _CreateShellExtInstance(&clsid, pidl, riid, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) return S_FALSE; - CLSID clsid; - hr = CLSIDFromString(wszName, &clsid); + return S_OK; +} + +HRESULT CFSFolder::_CreateShellExtInstance(const CLSID *pclsid, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut) +{ + HRESULT hr; + WCHAR wszPath[MAX_PATH]; + + FileStructW* pDataW = _ILGetFileStructW(pidl); + if (!pDataW) + { + ERR("Got garbage pidl\n"); + return E_INVALIDARG; + } + + PathCombineW(wszPath, sPathTarget, pDataW->wszName); + + CComPtr<IPersistFile> pp; + hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IPersistFile, &pp)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - if (m_bGroupPolicyActive) - { - res = RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - wszName, - RRF_RT_REG_SZ, - NULL, - NULL, - NULL); - if (res != ERROR_SUCCESS) - { - ERR("DropHandler extension %S not approved\n", wszName); - return E_FAIL; - } - } - - hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return S_OK; -} - -HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut) -{ - TRACE("CFSFolder::_LoadDynamicDropTargetHandler entered\n"); - HRESULT hr; - - CComPtr<IPersistFile> pp; - hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IPersistFile, &pp)); - if (hr != S_OK) - { - ERR("SHCoCreateInstance failed %x\n", GetLastError()); - } - pp->Load(pwcsname, 0); - - hr = pp->QueryInterface(IID_PPV_ARG(IDropTarget, (IDropTarget**) ppvOut)); + pp->Load(wszPath, 0); + + hr = pp->QueryInterface(riid, ppvOut); if (hr != S_OK) { ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Fri Aug 18 09:11:59 2017 @@ -39,10 +39,10 @@ LPITEMIDLIST pidlRoot; /* absolute pidl */ DWORD m_bGroupPolicyActive; - virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); - virtual HRESULT WINAPI _LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut); - virtual HRESULT WINAPI _LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut); - + HRESULT _CreateShellExtInstance(const CLSID *pclsid, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut); + HRESULT _CreateExtensionUIObject(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut); + HRESULT _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); + HRESULT _GetIconHandler(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut); public: CFSFolder(); ~CFSFolder(); Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Fri Aug 18 09:11:59 2017 @@ -750,7 +750,7 @@ if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei)))) { - if (SUCCEEDED(ei->GetIconLocation(uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) + if (SUCCEEDED(ei->GetIconLocation(uFlags &~ GIL_FORSHORTCUT, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) { *pIndex = SIC_GetIconIndex(szIconFile, iSourceIndex, uFlags); ret = TRUE;

7 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017