- Wine-Commits - list.winehq.org

Rémi Bernon : explorer: Hide the standalone systray window on close.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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 Dec. 1, 2023

Dec. 1, 2023

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

Fabian Maurer : coml2: Move WriteClassStg from ole32.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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 Dec. 1, 2023

Dec. 1, 2023

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 : server: Check socket flags after all sockets got processed.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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

Myah Caron : user32: Add SetDisplayAutoRotationPreferences stub.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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 : coml2: Move ReadClassStm from ole32.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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

Fabian Maurer : coml2: Move GetConvertStg from ole32.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: c6f049fc33c2d3dc9bca08498d24d1b8cc505b6b URL: https://gitlab.winehq.org/wine/wine/-/commit/c6f049fc33c2d3dc9bca08498d24d1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 16 04:56:12 2023 +0100 coml2: Move GetConvertStg from ole32. --- dlls/coml2/Makefile.in | 3 +- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/storage32.c | 30 ------------------ 4 files changed, 89 insertions(+), 32 deletions(-) diff --git a/dlls/coml2/Makefile.in b/dlls/coml2/Makefile.in index 9887ccff873..5aa96ded363 100644 --- a/dlls/coml2/Makefile.in +++ b/dlls/coml2/Makefile.in @@ -4,4 +4,5 @@ IMPORTLIB = coml2 IMPORTS = uuid SOURCES = \ - memlockbytes.c + memlockbytes.c \ + storage32.c diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index ea8eb7b5d9f..ae4ffcd8af8 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -12,7 +12,7 @@ @ stdcall CreateILockBytesOnHGlobal(ptr long ptr) @ stub DllGetClassObject @ stub FmtIdToPropStgName -@ stub GetConvertStg +@ stdcall GetConvertStg(ptr) @ stdcall GetHGlobalFromILockBytes(ptr ptr) @ stub PropStgNameToFmtId @ stub ReadClassStg diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c new file mode 100644 index 00000000000..1a14b14851e --- /dev/null +++ b/dlls/coml2/storage32.c @@ -0,0 +1,86 @@ +/* + * Compound Storage (32 bit version) + * Storage implementation + * + * This file contains the compound file implementation + * of the storage interface. + * + * Copyright 1999 Francis Beaudet + * Copyright 1999 Sylvain St-Germain + * Copyright 1999 Thuy Nguyen + * Copyright 2005 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * NOTES + * The compound file implementation of IStorage used for create + * and manage substorages and streams within a storage object + * residing in a compound file object. + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winuser.h" +#include "wine/debug.h" + +#include "ole2.h" /* For Write/ReadClassStm */ + +#include "winreg.h" +#include "wine/wingdi16.h" + +WINE_DEFAULT_DEBUG_CHANNEL(storage); + +enum stream_1ole_flags { + OleStream_LinkedObject = 0x00000001, + OleStream_Convert = 0x00000004 +}; + +/*********************************************************************** + * GetConvertStg (coml2.@) + */ +HRESULT WINAPI GetConvertStg(IStorage *stg) +{ + static const DWORD version_magic = 0x02000001; + DWORD header[2]; + IStream *stream; + HRESULT hr; + + TRACE("%p\n", stg); + + if (!stg) return E_INVALIDARG; + + hr = IStorage_OpenStream(stg, L"\1Ole", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); + if (FAILED(hr)) return hr; + + hr = IStream_Read(stream, header, sizeof(header), NULL); + IStream_Release(stream); + if (FAILED(hr)) return hr; + + if (header[0] != version_magic) + { + ERR("got wrong version magic for 1Ole stream, %#lx.\n", header[0]); + return E_FAIL; + } + + return header[1] & OleStream_Convert ? S_OK : S_FALSE; +} diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0d3f9922d78..5b11db7ff96 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10565,36 +10565,6 @@ HRESULT WINAPI OleConvertIStorageToOLESTREAMEx ( LPSTORAGE stg, CLIPFORMAT cf, L return E_NOTIMPL; } -/*********************************************************************** - * GetConvertStg (OLE32.@) - */ -HRESULT WINAPI GetConvertStg(IStorage *stg) -{ - static const DWORD version_magic = 0x02000001; - DWORD header[2]; - IStream *stream; - HRESULT hr; - - TRACE("%p\n", stg); - - if (!stg) return E_INVALIDARG; - - hr = IStorage_OpenStream(stg, L"\1Ole", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); - if (FAILED(hr)) return hr; - - hr = IStream_Read(stream, header, sizeof(header), NULL); - IStream_Release(stream); - if (FAILED(hr)) return hr; - - if (header[0] != version_magic) - { - ERR("got wrong version magic for 1Ole stream, %#lx.\n", header[0]); - return E_FAIL; - } - - return header[1] & OleStream_Convert ? S_OK : S_FALSE; -} - /*********************************************************************** * SetConvertStg (OLE32.@) */

