November 2023 - Wine-commits

Alistair Leslie-Hughes : comdlg32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 6fd308cd980535ac1c40062c0cc03a8d1a7ce273 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fd308cd980535ac1c40062c0cc03a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 9 18:23:47 2023 +1100 comdlg32: Remove DECLSPEC_HIDDEN usage. --- dlls/comdlg32/cdlg.h | 24 ++++++++++++------------ dlls/comdlg32/cdlg32.c | 2 +- dlls/comdlg32/filedlgbrowser.h | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index ae3c3d1ef37..16c3a15ab45 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -26,11 +26,11 @@ /* Common dialogs implementation globals */ #define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ -extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN; -extern HANDLE COMDLG32_hActCtx DECLSPEC_HIDDEN; +extern HINSTANCE COMDLG32_hInstance; +extern HANDLE COMDLG32_hActCtx; -void COMDLG32_SetCommDlgExtendedError(DWORD err) DECLSPEC_HIDDEN; -LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; +void COMDLG32_SetCommDlgExtendedError(DWORD err); +LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1); /* Find/Replace local definitions */ @@ -170,18 +170,18 @@ typedef struct { #include "shellapi.h" /* Constructors */ -HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; -HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv); +HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv); /* Shared helper functions */ -void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile) DECLSPEC_HIDDEN; +void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile); int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, - HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction) DECLSPEC_HIDDEN; -int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed) DECLSPEC_HIDDEN; -void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) DECLSPEC_HIDDEN; + HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction); +int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed); +void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText); -extern BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType ) DECLSPEC_HIDDEN; -extern BOOL GetFileName31W( OPENFILENAMEW *lpofn, UINT dlgType ) DECLSPEC_HIDDEN; +extern BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType ); +extern BOOL GetFileName31W( OPENFILENAMEW *lpofn, UINT dlgType ); #define ONOPEN_BROWSE 1 #define ONOPEN_OPEN 2 diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 9163930907a..6432b4c7442 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" -DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0; +HINSTANCE COMDLG32_hInstance = 0; HANDLE COMDLG32_hActCtx = INVALID_HANDLE_VALUE; static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index 21eb3d56dfe..57c8911fbd1 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -138,23 +138,23 @@ typedef struct * Prototypes for the methods of the IShellBrowserImpl class */ /* Constructor */ -IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner) DECLSPEC_HIDDEN; +IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner); -LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex) DECLSPEC_HIDDEN; +LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex); /* Functions used by the EDIT box */ -void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) DECLSPEC_HIDDEN; +void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd); /************************************************************************** * External Prototypes */ -extern FileOpenDlgInfos *get_filedlg_infoptr(HWND hwnd) DECLSPEC_HIDDEN; +extern FileOpenDlgInfos *get_filedlg_infoptr(HWND hwnd); -extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs) DECLSPEC_HIDDEN; -extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl) DECLSPEC_HIDDEN; +extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); +extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); -extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl) DECLSPEC_HIDDEN; -extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) DECLSPEC_HIDDEN; +extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl); +extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); #endif /*SHBROWSER_H*/

1 0

