wine-commits December 2023

wine-commits@winehq.org

1 participants
418 discussions

Rémi Bernon : winemac: Use the new NotifyIcon user driver interface.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 550cac96865ecd6f7a98d70ad88bf7f6d0ce2560 URL: https://gitlab.winehq.org/wine/wine/-/commit/550cac96865ecd6f7a98d70ad88bf7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 09:51:15 2023 +0100 winemac: Use the new NotifyIcon user driver interface. --- dlls/winemac.drv/dllmain.c | 6 ----- dlls/winemac.drv/gdi.c | 2 ++ dlls/winemac.drv/macdrv.h | 3 ++- dlls/winemac.drv/macdrv_main.c | 57 --------------------------------------- dlls/winemac.drv/systray.c | 24 ++++++----------- dlls/winemac.drv/unixlib.h | 8 ------ dlls/winemac.drv/winemac.drv.spec | 2 -- 7 files changed, 12 insertions(+), 90 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 8812426cc44..5917ed0906f 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -424,9 +424,3 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) macdrv_module = instance; return process_attach(); } - -int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) -{ - struct notify_icon_params params = { .msg = msg, .data = data }; - return MACDRV_CALL(notify_icon, &params); -} diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 60ee9339467..6c2241514a9 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -269,6 +269,8 @@ static const struct user_driver_funcs macdrv_funcs = .pBeep = macdrv_Beep, .pChangeDisplaySettings = macdrv_ChangeDisplaySettings, .pClipCursor = macdrv_ClipCursor, + .pNotifyIcon = macdrv_NotifyIcon, + .pCleanupIcons = macdrv_CleanupIcons, .pClipboardWindowProc = macdrv_ClipboardWindowProc, .pDesktopWindowProc = macdrv_DesktopWindowProc, .pDestroyCursorIcon = macdrv_DestroyCursorIcon, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a1cdcc76ebc..e1dd1c61b3f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -134,6 +134,8 @@ extern BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp); extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp); extern BOOL macdrv_ClipCursor(const RECT *clip, BOOL reset); +extern LRESULT macdrv_NotifyIcon(HWND hwnd, UINT msg, NOTIFYICONDATAW *data); +extern void macdrv_CleanupIcons(HWND hwnd); extern LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); extern void macdrv_DestroyWindow(HWND hwnd); extern void macdrv_SetDesktopWindow(HWND hwnd); @@ -281,7 +283,6 @@ extern NTSTATUS macdrv_dnd_get_formats(void *arg); extern NTSTATUS macdrv_dnd_have_format(void *arg); extern NTSTATUS macdrv_dnd_release(void *arg); extern NTSTATUS macdrv_dnd_retain(void *arg); -extern NTSTATUS macdrv_notify_icon(void *arg); extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, ULONG size); diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index b40bf02f267..21b148ff558 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -623,7 +623,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = macdrv_dnd_release, macdrv_dnd_retain, macdrv_init, - macdrv_notify_icon, macdrv_quit_result, }; @@ -661,61 +660,6 @@ static NTSTATUS wow64_init(void *arg) return macdrv_init(&params); } -static NTSTATUS wow64_notify_icon(void *arg) -{ - struct - { - DWORD msg; - ULONG data; - } *params32 = arg; - struct - { - DWORD cbSize; - ULONG hWnd; - UINT uID; - UINT uFlags; - UINT uCallbackMessage; - ULONG hIcon; - WCHAR szTip[128]; - DWORD dwState; - DWORD dwStateMask; - WCHAR szInfo[256]; - UINT uTimeout; - WCHAR szInfoTitle[64]; - DWORD dwInfoFlags; - GUID guidItem; - ULONG hBalloonIcon; - } *data32 = UlongToPtr(params32->data); - - struct notify_icon_params params; - NOTIFYICONDATAW data; - - params.msg = params32->msg; - params.data = &data; - - data.cbSize = sizeof(data); - data.hWnd = UlongToHandle(data32->hWnd); - data.uID = data32->uID; - data.uFlags = data32->uFlags; - data.uCallbackMessage = data32->uCallbackMessage; - data.hIcon = UlongToHandle(data32->hIcon); - if (data.uFlags & NIF_TIP) - wcscpy(data.szTip, data32->szTip); - data.dwState = data32->dwState; - data.dwStateMask = data32->dwStateMask; - if (data.uFlags & NIF_INFO) - { - wcscpy(data.szInfoTitle, data32->szInfoTitle); - wcscpy(data.szInfo, data32->szInfo); - data.uTimeout = data32->uTimeout; - data.dwInfoFlags = data32->dwInfoFlags; - } - data.guidItem = data32->guidItem; - data.hBalloonIcon = UlongToHandle(data32->hBalloonIcon); - - return macdrv_notify_icon(&params); -} - const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { wow64_dnd_get_data, @@ -724,7 +668,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = macdrv_dnd_release, macdrv_dnd_retain, wow64_init, - wow64_notify_icon, macdrv_quit_result, }; diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 42ffe49f563..0231e08e82b 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -59,12 +59,11 @@ static struct list icon_list = LIST_INIT(icon_list); static BOOL delete_icon(struct tray_icon *icon); + /*********************************************************************** - * cleanup_icons - * - * Delete all systray icons owned by a given window. + * CleanupIcons (MACDRV.@) */ -static void cleanup_icons(HWND hwnd) +void macdrv_CleanupIcons(HWND hwnd) { struct tray_icon *icon, *next; @@ -245,18 +244,14 @@ static BOOL delete_icon(struct tray_icon *icon) /*********************************************************************** - * wine_notify_icon (MACDRV.@) - * - * Driver-side implementation of Shell_NotifyIcon. + * NotifyIcon (MACDRV.@) */ -NTSTATUS macdrv_notify_icon(void *arg) +LRESULT macdrv_NotifyIcon(HWND hwnd, UINT msg, NOTIFYICONDATAW *data) { - struct notify_icon_params *params = arg; - NOTIFYICONDATAW *data = params->data; BOOL ret = FALSE; struct tray_icon *icon; - switch (params->msg) + switch (msg) { case NIM_ADD: ret = add_icon(data); @@ -267,9 +262,6 @@ NTSTATUS macdrv_notify_icon(void *arg) case NIM_MODIFY: if ((icon = get_icon(data->hWnd, data->uID))) ret = modify_icon(icon, data); break; - case 0xdead: /* Wine extension: owner window has died */ - cleanup_icons(data->hWnd); - break; case NIM_SETVERSION: if ((icon = get_icon(data->hWnd, data->uID))) { @@ -278,8 +270,8 @@ NTSTATUS macdrv_notify_icon(void *arg) } break; default: - FIXME("unhandled tray message: %u\n", params->msg); - break; + ERR("Unexpected NotifyIconProc call\n"); + return -1; } return ret; } diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 7f14517a8ee..e77a31a86c1 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -27,7 +27,6 @@ enum macdrv_funcs unix_dnd_release, unix_dnd_retain, unix_init, - unix_notify_icon, unix_quit_result, unix_funcs_count }; @@ -70,13 +69,6 @@ struct init_params struct localized_string *strings; }; -/* macdrv_notify_icon params */ -struct notify_icon_params -{ - unsigned int msg; - struct _NOTIFYICONDATAW *data; -}; - /* macdrv_quit_result params */ struct quit_result_params { diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 5f086f5c4e5..e69de29bb2d 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -1,2 +0,0 @@ -# System tray -@ cdecl wine_notify_icon(long ptr)