1 0

Fabian Maurer : coml2: Move ReadClassStg from ole32.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

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: Add dll and move code from ole32/memlockbytes.c.
by Alexandre Julliard Dec. 1, 2023

Dec. 1, 2023

Module: wine Branch: master Commit: 53c0a31b28a5a12d5091ebfc6bd3e3b9b649a16b URL: https://gitlab.winehq.org/wine/wine/-/commit/53c0a31b28a5a12d5091ebfc6bd3e3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 4 16:42:22 2023 +0100 coml2: Add dll and move code from ole32/memlockbytes.c. --- configure | 2 ++ configure.ac | 1 + dlls/coml2/Makefile.in | 7 +++++++ dlls/coml2/coml2.spec | 33 +++++++++++++++++++++++++++++++++ dlls/{ole32 => coml2}/memlockbytes.c | 0 dlls/ole32/Makefile.in | 3 +-- 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a6f056e839f..718b0dd777c 100755 --- a/configure +++ b/configure @@ -1016,6 +1016,7 @@ enable_combase enable_comcat enable_comctl32 enable_comdlg32 +enable_coml2 enable_compstui enable_comsvcs enable_concrt140 @@ -21509,6 +21510,7 @@ wine_fn_config_makefile dlls/comctl32 enable_comctl32 wine_fn_config_makefile dlls/comctl32/tests enable_tests wine_fn_config_makefile dlls/comdlg32 enable_comdlg32 wine_fn_config_makefile dlls/comdlg32/tests enable_tests +wine_fn_config_makefile dlls/coml2 enable_coml2 wine_fn_config_makefile dlls/comm.drv16 enable_win16 wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 6454b1c50a0..47918e4bd18 100644 --- a/configure.ac +++ b/configure.ac @@ -2433,6 +2433,7 @@ WINE_CONFIG_MAKEFILE(dlls/comctl32) WINE_CONFIG_MAKEFILE(dlls/comctl32/tests) WINE_CONFIG_MAKEFILE(dlls/comdlg32) WINE_CONFIG_MAKEFILE(dlls/comdlg32/tests) +WINE_CONFIG_MAKEFILE(dlls/coml2) WINE_CONFIG_MAKEFILE(dlls/comm.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) diff --git a/dlls/coml2/Makefile.in b/dlls/coml2/Makefile.in new file mode 100644 index 00000000000..9887ccff873 --- /dev/null +++ b/dlls/coml2/Makefile.in @@ -0,0 +1,7 @@ +EXTRADEFS = -DWINOLE32API= +MODULE = coml2.dll +IMPORTLIB = coml2 +IMPORTS = uuid + +SOURCES = \ + memlockbytes.c diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec new file mode 100644 index 00000000000..ea8eb7b5d9f --- /dev/null +++ b/dlls/coml2/coml2.spec @@ -0,0 +1,33 @@ +1 stub @ +2 stub @ +3 stub @ +4 stub @ +5 stub @ +6 stub @ +7 stub @ +8 stub @ +11 stub @ +12 stub @ +@ stub Coml2DllGetClassObject +@ stdcall CreateILockBytesOnHGlobal(ptr long ptr) +@ stub DllGetClassObject +@ stub FmtIdToPropStgName +@ stub GetConvertStg +@ stdcall GetHGlobalFromILockBytes(ptr ptr) +@ stub PropStgNameToFmtId +@ stub ReadClassStg +@ stub ReadClassStm +@ stub StgCreateDocfile +@ stub StgCreateDocfileOnILockBytes +@ stub StgCreatePropSetStg +@ stub StgCreatePropStg +@ stub StgCreateStorageEx +@ stub StgIsStorageFile +@ stub StgIsStorageILockBytes +@ stub StgOpenPropStg +@ stub StgOpenStorage +@ stub StgOpenStorageEx +@ stub StgOpenStorageOnILockBytes +@ stub StgSetTimes +@ stub WriteClassStg +@ stub WriteClassStm diff --git a/dlls/ole32/memlockbytes.c b/dlls/coml2/memlockbytes.c similarity index 100% rename from dlls/ole32/memlockbytes.c rename to dlls/coml2/memlockbytes.c diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index b65de3bd68a..ee0fcc41f7d 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_OLE32_ MODULE = ole32.dll IMPORTLIB = ole32 -IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase +IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase coml2 DELAYIMPORTS = oleaut32 SOURCES = \ @@ -26,7 +26,6 @@ SOURCES = \ irot.idl \ itemmoniker.c \ marshal.c \ - memlockbytes.c \ moniker.c \ nodrop.svg \ ole2.c \

1 0