July 2021 - Wine-commits - list.winehq.org

Paul Gofman : ole32: Do not link OLE clipboard object lifecycle to OLE initialization state.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 71aeb64c7350fc38b08ba797690a42ff618ce149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71aeb64c7350fc38b08ba797… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 26 11:28:13 2021 +0100 ole32: Do not link OLE clipboard object lifecycle to OLE initialization state. Fixes text paste in Origin launcher and overlay. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 111 +++++++++++++++++++++++++------------------ dlls/ole32/compobj.c | 1 + dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole2.c | 12 ++--- dlls/ole32/tests/clipboard.c | 29 +++++++++-- 5 files changed, 98 insertions(+), 57 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a1e68c64845..1cad47a6a47 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -170,7 +170,7 @@ typedef struct PresentationDataHeader } PresentationDataHeader; /* - * The one and only ole_clipbrd object which is created by OLEClipbrd_Initialize() + * The one and only ole_clipbrd object which is created by clipbrd_create() */ static ole_clipbrd* theOleClipboard; @@ -202,9 +202,6 @@ UINT ole_private_data_clipboard_format = 0; static UINT wine_marshal_clipboard_format; -/********************************************************* - * register_clipboard_formats - */ static void register_clipboard_formats(void) { ownerlink_clipboard_format = RegisterClipboardFormatW(L"OwnerLink"); @@ -222,56 +219,58 @@ static void register_clipboard_formats(void) wine_marshal_clipboard_format = RegisterClipboardFormatW(L"Wine Marshalled DataObject"); } -/*********************************************************************** - * OLEClipbrd_Initialize() - * Initializes the OLE clipboard. - */ -void OLEClipbrd_Initialize(void) +static BOOL WINAPI clipbrd_create(INIT_ONCE *init_once, void *parameter, void **context) { - register_clipboard_formats(); - - if ( !theOleClipboard ) - { - ole_clipbrd* clipbrd; - HGLOBAL h; + ole_clipbrd* clipbrd; + HGLOBAL h; - TRACE("()\n"); + TRACE("()\n"); - clipbrd = HeapAlloc( GetProcessHeap(), 0, sizeof(*clipbrd) ); - if (!clipbrd) return; + register_clipboard_formats(); - clipbrd->latest_snapshot = NULL; - clipbrd->window = NULL; - clipbrd->src_data = NULL; - clipbrd->cached_enum = NULL; + clipbrd = HeapAlloc( GetProcessHeap(), 0, sizeof(*clipbrd) ); + if (!clipbrd) + { + ERR("No memory.\n"); + return FALSE; + } - h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, 0); - if(!h) - { - HeapFree(GetProcessHeap(), 0, clipbrd); - return; - } + clipbrd->latest_snapshot = NULL; + clipbrd->window = NULL; + clipbrd->src_data = NULL; + clipbrd->cached_enum = NULL; - if(FAILED(CreateStreamOnHGlobal(h, TRUE, &clipbrd->marshal_data))) - { - GlobalFree(h); - HeapFree(GetProcessHeap(), 0, clipbrd); - return; - } + h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, 0); + if(!h) + { + ERR("No memory.\n"); + HeapFree(GetProcessHeap(), 0, clipbrd); + return FALSE; + } - theOleClipboard = clipbrd; + if(FAILED(CreateStreamOnHGlobal(h, TRUE, &clipbrd->marshal_data))) + { + ERR("CreateStreamOnHGlobal failed.\n"); + GlobalFree(h); + HeapFree(GetProcessHeap(), 0, clipbrd); + return FALSE; } + + theOleClipboard = clipbrd; + return TRUE; } static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd) { - struct oletls *info = COM_CurrentInfo(); - *clipbrd = NULL; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - if(!info->ole_inits) + if (!InitOnceExecuteOnce(&init_once, clipbrd_create, NULL, NULL)) + { + *clipbrd = NULL; return CO_E_NOTINITIALIZED; - *clipbrd = theOleClipboard; + } + *clipbrd = theOleClipboard; return S_OK; } @@ -2000,10 +1999,10 @@ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) } /*********************************************************************** - * OLEClipbrd_UnInitialize() + * clipbrd_uninitialize() * Un-Initializes the OLE clipboard */ -void OLEClipbrd_UnInitialize(void) +void clipbrd_uninitialize(void) { ole_clipbrd *clipbrd = theOleClipboard; @@ -2023,14 +2022,28 @@ void OLEClipbrd_UnInitialize(void) { DestroyWindow(clipbrd->window); UnregisterClassW( clipbrd_wndclass, GetModuleHandleW(L"ole32") ); + clipbrd->window = NULL; } - - IStream_Release(clipbrd->marshal_data); - HeapFree(GetProcessHeap(), 0, clipbrd); - theOleClipboard = NULL; } } +/*********************************************************************** + * clipbrd_destroy() + * Destroy the OLE clipboard + */ +void clipbrd_destroy(void) +{ + ole_clipbrd *clipbrd = theOleClipboard; + + if (!clipbrd) return; + + clipbrd_uninitialize(); + + IStream_Release(clipbrd->marshal_data); + HeapFree(GetProcessHeap(), 0, clipbrd); + theOleClipboard = NULL; +} + /*********************************************************************** * clipbrd_wndproc */ @@ -2164,12 +2177,16 @@ static HRESULT set_dataobject_format(HWND hwnd) HRESULT WINAPI OleSetClipboard(IDataObject* data) { + struct oletls *info = COM_CurrentInfo(); HRESULT hr; ole_clipbrd *clipbrd; HWND wnd; TRACE("(%p)\n", data); + if(!info->ole_inits) + return CO_E_NOTINITIALIZED; + if(FAILED(hr = get_ole_clipbrd(&clipbrd))) return hr; if(FAILED(hr = get_clipbrd_window(clipbrd, &wnd))) return hr; @@ -2258,6 +2275,7 @@ HRESULT WINAPI OleGetClipboard(IDataObject **obj) */ HRESULT WINAPI OleFlushClipboard(void) { + struct oletls *info = COM_CurrentInfo(); HRESULT hr; ole_clipbrd *clipbrd; HWND wnd; @@ -2266,6 +2284,9 @@ HRESULT WINAPI OleFlushClipboard(void) if(FAILED(hr = get_ole_clipbrd(&clipbrd))) return hr; + if(!info->ole_inits) + return E_FAIL; + if(FAILED(hr = get_clipbrd_window(clipbrd, &wnd))) return hr; /* diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c40d8d03b2d..815fdcb11d0 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -937,6 +937,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) break; case DLL_PROCESS_DETACH: + clipbrd_destroy(); if (reserved) break; release_std_git(); break; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 3c0e338127c..34f5a8ec485 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -132,6 +132,8 @@ extern UINT object_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT link_source_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT ole_private_data_clipboard_format DECLSPEC_HIDDEN; +void clipbrd_destroy(void) DECLSPEC_HIDDEN; + extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f2224ad5b6a..3f8f9b3232b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -133,10 +133,9 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam); /****************************************************************************** - * These are the prototypes of the OLE Clipboard initialization methods (in clipboard.c) + * This is a prototype of the OLE Clipboard uninitialization method (in clipboard.c) */ -extern void OLEClipbrd_UnInitialize(void); -extern void OLEClipbrd_Initialize(void); +extern void clipbrd_uninitialize(void); /****************************************************************************** * These are the prototypes of the utility methods used for OLE Drag n Drop @@ -197,11 +196,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH OleInitialize(LPVOID reserved) */ TRACE("() - Initializing the OLE libraries\n"); - /* - * OLE Clipboard - */ - OLEClipbrd_Initialize(); - /* * Drag and Drop */ @@ -241,7 +235,7 @@ void WINAPI DECLSPEC_HOTPATCH OleUninitialize(void) /* * OLE Clipboard */ - OLEClipbrd_UnInitialize(); + clipbrd_uninitialize(); /* * OLE shared menu diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index fd8f287680b..97575371edc 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -503,13 +503,27 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) static void test_get_clipboard_uninitialized(void) { - HRESULT hr; + REFCLSID rclsid = &CLSID_InternetZoneManager; IDataObject *pDObj; + IUnknown *pUnk; + HRESULT hr; pDObj = (IDataObject *)0xdeadbeef; hr = OleGetClipboard(&pDObj); - todo_wine ok(hr == S_OK, "OleGetClipboard() got 0x%08x instead of 0x%08x\n", hr, S_OK); - if (pDObj && pDObj != (IDataObject *)0xdeadbeef) IDataObject_Release(pDObj); + ok(hr == S_OK, "OleGetClipboard() got 0x%08x instead of 0x%08x\n", hr, S_OK); + ok(!!pDObj && pDObj != (IDataObject *)0xdeadbeef, "Got unexpected pDObj %p.\n", pDObj); + + /* COM is still not initialized. */ + hr = CoCreateInstance(rclsid, NULL, 0x17, &IID_IUnknown, (void **)&pUnk); + ok(hr == CO_E_NOTINITIALIZED, "Got unexpected hr %#x.\n", hr); + + hr = OleFlushClipboard(); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = OleIsCurrentClipboard(pDObj); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + IDataObject_Release(pDObj); } static void test_get_clipboard(void) @@ -1288,6 +1302,15 @@ static void test_consumer_refs(void) refs = count_refs(src); ok(refs == 2, "%d\n", refs); + OleInitialize(NULL); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "Failed to clear clipboard, hr %#x.\n", hr); + + OleUninitialize(); + + refs = count_refs(src); + ok(refs == 2, "%d\n", refs); + IDataObject_Release(src); }