1 0

Rémi Bernon : win32u: Introduce a new NtUserSystemTrayCall message call.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 22bfdbeb4809d731744591eba67cd112e0c24d9f URL: https://gitlab.winehq.org/wine/wine/-/commit/22bfdbeb4809d731744591eba67cd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 21 22:59:38 2023 +0200 win32u: Introduce a new NtUserSystemTrayCall message call. --- dlls/win32u/Makefile.in | 1 + dlls/win32u/driver.c | 24 ++++++++++++++++++++ dlls/win32u/message.c | 3 +++ dlls/win32u/ntuser_private.h | 4 ++++ dlls/win32u/systray.c | 49 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/user.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 9 ++++++++ include/wine/gdi_driver.h | 4 ++++ programs/explorer/systray.c | 18 +++++++-------- 9 files changed, 156 insertions(+), 9 deletions(-)

1 0

Rémi Bernon : explorer: Hide the standalone systray window on close.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 600206be3924519a43b0623717a47adc90c84668 URL: https://gitlab.winehq.org/wine/wine/-/commit/600206be3924519a43b0623717a47a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 29 10:19:36 2023 +0100 explorer: Hide the standalone systray window on close. --- programs/explorer/systray.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 2af028c0ef9..e3ec17a7708 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -938,6 +938,8 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP case WM_CLOSE: /* don't destroy the tray window, just hide it */ ShowWindow( hwnd, SW_HIDE ); + hide_balloon( balloon_icon ); + show_systray = FALSE; return 0; case WM_DRAWITEM:

