wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Jacek Caban : conhost: Use QS_ALLINPUT to wait for input in main loop.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 8a47ef28caf2432a06b753a6af9b0449dbc95e1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a47ef28caf2432a06b753a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 01:03:51 2020 +0100 conhost: Use QS_ALLINPUT to wait for input in main loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50014 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dbf0e1459d1..0548fcaafd3 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2625,7 +2625,7 @@ static int main_loop( struct console *console, HANDLE signal ) for (;;) { if (pump_msgs) - res = MsgWaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE, QS_ALLEVENTS ); + res = MsgWaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE, QS_ALLINPUT ); else res = WaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE );

1 0

Jacek Caban : conhost: Fix handling selection boundaries in copy_selection.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 14b50ee1b81338e2c2dcb432e4c8091ed376f2d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14b50ee1b81338e2c2dcb432… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 7 23:42:37 2020 +0100 conhost: Fix handling selection boundaries in copy_selection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50052 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 3d83632fabf..f5cf8e434c3 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -969,13 +969,13 @@ static void copy_selection( struct console *console ) WCHAR *p, *buf; HANDLE mem; - w = abs( console->window->selection_start.X - console->window->selection_end.X ) + 2; + w = abs( console->window->selection_start.X - console->window->selection_end.X ) + 1; h = abs( console->window->selection_start.Y - console->window->selection_end.Y ) + 1; if (!OpenClipboard( console->win )) return; EmptyClipboard(); - mem = GlobalAlloc( GMEM_MOVEABLE, (w * h) * sizeof(WCHAR) ); + mem = GlobalAlloc( GMEM_MOVEABLE, (w + 1) * h * sizeof(WCHAR) ); if (mem && (p = buf = GlobalLock( mem ))) { int x, y; @@ -992,20 +992,21 @@ static void copy_selection( struct console *console ) p[x - c.X] = console->active->data[y * console->active->width + x].ch; /* strip spaces from the end of the line */ - end = p + w - 1; + end = p + w; while (end > p && *(end - 1) == ' ') end--; - *end = (y < h - 1) ? '\n' : '\0'; + *end = (y < c.Y + h - 1) ? '\n' : '\0'; p = end + 1; } - GlobalUnlock( mem ); - if (p - buf != w * h) + TRACE( "%s\n", debugstr_w( buf )); + if (p - buf != (w + 1) * h) { HANDLE new_mem; new_mem = GlobalReAlloc( mem, (p - buf) * sizeof(WCHAR), GMEM_MOVEABLE ); if (new_mem) mem = new_mem; } + GlobalUnlock( mem ); SetClipboardData( CF_UNICODETEXT, mem ); } CloseClipboard();

1 0