Alistair Leslie-Hughes : msacm32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 60ee3e2cff8d66cdf21769f8a40ec43610e3de61 URL: https://gitlab.winehq.org/wine/wine/-/commit/60ee3e2cff8d66cdf21769f8a40ec4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 9 18:22:39 2023 +1100 msacm32: Remove DECLSPEC_HIDDEN usage. --- dlls/msacm32/wineacm.h | 59 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index 98d1ab5a2c8..d6a8112b8ee 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -111,43 +111,42 @@ typedef struct _WINE_ACMNOTIFYWND } WINE_ACMNOTIFYWND; /* From internal.c */ -extern HANDLE MSACM_hHeap DECLSPEC_HIDDEN; -extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID DECLSPEC_HIDDEN; +extern HANDLE MSACM_hHeap; +extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID; extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName, - PWINE_ACMLOCALDRIVER pLocalDriver) DECLSPEC_HIDDEN; -extern void MSACM_RegisterAllDrivers(void) DECLSPEC_HIDDEN; -extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p) DECLSPEC_HIDDEN; -extern void MSACM_UnregisterAllDrivers(void) DECLSPEC_HIDDEN; -extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID) DECLSPEC_HIDDEN; -extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver) DECLSPEC_HIDDEN; -extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver) DECLSPEC_HIDDEN; -extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type) DECLSPEC_HIDDEN; - -extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM) DECLSPEC_HIDDEN; -extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD) DECLSPEC_HIDDEN; - -extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD) DECLSPEC_HIDDEN; -extern void MSACM_WriteCurrentPriorities(void) DECLSPEC_HIDDEN; -extern void MSACM_BroadcastNotification(void) DECLSPEC_HIDDEN; -extern void MSACM_DisableNotifications(void) DECLSPEC_HIDDEN; -extern void MSACM_EnableNotifications(void) DECLSPEC_HIDDEN; -extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg) DECLSPEC_HIDDEN; -extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*) DECLSPEC_HIDDEN; - -extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) DECLSPEC_HIDDEN; - -extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc) DECLSPEC_HIDDEN; -extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM) DECLSPEC_HIDDEN; -extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST) DECLSPEC_HIDDEN; + PWINE_ACMLOCALDRIVER pLocalDriver); +extern void MSACM_RegisterAllDrivers(void); +extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p); +extern void MSACM_UnregisterAllDrivers(void); +extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID); +extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver); +extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver); +extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type); + +extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM); +extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD); + +extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD); +extern void MSACM_WriteCurrentPriorities(void); +extern void MSACM_BroadcastNotification(void); +extern void MSACM_DisableNotifications(void); +extern void MSACM_EnableNotifications(void); +extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg); +extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*); + +extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry); + +extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc); +extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM); +extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST); /* extern PWINE_ACMLOCALDRIVER MSACM_GetLocalDriver(HACMDRIVER hDriver); */ /* From msacm32.c */ -extern HINSTANCE MSACM_hInstance32 DECLSPEC_HIDDEN; +extern HINSTANCE MSACM_hInstance32; /* From pcmcnvtr.c */ -LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN; +LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2); /* Dialog box templates */ #include "msacmdlg.h"

1 0