1 0

Rémi Bernon : explorer: Always set the systray icon tooltip text.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 27c3cf93e33511a84c596d5108a6996cee250712 URL: https://gitlab.winehq.org/wine/wine/-/commit/27c3cf93e33511a84c596d5108a699… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 29 10:19:06 2023 +0100 explorer: Always set the systray icon tooltip text. --- programs/explorer/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index eb844a45003..2af028c0ef9 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -563,7 +563,7 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) if (nid->uFlags & NIF_TIP) { lstrcpynW( icon->tiptext, nid->szTip, ARRAY_SIZE( icon->tiptext )); - if (icon->display != ICON_DISPLAY_HIDDEN) update_tooltip_text(icon); + update_tooltip_text( icon ); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) {

1 0

Myah Caron : user32: Add SetDisplayAutoRotationPreferences stub.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 79d0c050a9dab733801e29cfea2bc57d1622b631 URL: https://gitlab.winehq.org/wine/wine/-/commit/79d0c050a9dab733801e29cfea2bc5… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Nov 21 17:43:21 2023 +0000 user32: Add SetDisplayAutoRotationPreferences stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55920 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/user32/sysparams.c | 11 ++++++++++- dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8f0afe51be3..b941f126a58 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -920,7 +920,7 @@ BOOL WINAPI GetAutoRotationState( AR_STATE *state ) } /********************************************************************** - * GetDisplayAutoRotationPreferences [USER32.@] + * GetDisplayAutoRotationPreferences (USER32.@) */ BOOL WINAPI GetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE *orientation ) { @@ -929,6 +929,15 @@ BOOL WINAPI GetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE *orientati return TRUE; } +/********************************************************************** + * SetDisplayAutoRotationPreferences (USER32.@) + */ +BOOL WINAPI SetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE orientation ) +{ + FIXME("(%d): stub\n", orientation); + return TRUE; +} + /* physical<->logical mapping functions from win8 that are nops in later versions */ /*********************************************************************** diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f6651c6c9e6..ecaeb075450 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -674,6 +674,7 @@ @ stdcall SetDeskWallPaper(str) # @ stub SetDeskWallpaper # @ stub SetDesktopBitmap +@ stdcall SetDisplayAutoRotationPreferences(long) @ stdcall SetDisplayConfig(long ptr long ptr long) @ stdcall SetDlgItemInt(long long long long) @ stdcall SetDlgItemTextA(long long str) diff --git a/include/winuser.h b/include/winuser.h index ca7176e9f15..82824cd0afc 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4569,6 +4569,7 @@ WINUSERAPI HCURSOR WINAPI SetCursor(HCURSOR); WINUSERAPI BOOL WINAPI SetCursorPos(INT,INT); WINUSERAPI VOID WINAPI SetDebugErrorLevel(DWORD); WINUSERAPI BOOL WINAPI SetDeskWallPaper(LPCSTR); +WINUSERAPI BOOL WINAPI SetDisplayAutoRotationPreferences(ORIENTATION_PREFERENCE); WINUSERAPI BOOL WINAPI SetDlgItemInt(HWND,INT,UINT,BOOL); WINUSERAPI BOOL WINAPI SetDlgItemTextA(HWND,INT,LPCSTR); WINUSERAPI BOOL WINAPI SetDlgItemTextW(HWND,INT,LPCWSTR);

1 0

Fabian Maurer : server: Check socket flags after all sockets got processed.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 13928e0855358f469543a0ceee56e5fa8dfa5175 URL: https://gitlab.winehq.org/wine/wine/-/commit/13928e0855358f469543a0ceee56e5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 30 22:50:57 2023 +0100 server: Check socket flags after all sockets got processed. In rare cases we get an event during the second iteration of the loop, changing the first element. This would lead to an assertion later. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55054 --- server/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/sock.c b/server/sock.c index bd441d822a8..84c0d4a4931 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3509,7 +3509,10 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus req->sockets[i].flags |= AFD_POLL_CONNECT_ERR; req->sockets[i].status = sock_get_ntstatus( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); } + } + for (i = 0; i < count; ++i) + { if (req->sockets[i].flags) signaled = TRUE; }

1 0

