Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[mjansen] 73906: [OLE32] Fix a crash when executing zz_winrar_3.80_test.exe 4.drag_and_drop CORE-12590 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Feb 25 14:52:16 2017 New Revision: 73906 URL: http://svn.reactos.org/svn/reactos?rev=73906&view=rev Log: [OLE32] Fix a crash when executing zz_winrar_3.80_test.exe 4.drag_and_drop CORE-12590 #resolve Modified: trunk/reactos/dll/win32/ole32/clipboard.c Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Sat Feb 25 14:52:16 2017 @@ -807,6 +807,9 @@ mem_fmt = *fmt; mem_fmt.tymed = TYMED_HGLOBAL; +#ifdef __REACTOS__ + med.pUnkForRelease = NULL; +#endif hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr;

7 years, 6 months

[tfaber] 73905: [KERNEL32] - Avoid leaving lpRootPath initialized in GetDriveTypeW. Powered by /RTC1

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 25 13:06:25 2017 New Revision: 73905 URL: http://svn.reactos.org/svn/reactos?rev=73905&view=rev Log: [KERNEL32] - Avoid leaving lpRootPath initialized in GetDriveTypeW. Powered by /RTC1 Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Sat Feb 25 13:06:25 2017 @@ -411,6 +411,7 @@ TRACE("lpRootPathName: %S\n", lpRootPathName); + lpRootPath = lpRootPathName; if (Length == 2) { WCHAR DriveLetter = RtlUpcaseUnicodeChar(lpRootPathName[0]); @@ -427,10 +428,6 @@ lpRootPath = CurrentDir; } - } - else - { - lpRootPath = lpRootPathName; } }

7 years, 6 months