Alistair Leslie-Hughes : uxtheme: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: beb3021719428eab14cf04c5f23e4cf7d1c96af6 URL: https://gitlab.winehq.org/wine/wine/-/commit/beb3021719428eab14cf04c5f23e4c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 9 18:27:05 2023 +1100 uxtheme: Remove DECLSPEC_HIDDEN usage. --- dlls/uxtheme/msstyles.h | 64 +++++++++++++++++++++++------------------------ dlls/uxtheme/system.c | 2 +- dlls/uxtheme/uxthemedll.h | 38 ++++++++++++++-------------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 98e1aa045d6..38ff94d8c80 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -87,37 +87,37 @@ typedef struct _THEME_FILE { typedef struct _UXINI_FILE *PUXINI_FILE; -HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf) DECLSPEC_HIDDEN; -void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics) DECLSPEC_HIDDEN; -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, UINT dpi) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) DECLSPEC_HIDDEN; -BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId) DECLSPEC_HIDDEN; -BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPEC_HIDDEN; -BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; -PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; -UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; -PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) DECLSPEC_HIDDEN; -PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; -PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; -PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; -HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha) DECLSPEC_HIDDEN; - -HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect) DECLSPEC_HIDDEN; -HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins) DECLSPEC_HIDDEN; - -PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) DECLSPEC_HIDDEN; -void UXINI_CloseINI(PUXINI_FILE uf) DECLSPEC_HIDDEN; -LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen) DECLSPEC_HIDDEN; -BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName) DECLSPEC_HIDDEN; -LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen) DECLSPEC_HIDDEN; -BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); +void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); +HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); +PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, UINT dpi); +HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); +BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); +BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); +BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); +PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); +UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc); +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId); +PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); +PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); +PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); +HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); + +HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal); +HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor); +HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont); +HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal); +HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList); +HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint); +HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars); +HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); +HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); + +PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); +void UXINI_CloseINI(PUXINI_FILE uf); +LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); +BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); +LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); +BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); #endif diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 83cbaea5dfa..f95a5d598ae 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); static const WCHAR szThemeManager[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\ThemeManager"; -DECLSPEC_HIDDEN ATOM atDialogThemeEnabled; +ATOM atDialogThemeEnabled; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; static ATOM atWindowTheme; diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 7abc2a58144..aa073cbbb3c 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -81,40 +81,40 @@ typedef struct tagTHEMENAMES } THEMENAMES, *PTHEMENAMES; /* Declarations for undocumented functions for use internally */ -DWORD WINAPI QueryThemeServices(void) DECLSPEC_HIDDEN; +DWORD WINAPI QueryThemeServices(void); HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, - DWORD unknown) DECLSPEC_HIDDEN; -HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile) DECLSPEC_HIDDEN; -HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd) DECLSPEC_HIDDEN; + DWORD unknown); +HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile); +HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd); HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, DWORD dwColorNameLen, LPWSTR pszSizeName, - DWORD dwSizeNameLen) DECLSPEC_HIDDEN; + DWORD dwSizeNameLen); HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback, - LPVOID lpData) DECLSPEC_HIDDEN; + LPVOID lpData); HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, - DWORD dwColorNum, PTHEMENAMES pszColorNames) DECLSPEC_HIDDEN; + DWORD dwColorNum, PTHEMENAMES pszColorNames); HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, - DWORD dwSizeNum, PTHEMENAMES pszColorNames) DECLSPEC_HIDDEN; + DWORD dwSizeNum, PTHEMENAMES pszColorNames); HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, - ParseThemeIniFileProc callback, LPVOID lpData) DECLSPEC_HIDDEN; -BOOL WINAPI ThemeHooksInstall(void) DECLSPEC_HIDDEN; -BOOL WINAPI ThemeHooksRemove(void) DECLSPEC_HIDDEN; + ParseThemeIniFileProc callback, LPVOID lpData); +BOOL WINAPI ThemeHooksInstall(void); +BOOL WINAPI ThemeHooksRemove(void); -extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; -extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; -extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; +extern void UXTHEME_InitSystem(HINSTANCE hInst); +extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf); +extern void UXTHEME_UninitSystem(void); -extern struct user_api_hook user_api DECLSPEC_HIDDEN; -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; +extern struct user_api_hook user_api; +LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode); void WINAPI UXTHEME_NonClientButtonDraw(HWND hwnd, HDC hdc, enum NONCLIENT_BUTTON_TYPE type, - RECT rect, BOOL down, BOOL grayed) DECLSPEC_HIDDEN; + RECT rect, BOOL down, BOOL grayed); void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior, RECT *rect, UINT enable_flags, - INT arrowsize, INT thumbpos, INT thumbsize, BOOL vertical) DECLSPEC_HIDDEN; + INT arrowsize, INT thumbpos, INT thumbsize, BOOL vertical); LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - BOOL unicode) DECLSPEC_HIDDEN; + BOOL unicode); /* No alpha blending */ #define ALPHABLEND_NONE 0

1 0

Alistair Leslie-Hughes : wmiutils: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: db50069167ba01917353870d5ac5a373b411b14f URL: https://gitlab.winehq.org/wine/wine/-/commit/db50069167ba01917353870d5ac5a3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 6 09:55:12 2023 +1100 wmiutils: Remove DECLSPEC_HIDDEN usage. --- dlls/wmiutils/wmiutils_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 791e6123bdb..599b27b41f1 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemPath_create(LPVOID *); +HRESULT WbemStatusCodeText_create(LPVOID *);

1 0