1 0

Francois Gouget : riched20: Tweak the wording of a comment.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 9f72c5601173728c52626342a1ec6c9a4c70670f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f72c5601173728c52626342… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 23 13:18:35 2021 +0200 riched20: Tweak the wording of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3a6a072f1f8..ab74e0ef1ab 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8995,8 +8995,8 @@ static void test_EM_SELECTIONTYPE(void) START_TEST( editor ) { BOOL ret; - /* Must explicitly LoadLibrary(). The test has no references to functions in - * RICHED20.DLL, so the linker doesn't actually link to it. */ + /* Must explicitly LoadLibrary(). The test has no reference to functions in + * RICHED20.DLL, so the linker does not actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE);

1 0

Akihiro Sagawa : midimap: Switch to the midi debug channel.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 1e02ef4027d7794cd3a2668616111c56becf1e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e02ef4027d7794cd3a26686… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jul 24 21:45:22 2021 +0900 midimap: Switch to the midi debug channel. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 86e4289d897..cf7d7b1dedb 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -75,7 +75,7 @@ * This last part isn't implemented (.idf file support). */ -WINE_DEFAULT_DEBUG_CHANNEL(msacm); +WINE_DEFAULT_DEBUG_CHANNEL(midi); WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct tagMIDIOUTPORT @@ -246,7 +246,7 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) } RegCloseKey(hKey); - if (ret && TRACE_ON(msacm)) + if (ret && TRACE_ON(midi)) { unsigned i;

1 0

Akihiro Sagawa : midimap: Introduce XP form and prefer it.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: dbf3b3b6bf88c8a003dc4ca9023e3182d64b34bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbf3b3b6bf88c8a003dc4ca9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jul 24 21:45:24 2021 +0900 midimap: Introduce XP form and prefer it. Since XP form doesn't support channel mappings, old form is remained for compatiblity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51505 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 58 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index cf7d7b1dedb..53eeadee915 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -36,7 +36,15 @@ /* * Here's how Windows stores the midiOut mapping information. * - * Full form (in HKU) is: + * Windows XP form (in HKU) is: + * + * [Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap] + * "szPname"="TiMidity port 0" + * (incomplete) + * + * szPname: name of midiOut device to use. + * + * If szPname isn't defined, we use Windows 2000 form (also in HKU): * * [Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap] 988836060 * "AutoScheme"=dword:00000000 @@ -214,33 +222,41 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) else { DWORD type, size, out; - WCHAR buffer[256]; + WCHAR buffer[256]; - ret = 2; - size = sizeof(out); - if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"szPname", 0, &type, (void*)buffer, &size)) { - size = sizeof(buffer); - if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) - { - if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); - } - else - { - ERR("Wrong registry: UseScheme is active, but no CurrentScheme found\n"); - } + ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } - if (ret == 2) + else { - size = sizeof(buffer); - if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) + ret = 2; + size = sizeof(out); + if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { - ret = MIDIMAP_LoadSettingsDefault(mom, buffer); + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) + { + if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) + ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + } + else + { + ERR("Wrong registry: UseScheme is active, but no CurrentScheme found\n"); + } } - else + if (ret == 2) { - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) + { + ret = MIDIMAP_LoadSettingsDefault(mom, buffer); + } + else + { + ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + } } } }

1 0

Francois Gouget : winetest: Fix handling of relative -d directories.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 2197bc9a92fac63b9ffe1008e0c74261028ad3e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2197bc9a92fac63b9ffe1008… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 26 11:55:45 2021 +0200 winetest: Fix handling of relative -d directories. Convert them to an absolute path so they result in a command line which is still valid after changing the current directory in CreateProcess(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index fa773e28d4f..7ced565447b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1066,7 +1066,10 @@ run_tests (char *logname, char *outdir) report (R_FATAL, "Could not open logfile: %u", GetLastError()); if (outdir) - strcpy( tempdir, outdir); + { + /* Get a full path so it is still valid after a chdir */ + GetFullPathNameA( outdir, ARRAY_SIZE(tempdir), tempdir, NULL ); + } else { strcpy( tempdir, tmppath );

1 0

Francois Gouget : oleaut32/tests: Use NUMPRS_HEX_OCT instead of hardcoding its value.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 6e8586ca1b64bb11ef540685e795fbffa7211bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8586ca1b64bb11ef540685… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 26 18:22:35 2021 +0200 oleaut32/tests: Use NUMPRS_HEX_OCT instead of hardcoding its value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 73df13fe5c9..2bb53939821 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1505,7 +1505,7 @@ static void test_VarParseNumFromStrEn(void) /* VB hex */ CONVERT("&HF800", NUMPRS_HEX_OCT); - EXPECT(4,NUMPRS_HEX_OCT,0x40,6,4,0); + EXPECT(4,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,6,4,0); EXPECTRGB(0,15); EXPECTRGB(1,8); EXPECTRGB(2,0); @@ -1514,7 +1514,7 @@ static void test_VarParseNumFromStrEn(void) /* VB hex lower case and leading zero */ CONVERT("&h0abcdef", NUMPRS_HEX_OCT); - EXPECT(6,NUMPRS_HEX_OCT,0x40,9,4,0); + EXPECT(6,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,9,4,0); EXPECTRGB(0,10); EXPECTRGB(1,11); EXPECTRGB(2,12); @@ -1525,7 +1525,7 @@ static void test_VarParseNumFromStrEn(void) /* VB oct */ CONVERT("&O300", NUMPRS_HEX_OCT); - EXPECT(3,NUMPRS_HEX_OCT,0x40,5,3,0); + EXPECT(3,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,5,3,0); EXPECTRGB(0,3); EXPECTRGB(1,0); EXPECTRGB(2,0); @@ -1533,7 +1533,7 @@ static void test_VarParseNumFromStrEn(void) /* VB oct lower case and leading zero */ CONVERT("&o0777", NUMPRS_HEX_OCT); - EXPECT(3,NUMPRS_HEX_OCT,0x40,6,3,0); + EXPECT(3,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,6,3,0); EXPECTRGB(0,7); EXPECTRGB(1,7); EXPECTRGB(2,7); @@ -1541,7 +1541,7 @@ static void test_VarParseNumFromStrEn(void) /* VB oct char bigger than 7 */ CONVERT("&o128", NUMPRS_HEX_OCT); - EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0); + EXPECT(2,NUMPRS_HEX_OCT,NUMPRS_HEX_OCT,4,3,0); EXPECTRGB(0,1); EXPECTRGB(1,2); EXPECTRGB(3,FAILDIG);

1 0

Esme Povirk : mscoree: Update Wine Mono to 6.3.0.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 451a54bc7a77b8b816f28ad1c615745e650586ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=451a54bc7a77b8b816f28ad1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Jul 26 10:41:59 2021 -0500 mscoree: Update Wine Mono to 6.3.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3f094d37ef4..dda94d34e1a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.2.0" +#define MONO_VERSION "6.3.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca" +#define MONO_SHA "a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 910cc40ccb0..c4692b4e656 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.2.0" +#define WINE_MONO_VERSION "6.3.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Zebediah Figura : server: Also return STATUS_PIPE_DISCONNECTED for shutdown nonblocking sockets.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: a9ddbc0cbc7d10233ebd18a2fba95994621a3527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9ddbc0cbc7d10233ebd18a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 11:53:42 2021 -0500 server: Also return STATUS_PIPE_DISCONNECTED for shutdown nonblocking sockets. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 10 +++++----- server/sock.c | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 41fcb5d9248..5f2a68e5073 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7453,12 +7453,12 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = recv(client, buffer, sizeof(buffer), 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = recv(client, buffer, sizeof(buffer), 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = shutdown(server, SD_SEND); @@ -7513,7 +7513,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = recv(client, buffer, sizeof(buffer), 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = send(client, "test", 5, 0); @@ -7577,7 +7577,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = WSARecv(client, &wsabuf, 1, &size, &flags, NULL, NULL); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); ret = send(server, "test", 5, 0); ok(ret == 5, "got %d\n", ret); @@ -7649,7 +7649,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = recvfrom(server, buffer, sizeof(buffer), 0, NULL, NULL); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); ret = sendto(client, "test", 5, 0, (struct sockaddr *)&server_addr, sizeof(server_addr)); ok(ret == 5, "got %d\n", ret); diff --git a/server/sock.c b/server/sock.c index cd77ff7bdca..e5b0e81ead2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3216,7 +3216,8 @@ DECL_HANDLER(recv_socket) status = STATUS_PENDING; } - if (status == STATUS_PENDING && sock->rd_shutdown) status = STATUS_PIPE_DISCONNECTED; + if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && sock->rd_shutdown) + status = STATUS_PIPE_DISCONNECTED; sock->pending_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ); sock->reported_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ); @@ -3326,7 +3327,8 @@ DECL_HANDLER(send_socket) status = STATUS_PENDING; } - if (status == STATUS_PENDING && sock->wr_shutdown) status = STATUS_PIPE_DISCONNECTED; + if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && sock->wr_shutdown) + status = STATUS_PIPE_DISCONNECTED; if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async ))) {

1 0

Zebediah Figura : server: Separate SD_RECEIVE and hangup conditions.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: ec07f285e2e71f1c3696989d9f05faf4dc87cdae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec07f285e2e71f1c3696989d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 11:53:43 2021 -0500 server: Separate SD_RECEIVE and hangup conditions. This patch does result in one functional change: if we are selecting for AFD_POLL_READ on a socket which has had SD_RECEIVE and there are no asyncs, we will now respond to POLLIN instead of ignoring it. Neither this nor the previous behaviour matches Windows, which instead puts the socket into an aborted state and sends RST to the peer if any data is received after SD_RECEIVE or if SD_RECEIVE is done while there is pending data. Apart from this there is no functional change, as the places where rd_shutdown alone is checked can't be reached if there was a hangup. It is instead for semantic clarity. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/server/sock.c b/server/sock.c index e5b0e81ead2..85ea019ad92 100644 --- a/server/sock.c +++ b/server/sock.c @@ -214,6 +214,7 @@ struct sock unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ + unsigned int hangup : 1; /* has the read end received a hangup? */ unsigned int nonblocking : 1; /* is the socket nonblocking? */ unsigned int bound : 1; /* is the socket bound? */ }; @@ -930,7 +931,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) int status = sock_get_ntstatus( error ); struct accept_req *req, *next; - if (sock->rd_shutdown) + if (sock->rd_shutdown || sock->hangup) async_wake_up( &sock->read_q, status ); if (sock->wr_shutdown) async_wake_up( &sock->write_q, status ); @@ -1072,15 +1073,17 @@ static void sock_poll_event( struct fd *fd, int event ) } } - if ((hangup_seen || event & (POLLHUP | POLLERR)) && (!sock->rd_shutdown || !sock->wr_shutdown)) + if (hangup_seen || (sock_shutdown_type == SOCK_SHUTDOWN_POLLHUP && (event & POLLHUP))) + { + sock->hangup = 1; + } + else if (event & (POLLHUP | POLLERR)) { - error = error ? error : sock_error( fd ); - if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) - sock->wr_shutdown = 1; sock->rd_shutdown = 1; + sock->wr_shutdown = 1; if (debug_level) - fprintf(stderr, "socket %p aborted by error %d, event: %x\n", sock, error, event); + fprintf( stderr, "socket %p aborted by error %d, event %#x\n", sock, error, event ); } if (hangup_seen) @@ -1168,7 +1171,9 @@ static int sock_get_poll_events( struct fd *fd ) } else { - if (!sock->rd_shutdown) + /* Don't ask for POLLIN if we got a hangup. We won't receive more + * data anyway, but we will get POLLIN if SOCK_SHUTDOWN_EOF. */ + if (!sock->hangup) { if (mask & AFD_POLL_READ) ev |= POLLIN; @@ -1380,6 +1385,7 @@ static struct sock *create_socket(void) sock->rd_shutdown = 0; sock->wr_shutdown = 0; sock->wr_shutdown_pending = 0; + sock->hangup = 0; sock->nonblocking = 0; sock->bound = 0; sock->rcvbuf = 0;

1 0

Zebediah Figura : server: Remove the socket from the polling loop if both it and the peer have SHUT_WR.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 361435f6095f8c759979600b06ed28785e7b3aec URL: https://source.winehq.org/git/wine.git/?a=commit;h=361435f6095f8c759979600b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 11:53:44 2021 -0500 server: Remove the socket from the polling loop if both it and the peer have SHUT_WR. Based on a patch by Torge Matthies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51319 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/server/sock.c b/server/sock.c index 85ea019ad92..2d2aa733565 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1161,6 +1161,20 @@ static int sock_get_poll_events( struct fd *fd ) case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: + if (sock->hangup && sock->wr_shutdown && !sock->wr_shutdown_pending) + { + /* Linux returns POLLHUP if a socket is both SHUT_RD and SHUT_WR, or + * if both the socket and its peer are SHUT_WR. + * + * We don't use SHUT_RD, so we can only encounter this in the latter + * case. In that case there can't be any pending read requests (they + * would have already been completed with a length of zero), the + * above condition ensures that we don't have any pending write + * requests, and nothing that can change about the socket state that + * would complete a pending poll request. */ + return -1; + } + if (sock->accept_recv_req) { ev |= POLLIN; @@ -1267,7 +1281,10 @@ static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) struct sock *sock = get_fd_user( fd ); if (sock->wr_shutdown_pending && list_empty( &sock->write_q.queue )) + { shutdown( get_unix_fd( sock->fd ), SHUT_WR ); + sock->wr_shutdown_pending = 0; + } /* Don't reselect the ifchange queue; we always ask for POLLIN. * Don't reselect an uninitialized socket; we can't call set_fd_events() on

1 0