[ekohl] 73904: [SETUPAPI] - Implement CM_Get_Class_Registry_PropertyA(). - Move mapping of poperty type to registry value type into a separate function and use it in CM_Get_Class_Registry_PropertyA...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 25 12:45:05 2017 New Revision: 73904 URL: http://svn.reactos.org/svn/reactos?rev=73904&view=rev Log: [SETUPAPI] - Implement CM_Get_Class_Registry_PropertyA(). - Move mapping of poperty type to registry value type into a separate function and use it in CM_Get_Class_Registry_PropertyA(), CM_Set_DevNode_Registry_Property_ExA() and CM_Set_DevNode_Registry_Property_ExW(). Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sat Feb 25 12:45:05 2017 @@ -95,6 +95,59 @@ } +static +ULONG +GetRegistryPropertyType( + ULONG ulProperty) +{ + switch (ulProperty) + { + case CM_DRP_DEVICEDESC: + case CM_DRP_SERVICE: + case CM_DRP_CLASS: + case CM_DRP_CLASSGUID: + case CM_DRP_DRIVER: + case CM_DRP_MFG: + case CM_DRP_FRIENDLYNAME: + case CM_DRP_LOCATION_INFORMATION: + case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: + case CM_DRP_ENUMERATOR_NAME: + case CM_DRP_SECURITY_SDS: + case CM_DRP_UI_NUMBER_DESC_FORMAT: + return REG_SZ; + + case CM_DRP_HARDWAREID: + case CM_DRP_COMPATIBLEIDS: + case CM_DRP_UPPERFILTERS: + case CM_DRP_LOWERFILTERS: + return REG_MULTI_SZ; + + case CM_DRP_CONFIGFLAGS: + case CM_DRP_CAPABILITIES: + case CM_DRP_UI_NUMBER: + case CM_DRP_LEGACYBUSTYPE: + case CM_DRP_BUSNUMBER: + case CM_DRP_DEVTYPE: + case CM_DRP_EXCLUSIVE: + case CM_DRP_CHARACTERISTICS: + case CM_DRP_ADDRESS: + case CM_DRP_REMOVAL_POLICY: + case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: + case CM_DRP_REMOVAL_POLICY_OVERRIDE: + case CM_DRP_INSTALL_STATE: + return REG_DWORD; + + case CM_DRP_BUSTYPEGUID: + case CM_DRP_SECURITY: + case CM_DRP_DEVICE_POWER_DATA: + default: + return REG_BINARY; + } + + return REG_NONE; +} + + /*********************************************************************** * CMP_Init_Detection [SETUPAPI.@] */ @@ -1689,10 +1742,68 @@ LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType, PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %lu %p %p %p %lx %lx\n", + PWSTR BufferW = NULL; + ULONG ulLength = 0; + ULONG ulType; + CONFIGRET ret; + + TRACE("%p %lu %p %p %p %lx %lx\n", ClassGuid, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + + if (pulLength == NULL) + return CR_INVALID_POINTER; + + if (ulProperty < CM_CRP_MIN || ulProperty > CM_CRP_MAX) + return CR_INVALID_PROPERTY; + + ulType = GetRegistryPropertyType(ulProperty); + if (ulType == REG_SZ || ulType == REG_MULTI_SZ) + { + /* Get the required buffer size */ + ret = CM_Get_Class_Registry_PropertyW(ClassGuid, ulProperty, pulRegDataType, + NULL, &ulLength, ulFlags, hMachine); + if (ret != CR_BUFFER_SMALL) + return ret; + + /* Allocate the unicode buffer */ + BufferW = HeapAlloc(GetProcessHeap(), 0, ulLength); + if (BufferW == NULL) + return CR_OUT_OF_MEMORY; + + /* Get the property */ + ret = CM_Get_Class_Registry_PropertyW(ClassGuid, ulProperty, pulRegDataType, + BufferW, &ulLength, ulFlags, hMachine); + if (ret != CR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, BufferW); + return ret; + } + + /* Do W->A conversion */ + *pulLength = WideCharToMultiByte(CP_ACP, + 0, + BufferW, + lstrlenW(BufferW) + 1, + Buffer, + *pulLength, + NULL, + NULL); + + /* Release the unicode buffer */ + HeapFree(GetProcessHeap(), 0, BufferW); + + if (*pulLength == 0) + ret = CR_FAILURE; + } + else + { + /* Get the property */ + ret = CM_Get_Class_Registry_PropertyW(ClassGuid, ulProperty, pulRegDataType, + Buffer, pulLength, ulFlags, hMachine); + } + + return ret; } @@ -5435,6 +5546,9 @@ if (Buffer == NULL && ulLength != 0) return CR_INVALID_POINTER; + if (ulProperty < CM_DRP_MIN || ulProperty > CM_DRP_MAX) + return CR_INVALID_PROPERTY; + if (Buffer == NULL) { ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, @@ -5447,87 +5561,7 @@ else { /* Get property type */ - switch (ulProperty) - { - case CM_DRP_DEVICEDESC: - ulType = REG_SZ; - break; - - case CM_DRP_HARDWAREID: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_COMPATIBLEIDS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SERVICE: - ulType = REG_SZ; - break; - - case CM_DRP_CLASS: - ulType = REG_SZ; - break; - - case CM_DRP_CLASSGUID: - ulType = REG_SZ; - break; - - case CM_DRP_DRIVER: - ulType = REG_SZ; - break; - - case CM_DRP_CONFIGFLAGS: - ulType = REG_DWORD; - break; - - case CM_DRP_MFG: - ulType = REG_SZ; - break; - - case CM_DRP_FRIENDLYNAME: - ulType = REG_SZ; - break; - - case CM_DRP_LOCATION_INFORMATION: - ulType = REG_SZ; - break; - - case CM_DRP_UPPERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_LOWERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SECURITY: - ulType = REG_BINARY; - break; - - case CM_DRP_DEVTYPE: - ulType = REG_DWORD; - break; - - case CM_DRP_EXCLUSIVE: - ulType = REG_DWORD; - break; - - case CM_DRP_CHARACTERISTICS: - ulType = REG_DWORD; - break; - - case CM_DRP_UI_NUMBER_DESC_FORMAT: - ulType = REG_SZ; - break; - - case CM_DRP_REMOVAL_POLICY_OVERRIDE: - ulType = REG_DWORD; - break; - - default: - return CR_INVALID_PROPERTY; - } + ulType = GetRegistryPropertyType(ulProperty); /* Allocate buffer if needed */ if (ulType == REG_SZ || @@ -5623,87 +5657,8 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - switch (ulProperty) - { - case CM_DRP_DEVICEDESC: - ulType = REG_SZ; - break; - - case CM_DRP_HARDWAREID: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_COMPATIBLEIDS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SERVICE: - ulType = REG_SZ; - break; - - case CM_DRP_CLASS: - ulType = REG_SZ; - break; - - case CM_DRP_CLASSGUID: - ulType = REG_SZ; - break; - - case CM_DRP_DRIVER: - ulType = REG_SZ; - break; - - case CM_DRP_CONFIGFLAGS: - ulType = REG_DWORD; - break; - - case CM_DRP_MFG: - ulType = REG_SZ; - break; - - case CM_DRP_FRIENDLYNAME: - ulType = REG_SZ; - break; - - case CM_DRP_LOCATION_INFORMATION: - ulType = REG_SZ; - break; - - case CM_DRP_UPPERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_LOWERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SECURITY: - ulType = REG_BINARY; - break; - - case CM_DRP_DEVTYPE: - ulType = REG_DWORD; - break; - - case CM_DRP_EXCLUSIVE: - ulType = REG_DWORD; - break; - - case CM_DRP_CHARACTERISTICS: - ulType = REG_DWORD; - break; - - case CM_DRP_UI_NUMBER_DESC_FORMAT: - ulType = REG_SZ; - break; - - case CM_DRP_REMOVAL_POLICY_OVERRIDE: - ulType = REG_DWORD; - break; - - default: - return CR_INVALID_PROPERTY; - } + /* Get property type */ + ulType = GetRegistryPropertyType(ulProperty); RpcTryExcept {