Fabian Maurer : coml2: Move WriteClassStg from ole32.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: c241468f165ad6208fe96ffbe78fdb77b482872a URL: https://gitlab.winehq.org/wine/wine/-/commit/c241468f165ad6208fe96ffbe78fdb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 16 05:15:35 2023 +0100 coml2: Move WriteClassStg from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 14 ++++++++++++++ dlls/ole32/storage32.c | 16 ---------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 79aaba8346c..9f20fdd525b 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -29,5 +29,5 @@ @ stub StgOpenStorageEx @ stub StgOpenStorageOnILockBytes @ stub StgSetTimes -@ stub WriteClassStg +@ stdcall WriteClassStg(ptr ptr) @ stdcall WriteClassStm(ptr ptr) diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 40fc7ff9a2e..8ce9f68524f 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -50,6 +50,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); +/*********************************************************************** + * WriteClassStg [coml2.@] + */ +HRESULT WINAPI WriteClassStg(IStorage *pStg, REFCLSID rclsid) +{ + if (!pStg) + return E_INVALIDARG; + + if (!rclsid) + return STG_E_INVALIDPOINTER; + + return IStorage_SetClass(pStg, rclsid); +} + /*********************************************************************** * ReadClassStg (coml2.@) */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5d1299a5797..3335186ff90 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9026,22 +9026,6 @@ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) return S_FALSE; } -/****************************************************************************** - * WriteClassStg [OLE32.@] - * - * This method will store the specified CLSID in the specified storage object - */ -HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid) -{ - if(!pStg) - return E_INVALIDARG; - - if(!rclsid) - return STG_E_INVALIDPOINTER; - - return IStorage_SetClass(pStg, rclsid); -} - /*********************************************************************** * OleLoadFromStream (OLE32.@) *

1 0

Fabian Maurer : coml2: Move WriteClassStm from ole32.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 754631becb83b2d1316385b907c55fbbced34158 URL: https://gitlab.winehq.org/wine/wine/-/commit/754631becb83b2d1316385b907c55f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 25 22:37:38 2023 +0100 coml2: Move WriteClassStm from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 13 +++++++++++++ dlls/ole32/storage32.c | 23 ----------------------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index a41482bc46e..79aaba8346c 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -30,4 +30,4 @@ @ stub StgOpenStorageOnILockBytes @ stub StgSetTimes @ stub WriteClassStg -@ stub WriteClassStm +@ stdcall WriteClassStm(ptr ptr) diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 06a58749c5d..40fc7ff9a2e 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -74,6 +74,19 @@ HRESULT WINAPI ReadClassStg(IStorage *pstg, CLSID *pclsid) return hRes; } +/*********************************************************************** + * WriteClassStm (coml2.@) + */ +HRESULT WINAPI WriteClassStm(IStream *pStm, REFCLSID rclsid) +{ + TRACE("(%p,%p)\n", pStm, rclsid); + + if (!pStm || !rclsid) + return E_INVALIDARG; + + return IStream_Write(pStm, rclsid, sizeof(CLSID), NULL); +} + /*********************************************************************** * ReadClassStm (coml2.@) */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 33586de5e68..5d1299a5797 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9426,29 +9426,6 @@ StgIsStorageFile(LPCOLESTR fn) return S_FALSE; } -/*********************************************************************** - * WriteClassStm (OLE32.@) - * - * Writes a CLSID to a stream. - * - * PARAMS - * pStm [I] Stream to write to. - * rclsid [I] CLSID to write. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid) -{ - TRACE("(%p,%p)\n",pStm,rclsid); - - if (!pStm || !rclsid) - return E_INVALIDARG; - - return IStream_Write(pStm,rclsid,sizeof(CLSID),NULL); -} - /************************************************************************ * OleConvert Functions ***********************************************************************/

1 0

