January 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] user32/tests: Relax WindowFromDC() tests a bit.
by Zebediah Figura 06 Jan '20

06 Jan '20

Windows often reuses the DC handle for a different window (which may be in another process). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dce.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 18ded3357de..017506d9aa4 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -54,7 +54,7 @@ static void test_dc_attributes(void) ok( WindowFromDC( hdc ) == hwnd_cache, "wrong window\n" ); ReleaseDC( hwnd_cache, hdc ); - ok( WindowFromDC( hdc ) == 0, "wrong window\n" ); + ok( WindowFromDC( hdc ) != hwnd_cache, "wrong window\n" ); hdc = GetDC( hwnd_cache ); rop = GetROP2( hdc ); ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); @@ -124,7 +124,7 @@ static void test_dc_attributes(void) ok( caps == 0, "got %d\n", caps ); caps = GetDeviceCaps( old_hdc, NUMCOLORS ); ok( caps == 0, "got %d\n", caps ); - ok( WindowFromDC( old_hdc ) == 0, "wrong window\n" ); + ok( WindowFromDC( old_hdc ) != hwnd_cache, "wrong window\n" ); hdc = GetDC(0); caps = GetDeviceCaps( hdc, HORZRES ); @@ -645,7 +645,7 @@ static void test_destroyed_window(void) DestroyWindow( hwnd_cache ); rop = GetROP2( dc ); ok( rop == 0, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_cache, "wrong window\n" ); ok( !ReleaseDC( hwnd_cache, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_cache ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -674,7 +674,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_classdc2, "wrong window\n" ); ok( !ReleaseDC( hwnd_classdc2, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc2 ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -688,7 +688,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_classdc, "wrong window\n" ); ok( !ReleaseDC( hwnd_classdc, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -702,7 +702,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == 0, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_owndc, "wrong window\n" ); ok( !ReleaseDC( hwnd_owndc, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_owndc ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); -- 2.24.1

1 1

[PATCH 1/7] d3dx9/tests: Add some tests for ID3DXFont_DrawText().
by Sven Baars 06 Jan '20

06 Jan '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- I'm sending this series mostly so it can be reviewed, but I sent the tests first so they may still be committed during code freeze, if they are acceptable. dlls/d3dx9_36/tests/core.c | 63 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index fa874a5ef5..8b90f0ef5f 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -637,6 +637,69 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ID3DXFont_Release(font); } + + /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if (SUCCEEDED(hr)) { + RECT rect; + int height; + + todo_wine { + SetRect(&rect, 10, 10, 200, 200); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 0, &rect, 0, 0xFF00FF); + ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); + +if (0) { /* Causes a lockup on windows 7. */ + height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); +} + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF); + ok(height == 0, "DrawTextW returned %d, expected 0.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "DrawTextW returned %d, expected 0.\n", height); + } + + ID3DXFont_Release(font); + } } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) -- 2.24.0

5 17

[PATCH] ddraw/tests: Disable a test that causes heap corruption on some Nvidia.
by Stefan Dösinger 06 Jan '20

06 Jan '20

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com --- The other parts of test_clipper_refcount appear to work fine on the affected system, including the invokation of Release() on a destroyed clipper and destroying the surface that has the destroyed clipper attached to it. --- dlls/ddraw/tests/ddraw1.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw2.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw4.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw7.c | 16 +++++++++++++--- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b513121fbbc..61b846fa4a6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12908,9 +12908,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 541362c7488..576c8e7df99 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13734,9 +13734,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8cadfae52a0..560af41a95c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16386,9 +16386,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface4_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface4_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f4a709711b0..1f9328c45d0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16290,9 +16290,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface7_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface7_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to -- 2.24.1

4 4

[PATCH] po: Update Norwegian translation.
by Kim Malmo 06 Jan '20

06 Jan '20

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2e95616fe1..b4ebed3cf4 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-01-03 16:23+0100\n" +"PO-Revision-Date: 2020-01-05 13:06+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -625,7 +625,7 @@ msgstr "&Egendefinerte farger:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|S&olid" #: comdlg32.rc:290 msgid "&Red:" @@ -6850,10 +6850,8 @@ msgid "Invalid media type.\n" msgstr "Ugyldig mediatype.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "Ingen flere oppføringer.\n" +msgstr "Ingen flere inndata akseptert.\n" #: mferror.mc:74 msgid "Object is not initialized.\n" @@ -6865,7 +6863,7 @@ msgstr "Representasjonen støttes ikke.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Ingen flere typer i listen av foreslåtte mediatyper.\n" #: mferror.mc:95 msgid "Unsupported service.\n" @@ -6884,10 +6882,8 @@ msgid "Invalid file format.\n" msgstr "Ugyldig filformat.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "Ugyldig tid.\n" +msgstr "Ugyldig tidspunkt.\n" #: mferror.mc:144 msgid "Unsupported scheme.\n" @@ -7067,7 +7063,7 @@ msgstr "Tjeneren er ikke deaktivert.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "Plattformen er avslått i sikkermodus.\n" #: mferror.mc:410 #, fuzzy @@ -7114,32 +7110,24 @@ msgid "Shutdown() was called.\n" msgstr "" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Registeret har blitt gjenopprettet.\n" +msgstr "Mediastrømmen har ingen satt varighet.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Mediaformatet ble gjenkjent men er ugyldig.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Fant ikke settet av egenskaper.\n" +msgstr "Fant ikke egenskapen.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "Katalogen er ikke tom.\n" +msgstr "Egenskapen kan kun leses.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Hook-typen er ikke tillat.\n" +msgstr "Egenskapen er ikke tillat.\n" #: mferror.mc:501 msgid "Media source is not started.\n" @@ -7156,10 +7144,8 @@ msgid "Media source is in wrong state.\n" msgstr "Ressursen er i bruk.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Ingen data oppdaget.\n" +msgstr "Ingen mediastrømmer ble valgt.\n" #: mferror.mc:529 #, fuzzy @@ -7242,10 +7228,8 @@ msgid "Cannot find decryptor.\n" msgstr "Kan ikke finne skriveren." #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "Fant ikke modulen.\n" +msgstr "Fant ikke kodeks.\n" #: mferror.mc:648 #, fuzzy -- 2.17.1

1 0

[PATCH] msctf: Clear the corresponding DocumentMgr pointers for Associated Focus Windows on destruction.
by Gabriel Ivăncescu 06 Jan '20

06 Jan '20

Fixes a regression introduced by d541087079a8770bb02bae830c56a6d3c0b6424e due to an alternate code path being executed for Firefox and Pale Moon browsers that made use of the Thread Manager, causing a crash. AssociateFocus does not grab ownership of the Document Manager, but it does return it in the "prev" output parameter with an increased refcount. So, if the docmgr gets destroyed and AssociateFocus is called again, its "prev" parameter will refer to freed memory. Windows sets it to NULL in such case. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msctf/tests/inputprocessor.c | 15 +++++++++++++-- dlls/msctf/threadmgr.c | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591e..f8ec492 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2287,6 +2287,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr *dm1, *dm2, *olddm, *dmcheck, *dmorig; HWND wnd1, wnd2, wnd3; HRESULT hr; + ULONG ref; ITfThreadMgr_GetFocus(g_tm, &dmorig); test_CurrentFocus = NULL; @@ -2428,10 +2429,20 @@ static void test_AssociateFocus(void) processPendingMessages(); SetFocus(wnd1); processPendingMessages(); - test_OnSetFocus = SINK_UNEXPECTED; + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + + /* Vista doesn't return NULL */ + if (olddm) ITfDocumentMgr_Release(olddm); + ref = ITfDocumentMgr_Release(dm2); + ok(ref == 0, "incorrect DocumentMgr ref %d\n", ref); + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,NULL,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + ok(olddm == NULL, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(dm1); - ITfDocumentMgr_Release(dm2); test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2c208fb..77cf47c 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1530,6 +1530,8 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { ThreadMgr *This = impl_from_ITfThreadMgrEx((ITfThreadMgrEx *)iface); struct list *cursor; + BOOL found = FALSE; + LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs) { DocumentMgrEntry *mgrentry = LIST_ENTRY(cursor,DocumentMgrEntry,entry); @@ -1537,8 +1539,16 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { list_remove(cursor); HeapFree(GetProcessHeap(),0,mgrentry); - return; + found = TRUE; + break; } } - FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + if (!found) FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + + LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + if (wnd->docmgr == mgr) + wnd->docmgr = NULL; + } } -- 2.21.0

2 2

[PATCH] advapi32/tests: Don't test function directly when reporting GetLastError()
by André Hentschel 06 Jan '20

06 Jan '20

Found with Coccinelle. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8bcd16cb954..d52afb8c82c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7346,7 +7346,8 @@ static void test_child_token_sd(void) ok(acl->AceCount, "Expected at least one ACE\n"); for (i = 0; i < acl->AceCount; i++) { - ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ret = pGetAce(acl, i, (void **)&acc_ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), "ACE inherited from the parent\n"); } -- 2.17.1