Michael Stefaniuc : jscript/tests: Use wide-char string literals.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 887d16c98c20f0f25f6217fd7adbb13da9499ac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887d16c98c20f0f25f6217fd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 6 16:02:19 2020 +0100 jscript/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 5 +---- dlls/jscript/tests/run.c | 29 +++++++++++++---------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index c1b83d47799..e96127fbc5e 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -828,9 +828,6 @@ static void test_jscript_uninitializing(void) ULONG ref; HRESULT hres; - static const WCHAR script_textW[] = - {'f','u','n','c','t','i','o','n',' ','f','(',')',' ','{','}',0}; - script = create_jscript(); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); @@ -850,7 +847,7 @@ static void test_jscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); - hres = IActiveScriptParse_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parse, L"function f() {}", NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 7cd0755497c..1deb460f715 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2484,9 +2484,6 @@ static void test_isvisible(BOOL global_members) IActiveScript *engine; HRESULT hres; - static const WCHAR script_textW[] = - {'v','a','r',' ','v',' ','=',' ','t','e','s','t','V','a','l',';',0}; - engine = create_script(); if(!engine) return; @@ -2519,12 +2516,12 @@ static void test_isvisible(BOOL global_members) if(!global_members) SET_EXPECT(GetItemInfo_testVal); - hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, L"var v = testVal;", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); if(!global_members) CHECK_CALLED(GetItemInfo_testVal); - hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, L"var v = testVal;", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); IActiveScript_Release(engine); @@ -3035,17 +3032,17 @@ static void run_bom_tests(void) int i; HRESULT hres; struct bom_test bom_tests[] = { - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{0xFEFF,'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{'v',0xFEFF,'a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, - {{'v','a','r',0xFEFF,' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ',0xFEFF,'r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t',0xFEFF,'S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s',0xFEFF,'(',')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, - {{0xFEFF,'v','a','r',' ','a',' ','=',0xFEFF,0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, - {{0}} + {L"var a = 1; reportSuccess();", S_OK}, + {L"\xfeffvar a = 1; reportSuccess();", S_OK}, + {L"v\xfeff" "ar a = 1; reportSuccess();", JS_E_OUT_OF_MEMORY}, + {L"var\xfeff a = 1; reportSuccess();", S_OK}, + {L"var a = 1; \xfeffreportSuccess();", S_OK}, + {L"var a = 1; report\xfeffSuccess();", JS_E_OUT_OF_MEMORY}, + {L"var a = 1; reportSuccess\xfeff();", S_OK}, + {L"var a = 1; reportSuccess(\xfeff);", S_OK}, + {L"var a =\xfeff 1; reportSuccess(\xfeff);", S_OK}, + {L"\xfeffvar a =\xfeff\xfeff 1; reportSuccess(\xfeff);", S_OK}, + {L""} }; engine_clsid = &CLSID_JScript;

1 0

Michael Stefaniuc : ieframe/tests: Use wide-char string literals.
by Alexandre Julliard 08 Dec '20

08 Dec '20

Module: wine Branch: master Commit: 22471237bf4d8a3749ff51cccc99cf42a4a38fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=22471237bf4d8a3749ff51cc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 6 16:02:18 2020 +0100 ieframe/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/intshcut.c | 12 ++++-------- dlls/ieframe/tests/webbrowser.c | 16 +++++----------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 803e7ec60e9..d2135d0ebb3 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -171,9 +171,7 @@ static void test_ReadAndWriteProperties(void) IUniformResourceLocatorA *urlA; IUniformResourceLocatorA *urlAFromFile; WCHAR fileNameW[MAX_PATH]; - - static const WCHAR shortcutW[] = {'t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; - WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; + static WCHAR iconPath[] = L"file:///C:/arbitrary/icon/path"; char testurl[] = "http://some/bogus/url.html"; ps[0].ulKind = PRSPEC_PROPID; @@ -183,7 +181,7 @@ static void test_ReadAndWriteProperties(void) /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); - lstrcatW(fileNameW, shortcutW); + lstrcatW(fileNameW, L"testshortcut.url"); hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); ok(hr == S_OK, "Could not create CLSID_InternetShortcut instance: %08x\n", hr); @@ -208,7 +206,7 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); pv[0].vt = VT_LPWSTR; - U(pv[0]).pwszVal = (void *) iconPath; + U(pv[0]).pwszVal = iconPath; pv[1].vt = VT_I4; U(pv[1]).lVal = iconIndex; hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); @@ -326,10 +324,8 @@ static void test_Load(void) HANDLE file; HRESULT hres; - static const WCHAR test_urlW[] = {'t','e','s','t','.','u','r','l',0}; - GetTempPathW(MAX_PATH, file_path); - lstrcatW(file_path, test_urlW); + lstrcatW(file_path, L"test.url"); for(test = load_tests; test < load_tests + ARRAY_SIZE(load_tests); test++) { IPropertySetStorage *propsetstorage; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9c2c393aafe..52d1f707357 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -160,8 +160,6 @@ DEFINE_EXPECT(GetExternal); DEFINE_EXPECT(outer_QI_test); DEFINE_EXPECT(Advise_OnClose); -static const WCHAR wszItem[] = {'i','t','e','m',0}; - static VARIANT_BOOL exvb; static IWebBrowser2 *wb; @@ -1268,7 +1266,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, CHECK_EXPECT(UIWindow_SetActiveObject); if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + ok(!lstrcmpW(pszObjName, L"item"), "unexpected pszObjName\n"); } else { ok(!pActiveObject, "pActiveObject != NULL\n"); ok(!pszObjName, "pszObjName != NULL\n"); @@ -1282,7 +1280,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, CHECK_EXPECT(Frame_SetActiveObject); if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + ok(!lstrcmpW(pszObjName, L"item"), "unexpected pszObjName\n"); } else { ok(!pActiveObject, "pActiveObject != NULL\n"); ok(!pszObjName, "pszObjName != NULL\n"); @@ -1817,19 +1815,17 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam static HWND create_container_window(void) { - static const WCHAR wszWebBrowserContainer[] = - {'W','e','b','B','r','o','w','s','e','r','C','o','n','t','a','i','n','e','r',0}; static WNDCLASSEXW wndclass = { sizeof(WNDCLASSEXW), 0, wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wszWebBrowserContainer, + L"WebBrowserContainer", NULL }; RegisterClassExW(&wndclass); - return CreateWindowW(wszWebBrowserContainer, wszWebBrowserContainer, + return CreateWindowW(L"WebBrowserContainer", L"WebBrowserContainer", WS_OVERLAPPEDWINDOW, 10, 10, 600, 600, NULL, NULL, NULL, NULL); } @@ -1942,9 +1938,7 @@ static void test_SetHostNames(IOleObject *oleobj) { HRESULT hres; - static const WCHAR test_appW[] = {'t','e','s','t',' ','a','p','p',0}; - - hres = IOleObject_SetHostNames(oleobj, test_appW, (void*)0xdeadbeef); + hres = IOleObject_SetHostNames(oleobj, L"test app", (void*)0xdeadbeef); ok(hres == S_OK, "SetHostNames failed: %08x\n", hres); }

1 0

Hans Leidekker : setupapi: Handle NULL source filename in build_filepathsW.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: fac1e40aaf0726a3e328a922cb496927548190cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac1e40aaf0726a3e328a922… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 17:53:01 2020 +0100 setupapi: Handle NULL source filename in build_filepathsW. Source filename is NULL for files to be deleted. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 7ed66c298d3..dc718cc66fc 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -152,7 +152,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) unsigned int src_len = 1, dst_len = 1; WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target; - if (op->src_file[0] != '@') + if (!op->src_file || op->src_file[0] != '@') { if (op->media) src_len += lstrlenW(op->media->root) + 1; if (op->src_path) src_len += lstrlenW(op->src_path) + 1; @@ -174,7 +174,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) paths->Target = target = HeapAlloc( GetProcessHeap(), 0, dst_len ); } if (!source || !target) return FALSE; - if (op->src_file[0] != '@') + if (!op->src_file || op->src_file[0] != '@') concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); else lstrcpyW( source, op->src_file );

1 0

Paul Gofman : ntdll: Restore non-volatile registers in call_user_exception_dispatcher() on x86_64.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 183a8cf380ae2d95c8d694604e930965aae12f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=183a8cf380ae2d95c8d69460… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 7 13:39:49 2020 +0300 ntdll: Restore non-volatile registers in call_user_exception_dispatcher() on x86_64. Required to correctly restore non-volatile registers during unwind. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 58 +++++++++++++++++++++++++++++++++++------ dlls/ntdll/unix/signal_x86_64.c | 46 ++++++++++++++++++++------------ 2 files changed, 80 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=183a8cf380ae2d95c8d6…

1 0

Paul Gofman : ntdll/tests: Add a broken result for Win7u in test_extended_context().
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: c073b1ad407ec285843c179221f1c9d0ccb0d375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c073b1ad407ec285843c1792… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 7 14:41:45 2020 +0300 ntdll/tests: Add a broken result for Win7u in test_extended_context(). Fixes test failures on w7u testbot machines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3451a7d6465..eb03ee64bac 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7634,9 +7634,10 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(xs->Mask == (sizeof(void *) == 4 ? 4 : 0), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (sizeof(void *) == 4 ? 4 : 0) || broken(sizeof(void *) == 4 && !xs->Mask) /* Win7u */, + "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (sizeof(void *) == 4 ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), + ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); bret = ResumeThread(thread);

1 0

Alexandre Julliard : gdi32: Always let the Freetype driver fixup the AA flags.
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 5f701914705cf6437502f8e593971294815125b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f701914705cf6437502f8e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 7 12:46:28 2020 +0100 gdi32: Always let the Freetype driver fixup the AA flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50127 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9fa0f45ec4b..858f5ef675f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3761,9 +3761,9 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) font = select_font( &lf, dcmat, can_use_bitmap ); - if (font && !*aa_flags) + if (font) { - *aa_flags = font->aa_flags; + if (!*aa_flags) *aa_flags = font->aa_flags; if (!*aa_flags) { if (lf.lfQuality == CLEARTYPE_QUALITY || lf.lfQuality == CLEARTYPE_NATURAL_QUALITY)

1 0

Nikolay Sivov : sxs: Query context that contains the GUID in SxsLookupClrGuid().
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: c7ba8b7aa49f9938b24f55a7c3cd049c27d73aad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7ba8b7aa49f9938b24f55a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 7 10:27:56 2020 +0300 sxs: Query context that contains the GUID in SxsLookupClrGuid(). This restores pre-2cfc85dc55d403a7fcb885a62bb28f8d73498c2d logic; activation/deactivation still happens, and user context in this case is returned from FindActCtxSectionGuid(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50139 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 7150f55c33e..cd1d0f7bb56 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -135,14 +135,20 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff if (flags & SXS_LOOKUP_CLR_GUID_FIND_SURROGATE) { - if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + { flags &= ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS; + } } if (!retval && (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) { - if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + { flags &= ~SXS_LOOKUP_CLR_GUID_FIND_SURROGATE; + } } if (!retval) @@ -151,7 +157,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff goto out; } - retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, + retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); if (!retval && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { @@ -159,7 +165,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff } assembly_info = heap_alloc(bytes_assembly_info); - if (!(retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, + if (!(retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info))) { @@ -225,6 +231,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff SetLastError(0); out: + ReleaseActCtx(guid_info.hActCtx); if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) DeactivateActCtx(0, cookie);

1 0

Zebediah Figura : winegstreamer: Clean up a newly allocated buffer on error in bytestream_wrapper_pull().
by Alexandre Julliard 07 Dec '20

07 Dec '20

Module: wine Branch: master Commit: 43a5234bd9adb455cadf7be2c438edbcb58afb6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a5234bd9adb455cadf7be2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 5 10:32:17 2020 -0600 winegstreamer: Clean up a newly allocated buffer on error in bytestream_wrapper_pull(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5c502cf3ed5..a9a85cf4d4b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -441,6 +441,7 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of { struct media_source *source = gst_pad_get_element_private(pad); IMFByteStream *byte_stream = source->byte_stream; + GstBuffer *new_buffer = NULL; ULONG bytes_read; GstMapInfo info; BOOL is_eof; @@ -460,7 +461,7 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of return GST_FLOW_EOS; if (!(*buf)) - *buf = gst_buffer_new_and_alloc(len); + *buf = new_buffer = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); hr = IMFByteStream_Read(byte_stream, info.data, len, &bytes_read); gst_buffer_unmap(*buf, &info); @@ -468,7 +469,11 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of gst_buffer_set_size(*buf, bytes_read); if (FAILED(hr)) + { + if (new_buffer) + gst_buffer_unref(new_buffer); return GST_FLOW_ERROR; + } return GST_FLOW_OK; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
42
Older →

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 2020