Alistair Leslie-Hughes : msi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 91e81083458374706bbace11114f4ad5e473ac07 URL: https://gitlab.winehq.org/wine/wine/-/commit/91e81083458374706bbace11114f4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 6 11:19:02 2023 +1100 msi: Remove DECLSPEC_HIDDEN usage. --- dlls/msi/query.h | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 2323a8481d4..1997b50e932 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -108,50 +108,46 @@ typedef struct struct list *mem; } SQL_input; -UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, - struct list *mem ) DECLSPEC_HIDDEN; +UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, struct list *mem ); -UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ); -UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - const column_info *columns ) DECLSPEC_HIDDEN; +UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, const column_info *columns ); -UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) DECLSPEC_HIDDEN; +UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); -UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - column_info *columns ) DECLSPEC_HIDDEN; +UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, column_info *columns ); -UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, - struct expr *cond ) DECLSPEC_HIDDEN; +UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, struct expr *cond ); UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, - column_info *col_info, BOOL hold ) DECLSPEC_HIDDEN; + column_info *col_info, BOOL hold ); UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, - column_info *columns, column_info *values, BOOL temp ) DECLSPEC_HIDDEN; + column_info *columns, column_info *values, BOOL temp ); UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, - column_info *list, struct expr *expr ) DECLSPEC_HIDDEN; + column_info *list, struct expr *expr ); -UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) DECLSPEC_HIDDEN; +UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); -UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) DECLSPEC_HIDDEN; +UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ); -UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ); -UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ); -UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ) DECLSPEC_HIDDEN; +UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ); -int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip) DECLSPEC_HIDDEN; +int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip); -MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; +MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ); UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent, BOOL hold ) DECLSPEC_HIDDEN; + MSICONDITION persistent, BOOL hold ); -UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ) DECLSPEC_HIDDEN; +UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ); -UINT msi_view_refresh_row( MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec ) DECLSPEC_HIDDEN; +UINT msi_view_refresh_row( MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec ); #endif /* __WINE_MSI_QUERY_H */

1 0

Alistair Leslie-Hughes : winhttp: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 01d7780a0f7574d7f7fe0a8beb2fad181ec66838 URL: https://gitlab.winehq.org/wine/wine/-/commit/01d7780a0f7574d7f7fe0a8beb2fad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 6 12:20:37 2023 +1100 winhttp: Remove DECLSPEC_HIDDEN usage. --- dlls/winhttp/winhttp_private.h | 80 +++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index bf1e60e2cee..0bf1c5bc6b0 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -378,45 +378,45 @@ struct socket_shutdown BOOL complete_async; }; -struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN; -struct object_header *grab_object( HINTERNET ) DECLSPEC_HIDDEN; -void release_object( struct object_header * ) DECLSPEC_HIDDEN; -HINTERNET alloc_handle( struct object_header * ) DECLSPEC_HIDDEN; -BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; - -void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; -void close_connection( struct request * ) DECLSPEC_HIDDEN; -void init_queue( struct queue *queue ) DECLSPEC_HIDDEN; -void stop_queue( struct queue * ) DECLSPEC_HIDDEN; - -void netconn_addref( struct netconn * ) DECLSPEC_HIDDEN; -void netconn_release( struct netconn * ) DECLSPEC_HIDDEN; -DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; -void netconn_unload( void ) DECLSPEC_HIDDEN; -ULONG netconn_query_data_available( struct netconn * ) DECLSPEC_HIDDEN; -DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; -DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; -DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ) DECLSPEC_HIDDEN; -BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) DECLSPEC_HIDDEN; -void netconn_cancel_io( struct netconn *conn ) DECLSPEC_HIDDEN; -DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; -BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN; -const void *netconn_get_certificate( struct netconn * ) DECLSPEC_HIDDEN; -int netconn_get_cipher_strength( struct netconn * ) DECLSPEC_HIDDEN; - -BOOL set_cookies( struct request *, const WCHAR * ) DECLSPEC_HIDDEN; -DWORD add_cookie_headers( struct request * ) DECLSPEC_HIDDEN; -DWORD add_request_headers( struct request *, const WCHAR *, DWORD, DWORD ) DECLSPEC_HIDDEN; -void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; -BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; -void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; - -void release_host( struct hostdata * ) DECLSPEC_HIDDEN; -DWORD process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ) DECLSPEC_HIDDEN; - -extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; -void release_typelib( void ) DECLSPEC_HIDDEN; +struct object_header *addref_object( struct object_header * ); +struct object_header *grab_object( HINTERNET ); +void release_object( struct object_header * ); +HINTERNET alloc_handle( struct object_header * ); +BOOL free_handle( HINTERNET ); + +void send_callback( struct object_header *, DWORD, LPVOID, DWORD ); +void close_connection( struct request * ); +void init_queue( struct queue *queue ); +void stop_queue( struct queue * ); + +void netconn_addref( struct netconn * ); +void netconn_release( struct netconn * ); +DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ); +void netconn_unload( void ); +ULONG netconn_query_data_available( struct netconn * ); +DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ); +DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ); +DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ); +DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ); +BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ); +void netconn_cancel_io( struct netconn *conn ); +DWORD netconn_set_timeout( struct netconn *, BOOL, int ); +BOOL netconn_is_alive( struct netconn * ); +const void *netconn_get_certificate( struct netconn * ); +int netconn_get_cipher_strength( struct netconn * ); + +BOOL set_cookies( struct request *, const WCHAR * ); +DWORD add_cookie_headers( struct request * ); +DWORD add_request_headers( struct request *, const WCHAR *, DWORD, DWORD ); +void destroy_cookies( struct session * ); +BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ); +void destroy_authinfo( struct authinfo * ); + +void release_host( struct hostdata * ); +DWORD process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ); + +extern HRESULT WinHttpRequest_create( void ** ); +void release_typelib( void ); static inline WCHAR *strdupAW( const char *src ) { @@ -457,7 +457,7 @@ static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) return dst; } -extern HINSTANCE winhttp_instance DECLSPEC_HIDDEN; +extern HINSTANCE winhttp_instance; #define MIN_WEBSOCKET_SEND_BUFFER_SIZE 16