1 0

[PATCH] explorer: Add parsing '/cd' arg in explorer commandline
by Zhipeng Zhao 06 Jan '20

06 Jan '20

There is some application use explorer open some folder with '/cd' arg instead of '/select' arg, in this case explorer cannot work as expect. In this patch, the arg will be ignored. Signed-off-by: Zhipeng Zhao <near2see(a)163.com> --- programs/explorer/explorer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index dcd09ac969..3cef83f285 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -729,6 +729,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; static const WCHAR arg_desktop_quotes[] = {'"','/','d','e','s','k','t','o','p'}; + static const WCHAR arg_cd[] = {'/','c','d',','}; LPWSTR p = commandline; @@ -769,6 +770,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } + else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + { + p += ARRAY_SIZE( arg_cd ); + p = copy_path_string(parameters->selection,p); + } else { /* left over command line is generally the path to be opened */ -- 2.20.1

1 0

[PATCH] include: Update shell link flags enum.
by Nikolay Sivov 06 Jan '20

06 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/shlobj.h | 61 +++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index bc1150bf91..d30944662f 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1375,36 +1375,39 @@ typedef struct _SHChangeNotifyEntry void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); -typedef enum { - SLDF_HAS_ID_LIST = 0x00000001, - SLDF_HAS_LINK_INFO = 0x00000002, - SLDF_HAS_NAME = 0x00000004, - SLDF_HAS_RELPATH = 0x00000008, - SLDF_HAS_WORKINGDIR = 0x00000010, - SLDF_HAS_ARGS = 0x00000020, - SLDF_HAS_ICONLOCATION = 0x00000040, - SLDF_UNICODE = 0x00000080, - SLDF_FORCE_NO_LINKINFO = 0x00000100, - SLDF_HAS_EXP_SZ = 0x00000200, - SLDF_RUN_IN_SEPARATE = 0x00000400, - SLDF_HAS_LOGO3ID = 0x00000800, - SLDF_HAS_DARWINID = 0x00001000, - SLDF_RUNAS_USER = 0x00002000, - SLDF_HAS_EXP_ICON_SZ = 0x00004000, - SLDF_NO_PIDL_ALIAS = 0x00008000, - SLDF_FORCE_UNCNAME = 0x00010000, - SLDF_RUN_WITH_SHIMLAYER = 0x00020000, - SLDF_FORCE_NO_LINKTRACK = 0x00040000, - SLDF_ENABLE_TARGET_METADATA = 0x00080000, +typedef enum +{ + SLDF_DEFAULT = 0x00000000, + SLDF_HAS_ID_LIST = 0x00000001, + SLDF_HAS_LINK_INFO = 0x00000002, + SLDF_HAS_NAME = 0x00000004, + SLDF_HAS_RELPATH = 0x00000008, + SLDF_HAS_WORKINGDIR = 0x00000010, + SLDF_HAS_ARGS = 0x00000020, + SLDF_HAS_ICONLOCATION = 0x00000040, + SLDF_UNICODE = 0x00000080, + SLDF_FORCE_NO_LINKINFO = 0x00000100, + SLDF_HAS_EXP_SZ = 0x00000200, + SLDF_RUN_IN_SEPARATE = 0x00000400, + SLDF_HAS_LOGO3ID = 0x00000800, + SLDF_HAS_DARWINID = 0x00001000, + SLDF_RUNAS_USER = 0x00002000, + SLDF_HAS_EXP_ICON_SZ = 0x00004000, + SLDF_NO_PIDL_ALIAS = 0x00008000, + SLDF_FORCE_UNCNAME = 0x00010000, + SLDF_RUN_WITH_SHIMLAYER = 0x00020000, + SLDF_FORCE_NO_LINKTRACK = 0x00040000, + SLDF_ENABLE_TARGET_METADATA = 0x00080000, + SLDF_DISABLE_LINK_PATH_TRACKING = 0x00100000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SDLF_NO_KF_ALIAS = 0x00400000, - SDLF_ALLOW_LINK_TO_LINK = 0x00800000, - SDLF_UNALIAS_ON_SAVE = 0x01000000, - SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, - SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, - SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, - SLDF_VALID = 0x0ffff7ff, - SLDF_RESERVED = 0x80000000, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, + SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; typedef struct tagDATABLOCKHEADER -- 2.24.1

1 0

[PATCH] shlwapi: Fix spec entry for QISearch().
by Nikolay Sivov 06 Jan '20

06 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 2 +- .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 2 +- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- dlls/shlwapi/shlwapi.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec index a867dfd975..22ebae6d7c 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString @ stdcall StrCSpnA(str str) shlwapi.StrCSpnA @ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec index 50661b1376..8de25172ae 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec @@ -1,4 +1,4 @@ -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA @ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW @ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index c8d82ac556..acd4526dd9 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -67,7 +67,7 @@ @ stdcall PathStripToRootW(wstr) shlwapi.PathStripToRootW @ stdcall PathUnquoteSpacesA(str) shlwapi.PathUnquoteSpacesA @ stdcall PathUnquoteSpacesW(wstr) shlwapi.PathUnquoteSpacesW -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString @ stdcall SHRegCloseUSKey(ptr) shlwapi.SHRegCloseUSKey @ stdcall SHRegDeleteUSValueA(long str long) shlwapi.SHRegDeleteUSValueA diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a7f3eeb869..9b4b6357c6 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -216,7 +216,7 @@ 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) -219 stdcall -import QISearch(long long long long) +219 stdcall -import QISearch(ptr ptr ptr ptr) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 222 stdcall -noname SHGlobalCounterCreate(long) -- 2.24.1

1 0

[PATCH] include: Update CTF_ flags.
by Nikolay Sivov 06 Jan '20

06 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/shlwapi.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 0cd50e9e91..d02005763b 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1018,13 +1018,24 @@ HRESULT WINAPI SHSetThreadRef(IUnknown*); HRESULT WINAPI SHReleaseThreadRef(void); /* SHCreateThread flags */ -#define CTF_INSIST 0x01 /* Always call */ -#define CTF_THREAD_REF 0x02 /* Hold thread ref */ -#define CTF_PROCESS_REF 0x04 /* Hold process ref */ -#define CTF_COINIT 0x08 /* Startup COM first */ -#define CTF_FREELIBANDEXIT 0x10 /* Hold DLL ref */ -#define CTF_REF_COUNTED 0x20 /* Thread is ref counted */ -#define CTF_WAIT_ALLOWCOM 0x40 /* Allow marshalling */ +enum +{ + CTF_INSIST = 0x00000001, /* Always call */ + CTF_THREAD_REF = 0x00000002, /* Hold thread ref */ + CTF_PROCESS_REF = 0x00000004, /* Hold process ref */ + CTF_COINIT_STA = 0x00000008, + CTF_COINIT = 0x00000008, /* Startup COM first */ + CTF_FREELIBANDEXIT = 0x00000010, /* Hold DLL ref */ + CTF_REF_COUNTED = 0x00000020, /* Thread is ref counted */ + CTF_WAIT_ALLOWCOM = 0x00000040, /* Allow marshalling */ + CTF_UNUSED = 0x00000080, + CTF_INHERITWOW64 = 0x00000100, + CTF_WAIT_NO_REENTRACY = 0x00000200, + CTF_KEYBOARD_LOCALE = 0x00000400, + CTF_OLEINITIALIZE = 0x00000800, + CTF_COINIT_MTA = 0x00001000, + CTF_NOADDREFLIB = 0x00002000, +}; BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE,void*,DWORD,LPTHREAD_START_ROUTINE); -- 2.24.1

1 0