7 years, 6 months

[bfreisen] 73903: [MSPAINT] - fix error in dynamic menu: most recently used files were showing up in zoom menu, too CORE-12829 #resolve

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sat Feb 25 11:24:15 2017 New Revision: 73903 URL: http://svn.reactos.org/svn/reactos?rev=73903&view=rev Log: [MSPAINT] - fix error in dynamic menu: most recently used files were showing up in zoom menu, too CORE-12829 #resolve Modified: trunk/reactos/base/applications/mspaint/winproc.cpp Modified: trunk/reactos/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] Sat Feb 25 11:24:15 2017 @@ -222,6 +222,8 @@ switch (lParam) { case 0: /* File menu */ + if ((HMENU)wParam != GetSubMenu(menu, 0)) + break; EnableMenuItem(menu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(isAFile)); EnableMenuItem(menu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(isAFile)); EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile));

7 years, 6 months

[gadamopoulos] 73902: [COMCTL32] -Add helper functions for setting and retrieving the button bitmap.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 25 11:05:19 2017 New Revision: 73902 URL: http://svn.reactos.org/svn/reactos?rev=73902&view=rev Log: [COMCTL32] -Add helper functions for setting and retrieving the button bitmap. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sat Feb 25 11:05:19 2017 @@ -207,6 +207,16 @@ BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag); +static inline LONG_PTR get_button_image(HWND hwnd) +{ + return GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); +} + +static inline LONG_PTR set_button_image(HWND hwnd, LONG_PTR image) +{ + return SetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET, image ); +} + #endif static inline HFONT get_button_font( HWND hwnd ) @@ -697,12 +707,20 @@ default: return 0; } +#ifdef _USER32_ oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam ); +#else + oldHbitmap = (HBITMAP)set_button_image(hWnd, lParam ); +#endif InvalidateRect( hWnd, NULL, FALSE ); return (LRESULT)oldHbitmap; case BM_GETIMAGE: +#ifdef _USER32_ return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); +#else + return get_button_image(hWnd); +#endif case BM_GETCHECK: return get_button_state( hWnd ) & 3; @@ -886,7 +904,11 @@ } case BS_ICON: +#ifdef _USER32_ if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo)) +#else + if (!GetIconInfo((HICON)get_button_image(hwnd), &iconInfo)) +#endif goto empty_rect; GetObjectW (iconInfo.hbmColor, sizeof(BITMAP), &bm); @@ -899,7 +921,11 @@ break; case BS_BITMAP: +#ifdef _USER32_ if (!GetObjectW( (HANDLE)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), sizeof(BITMAP), &bm)) +#else + if (!GetObjectW( (HANDLE)get_button_image(hwnd), sizeof(BITMAP), &bm)) +#endif goto empty_rect; r.right = r.left + bm.bmWidth; @@ -1006,12 +1032,20 @@ case BS_ICON: flags |= DST_ICON; +#ifdef _USER32_ lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); +#else + lp = get_button_image(hwnd); +#endif break; case BS_BITMAP: flags |= DST_BITMAP; +#ifdef _USER32_ lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); +#else + lp = get_button_image(hwnd); +#endif break; default:

7 years, 6 months

[pschweitzer] 73901: [REISERFS] When compiling the driver with GCC, define __GCC__. Fix defines accordingly. CORE-12826

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 25 10:16:33 2017 New Revision: 73901 URL: http://svn.reactos.org/svn/reactos?rev=73901&view=rev Log: [REISERFS] When compiling the driver with GCC, define __GCC__. Fix defines accordingly. CORE-12826 Modified: trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h Modified: trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser… ============================================================================== --- trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt [iso-8859-1] Sat Feb 25 10:16:33 2017 @@ -81,7 +81,7 @@ if(NOT MSVC) add_target_compile_flags(reiserfs "-Wno-pointer-sign -Wno-unused-function") if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(reiserfs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces") + add_target_compile_flags(reiserfs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces -D__GCC__") endif() else() #disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" Modified: trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser… ============================================================================== --- trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h [iso-8859-1] Sat Feb 25 10:16:33 2017 @@ -3,7 +3,11 @@ */ #ifdef __GCC__ +#ifndef __REACTOS__ #define __PACKED __PACKED +#else + #define __PACKED __attribute__((packed)) +#endif #else #define __PACKED #endif Modified: trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser… ============================================================================== --- trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h [iso-8859-1] Sat Feb 25 10:16:33 2017 @@ -4,7 +4,11 @@ #include <linux/types.h> #ifdef __GCC__ +#ifndef __REACTOS__ #define __PACKED __PACKED +#else + #define __PACKED __attribute__((packed)) +#endif #else #define __PACKED #endif