Fabian Maurer : coml2: Move ReadClassStg from ole32.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: fae825276a446f72e1d6793df0227076bb87aa92 URL: https://gitlab.winehq.org/wine/wine/-/commit/fae825276a446f72e1d6793df02270… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 16 05:04:10 2023 +0100 coml2: Move ReadClassStg from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 24 ++++++++++++++++++++++++ dlls/ole32/storage32.c | 35 ----------------------------------- 3 files changed, 25 insertions(+), 36 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 9cac5f9d01f..a41482bc46e 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -15,7 +15,7 @@ @ stdcall GetConvertStg(ptr) @ stdcall GetHGlobalFromILockBytes(ptr ptr) @ stub PropStgNameToFmtId -@ stub ReadClassStg +@ stdcall ReadClassStg(ptr ptr) @ stdcall ReadClassStm(ptr ptr) @ stub StgCreateDocfile @ stub StgCreateDocfileOnILockBytes diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 051555566ef..06a58749c5d 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -50,6 +50,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); +/*********************************************************************** + * ReadClassStg (coml2.@) + */ +HRESULT WINAPI ReadClassStg(IStorage *pstg, CLSID *pclsid) +{ + STATSTG pstatstg; + HRESULT hRes; + + TRACE("(%p, %p)\n", pstg, pclsid); + + if (!pstg || !pclsid) + return E_INVALIDARG; + + /* + * read a STATSTG structure (contains the clsid) from the storage + */ + hRes = IStorage_Stat(pstg, &pstatstg, STATFLAG_NONAME); + + if (SUCCEEDED(hRes)) + *pclsid = pstatstg.clsid; + + return hRes; +} + /*********************************************************************** * ReadClassStm (coml2.@) */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e463400d2bb..33586de5e68 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9042,41 +9042,6 @@ HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid) return IStorage_SetClass(pStg, rclsid); } -/*********************************************************************** - * ReadClassStg (OLE32.@) - * - * This method reads the CLSID previously written to a storage object with - * the WriteClassStg. - * - * PARAMS - * pstg [I] IStorage pointer - * pclsid [O] Pointer to where the CLSID is written - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid){ - - STATSTG pstatstg; - HRESULT hRes; - - TRACE("(%p, %p)\n", pstg, pclsid); - - if(!pstg || !pclsid) - return E_INVALIDARG; - - /* - * read a STATSTG structure (contains the clsid) from the storage - */ - hRes=IStorage_Stat(pstg,&pstatstg,STATFLAG_NONAME); - - if(SUCCEEDED(hRes)) - *pclsid=pstatstg.clsid; - - return hRes; -} - /*********************************************************************** * OleLoadFromStream (OLE32.@) *

1 0

Fabian Maurer : coml2: Move ReadClassStm from ole32.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: a72b534dc94eefe5f6bd260b8415c0a71071d67a URL: https://gitlab.winehq.org/wine/wine/-/commit/a72b534dc94eefe5f6bd260b8415c0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 16 05:03:05 2023 +0100 coml2: Move ReadClassStm from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 27 +++++++++++++++++++++++++++ dlls/ole32/storage32.c | 38 -------------------------------------- 3 files changed, 28 insertions(+), 39 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index ae4ffcd8af8..9cac5f9d01f 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -16,7 +16,7 @@ @ stdcall GetHGlobalFromILockBytes(ptr ptr) @ stub PropStgNameToFmtId @ stub ReadClassStg -@ stub ReadClassStm +@ stdcall ReadClassStm(ptr ptr) @ stub StgCreateDocfile @ stub StgCreateDocfileOnILockBytes @ stub StgCreatePropSetStg diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index 1a14b14851e..051555566ef 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -50,6 +50,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); +/*********************************************************************** + * ReadClassStm (coml2.@) + */ +HRESULT WINAPI ReadClassStm(IStream *pStm, CLSID *pclsid) +{ + ULONG nbByte; + HRESULT res; + + TRACE("(%p,%p)\n", pStm, pclsid); + + if (!pStm || !pclsid) + return E_INVALIDARG; + + /* clear the output args */ + *pclsid = CLSID_NULL; + + res = IStream_Read(pStm, pclsid, sizeof(CLSID), &nbByte); + + if (FAILED(res)) + return res; + + if (nbByte != sizeof(CLSID)) + return STG_E_READFAULT; + else + return S_OK; +} + enum stream_1ole_flags { OleStream_LinkedObject = 0x00000001, OleStream_Convert = 0x00000004 diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5b11db7ff96..e463400d2bb 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9484,44 +9484,6 @@ HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid) return IStream_Write(pStm,rclsid,sizeof(CLSID),NULL); } -/*********************************************************************** - * ReadClassStm (OLE32.@) - * - * Reads a CLSID from a stream. - * - * PARAMS - * pStm [I] Stream to read from. - * rclsid [O] CLSID to read. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid) -{ - ULONG nbByte; - HRESULT res; - - TRACE("(%p,%p)\n",pStm,pclsid); - - if (!pStm || !pclsid) - return E_INVALIDARG; - - /* clear the output args */ - *pclsid = CLSID_NULL; - - res = IStream_Read(pStm, pclsid, sizeof(CLSID), &nbByte); - - if (FAILED(res)) - return res; - - if (nbByte != sizeof(CLSID)) - return STG_E_READFAULT; - else - return S_OK; -} - - /************************************************************************ * OleConvert Functions ***********************************************************************/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2023