1 0

Zebediah Figura : d3d9/tests: Test that GetDC() records a dirty rect.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 8fa82bd1f89c669bc89be7d56413adde67638a82 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fa82bd1f89c669bc89be7d56413ad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 17:43:55 2023 -0600 d3d9/tests: Test that GetDC() records a dirty rect. --- dlls/d3d9/tests/visual.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0ac6b58cb36..51848cecbf6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19507,6 +19507,7 @@ static void add_dirty_rect_test(void) ULONG refcount; DWORD *texel; HWND window; + HDC dc; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; static const RECT oob_rect[] = @@ -19748,6 +19749,21 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* GetDC() records a dirty rect. */ + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_src_green, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_src_green, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -19873,6 +19889,18 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* So does GetDC(). */ + fill_surface(surface_managed0, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_managed0, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_managed0, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* Tests with dynamic textures */ fill_surface(surface_dynamic, 0x0000ffff, 0); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dynamic);

1 0

Zebediah Figura : wined3d: Record a dirty rect in wined3d_texture_create_dc().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: a32872870271083a0bd5caa55771be4ff1b2fff2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a32872870271083a0bd5caa55771be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 17:45:07 2023 -0600 wined3d: Record a dirty rect in wined3d_texture_create_dc(). --- dlls/d3d9/tests/visual.c | 4 +-- dlls/wined3d/texture.c | 66 +++++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51848cecbf6..bb8381cde3d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19760,7 +19760,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); @@ -19897,7 +19897,7 @@ static void add_dirty_rect_test(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a89fad97ed8..1f4c4b80d3c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1088,6 +1088,37 @@ static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture checkGLcall("allocate immutable storage"); } +static void wined3d_texture_dirty_region_add(struct wined3d_texture *texture, + unsigned int layer, const struct wined3d_box *box) +{ + struct wined3d_dirty_regions *regions; + unsigned int count; + + if (!texture->dirty_regions) + return; + + regions = &texture->dirty_regions[layer]; + count = regions->box_count + 1; + if (count >= WINED3D_MAX_DIRTY_REGION_COUNT || !box + || (!box->left && !box->top && !box->front + && box->right == texture->resource.width + && box->bottom == texture->resource.height + && box->back == texture->resource.depth)) + { + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + if (!wined3d_array_reserve((void **)&regions->boxes, &regions->boxes_size, count, sizeof(*regions->boxes))) + { + ERR("Failed to grow boxes array, marking entire texture dirty.\n"); + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + regions->boxes[regions->box_count++] = *box; +} + void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -1150,6 +1181,10 @@ static void wined3d_texture_create_dc(void *object) context = context_acquire(device, NULL, 0); wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } + + if (texture->dirty_regions) + wined3d_texture_dirty_region_add(texture, sub_resource_idx / texture->level_count, NULL); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, texture->resource.map_binding); @@ -2123,37 +2158,6 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str return &texture->sub_resources[sub_resource_idx]; } -static void wined3d_texture_dirty_region_add(struct wined3d_texture *texture, - unsigned int layer, const struct wined3d_box *box) -{ - struct wined3d_dirty_regions *regions; - unsigned int count; - - if (!texture->dirty_regions) - return; - - regions = &texture->dirty_regions[layer]; - count = regions->box_count + 1; - if (count >= WINED3D_MAX_DIRTY_REGION_COUNT || !box - || (!box->left && !box->top && !box->front - && box->right == texture->resource.width - && box->bottom == texture->resource.height - && box->back == texture->resource.depth)) - { - regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; - return; - } - - if (!wined3d_array_reserve((void **)&regions->boxes, &regions->boxes_size, count, sizeof(*regions->boxes))) - { - WARN("Failed to grow boxes array, marking entire texture dirty.\n"); - regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; - return; - } - - regions->boxes[regions->box_count++] = *box; -} - HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) {

1 0

Paul Gofman : user32: Return empty string from LoadStringW() if resource is not found.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 726027d60182db021edfdf83f1ec39f17486fd5d URL: https://gitlab.winehq.org/wine/wine/-/commit/726027d60182db021edfdf83f1ec39… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:32:04 2023 -0600 user32: Return empty string from LoadStringW() if resource is not found. --- dlls/user32/resource.c | 13 +++++++------ dlls/user32/tests/resource.c | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 3714b05ce8d..d2937988765 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -161,12 +161,13 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, if(buffer == NULL) return 0; - /* Use loword (incremented by 1) as resourceid */ - hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), - (LPWSTR)RT_STRING ); - if (!hrsrc) return 0; - hmem = LoadResource( instance, hrsrc ); - if (!hmem) return 0; + if (!(hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING )) || + !(hmem = LoadResource( instance, hrsrc ))) + { + TRACE( "Failed to load string.\n" ); + if (buflen > 0) buffer[0] = 0; + return 0; + } p = LockResource(hmem); string_num = resource_id & 0x000f; diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 2369aef2a09..da4efd2465f 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -120,6 +120,33 @@ static void test_LoadStringW(void) winetest_pop_context(); } } + + /* Test missing resource. */ + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, ARRAY_SIZE(returnedstringw)); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_FOUND) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, 0); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_LOADED) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(returnedstringw[0] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, 1); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_LOADED) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); } static void test_LoadStringA (void)

1 0

Paul Gofman : user32: Put 0 to output string even for 1 char buffer in LoadStringW().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: ad9303d888aa0b463f07f16059ce801d8da10ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad9303d888aa0b463f07f16059ce80… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:56:17 2023 -0600 user32: Put 0 to output string even for 1 char buffer in LoadStringW(). --- dlls/user32/resource.c | 13 +++---------- dlls/user32/tests/resource.c | 9 +++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index d2937988765..b050e1eba8c 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -185,17 +185,10 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, } i = min(buflen - 1, *p); - if (i > 0) { - memcpy(buffer, p + 1, i * sizeof (WCHAR)); - buffer[i] = 0; - } else { - if (buflen > 1) { - buffer[0] = 0; - return 0; - } - } + memcpy(buffer, p + 1, i * sizeof(WCHAR)); + buffer[i] = 0; - TRACE("%s loaded !\n", debugstr_w(buffer)); + TRACE("returning %s\n", debugstr_w(buffer)); return i; } diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index da4efd2465f..de4bb2c8a53 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -147,6 +147,15 @@ static void test_LoadStringW(void) "got %lu.\n", GetLastError()); ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + /* Test short buffer */ + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 2, returnedstringw, 1); /* get resource string */ + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == 0xdeadbeef, "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); } static void test_LoadStringA (void)

1 0