7 years, 6 months

[mjansen] 73900: [WIN32SS] Rewrite font selection code. Patch by Katayama Hirofumi MZ. CORE-6621 - Adding support for multiple font formats (including collections) - Choosing a font based on weight...

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Feb 25 10:10:25 2017 New Revision: 73900 URL: http://svn.reactos.org/svn/reactos?rev=73900&view=rev Log: [WIN32SS] Rewrite font selection code. Patch by Katayama Hirofumi MZ. CORE-6621 - Adding support for multiple font formats (including collections) - Choosing a font based on weights as documented - Adding support for loading fonts from memory - Share font faces - Emulation of Italic and Bold - Support for Underline and Strike-out - Localized font names - Fix GetFontResourceInfoW - Fix Registry settings - Fix multiple font properties Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h trunk/reactos/win32ss/gdi/gdi32/objects/font.c trunk/reactos/win32ss/gdi/gdi32/objects/text.c trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/text.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engobjects… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r…

7 years, 6 months

[gadamopoulos] 73899: [COMCTL32] -Redraw the button when we get a WM_THEMECHANGED.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 25 09:24:40 2017 New Revision: 73899 URL: http://svn.reactos.org/svn/reactos?rev=73899&view=rev Log: [COMCTL32] -Redraw the button when we get a WM_THEMECHANGED. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sat Feb 25 09:24:40 2017 @@ -380,6 +380,7 @@ case WM_THEMECHANGED: CloseThemeData (GetWindowTheme(hWnd)); OpenThemeData(hWnd, WC_BUTTONW); + InvalidateRect(hWnd, NULL, FALSE); break; case WM_MOUSEHOVER:

7 years, 6 months

[gadamopoulos] 73898: [UXTHEME] - When we set the desired app name and class name in SetWindowTheme we need to support empty strings meaning no themes for this window. Sort of support empty strings...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 25 09:23:37 2017 New Revision: 73898 URL: http://svn.reactos.org/svn/reactos?rev=73898&view=rev Log: [UXTHEME] - When we set the desired app name and class name in SetWindowTheme we need to support empty strings meaning no themes for this window. Sort of support empty strings by replacing them with a string containing a single "0". This works since there is no app name or class name with this name. Also add some error messages. Modified: trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sat Feb 25 09:23:37 2017 @@ -667,14 +667,31 @@ { ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp)); if(oldValue) + { DeleteAtom(oldValue); - if(pszValue) { - ATOM atValue = AddAtomW(pszValue); - if(!atValue - || !SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp), (LPWSTR)MAKEINTATOM(atValue))) { - HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); + } + + if(pszValue) + { + ATOM atValue; + + /* A string with zero lenght is not acceptatble in AddAtomW but we want to support + users passing an empty string meaning they want no theme for the specified window */ + if(!pszValue[0]) + pszValue = L"0"; + + atValue = AddAtomW(pszValue); + if (!atValue) + { + ERR("AddAtomW for %S failed with last error %d!\n", pszValue, GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (!SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp), (LPWSTR)MAKEINTATOM(atValue))) + { + ERR("SetPropW for atom %d failed with last error %d\n", aProp, GetLastError()); if(atValue) DeleteAtom(atValue); - return hr; + return HRESULT_FROM_WIN32(GetLastError()); } } return S_OK;

7 years, 6 months

[gadamopoulos] 73897: [COMCTL32] -Draw button with classic style if BM_SETIMAGE was used.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Feb 24 22:47:59 2017 New Revision: 73897 URL: http://svn.reactos.org/svn/reactos?rev=73897&view=rev Log: [COMCTL32] -Draw button with classic style if BM_SETIMAGE was used. Modified: trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Fri Feb 24 22:47:59 2017 @@ -38,6 +38,7 @@ #define STATE_GWL_OFFSET 0 #define HFONT_GWL_OFFSET (sizeof(LONG)) +#define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET+sizeof(HFONT)) static inline LONG get_button_state( HWND hwnd ) { @@ -320,14 +321,24 @@ BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag) { - DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); - UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - int state = get_button_state(hwnd); + DWORD dwStyle; + DWORD dwStyleEx; + UINT dtFlags; + int state; ButtonState drawState; - pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; + pfThemedPaint paint; + + dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; if (!paint) return FALSE; + + if (GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET) != 0) + return FALSE; + + dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); + dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); + state = get_button_state(hwnd); if(IsWindowEnabled(hwnd)) {

7 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
36
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 February 2017