- wine-devel - winehq.org

msvcrt:scanf float conversion behavior
by Erich E. Hoover 27 Dec '19

27 Dec '19

I am trying to resolve places where "long double" is being used to compute the value of a floating point number and I am currently looking at resolving this issue in the scanf family of functions. I'm not the hugest fan of having duplicated code running around, so I'm wondering if anyone knows why scanf float behavior isn't implemented using [str|wcs]tod (or possibly the other way around). So, does anyone know why this is the case? Would a patch be accepted that consolidates these instances? Best, Erich

4 7

[PATCH] quartz/tests: Skip the IVideoWindow tests if connecting returns E_FAIL.
by Zebediah Figura 27 Dec '19

27 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3024fa84ef..d3d8893cb5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2267,7 +2267,13 @@ static void test_video_window(void) testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_GetAllocator(input, &allocator); @@ -2302,8 +2308,6 @@ static void test_video_window(void) hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height); todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -2324,6 +2328,7 @@ static void test_video_window(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); +out: IMediaControl_Release(control); IFilterGraph2_Release(graph); IVideoWindow_Release(window); -- 2.24.1

1 0

[PATCH 1/3] user32/tests: Remove unnecessary uses of CREATE_SUSPENDED.
by Zebediah Figura 27 Dec '19

27 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dde.c | 102 ++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 56 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index d370df181a..786d4eca07 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -43,6 +43,22 @@ static WNDPROC old_dde_client_wndproc; static const DWORD default_timeout = 200; +static HANDLE create_process(const char *arg) +{ + STARTUPINFOA si = {.cb = sizeof(si)}; + PROCESS_INFORMATION pi; + char cmdline[200]; + char **argv; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], arg); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(pi.hThread); + return pi.hProcess; +} + static BOOL is_cjk(void) { int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); @@ -253,23 +269,25 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_msg_server(HANDLE hproc, HANDLE hthread) +static void test_msg_server(void) { + HANDLE client; MSG msg; HWND hwnd; DWORD res; create_dde_window(&hwnd, "dde_server", dde_server_wndproc); - ResumeThread( hthread ); + client = create_process("ddeml"); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } destroy_dde_window(&hwnd, "dde_server"); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } static HDDEDATA CALLBACK client_ddeml_callback(UINT uType, UINT uFmt, HCONV hconv, @@ -823,14 +841,17 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon return 0; } -static void test_ddeml_server(HANDLE hproc) +static void test_ddeml_server(void) { + HANDLE client; MSG msg; UINT res; BOOL ret; HSZ server; HDDEDATA hdata; + client = create_process("msg"); + /* set up DDE server */ server_pid = 0; res = DdeInitializeA(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); @@ -842,14 +863,15 @@ static void test_ddeml_server(HANDLE hproc) hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } static HWND client_hwnd, server_hwnd; @@ -2683,8 +2705,9 @@ static void test_end_to_end_client(BOOL type_a) } -static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) +static void test_end_to_end_server(BOOL client_unicode, BOOL server_unicode) { + HANDLE client; MSG msg; HSZ server; BOOL ret; @@ -2692,13 +2715,14 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("start end to end server %s\n", type_a ? "ASCII" : "UNICODE"); + trace("client %s, server %s\n", client_unicode ? "unicode" : "ascii", + server_unicode ? "unicode" : "ascii"); server_pid = 0; - if (type_a) - res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); - else + if (server_unicode) res = DdeInitializeW(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); + else + res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); server = DdeCreateStringHandleA(server_pid, test_service, CP_WINANSI); @@ -2706,27 +2730,25 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); - ResumeThread( hthread ); + client = create_process(client_unicode ? "endw" : "enda"); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } START_TEST(dde) { int argc; char **argv; - char buffer[MAX_PATH]; - STARTUPINFOA startup; - PROCESS_INFORMATION proc; DWORD dde_inst = 0xdeadbeef; argc = winetest_get_mainargs(&argv); @@ -2754,30 +2776,12 @@ START_TEST(dde) return; } - ZeroMemory(&startup, sizeof(STARTUPINFOA)); - sprintf(buffer, "%s dde ddeml", argv[0]); - startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESHOWWINDOW; - startup.wShowWindow = SW_SHOWNORMAL; - - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_msg_server(proc.hProcess, proc.hThread); - - sprintf(buffer, "%s dde msg", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - 0, NULL, NULL, &startup, &proc); - - test_ddeml_server(proc.hProcess); + test_msg_server(); + test_ddeml_server(); /* Test the combinations of A and W interfaces with A and W data end to end to ensure that data conversions are accurate */ - sprintf(buffer, "%s dde enda", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_end_to_end_server(FALSE, FALSE); /* Don't bother testing W interfaces on Win9x/WinMe */ SetLastError(0xdeadbeef); @@ -2788,23 +2792,9 @@ START_TEST(dde) } else { - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - - sprintf(buffer, "%s dde enda", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_end_to_end_server(TRUE, TRUE); + test_end_to_end_server(FALSE, TRUE); + test_end_to_end_server(TRUE, FALSE); test_dde_aw_transaction( FALSE, TRUE ); test_dde_aw_transaction( TRUE, FALSE ); -- 2.24.1

2 6

[PATCH] ntdll/tests: Fix some test failures with Windows 10.
by Zebediah Figura 27 Dec '19

27 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/reg.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9bb8d25020..51562786e9 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -387,7 +387,9 @@ todo_wine /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtOpenKey Failed: 0x%08x\n", status); + if (!status) pNtClose( key ); attr.Attributes = OBJ_CASE_INSENSITIVE; status = pNtOpenKey(&key, KEY_READ, &attr); @@ -615,8 +617,9 @@ static void test_NtCreateKey(void) attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); @@ -926,14 +929,14 @@ static void test_NtQueryLicenseKey(void) len = 0xbeef; status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); type = 0xdead; len = 0xbeef; status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n"); ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); pRtlFreeUnicodeString(&name); @@ -1291,7 +1294,7 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); attr.ObjectName = &link_str; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, + ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID /* Win10 1607+ */, "NtOpenKey wrong status 0x%08x\n", status ); key = (HKEY)0xdeadbeef; @@ -1320,8 +1323,10 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_NAME_TOO_LONG, - "NtOpenKey failed: 0x%08x\n", status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND /* XP */ + || status == STATUS_NAME_TOO_LONG + || status == STATUS_INVALID_PARAMETER /* Win10 1607+ */, + "NtOpenKey failed: 0x%08x\n", status ); attr.Attributes = OBJ_OPENLINK; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); -- 2.24.1

1 0

[PATCH] msscript.ocx/tests: Fix a typo.
by Andrey Gusev 27 Dec '19

27 Dec '19

And the same for mshtml/tests and scrobj/tests

1 0

[PATCH] msscript.ocx/tests: Fix a typo.
by Dmitry Timoshkov 27 Dec '19

27 Dec '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msscript.ocx/tests/msscript.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7693f0b51b..d95c43d9b4 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -448,7 +448,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc IActiveScriptSiteWindow *window; IActiveScriptSiteDebug *debug; IServiceProvider *service; - ICanHandleException *canexpection; + ICanHandleException *canexception; LCID lcid; HRESULT hres; @@ -468,7 +468,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08x\n", hres); - hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); + hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); -- 2.20.1

1 0

[PATCH] po: Update Catalan translation
by Alex Henrie 27 Dec '19

27 Dec '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 508 ++++++++++++++++--------------------------------------- 1 file changed, 146 insertions(+), 362 deletions(-) diff --git a/po/ca.po b/po/ca.po index 4b7466522b..7255f30d38 100644 --- a/po/ca.po +++ b/po/ca.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: 2018-12-17 21:33-0700\n" +"PO-Revision-Date: 2019-12-26 18:54-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 2.2.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -629,7 +629,7 @@ msgstr "Colors personalit&zats:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|Sò&lid" #: comdlg32.rc:290 msgid "&Red:" @@ -666,11 +666,9 @@ msgid "&Define Custom Colors >>" msgstr "D&efinició de colors personalitzats >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&No" +msgstr "&l" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" @@ -1723,7 +1721,7 @@ msgstr "Correu electrònic segur" #: crypt32.rc:142 msgid "Time Stamping" -msgstr "Segellament de temps" +msgstr "Marcació horària" #: crypt32.rc:143 msgid "Microsoft Trust List Signing" @@ -1731,7 +1729,7 @@ msgstr "Segellament de llista de confiança del Microsoft" #: crypt32.rc:144 msgid "Microsoft Time Stamping" -msgstr "Segellament de temps del Microsoft" +msgstr "Marcació horària del Microsoft" #: crypt32.rc:145 msgid "IP security end system" @@ -3924,7 +3922,7 @@ msgstr "La longitud és dolenta.\n" #: winerror.mc:153 winerror.mc:528 msgid "Seek error.\n" -msgstr "Hi ha hagut un error en cercar.\n" +msgstr "Hi ha hagut un error en saltar.\n" #: winerror.mc:158 msgid "Not DOS disk.\n" @@ -4216,7 +4214,7 @@ msgstr "L'ús d'identificador d'accés directe no és vàlid.\n" #: winerror.mc:523 msgid "Negative seek.\n" -msgstr "La cerca és negativa.\n" +msgstr "El salt és negatiu.\n" #: winerror.mc:533 msgid "Drive is a JOIN target.\n" @@ -4372,7 +4370,7 @@ msgstr "El fitxer ja existeix.\n" #: winerror.mc:723 msgid "Invalid flag number.\n" -msgstr "El número de bandera no és vàlid.\n" +msgstr "El número d'opció no és vàlid.\n" #: winerror.mc:728 msgid "Semaphore name not found.\n" @@ -4624,7 +4622,7 @@ msgstr "No es pot acabar.\n" #: winerror.mc:1038 msgid "Invalid flags.\n" -msgstr "Les banderes no són vàlides.\n" +msgstr "Les opcions no són vàlides.\n" #: winerror.mc:1043 msgid "Unrecognized volume.\n" @@ -5700,7 +5698,7 @@ msgstr "L'autenticació mútua ha fallat.\n" #: winerror.mc:2393 msgid "Time skew between client and server.\n" -msgstr "Hi ha una asimetria de temps entre el client i el servidor.\n" +msgstr "Hi ha una asimetria horària entre el client i el servidor.\n" #: winerror.mc:2398 msgid "Invalid window handle.\n" @@ -6840,541 +6838,387 @@ msgstr "Envia correu" #: mferror.mc:249 mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "Ja s'ha fet la sol·licitud per començar.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "No s'ha trobat l'UUID de l'objecte.\n" +msgstr "No s'ha finalitzat el receptor.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "La plataforma d'instal·lació no és compatible.\n" +msgstr "No s'ha inicialitzat la plataforma de Fundació de Mitjans.\n" #: mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "El nombre de bytes és massa petit.\n" +msgstr "La memòria intermèdia és massa petita.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "La sintaxi de consulta no és vàlida.\n" +msgstr "La sol·licitud no és vàlida.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "El número de segment no és vàlid.\n" +msgstr "El número de flux no és vàlid.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "El tipus de dades no és vàlid.\n" +msgstr "El tipus de mitjans no és vàlid.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "No hi ha més entrades.\n" +msgstr "No s'accepten més entrades.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "No s'ha trobat l'UUID de l'objecte.\n" +msgstr "No s'ha inicialitzat l'objecte.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "No s'admet l'operació.\n" +msgstr "No s'admet la representació.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "No hi ha més tipus en la llista de tipus de mitjans suggerits.\n" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El servei és incompatible.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Hi ha hagut un error de xarxa inesperat.\n" +msgstr "Hi ha hagut un error inesperat.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "L'hora no és vàlida.\n" +msgstr "El tipus no és vàlid.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "El format de píxels no és vàlid.\n" +msgstr "El format de fitxer no és vàlid.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "L'hora no és vàlida.\n" +msgstr "La marca horària no és vàlida.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "El tipus és incompatible.\n" +msgstr "L'esquema és incompatible.\n" #: mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El flux de bytes és incompatible.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El format horari és incompatible.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "La marca horària de la mostra no està establerta.\n" #: mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "La mostra no té cap duració establerta.\n" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Les dades no són vàlides.\n" +msgstr "Les dades de flux no són vàlides.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "No hi ha cap ajuda disponible." +msgstr "Suport per a temps real no està disponible.\n" #: mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "El tipus és incompatible.\n" +msgstr "La velocitat és incompatible.\n" #: mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "El tipus és incompatible.\n" +msgstr "L'aprimament és incompatible.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "No s'admet la sol·licitud.\n" +msgstr "No s'admet marxa enrere.\n" #: mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "No s'admet el nivell d'autorització.\n" +msgstr "La transició de velocitat no és compatible.\n" #: mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "El canvi de velocitat ha estat cancel·lat per un altre.\n" #: mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "No s'ha trobat l'UUID de l'objecte.\n" +msgstr "No s'ha trobat l'objecte o el valor.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "No hi ha cap ajuda disponible." +msgstr "El valor no està disponible.\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "No hi ha cap ajuda disponible." +msgstr "El rellotge no està disponible.\n" #: mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "No s'accepten atributs extensos.\n" +msgstr "No s'accepten múltiples subscriptors.\n" #: mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "El controlador no estava habilitat." +msgstr "El temporitzador s'ha fet orfe.\n" #: mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "Ha fallat l'obertura de la taula de traducció de caràcters.\n" +msgstr "Una transició d'estat està penjada.\n" #: mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "No s'admet el nivell d'autorització.\n" +msgstr "La transició de velocitat no és compatible.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "Ha ocorregut un error intern.\n" +msgstr "Ha ocorregut un error no recuperable.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "La mostra té massa memòria intermèdia.\n" #: mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "No es pot escriure al directori temporal.\n" +msgstr "No es pot escriure a la mostra.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "El camí no és vàlid.\n" +msgstr "La clau no és vàlida.\n" #: mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "La versió d'esbós (stub) és incorrecta.\n" +msgstr "La versió d'inici és dolenta.\n" #: mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El subtítol és incompatible.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "L'estació de treball no és vàlida.\n" +msgstr "La posició no és vàlida.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "No s'ha trobat el fitxer.\n" +msgstr "No s'ha trobat l'atribut.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "El tipus de ganxo no es permet.\n" +msgstr "El tipus de propietat no es permet.\n" #: mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "No s'admet l'operació.\n" +msgstr "El tipus de propietat no s'admet.\n" #: mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "El directori no està buit.\n" +msgstr "La propietat està buida.\n" #: mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "El directori no està buit.\n" +msgstr "La propietat no està buida.\n" #: mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "El tipus de ganxo no es permet.\n" +msgstr "No es permet una propietat vectora.\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "Cal una propietat vectora.\n" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "L'usuari ha cancel·lat l'operació.\n" +msgstr "S'ha cancel·lat l'operació.\n" #: mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "El servidor no està inhabilitat.\n" +msgstr "No es pot saltar en el flux de bytes.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "La plataforma està inhabilitat en el mode segur.\n" #: mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "No es pot crear el fil de servei.\n" +msgstr "No es pot analitzar el flux de bytes.\n" #: mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "S'han passat opcions mutualment exclusives al resolutor de fons.\n" #: mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "La interfície és desconeguda.\n" +msgstr "La llargada del flux de dades és desconeguda.\n" #: mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "L'índex no és vàlid.\n" +msgstr "L'índex de cua de treball no és vàlida.\n" #: mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "Cap servidor d'autenticació està disponible.\n" +msgstr "Cap esdeveniment està disponible.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Invalid media source state transition.\n" -msgstr "No s'admet el nivell d'autorització.\n" +msgstr "La transició d'estat de fons de mitjans no és vàlida.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "S'ha recuperat el registre.\n" +msgstr "S'ha arribat al final del flux de mitjans.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "S'ha invocat Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "S'ha recuperat el registre.\n" +msgstr "El flux de mitjans no té cap duració establerta.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "El format de mitjans s'ha reconegut però no és vàlid.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "No s'ha trobat el conjunt de propietats.\n" +msgstr "No s'ha trobat la propietat.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "El directori no està buit.\n" +msgstr "Només es pot llegir la propietat.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "El tipus de ganxo no es permet.\n" +msgstr "No es permet la propietat.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "El recurs està en ús.\n" +msgstr "No s'ha començat la font de mitjans.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "El tipus és incompatible.\n" +msgstr "El format de mitjans és incompatible.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "El recurs està en ús.\n" +msgstr "La font de mitjans està en un estat incorrecte.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "No s'ha detectat dades.\n" +msgstr "No s'ha seleccionat cap flux de mitjans.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "El tipus és incompatible.\n" +msgstr "Les característiques de font de mitjans són incompatibles.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "S'ha eliminat el receptor de flux.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Els receptors de flux no estan sincronitzats.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "S'ha recuperat el registre.\n" +msgstr "El conjunt de receptors del flux de mitjans és fix.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "El domini ja existeix.\n" +msgstr "El receptor de flux ja existeix.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "L'usuari ha cancel·lat l'operació.\n" +msgstr "S'ha cancel·lat l'assignació de mostra.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "El directori no està buit.\n" +msgstr "L'assignador de mostra està buit.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "La classe ja existeix.\n" +msgstr "El receptor ja s'ha aturat.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "No s'ha reconegut la velocitat de bits del receptor ASF.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "No s'ha detectat dades.\n" +msgstr "No s'ha seleccionat cap flux per al receptor.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "El nom de fitxer és massa llarg.\n" +msgstr "Les metadades han estat massa llargues.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "El receptor no ha processat cap mostra.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "No s'han proporcionat les capçaleres requerides al receptor.\n" #: mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "La connexió no és vàlida.\n" +msgstr "El node opcional no és vàlid.\n" #: mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "No es pot trobar la impressora." +msgstr "No es pot trobar el desxifrador.\n" #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "No s'ha trobat el mòdul.\n" +msgstr "No s'ha trobat el còdec.\n" #: mferror.mc:648 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "No es pot obtenir l'identificador de trucada.\n" +msgstr "No es poden connectar els nodes de la topologia.\n" #: mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "No s'admet la sol·licitud.\n" +msgstr "No s'admet la sol·licitud de topologia.\n" #: mferror.mc:662 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "Els atributs de grup no són vàlids.\n" +msgstr "Els atributs de topologia horària no són vàlids.\n" #: mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "S'han trobat bucles en la topologia.\n" #: mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "Manca la font d'instal·lació.\n" +msgstr "Manca el descriptor de presentació.\n" #: mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "Manca l'índex.\n" +msgstr "Manca el descriptor de flux.\n" #: mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "El dispositiu no està connectat.\n" +msgstr "El descriptor de flux no està seleccionat.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Manca l'índex.\n" +msgstr "Manca la font.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "El carregador de topologia no admet activacions de receptor.\n" #: mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "El rellotge no té cap font d'hora establerta.\n" #: mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "La classe ja existeix.\n" +msgstr "Ja s'ha establert l'estat de rellotge.\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8471,26 +8315,20 @@ msgid "Off" msgstr "Inactiu" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "vídeo" +msgstr "Proveïdor" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Seleccioneu el format que voleu utilitzar:" +msgstr "Seleccioneu les dades a les qualles voleu connectar:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Propietats" +msgstr "Propietats d'enllaç de dades" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "Proveïdors de base de dades OLE" #: oledlg.rc:55 msgid "Insert Object" @@ -9884,11 +9722,11 @@ msgstr "Hora d'estiu central" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "Hora estàndard dels Açores" +msgstr "Hora estàndard de les Açores" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "Hora d'estiu dels Açores" +msgstr "Hora d'estiu de les Açores" #: tzres.rc:158 msgid "North Asia East Standard Time" @@ -10048,11 +9886,11 @@ msgstr "Hora d'estiu de les muntanyes" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "Hora estàndard oriental EEUU" +msgstr "Hora estàndard oriental EUA" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "Hora d'estiu oriental EEUU" +msgstr "Hora d'estiu oriental EUA" #: tzres.rc:196 msgid "Tasmania Standard Time" @@ -10072,11 +9910,11 @@ msgstr "Hora d'estiu de l'Àmerica Central" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "Hora estàndard de les muntanyes EEUU" +msgstr "Hora estàndard de les muntanyes EUA" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "Hora d'estiu de les muntanyes EEUU" +msgstr "Hora d'estiu de les muntanyes EUA" #: tzres.rc:188 msgid "South Africa Standard Time" @@ -10120,11 +9958,11 @@ msgstr "Hora d'estiu de Iakutsk" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-Est" +msgstr "Hora estàndard de l'Àmerica del Sud-est" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-Est" +msgstr "Hora d'estiu de l'Àmerica del Sud-est" #: tzres.rc:34 msgid "Arab Standard Time" @@ -10160,11 +9998,11 @@ msgstr "Hora d'estiu romànic" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "Hora estàndard d'Iekaterinburg" +msgstr "Hora estàndard de Iekaterinburg" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "Hora d'estiu d'Iekaterinburg" +msgstr "Hora d'estiu de Iekaterinburg" #: tzres.rc:192 msgid "Syria Standard Time" @@ -10288,11 +10126,11 @@ msgstr "Hora d'estiu de Hawaii" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "Hora estàndard de l'Àsia del Sud-Est" +msgstr "Hora estàndard de l'Àsia del Sud-est" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Sud-Est" +msgstr "Hora d'estiu de l'Àsia del Sud-est" #: tzres.rc:154 msgid "New Zealand Standard Time" @@ -10320,11 +10158,11 @@ msgstr "Hora d'estiu de Bielorússia" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-Oest" +msgstr "Hora estàndard de l'Àmerica del Sud-oest" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-Oest" +msgstr "Hora d'estiu de l'Àmerica del Sud-oest" #: tzres.rc:108 msgid "Greenland Standard Time" @@ -10747,7 +10585,7 @@ msgstr "Un número d'error s'ha especificat que no està definit en el sistema." #: winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "S'ha passat una bandera no vàlida a una funció de sistema." +msgstr "S'ha passat una opció no vàlida a una funció de sistema." #: winmm.rc:43 msgid "An invalid parameter was passed to a system function." @@ -10783,7 +10621,7 @@ msgid "" "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " "and then try again." msgstr "" -"No es pot obrir el dispositiu sense utilitzar la bandera WAVE_ALLOWSYNC. " +"No es pot obrir el dispositiu sense utilitzar l'opció WAVE_ALLOWSYNC. " "Utilitzeu la bandera i després torneu a intentar." #: winmm.rc:52 @@ -11026,7 +10864,7 @@ msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." msgstr "" -"El valor especificat per al format d'hora no és vàlid. Consulteu la " +"El valor especificat per al format horari no és vàlid. Consulteu la " "documentació MCI pels formats vàlids." #: winmm.rc:93 @@ -11066,7 +10904,7 @@ msgstr "Heu d'especificar un àlies quan s'utilitza el paràmetre 'new'." #: winmm.rc:99 msgid "Cannot use the 'notify' flag with auto-opened devices." msgstr "" -"No es pot utilitzar la bandera 'notify' amb els dispositius oberts " +"No es pot utilitzar l'opció 'notify' amb els dispositius oberts " "automàticament." #: winmm.rc:100 @@ -11242,19 +11080,15 @@ msgid "" "The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " "You can't use them together." msgstr "" -"Els formats d'hora de la \"punter de cançó\" i SMPTE són mútuament " +"Els formats horaris de la \"punter de cançó\" i SMPTE són mútuament " "excloents. No es poden utilitzar junts." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." msgstr "" -"El port MIDI especificat ja està en ús. Espereu fins que estigui lliure; " +"El port MIDI especificat ja està en ús. Espereu fins que estigui lliure i " "llavors torneu a intentar." #: winmm.rc:131 @@ -11271,16 +11105,12 @@ msgid "An error occurred with the specified port." msgstr "Ha ocorregut un error amb el port especificat." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." msgstr "" -"Les altres aplicacions estan utilitzant tots els temporitzadors de " -"multimèdia. Tanqueu una d'aquestes aplicacions, llavors torneu a intentar." +"Tots els temporitzadors de multimèdia estan en ús per altres aplicacions. " +"Tanqueu una d'aquestes aplicacions i llavors torneu a intentar." #: winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -11692,7 +11522,7 @@ msgid "" msgstr "" "CALL <nom de fitxer BAT> s'utilitza dins un fitxer BAT per a executar\n" "ordres d'un altre fitxer BAT. Quan se surt del fitxer BAT, el control\n" -"retorna al fitxer que l'ha trucat. L'ordre CALL pot proveir paràmetres al\n" +"retorna al fitxer que l'ha invocat. L'ordre CALL pot proveir paràmetres al\n" "procediment trucat.\n" "\n" "El procediment trucant hereta els canvis al directori per defecte,\n" @@ -11792,7 +11622,7 @@ msgstr "" "\n" "L'etiqueta que és la destinació d'un GOTO pot ser de fins a 255 caràcters\n" "de longitud però no pot incloure espais (això és diferent d'altres sistemes\n" -"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer BAT,\n" +"operatius). Si dues o més etiquetes idèntiques existeixen en un fitxer BAT,\n" "el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no existent\n" "termina l'execució del fitxer BAT.\n" "\n" @@ -12104,14 +11934,14 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"S'utilitza VERIFY per a definir, esborrar o provar la bandera de\n" +"S'utilitza VERIFY per a establir, esborrar o provar l'opció de\n" "verificació. Les formes vàlides són:\n" "\n" -"VERIFY ON\tEstableix la bandera.\n" -"VERIFY OFF\tEsborra la bandera.\n" +"VERIFY ON\tEstableix l'opció.\n" +"VERIFY OFF\tEsborra l'opció.\n" "VERIFY\t\tMostra ON o OFF segons correspongui.\n" "\n" -"La bandera de verificació no té cap funció en el Wine.\n" +"L'opció de verificació no té cap funció en el Wine.\n" #: cmd.rc:256 msgid "VER displays the version of cmd you are running.\n" @@ -13132,7 +12962,7 @@ msgstr "&Executa l'Editor de Registre" #: oleview.rc:42 msgid "&CoCreateInstance Flag" -msgstr "Bandera &CoCreateInstance" +msgstr "Opció &CoCreateInstance" #: oleview.rc:44 msgid "&In-process server" @@ -14699,7 +14529,7 @@ msgstr "De&finició de la prioritat" #: taskmgr.rc:156 msgid "&Realtime" -msgstr "&Temps real" +msgstr "Temps &real" #: taskmgr.rc:160 msgid "&Above Normal" @@ -15470,7 +15300,7 @@ msgstr "Visualitzador de Metafitxers Regular" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafitxers (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15643,10 +15473,6 @@ msgid "Drive configuration" msgstr "Configuració d'unitats" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." @@ -15938,12 +15764,6 @@ msgid "System drive" msgstr "Unitat de sistema" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16375,7 +16195,7 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" -"Un program en el vostre sistema ha tingut una pana, però el WineDbg no ha " +"Un programa en el vostre sistema ha tingut una pana, però el WineDbg no ha " "pogut enganxar-se al procès per a obtenir una traça inversa." #: winedbg.rc:41 @@ -17027,10 +16847,8 @@ msgid "Text documents (*.txt)" msgstr "Documents de text (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Documents de text d'Unicode (*.txt)" +msgstr "Document de text d'Unicode (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17234,42 +17052,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -17333,6 +17115,8 @@ msgstr "" "[/A] Només copiar els fitxers amb l'atribut d'arxiu establert.\n" "[/M] Només copiar els fitxers amb l'atribut d'arxiu establert, elimina\n" "\tl'atribut d'arxiu.\n" +"[/K] Copiar els atributs de fitxer; sense això, no se preserven els\n" +" atributs.\n" "[/D | /D:m-d-y] Copiar els fitxers nous o els modificats després de la data\n" "\t\tproveïda.\n" "\t\tSi no es proveeix cap data, només es copia si la destinació és més\n" -- 2.24.1

1 0

[PATCH v2 1/5] msvcrt: Introduce IMPORT_SYMBOL helper macro.
by Jacek Caban 26 Dec '19

26 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/iob.c | 8 ++------ dlls/msvcrt/msvcrt.h | 8 ++++++++ 2 files changed, 10 insertions(+), 6 deletions(-)

2 1

[PATCH v4 1/4] ntdll: Rename find_free_area to find_reserved_free_area.
by Rémi Bernon 26 Dec '19

26 Dec '19

We used this function to find free areas outside of the reserved range, and it's obviously incorrect as there can be some system or external memory mapping we don't know about. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/virtual.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index cb869feff02..ded00e3eb7d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,14 +496,14 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } - /*********************************************************************** - * find_free_area + * find_reserved_free_area * * Find a free area between views inside the specified range. * The csVirtual section must be held by caller. + * The range must be inside the preloader reserved range. */ -static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static void *find_reserved_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; void *start; @@ -1053,14 +1053,14 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) else { /* range is split in two by the preloader reservation, try first part */ - if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, - alloc->mask, alloc->top_down ))) + if ((alloc->result = find_reserved_free_area( start, preload_reserve_start, alloc->size, + alloc->mask, alloc->top_down ))) return 1; /* then fall through to try second part */ start = preload_reserve_end; } } - if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + if ((alloc->result = find_reserved_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) return 1; return 0; @@ -1167,7 +1167,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if (!zero_bits_64) ptr = NULL; - else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + else if (!(ptr = find_reserved_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) return STATUS_NO_MEMORY; if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1) -- 2.24.1

1 3

[PATCH] ntdll/tests: Remove a no longer reliable test.
by Zebediah Figura 26 Dec '19

26 Dec '19

On Windows 10 version 1607, a process called "Memory Compression" violates this invariant. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/info.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index caa123e982..76de56810c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -363,8 +363,6 @@ static void test_query_process(void) last_pid = (DWORD_PTR)spi->UniqueProcessId; - ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\n"); - /* Loop through the threads, skip NT4 for now */ if (!is_nt) -- 2.24.1

1 0

[PATCH v4] user32/tests: Move TEST_MOUSEACTIVATE to test_defwinproc.
by Rémi Bernon 26 Dec '19

26 Dec '19

This test is actually testing the reply from DefWindowProcA, as the window it was sent to is not handling this particular message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending just this one with the missing "LRESULT res;" removal. The other two (176134 and 176136) should still apply. dlls/user32/tests/msg.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/tests/win.c | 33 --------------------------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c0ba5834cf9..b1095037066 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15623,6 +15623,38 @@ static void test_defwinproc(void) ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + /* Test WM_MOUSEACTIVATE */ +#define TEST_MOUSEACTIVATE(A,B,C) \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + + TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); + TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9309a8cba6..926234fa5d4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3782,7 +3782,6 @@ static void test_mouse_input(HWND hwnd) HWND popup, child = NULL; MSG msg; BOOL ret; - LRESULT res; ShowWindow(hwnd, SW_SHOWNORMAL); UpdateWindow(hwnd); @@ -3935,38 +3934,6 @@ static void test_mouse_input(HWND hwnd) msg.hwnd, popup, msg.message); ok(peek_message(&msg), "no message available\n"); - /* Test WM_MOUSEACTIVATE */ -#define TEST_MOUSEACTIVATE(A,B,C) \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ - ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ - ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); - - TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); - TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); - ShowWindow(popup, SW_HIDE); /* Test sending double click to the non-client area, while capturing the window after -- 2.24.1

2 1

[PATCH 2/2] msvcr90: Improve floats comparison in _atoflt tests.
by Piotr Caban 26 Dec '19

26 Dec '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)

1 0

[PATCH 1/2] msvcrt: Improve doubles comparison in strtod and atodbl tests.
by Piotr Caban 26 Dec '19

26 Dec '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 80 ++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 38 deletions(-)

1 0

[PATCH] oleaut32/tests: Avoid testing that GDI objects are invalid.
by Zebediah Figura 26 Dec '19

26 Dec '19

This is not consistent across Windows versions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/olefont.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 10e2a4cf2f..9c8d255af1 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -1033,9 +1033,6 @@ static void test_hfont_lifetime(void) hr = IFont_get_hFont(font, &hfont); EXPECT_HR(hr, S_OK); - - obj_type = GetObjectType(last_hfont); - ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); } /* now show that if we take a reference on the hfont, it persists @@ -1063,9 +1060,6 @@ static void test_hfont_lifetime(void) IFont_Release(font); - obj_type = GetObjectType(first_hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); - /* An AddRefHfont followed by a ReleaseHfont means the font doesn't not persist through re-realization */ @@ -1099,9 +1093,6 @@ static void test_hfont_lifetime(void) hr = IFont_ReleaseHfont(font, hfont); EXPECT_HR(hr, S_OK); - - obj_type = GetObjectType(last_hfont); - ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); } /* Interestingly if we release a nonexistent reference on the hfont, @@ -1130,9 +1121,6 @@ static void test_hfont_lifetime(void) IFont_Release(font); - obj_type = GetObjectType(first_hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); - /* If we take two internal references on a hfont then we can release it twice. So it looks like there's a total reference count that includes internal and external references */ @@ -1165,9 +1153,6 @@ todo_wine ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); IFont_Release(font2); - - obj_type = GetObjectType(hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); } static void test_realization(void) -- 2.24.1

1 0

[PATCH 1/2] ole32/tests: Rewrite and expand test_data_cache_updatecache().
by Zebediah Figura 26 Dec '19

26 Dec '19

Instead of testing calls to IDataObject::GetData() and IDataObject::QueryGetData(), actually test whether the cache contains the updated data that we expose after calling IOleCache2::UpdateCache(). Fixes test failures with Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/ole2.c | 511 +++++++++++++++++++--------------------- 1 file changed, 242 insertions(+), 269 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6be187497d..4103a75abc 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -118,7 +118,8 @@ static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; -static FORMATETC *g_dataobject_fmts; +static FORMATETC *data_object_format; +static const BYTE *data_object_dib; /**************************************************************************** * PresentationDataHeader @@ -182,8 +183,7 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM ok(!expected_method_list->method, "Method sequence starting from %s not called\n", expected_method_list->method); \ } while (0) -/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ -static const BYTE dib[] = +static const BYTE dib_white[] = { 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, @@ -193,14 +193,24 @@ static const BYTE dib[] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; +static const BYTE dib_black[] = +{ + 0x28, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc8, 0x00, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + static void create_dib( STGMEDIUM *med ) { void *ptr; med->tymed = TYMED_HGLOBAL; - U(med)->hGlobal = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) ); + U(med)->hGlobal = GlobalAlloc(GMEM_MOVEABLE, sizeof(dib_white)); ptr = GlobalLock( U(med)->hGlobal ); - memcpy( ptr, dib, sizeof(dib) ); + memcpy(ptr, dib_white, sizeof(dib_white)); GlobalUnlock( U(med)->hGlobal ); med->pUnkForRelease = NULL; } @@ -1361,34 +1371,33 @@ static inline BOOL fmtetc_equal( const FORMATETC *a, const FORMATETC *b ) } -static HRESULT WINAPI DataObject_GetData( IDataObject *iface, FORMATETC *fmt_in, - STGMEDIUM *med ) +static HRESULT WINAPI DataObject_GetData(IDataObject *iface, FORMATETC *format, STGMEDIUM *medium) { - FORMATETC *fmt; - - CHECK_EXPECTED_METHOD_FMT("DataObject_GetData", fmt_in); + if (winetest_debug > 1) trace("IDataObject::GetData(cf %u)\n", format->cfFormat); - for (fmt = g_dataobject_fmts; fmt && fmt->cfFormat != 0; fmt++) + if (data_object_format && fmtetc_equal(format, data_object_format)) { - if (fmtetc_equal( fmt_in, fmt )) + switch (format->cfFormat) { - switch (fmt->cfFormat) - { - case CF_DIB: - create_dib( med ); - return S_OK; - case CF_BITMAP: - create_bitmap( med ); - return S_OK; - case CF_ENHMETAFILE: - create_emf( med ); - return S_OK; - case CF_TEXT: - create_text( med ); - return S_OK; - default: - trace( "unhandled fmt %d\n", fmt->cfFormat ); - } + case CF_DIB: + medium->tymed = TYMED_HGLOBAL; + medium->pUnkForRelease = NULL; + U(*medium).hGlobal = GlobalAlloc(GMEM_MOVEABLE, sizeof(dib_white)); + memcpy(GlobalLock(U(*medium).hGlobal), data_object_dib, sizeof(dib_white)); + GlobalUnlock(U(*medium).hGlobal); + return S_OK; + case CF_BITMAP: + create_bitmap(medium); + return S_OK; + case CF_ENHMETAFILE: + create_emf(medium); + return S_OK; + case CF_METAFILEPICT: + create_mfpict(medium); + return S_OK; + case CF_TEXT: + create_text(medium); + return S_OK; } } @@ -1404,16 +1413,11 @@ static HRESULT WINAPI DataObject_GetDataHere( return E_NOTIMPL; } -static HRESULT WINAPI DataObject_QueryGetData( IDataObject *iface, FORMATETC *fmt_in ) +static HRESULT WINAPI DataObject_QueryGetData(IDataObject *iface, FORMATETC *format) { - FORMATETC *fmt; - - CHECK_EXPECTED_METHOD_FMT("DataObject_QueryGetData", fmt_in); + if (winetest_debug > 1) trace("IDataObject::QueryGetData(cf %u)\n", format->cfFormat); - for (fmt = g_dataobject_fmts; fmt && fmt->cfFormat != 0; fmt++) - if (fmtetc_equal( fmt_in, fmt )) return S_OK; - - return S_FALSE; + return (data_object_format && fmtetc_equal(format, data_object_format)) ? S_OK : S_FALSE; } static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( @@ -1606,9 +1610,6 @@ static void test_data_cache(void) { "draw_continue", 1 }, { "draw_continue", 1 }, { "draw_continue", 1 }, - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_THUMBNAIL, -1, TYMED_HGLOBAL} }, - { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_THUMBNAIL, -1, TYMED_GDI} }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_ICON, -1, TYMED_MFPICT} }, { NULL, 0 } }; static const struct expected_method methods_cachethenrun[] = @@ -2042,7 +2043,7 @@ static void test_data_cache_dib_contents_stream(int num) hr = IDataObject_GetData( data, &fmt, &med ); ok( SUCCEEDED(hr), "got %08x\n", hr ); ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); - ok( GlobalSize( U(med).hGlobal ) >= sizeof(dib) - sizeof(BITMAPFILEHEADER), + ok( GlobalSize( U(med).hGlobal ) >= sizeof(dib_white) - sizeof(BITMAPFILEHEADER), "got %lu\n", GlobalSize( U(med).hGlobal ) ); ptr = GlobalLock( U(med).hGlobal ); @@ -2518,84 +2519,26 @@ static void test_data_cache_initnew(void) IOleCache2_Release( cache ); } +static BOOL compare_global(HGLOBAL handle, const void *data, SIZE_T size) +{ + const void *mem = GlobalLock(handle); + BOOL ret = GlobalSize(handle) == size && !memcmp(data, mem, size); + GlobalUnlock(handle); + return ret; +} + static void test_data_cache_updatecache( void ) { + FORMATETC dib_fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; + FORMATETC emf_fmt = {CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF}; + FORMATETC wmf_fmt = {CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT}; + FORMATETC view_fmt = {0, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; + IDataObject *data; HRESULT hr; IOleCache2 *cache; - FORMATETC fmt; + STGMEDIUM medium; DWORD conn[4]; - static const struct expected_method methods_dib[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, - { NULL } - }; - - static const struct expected_method methods_dib_emf[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_dib_wmf[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_viewcache[] = - { - { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { "DataObject_QueryGetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_QueryGetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_QueryGetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, - { NULL } - }; - static const struct expected_method methods_viewcache_with_dib[] = - { - { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { "DataObject_QueryGetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_QueryGetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { NULL } - }; - static const struct expected_method methods_flags_all[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_flags_ifblank_1[] = - { - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_flags_ifblank_2[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_flags_normal[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { NULL } - }; - static const struct expected_method methods_initcache[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, - { NULL } - }; - static const struct expected_method methods_empty[] = - { - { NULL } - }; - static STATDATA view_cache[] = { {{ 0, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 0 } @@ -2606,216 +2549,276 @@ static void test_data_cache_updatecache( void ) {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 0 } }; - static FORMATETC dib_fmt[] = - { - { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, - { 0 } - }; - hr = CreateDataCache( NULL, &CLSID_WineTestOld, &IID_IOleCache2, (void **)&cache ); ok( hr == S_OK, "got %08x\n", hr ); + IOleCache2_QueryInterface(cache, &IID_IDataObject, (void **)&data); - /* No cache slots */ - g_dataobject_fmts = NULL; - expected_method_list = NULL; - + data_object_format = NULL; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - /* A dib cache slot */ - fmt.cfFormat = CF_DIB; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_HGLOBAL; - - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[0] ); + hr = IOleCache2_Cache( cache, &dib_fmt, 0, &conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_dib; - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - /* Now with a dib available */ - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_dib; + data_object_format = &dib_fmt; + data_object_dib = dib_white; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + + hr = IOleCache2_Cache(cache, &emf_fmt, 0, &conn[1]); + ok( hr == S_OK, "got %08x\n", hr ); + + data_object_dib = dib_black; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - /* Add an EMF cache slot */ - fmt.cfFormat = CF_ENHMETAFILE; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_ENHMF; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_black, sizeof(dib_black)), "Media didn't match.\n"); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[1] ); + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_dib_emf; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_ENHMF, "Got unexpected tymed %u.\n", medium.tymed); - /* Two slots to fill, only the dib will succeed */ + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + + data_object_format = &wmf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_ENHMF, "Got unexpected tymed %u.\n", medium.tymed); + + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - /* Replace the emf slot with a wmf */ hr = IOleCache2_Uncache( cache, conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); - fmt.cfFormat = CF_METAFILEPICT; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_MFPICT; + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[1] ); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IOleCache2_Cache( cache, &wmf_fmt, 0, &conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_dib_wmf; + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); + + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &wmf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &wmf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IOleCache2_Uncache( cache, conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); hr = IOleCache2_Uncache( cache, conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - /* View caching */ - fmt.cfFormat = 0; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_HGLOBAL; + /* Test view caching. */ - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[0] ); + hr = IOleCache2_Cache( cache, &view_fmt, 0, &conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); view_cache[0].dwConnection = conn[0]; - g_dataobject_fmts = NULL; - expected_method_list = methods_viewcache; - + data_object_format = NULL; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); check_enum_cache( cache, view_cache, 1 ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_viewcache_with_dib; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &view_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &dib_fmt; + data_object_dib = dib_white; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); view_cache_after_dib[0].dwConnection = view_cache_after_dib[1].dwConnection = view_cache[0].dwConnection; check_enum_cache( cache, view_cache_after_dib, 2 ); - hr = IOleCache2_Uncache( cache, conn[0] ); - ok( hr == S_OK, "got %08x\n", hr ); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &view_fmt, &medium); + todo_wine ok(hr == DV_E_CLIPFORMAT, "Got hr %#x.\n", hr); - /* Try some different flags */ + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + ok( hr == CACHE_E_NOCACHE_UPDATED, "got %08x\n", hr ); - fmt.cfFormat = CF_DIB; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_HGLOBAL; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_Cache( cache, &fmt, 0, &conn[0] ); + hr = IOleCache2_Uncache( cache, conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - fmt.cfFormat = CF_ENHMETAFILE; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_ENHMF; + /* Try some different flags */ - hr = IOleCache2_Cache( cache, &fmt, ADVF_NODATA, &conn[1] ); + hr = IOleCache2_Cache( cache, &dib_fmt, 0, &conn[0] ); ok( hr == S_OK, "got %08x\n", hr ); - fmt.cfFormat = CF_METAFILEPICT; - fmt.ptd = NULL; - fmt.dwAspect = DVASPECT_CONTENT; - fmt.lindex = -1; - fmt.tymed = TYMED_MFPICT; - - hr = IOleCache2_Cache( cache, &fmt, ADVFCACHE_ONSAVE, &conn[2] ); + hr = IOleCache2_Cache( cache, &emf_fmt, ADVF_NODATA, &conn[1] ); ok( hr == S_OK, "got %08x\n", hr ); - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_flags_all; - - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); - - CHECK_NO_EXTRA_METHODS(); + data_object_format = &dib_fmt; + data_object_dib = dib_white; + hr = IOleCache2_UpdateCache(cache, &DataObject, UPDFCACHE_IFBLANK, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); - expected_method_list = methods_flags_all; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ALL, NULL ); + data_object_dib = dib_black; + hr = IOleCache2_UpdateCache(cache, &DataObject, UPDFCACHE_IFBLANK, NULL); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); - - expected_method_list = methods_flags_ifblank_1; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &emf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK , NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(medium.tymed == TYMED_HGLOBAL, "Got unexpected tymed %u.\n", medium.tymed); + ok(compare_global(U(medium).hGlobal, dib_white, sizeof(dib_white)), "Media didn't match.\n"); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_flags_ifblank_2; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK , NULL ); + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK | UPDFCACHE_NODATACACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_flags_all; - - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK | UPDFCACHE_NODATACACHE, NULL ); + data_object_format = &dib_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); - - expected_method_list = methods_empty; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + data_object_format = &emf_fmt; hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_IFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_flags_normal; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); + hr = IOleCache2_DiscardCache( cache, DISCARDCACHE_NOSAVE ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + data_object_format = &dib_fmt; + hr = IOleCache2_InitCache( cache, &DataObject ); + ok( hr == S_OK, "got %08x\n", hr ); - expected_method_list = methods_initcache; + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); - hr = IOleCache2_InitCache( cache, &DataObject ); + data_object_format = &emf_fmt; + hr = IOleCache2_UpdateCache( cache, &DataObject, UPDFCACHE_ONLYIFBLANK | UPDFCACHE_NORMALCACHE, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - CHECK_NO_EXTRA_METHODS(); + hr = IDataObject_GetData(data, &dib_fmt, &medium); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDataObject_GetData(data, &emf_fmt, &medium); + ok(hr == OLE_E_BLANK, "Got hr %#x.\n", hr); + IDataObject_Release(data); IOleCache2_Release( cache ); } @@ -4130,18 +4133,18 @@ static void get_stgdef(struct storage_def *stg_def, CLIPFORMAT cf, STGMEDIUM *st switch (cf) { case CF_DIB: - data_size = sizeof(dib); + data_size = sizeof(dib_white); if (!strcmp(stg_def->stream[stm_idx].name, "CONTENTS")) { data_size += sizeof(dib_inf); data = HeapAlloc(GetProcessHeap(), 0, data_size); memcpy(data, dib_inf, sizeof(dib_inf)); - memcpy(data + sizeof(dib_inf), dib, sizeof(dib)); + memcpy(data + sizeof(dib_inf), dib_white, sizeof(dib_white)); } else { data = HeapAlloc(GetProcessHeap(), 0, data_size); - memcpy(data, dib, sizeof(dib)); + memcpy(data, dib_white, sizeof(dib_white)); } stg_def->stream[stm_idx].data = data; stg_def->stream[stm_idx].data_size = data_size; @@ -4484,6 +4487,9 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || static void test_OleCreateStaticFromData(void) { + FORMATETC dib_fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; + FORMATETC emf_fmt = {CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF}; + FORMATETC text_fmt = {CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; HRESULT hr; IOleObject *ole_obj = NULL; IStorage *storage; @@ -4493,41 +4499,10 @@ static void test_OleCreateStaticFromData(void) STATSTG statstg; int enumerated_streams, matched_streams; STGMEDIUM stgmed; - static FORMATETC dib_fmt[] = - { - { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, - { 0 } - }; - static FORMATETC emf_fmt[] = - { - { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, - { 0 } - }; - static FORMATETC text_fmt[] = - { - { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, - { 0 } - }; static const struct expected_method methods_create_from_dib[] = { { "DataObject_EnumFormatEtc", TEST_TODO }, { "DataObject_GetDataHere", 0 }, - { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, - { NULL } - }; - static const struct expected_method methods_createstatic_from_dib[] = - { - { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, - { NULL } - }; - static const struct expected_method methods_createstatic_from_emf[] = - { - { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, - { NULL } - }; - static const struct expected_method methods_createstatic_from_text[] = - { - { "DataObject_GetData", 0, { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, { NULL } }; static struct storage_def stg_def_dib = @@ -4554,18 +4529,18 @@ static void test_OleCreateStaticFromData(void) ILockBytes_Release(ilb); hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - dib_fmt, NULL, NULL, (void **)&ole_obj); + &dib_fmt, NULL, NULL, (void **)&ole_obj); ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - dib_fmt, NULL, storage, NULL); + &dib_fmt, NULL, storage, NULL); ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); /* CF_DIB */ - g_dataobject_fmts = dib_fmt; - expected_method_list = methods_createstatic_from_dib; + data_object_format = &dib_fmt; + data_object_dib = dib_white; hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - dib_fmt, NULL, storage, (void **)&ole_obj); + &dib_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); @@ -4596,10 +4571,9 @@ static void test_OleCreateStaticFromData(void) 0, &storage); ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); ILockBytes_Release(ilb); - g_dataobject_fmts = emf_fmt; - expected_method_list = methods_createstatic_from_emf; + data_object_format = &emf_fmt; hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - emf_fmt, NULL, storage, (void **)&ole_obj); + &emf_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); @@ -4630,10 +4604,9 @@ static void test_OleCreateStaticFromData(void) 0, &storage); ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); ILockBytes_Release(ilb); - g_dataobject_fmts = text_fmt; - expected_method_list = methods_createstatic_from_text; + data_object_format = &text_fmt; hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, - text_fmt, NULL, storage, (void **)&ole_obj); + &text_fmt, NULL, storage, (void **)&ole_obj); ok(hr == DV_E_CLIPFORMAT, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); IStorage_Release(storage); @@ -4643,9 +4616,9 @@ static void test_OleCreateStaticFromData(void) 0, &storage); ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); ILockBytes_Release(ilb); - g_dataobject_fmts = dib_fmt; + data_object_format = &dib_fmt; expected_method_list = methods_create_from_dib; - hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, dib_fmt, NULL, + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, &dib_fmt, NULL, storage, (void **)&ole_obj); todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); IStorage_Release(storage); -- 2.24.1

1 1

[PATCH v3] dmcompos/tests: Add Chord track GetParam/SetParam tests
by Michael Stefaniuc 26 Dec '19

26 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v3: Fix a wrong test dlls/dmcompos/tests/dmcompos.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index e5cb7da8ad..f041d0ac34 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -267,6 +267,7 @@ static void test_chordmaptrack(void) { IDirectMusicTrack8 *dmt8; IPersistStream *ps; + IDirectMusicChordMap *chordmap; CLSID class; ULARGE_INTEGER size; HRESULT hr; @@ -331,11 +332,29 @@ static void test_chordmaptrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_NOT_FOUND, + "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void **)&chordmap); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); + ok(hr == S_OK, "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + IDirectMusicChordMap_Release(chordmap); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); + todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); -- 2.24.1

1 0

[PATCH] msvcr90: Fix compilation warning in __AdjustPointer tests.
by Piotr Caban 26 Dec '19

26 Dec '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0

[PATCH v3] ucrtbase: Fix handling of tab and non-breaking space in iswctype().
by Chip Davis 26 Dec '19

26 Dec '19

It's just these two that are handled specially AFAICT. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Fix build. v3: Fix sign extension bug. dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 30 +++++++++++++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 28 +++++++++++++++++++++++ dlls/msvcrt/wcs.c | 29 +++++++++++++++++------- dlls/ucrtbase/tests/misc.c | 41 +++++++++++++++++++++++++++++----- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 123 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 560e14b33b8..177b67298b2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1719,7 +1719,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2316535e5d1..376c36cd159 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2077,7 +2077,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 09876131f07..862d2bfce74 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -33,6 +33,7 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); static size_t (CDECL *p___strncnt)(const char *str, size_t count); +static int (CDECL *p_iswctype)(wchar_t, wctype_t); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -52,6 +53,7 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors@CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors@_CurrentScheduler@details@Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id@CurrentScheduler@Concurrency@@SAIXZ"); @@ -143,10 +145,38 @@ static void test___strncnt(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); test___strncnt(); + test_iswctype(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 903f4b7ce38..f04a0ec3494 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2230,7 +2230,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index a014cf50365..d1457e8a32e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -754,7 +754,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 21b73d3a75c..72f292e64f0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -750,7 +750,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 402e6efc109..9e5f03685ce 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1401,7 +1401,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8a079abe254..8c54c5f762d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1374,7 +1374,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b97..0d6b17eb6d8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1340,7 +1340,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1be4dcb129c..5b215728ad4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4024,6 +4024,33 @@ static void test_iswdigit(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(string) { char mem[100]; @@ -4167,4 +4194,5 @@ START_TEST(string) test_C_locale(); test_strstr(); test_iswdigit(); + test_iswctype(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1ae292423c0..e54e2bb8d1f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1845,6 +1845,27 @@ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate return MSVCRT_wctomb(dst, ch); } +/********************************************************************* + * _iswctype_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswctype_l(MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale) +{ + int ret = (get_char_typeW(wc) & 0xffff) & type; + +#if _MSVCR_VER >= 140 + if (wc == '\t' || wc == 0x00a0) ret &= ~MSVCRT__BLANK; +#endif + return ret; +} + +/********************************************************************* + * iswctype (MSVCRT.@) + */ +int CDECL MSVCRT_iswctype(MSVCRT_wchar_t wc, MSVCRT_wctype_t type) +{ + return MSVCRT__iswctype_l( wc, type, NULL ); +} + /********************************************************************* * iswalnum (MSVCRT.@) */ @@ -2021,14 +2042,6 @@ int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) return isxdigitW( wc ); } -/********************************************************************* - * _iswctype_l (MSVCRT.@) - */ -INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) -{ - return (get_char_typeW(wc) & 0xffff) & type; -} - /********************************************************************* * _iswblank_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index f637997a0d1..c9b04b7dd47 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -33,6 +33,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include "wine/test.h" #define DEFINE_EXPECT(func) \ @@ -154,6 +155,7 @@ static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); +static int (CDECL *p_iswctype)(int,int); static int (CDECL *p__iswctype_l)(int,int,_locale_t); static int (CDECL *p_iswblank)(int); static int (CDECL *p__iswblank_l)(wint_t,_locale_t); @@ -531,6 +533,7 @@ static BOOL init(void) p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); p_iswblank = (void*)GetProcAddress(module, "iswblank"); p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); @@ -647,21 +650,46 @@ static void test_isblank(void) for(c = 0; c <= 0xffff; c++) { if(c == '\t' || c == ' ' || c == 0x3000 || c == 0xfeff) { if(c == '\t') - todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); + ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); ok(p_iswblank(c), "%d should be blank\n", c); ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { - todo_wine_if(c == 0xa0) { - ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); - ok(!p_iswblank(c), "%d shouldn't be blank\n", c); - ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); - } + ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!p_iswblank(c), "%d shouldn't be blank\n", c); + ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, 0 }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + static struct MSVCRT__exception exception; static int CDECL matherr_callback(struct MSVCRT__exception *e) @@ -1460,6 +1488,7 @@ START_TEST(misc) test__sopen_s(); test_lldiv(); test_isblank(); + test_iswctype(); test_math_errors(); test_asctime(); test_strftime(); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1293dd62f16..ca474dce9f9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2364,7 +2364,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower -- 2.21.0

2 1

[PATCH] msvcrt: Fix the btowc() function.
by Chip Davis 26 Dec '19

26 Dec '19

This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Actually run the tests. Add new tests. Make them pass. dlls/msvcrt/locale.c | 8 +++-- dlls/msvcrt/tests/string.c | 61 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 11ad9ed5f5f..c2dd10667f7 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -787,9 +787,11 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(!get_locinfo()->lc_codepage) + return c <= 255 ? c : MSVCRT_WEOF; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f4c4657791c..1be4dcb129c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -87,6 +87,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2829,6 +2830,64 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(0); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4007,6 +4066,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4083,6 +4143,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp(); -- 2.24.0

2 1

[PATCH v3 1/3] user32/tests: Move TEST_MOUSEACTIVATE to test_defwinproc.
by Rémi Bernon 26 Dec '19

26 Dec '19

This test is actually testing the reply from DefWindowProcA, as the window it was sent to is not handling this particular message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- We are going to handle the message in the next patch, this avoids an unnecessary test change. dlls/user32/tests/msg.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/tests/win.c | 32 -------------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c0ba5834cf9..b1095037066 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15623,6 +15623,38 @@ static void test_defwinproc(void) ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + /* Test WM_MOUSEACTIVATE */ +#define TEST_MOUSEACTIVATE(A,B,C) \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + + TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); + TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9309a8cba6..3f64d53958e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3935,38 +3935,6 @@ static void test_mouse_input(HWND hwnd) msg.hwnd, popup, msg.message); ok(peek_message(&msg), "no message available\n"); - /* Test WM_MOUSEACTIVATE */ -#define TEST_MOUSEACTIVATE(A,B,C) \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ - ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ - ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); - - TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); - TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); - ShowWindow(popup, SW_HIDE); /* Test sending double click to the non-client area, while capturing the window after -- 2.24.1

2 4

[PATCH] winex11.drv: ignore .dwAspect in FORMATETC during XDnD
by Damjan Jovanovic 26 Dec '19

26 Dec '19

Some applications pass FORMATETC.dwAspect=0 to IDataObject_[Query]GetData() during drag and drop, which is not a valid DVASPECT_* value. Tests show that Windows Explorer completely ignores .dwAspect for CF_HDROP when it is the drag source, treating all values as DVASPECT_CONTENT instead. Do the same. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43368 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/winex11.drv/xdnd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

1 0

[PATCH v2] winex11.drv: Send HTMENU instead of HTCAPTION to query window activation.
by Rémi Bernon 26 Dec '19

26 Dec '19

Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented: WM_MOUSEACTIVATE now replies MA_NOACTIVATE by default when using HTCAPTION. We use the WM_MOUSEACTIVATE -although Windows does not- regardless of the way focus is changed to check whether a window wants focus, and Windows sometimes changes focus regardless of the message reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending just this one as the other seems too risky and has been deferred. I have looked for matching bugs, but couldn't find any for sure, and I'm not sure if opening a bug just for it now is worth it. The dinput mouse test is going to be broken again until a proper fix is found -not because of the focus on mouse hover as I first thought but because of the CreateWindow / X11 focus message race condition, as described in: https://source.winehq.org/patches/data/176093 dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..07f7a1ad502 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -706,7 +706,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); + MAKELONG( HTMENU, WM_LBUTTONDOWN ) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { set_focus( event->display, hwnd, event_time ); -- 2.24.1

2 1

[PATCH] ntoskrnl: Add KeSetImportanceDpc stub
by Alex Henrie 26 Dec '19

26 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48358 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 93c9720e96..36637331c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3031,6 +3031,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI FIXME("stub\n"); } +/*********************************************************************** + * KeSetImportanceDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetImportanceDpc(PRKDPC dpc, KDPC_IMPORTANCE importance) +{ + FIXME("%p, %d stub\n", dpc, importance); +} + /*********************************************************************** * KeSetTargetProcessorDpc (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 695b375698..a39247811e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -626,7 +626,7 @@ @ stdcall KeSetEvent(ptr long long) @ stub KeSetEventBoostPriority @ stub KeSetIdealProcessorThread -@ stub KeSetImportanceDpc +@ stdcall KeSetImportanceDpc(ptr long) @ stub KeSetKernelStackSwapEnable @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a092216b82..5152a89842 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -91,6 +91,13 @@ typedef struct _KDPC { PULONG_PTR Lock; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; +typedef enum _KDPC_IMPORTANCE { + LowImportance, + MediumImportance, + HighImportance, + MediumHighImportance +} KDPC_IMPORTANCE; + typedef struct _KDEVICE_QUEUE_ENTRY { LIST_ENTRY DeviceListEntry; ULONG SortKey; -- 2.24.1

1 0

[PATCH] include: Add GUID_DEVINTERFACE_MONITOR.
by Zhiyi Zhang 26 Dec '19

26 Dec '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/ntddvdeo.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index d2c078084a..9523e37f7b 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -20,5 +20,6 @@ #define _NTDDVDEO_ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); +DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); #endif -- 2.24.0

1 0

[PATCH v2] dmcompos/tests: Add Chord track GetParam/SetParam tests
by Michael Stefaniuc 25 Dec '19

25 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Get rid of the buf variable dlls/dmcompos/tests/dmcompos.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index e5cb7da8ad..66379fdae2 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -267,6 +267,7 @@ static void test_chordmaptrack(void) { IDirectMusicTrack8 *dmt8; IPersistStream *ps; + IDirectMusicChordMap *chordmap; CLSID class; ULARGE_INTEGER size; HRESULT hr; @@ -331,11 +332,31 @@ static void test_chordmaptrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_NOT_FOUND, + "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void **)&chordmap); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + /* Unsupported but crashes on non interface pointer passed in */ + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); + ok(hr != DMUS_E_SET_UNSUPPORTED, + "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", hr); + IDirectMusicChordMap_Release(chordmap); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); + todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); -- 2.24.1

1 0

[PATCH] dmcompos/tests: Add Chord Map track GetParam/SetParam tests
by Michael Stefaniuc 25 Dec '19

25 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index e5cb7da8ad..e97f5dc983 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -267,8 +267,10 @@ static void test_chordmaptrack(void) { IDirectMusicTrack8 *dmt8; IPersistStream *ps; + IDirectMusicChordMap *chordmap; CLSID class; ULARGE_INTEGER size; + char buf[64] = { 0 }; HRESULT hr; #define X(guid) &guid, #guid const struct { @@ -331,11 +333,31 @@ static void test_chordmaptrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_NOT_FOUND, + "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void **)&chordmap); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + /* Unsupported but crashes on non interface pointer passed in */ + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); + ok(hr != DMUS_E_SET_UNSUPPORTED, + "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", hr); + IDirectMusicChordMap_Release(chordmap); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, buf); + todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, buf); + todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); -- 2.24.1

1 0

[PATCH v2] include: Fix SetupDiOpenDeviceInterfaceRegKey() prototype.
by Zhiyi Zhang 24 Dec '19

24 Dec '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 176126 include/setupapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/setupapi.h b/include/setupapi.h index 818cc12599..48060edf91 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1615,7 +1615,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO, PCWSTR, HWND, DWORD, PSP_DEVINF BOOL WINAPI SetupDiOpenDeviceInterfaceA(HDEVINFO, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); BOOL WINAPI SetupDiOpenDeviceInterfaceW(HDEVINFO, PCWSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); #define SetupDiOpenDeviceInterface WINELIB_NAME_AW(SetupDiOpenDeviceInterface) -BOOL WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, REGSAM); +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM); HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); -- 2.24.0

1 0

[PATCH resend v3 1/2] ntdll: Try mapping free memory region outside of reserved regions.
by Rémi Bernon 24 Dec '19

24 Dec '19

We assumed that all mapped regions are known by Wine view tree, which is obviously not the case with external allocations. This could lead to memory corruption when find_free_area returns an expected free region which is already mapped. Using MAP_FIXED forces mmap to succeed and corrupts the mapping. This patch uses safe mmap calls to check if the expected free memory is actually free, and iterates over the expected free ranges until it succeeds. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/virtual.c | 64 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index cb869feff02..a29517e286d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,6 +496,35 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } +/*********************************************************************** + * try_map_free_area + * + * Try mmaping some expected free memory region, eventually stepping and + * retrying inside it, and return where it actually succeeded, or NULL. + */ +static void* try_map_free_area( void *base, void *end, ptrdiff_t step, + void *start, size_t size, int unix_prot ) +{ + void *ptr; + + while (start && base <= start && (char*)start + size <= (char*)end) + { + if ((ptr = wine_anon_mmap( start, size, unix_prot, 0 )) == start) + return start; + TRACE( "Found free area is already mapped, start %p.\n", start ); + + if (ptr != (void *)-1) + munmap( ptr, size ); + + if ((step > 0 && (char *)end - (char *)start < step) || + (step < 0 && (char *)start - (char *)base < -step) || + step == 0) + break; + start = (char *)start + step; + } + + return NULL; +} /*********************************************************************** * find_free_area @@ -503,9 +532,11 @@ static struct file_view *find_view_range( const void *addr, size_t size ) * Find a free area between views inside the specified range. * The csVirtual section must be held by caller. */ -static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down, + int map_area, int unix_prot ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; + ptrdiff_t step = top_down ? -(mask + 1) : (mask + 1); void *start; /* find the first (resp. last) view inside the range */ @@ -538,7 +569,10 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base + view->size <= (char *)start) break; + if (!map_area && (char *)view->base + view->size <= (char *)start) break; + if (map_area && (start = try_map_free_area( (char *)view->base + view->size, + (char *)start + size, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base - size, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || start < base) return NULL; @@ -554,13 +588,17 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base >= (char *)start + size) break; + if (!map_area && (char *)view->base >= (char *)start + size) break; + if (map_area && (start = try_map_free_area( start, view->base, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base + view->size + mask, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || (char *)end - (char *)start < size) return NULL; first = wine_rb_next( first ); } } + + if (!first && map_area) return try_map_free_area( base, end, step, start, size, unix_prot ); return start; } @@ -1054,13 +1092,13 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) { /* range is split in two by the preloader reservation, try first part */ if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, - alloc->mask, alloc->top_down ))) + alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; /* then fall through to try second part */ start = preload_reserve_end; } } - if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; return 0; @@ -1148,6 +1186,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { size_t view_size = size + mask + 1; struct alloc_area alloc; + int unix_prot = VIRTUAL_GetUnixProt(vprot); alloc.size = size; alloc.mask = mask; @@ -1158,19 +1197,22 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); - if (wine_anon_mmap( ptr, size, VIRTUAL_GetUnixProt(vprot), MAP_FIXED ) != ptr) + if (wine_anon_mmap( ptr, size, unix_prot, MAP_FIXED ) != ptr) return STATUS_INVALID_PARAMETER; goto done; } - for (;;) + if (zero_bits_64) { - if (!zero_bits_64) - ptr = NULL; - else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + if (!(ptr = find_free_area( (void*)0, alloc.limit, size, mask, top_down, TRUE, unix_prot ))) return STATUS_NO_MEMORY; + TRACE( "got mem with find_free_area %p-%p\n", ptr, (char *)ptr + size ); + goto done; + } - if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1) + for (;;) + { + if ((ptr = wine_anon_mmap( NULL, view_size, unix_prot, 0 )) == (void *)-1) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; -- 2.24.1

3 6

[PATCH] include: Fix SetupDiOpenDeviceInterfaceRegKey() prototype.
by Zhiyi Zhang 24 Dec '19

24 Dec '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/setupapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/setupapi.h b/include/setupapi.h index 818cc12599..fb8f2e4442 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1615,7 +1615,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO, PCWSTR, HWND, DWORD, PSP_DEVINF BOOL WINAPI SetupDiOpenDeviceInterfaceA(HDEVINFO, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); BOOL WINAPI SetupDiOpenDeviceInterfaceW(HDEVINFO, PCWSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); #define SetupDiOpenDeviceInterface WINELIB_NAME_AW(SetupDiOpenDeviceInterface) -BOOL WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, REGSAM); +BOOL WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM); HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); -- 2.24.0

1 0

[PATCH] ntdll: Use default casemap and codepage file names if the value in registry is empty.
by Dmitry Timoshkov 24 Dec '19

24 Dec '19

This helps to keep compatibility with old prefixes being reused for wine-5.0. Old prefixes in their registry have [System\\CurrentControlSet\\Control\\Nls\\Codepage] "37"="" [System\\CurrentControlSet\\Control\\Nls\\Language] "0409"="" and this leads to LCMapString(LCMAP_LOWERCASE/LCMAP_UPPERCASE) return garbage. This is a regression caused by 94a3add0ea7889dbd26a4ded60ace1c40b02ed89. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d9e4e8086e..e3f562808b 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -218,7 +218,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) NtClose( handle ); } - if (!name) /* otherwise some hardcoded defaults */ + if (!name || !*name) /* otherwise some hardcoded defaults */ { switch (type) { -- 2.20.1

1 0

[PATCH] winhttp: Initialize a return variable.
by Zhiyi Zhang 24 Dec '19

24 Dec '19

When getaddrinfo() failed in detect_autoproxyconfig_url_dns(), an undefined variable is passed to WinHttpDetectAutoProxyConfigUrl(), causing applications to receive a wrong url. This is a regression from 4ad4173e3a715d5bd27bedc164718cef9cafe0a4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48349 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- This fixes Steam not displaying anything. dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 22aa285a44..e647d71faf 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1427,7 +1427,7 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) static WCHAR *detect_autoproxyconfig_url_dns(void) { char *fqdn, *domain, *p; - WCHAR *ret; + WCHAR *ret = NULL; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) -- 2.24.0

2 1

[PATCH] user32/tests: Mark some GetDeviceCaps() tests as todo on Wine.
by Zhiyi Zhang 24 Dec '19

24 Dec '19

GetDeviceCaps(hdc, DESKTOPHORZRES/DESKTOPVERTRES) on Windows reports the primary desktop, but on Wine it reports the virtual screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 645c188008..e40d49e8f8 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3267,6 +3267,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu: wrong caps desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu: wrong caps virt desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); DeleteDC( hdc ); @@ -3345,6 +3346,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu/%lu: wrong DC resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu/%lu: wrong desktop resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); ReleaseDC( hwnd, hdc ); -- 2.24.0

2 1

[PATCH] configure: Update Xinerama and XRandR extension help strings.
by Zhiyi Zhang 24 Dec '19

24 Dec '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 88965115d7..5e36331596 100644 --- a/configure.ac +++ b/configure.ac @@ -92,14 +92,14 @@ AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcurso [if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi]) AC_ARG_WITH(xfixes, AS_HELP_STRING([--without-xfixes],[do not use Xfixes for clipboard change notifications]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xfixes_h=no; fi]) -AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]), +AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (legacy multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi]) AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi]) AC_ARG_WITH(xinput2, AS_HELP_STRING([--without-xinput2],[do not use the Xinput 2 extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi]) AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML])) -AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]), +AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi]) AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrender extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi]) -- 2.24.0

1 0

[PATCH] ole32/tests: Avoid testing exact sequences of IUnknown methods.
by Zebediah Figura 24 Dec '19

24 Dec '19

Instead, just test that AddRef()/Release() come in balanced pairs by keeping track of the reference count. This fixes test failures with recent Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/ole2.c | 174 ++++++---------------------------------- 1 file changed, 23 insertions(+), 151 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b71a103dbc..6be187497d 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -99,7 +99,6 @@ static const IID IID_WineTest = {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe1} }; -#define TEST_OPTIONAL 0x1 #define TEST_TODO 0x2 struct expected_method @@ -152,16 +151,8 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM { trace("%s\n", method_name); ok(expected_method_list->method != NULL, "Extra method %s called\n", method_name); - if (!strcmp(expected_method_list->method, "WINE_EXTRA")) - { - todo_wine ok(0, "Too many method calls.\n"); - return; - } if (expected_method_list->method) { - while (expected_method_list->flags & TEST_OPTIONAL && - strcmp(expected_method_list->method, method_name) != 0) - expected_method_list++; todo_wine_if (expected_method_list->flags & TEST_TODO) { ok(!strcmp(expected_method_list->method, method_name), @@ -188,8 +179,6 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM #define CHECK_NO_EXTRA_METHODS() \ do { \ - while (expected_method_list->flags & TEST_OPTIONAL) \ - expected_method_list++; \ ok(!expected_method_list->method, "Method sequence starting from %s not called\n", expected_method_list->method); \ } while (0) @@ -266,10 +255,10 @@ static void create_text(STGMEDIUM *med) med->pUnkForRelease = NULL; } +static LONG ole_object_refcount; + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { - CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); - *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleObject)) @@ -294,14 +283,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v static ULONG WINAPI OleObject_AddRef(IOleObject *iface) { - CHECK_EXPECTED_METHOD("OleObject_AddRef"); - return 2; + return InterlockedIncrement(&ole_object_refcount); } static ULONG WINAPI OleObject_Release(IOleObject *iface) { - CHECK_EXPECTED_METHOD("OleObject_Release"); - return 1; + return InterlockedDecrement(&ole_object_refcount); } static HRESULT WINAPI OleObject_SetClientSite @@ -573,20 +560,17 @@ static IOleObject OleObject = { &OleObjectVtbl }; static HRESULT WINAPI OleObjectPersistStg_QueryInterface(IPersistStorage *iface, REFIID riid, void **ppv) { - trace("OleObjectPersistStg_QueryInterface\n"); return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectPersistStg_AddRef(IPersistStorage *iface) { - CHECK_EXPECTED_METHOD("OleObjectPersistStg_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectPersistStg_Release(IPersistStorage *iface) { - CHECK_EXPECTED_METHOD("OleObjectPersistStg_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectPersistStg_GetClassId(IPersistStorage *iface, CLSID *clsid) @@ -677,14 +661,12 @@ static HRESULT WINAPI OleObjectCache_QueryInterface(IOleCache *iface, REFIID rii static ULONG WINAPI OleObjectCache_AddRef(IOleCache *iface) { - CHECK_EXPECTED_METHOD("OleObjectCache_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectCache_Release(IOleCache *iface) { - CHECK_EXPECTED_METHOD("OleObjectCache_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectCache_Cache @@ -824,14 +806,12 @@ static HRESULT WINAPI OleObjectRunnable_QueryInterface(IRunnableObject *iface, R static ULONG WINAPI OleObjectRunnable_AddRef(IRunnableObject *iface) { - CHECK_EXPECTED_METHOD("OleObjectRunnable_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectRunnable_Release(IRunnableObject *iface) { - CHECK_EXPECTED_METHOD("OleObjectRunnable_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectRunnable_GetRunningClass( @@ -974,143 +954,49 @@ static void test_OleCreate(IStorage *pStorage) FORMATETC formatetc; static const struct expected_method methods_olerender_none[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL }, - { "OleObject_Release", TEST_OPTIONAL }, - { "OleObject_QueryInterface", TEST_OPTIONAL }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw_with_site[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_olerender_format[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_olerender_asis[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw_no_runnable[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 }, }; static const struct expected_method methods_olerender_draw_no_cache[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; @@ -1128,6 +1014,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw; trace("OleCreate with OLERENDER_DRAW:\n"); @@ -1135,6 +1022,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw_with_site; trace("OleCreate with OLERENDER_DRAW, with site:\n"); @@ -1142,6 +1030,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); /* GetMiscStatus fails */ g_GetMiscStatusFailsWith = 0x8fafefaf; @@ -1151,6 +1040,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_GetMiscStatusFailsWith = S_OK; formatetc.cfFormat = CF_TEXT; @@ -1169,6 +1059,7 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_asis; trace("OleCreate with OLERENDER_ASIS:\n"); @@ -1176,6 +1067,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); formatetc.cfFormat = 0; formatetc.tymed = TYMED_NULL; @@ -1195,6 +1087,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); trace("end\n"); g_expected_fetc = NULL; } @@ -1207,20 +1100,10 @@ static void test_OleLoad(IStorage *pStorage) static const struct expected_method methods_oleload[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_Load", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; @@ -1242,6 +1125,7 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_GetMiscStatusFailsWith = S_OK; /* Test again, let IOleObject_GetMiscStatus succeed. */ @@ -1261,6 +1145,7 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); for (fmt = CF_TEXT; fmt < CF_MAX; fmt++) { @@ -1447,8 +1332,6 @@ static HRESULT WINAPI DataObject_QueryInterface( REFIID riid, void** ppvObject) { - CHECK_EXPECTED_METHOD("DataObject_QueryInterface"); - if (IsEqualIID(riid, &IID_IDataObject) || IsEqualIID(riid, &IID_IUnknown)) { *ppvObject = iface; @@ -1461,14 +1344,12 @@ static HRESULT WINAPI DataObject_QueryInterface( static ULONG WINAPI DataObject_AddRef( IDataObject* iface) { - CHECK_EXPECTED_METHOD("DataObject_AddRef"); return 2; } static ULONG WINAPI DataObject_Release( IDataObject* iface) { - CHECK_EXPECTED_METHOD("DataObject_Release"); return 1; } @@ -2962,15 +2843,6 @@ static void test_default_handler(void) static const struct expected_method methods_embeddinghelper[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", TEST_TODO }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", TEST_OPTIONAL }, /* Win95/98/NT4 */ - { "OleObject_Release", TEST_TODO }, - { "WINE_EXTRA", TEST_OPTIONAL }, { NULL, 0 } }; @@ -3138,6 +3010,7 @@ static void test_default_handler(void) } CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); hr = CoRevokeClassObject(dwRegister); ok_ole_success(hr, "CoRevokeClassObject"); @@ -3148,16 +3021,12 @@ static void test_runnable(void) { static const struct expected_method methods_query_runnable[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_IsRunning", 0 }, - { "OleObjectRunnable_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_no_runnable[] = { - { "OleObject_QueryInterface", 0 }, { NULL, 0 } }; @@ -3172,18 +3041,21 @@ static void test_runnable(void) ret = OleIsRunning(object); ok(ret == TRUE, "Object should be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_isRunning = FALSE; expected_method_list = methods_query_runnable; ret = OleIsRunning(object); ok(ret == FALSE, "Object should not be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_showRunnable = FALSE; /* QueryInterface(IID_IRunnableObject, ...) will fail */ expected_method_list = methods_no_runnable; ret = OleIsRunning(object); ok(ret == TRUE, "Object without IRunnableObject should be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_isRunning = TRUE; g_showRunnable = TRUE; -- 2.24.1

2 1

[PATCH] include: Update DWRITE_FONT_PROPERTY_ID enum.
by Nikolay Sivov 23 Dec '19

23 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index f7cb97dff6..54d204f39f 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -53,9 +53,9 @@ typedef enum DWRITE_RENDERING_MODE1 typedef enum DWRITE_FONT_PROPERTY_ID { DWRITE_FONT_PROPERTY_ID_NONE, - DWRITE_FONT_PROPERTY_ID_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, DWRITE_FONT_PROPERTY_ID_FULL_NAME, DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, @@ -65,7 +65,12 @@ typedef enum DWRITE_FONT_PROPERTY_ID DWRITE_FONT_PROPERTY_ID_WEIGHT, DWRITE_FONT_PROPERTY_ID_STRETCH, DWRITE_FONT_PROPERTY_ID_STYLE, - DWRITE_FONT_PROPERTY_ID_TOTAL + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_TOTAL = DWRITE_FONT_PROPERTY_ID_STYLE + 1, + DWRITE_FONT_PROPERTY_ID_TOTAL_RS3 = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME + 1, + DWRITE_FONT_PROPERTY_ID_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_FACE_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, } DWRITE_FONT_PROPERTY_ID; typedef struct DWRITE_FONT_PROPERTY -- 2.24.0

1 0

[PATCH v2 5/5] msvcrt: Add compatibility _set_invalid_parameter_handler importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/invalid_parameter.c | 38 +++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 5 files changed, 42 insertions(+) create mode 100644 dlls/msvcrt/invalid_parameter.c

1 0

[PATCH v2 4/5] msvcrt: Add compatibility __p__wcmdln importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/wcmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/wcmdln.c

1 0

[PATCH v2 3/5] msvcrt: Add compatibility __p__acmdln importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/acmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/acmdln.c

1 0

[PATCH v2 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/fmode.c

1 0

[PATCH v2] winegstreamer: Recognize the "video/x-cinepak" type.
by Zebediah Figura 23 Dec '19

23 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: remove an unused variable dlls/winegstreamer/gstdemux.c | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..e67efd58eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -853,12 +888,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); -- 2.24.1

1 0

[PATCH 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.
by Jacek Caban 23 Dec '19

23 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/fmode.c

2 2

[PATCH] msvcrt: Fix [str|wcs]tod result being compared against FLT_MAX.
by Erich E. Hoover 23 Dec '19

23 Dec '19

Apparently cl.exe treats floats as doubles and compares them against FLT_MAX before converting them (see Bug #48324). It would be really nice if people didn't use constants that are more precise than the number format actually supports... Best, Erich

1 0

[PATCH 1/2] winex11.drv: Don't set the foreground for focus events that are older than the last SetFocus sent without an event.
by Rémi Bernon 23 Dec '19

23 Dec '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> When creating a visible window, the focus and the respective messages are immediately sent to the created window to match Windows behavior. However, the X11 server also sends either FocusIn events or the WM sends ClientMessages with the WM_TAKE_FOCUS atom (by default) if the windows are managed, since it received focus. If the application didn't have a message loop up to process these events, they will remain in the queue. If only one window is created, this is not a problem because the focus set manually and the focus set when processing the events will be the same and no message is sent. However, if 2 or more windows are created before the message loop, when these events are later processed by the app's message loop, they will change the focus and send the messages again, even though we've already done so earlier, which confuses some apps at this point. One example is Heroes of Might and Magic 5. See comment #11 on https://bugs.winehq.org/show_bug.cgi?id=39742#c11 -- `When "Full screen" active game starts and then shows desktop but it is not exited and after a few times switching game/desktop it shows game screen and it is playable` Related Proton bug: https://github.com/ValveSoftware/Proton/issues/2401 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe this is the correct fix to the failing dinput mouse test. The test fails because the focus is changed back to the second window after it's been created, when the WM_TAKE_FOCUS event actually arrives: as we do not wait for the X11 focus to be set on CreateWindow, it can create an additional and unexpected focus change later on. dlls/winex11.drv/event.c | 48 ++++++++++++++++++++++++++++++++------- dlls/winex11.drv/x11drv.h | 2 ++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..2649d561a6b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -594,14 +594,22 @@ static void set_input_focus( struct x11drv_win_data *data ) /********************************************************************** * set_focus */ -static void set_focus( Display *display, HWND hwnd, Time time ) +static void set_focus( Display *display, HWND hwnd, Time time, unsigned long serial ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); HWND focus; Window win; GUITHREADINFO threadinfo; - TRACE( "setting foreground window to %p\n", hwnd ); - SetForegroundWindow( hwnd ); + if ((long)(thread_data->setfocus_serial - serial) > 0) + { + TRACE( "ignoring old serial %lu/%lu\n", serial, thread_data->setfocus_serial ); + } + else + { + TRACE( "setting foreground window to %p\n", hwnd ); + SetForegroundWindow( hwnd ); + } threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); @@ -709,7 +717,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } } @@ -718,7 +726,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd = GetForegroundWindow(); if (!hwnd) hwnd = last_focus; if (!hwnd) hwnd = GetDesktopWindow(); - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } /* try to find some other window to give the focus to */ @@ -726,7 +734,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time, event->serial ); } else if (protocol == x11drv_atom(_NET_WM_PING)) { @@ -806,9 +814,17 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = x11drv_thread_data()->last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime, event->serial ); + } + else + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if ((long)(thread_data->setfocus_serial - event->serial) > 0) + TRACE("ignoring old serial %lu/%lu\n", event->serial, thread_data->setfocus_serial); + else + SetForegroundWindow( hwnd ); } - else SetForegroundWindow( hwnd ); return TRUE; } @@ -1426,6 +1442,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1441,6 +1458,21 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + hwnd = GetAncestor(hwnd, GA_ROOT); + if (hwnd != thread_data->setfocus_hwnd) + { + thread_data->setfocus_hwnd = hwnd; + + /* If we are not processing an event, store the current serial so that + we ignore all older focus-related events. This prevents the focus + from being reverted later when the app processes its messages. */ + if (!thread_data->current_event) + { + thread_data->setfocus_serial = NextRequest(thread_data->display); + XNoOp(thread_data->display); + } + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..e9b827c7e9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -333,6 +333,8 @@ struct x11drv_thread_data HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + HWND setfocus_hwnd; /* top-level window corresponding to the last SetFocus */ + unsigned long setfocus_serial; /* serial number when last SetFocus without an event happened */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ -- 2.24.1

1 2

[PATCH] winex11.drv: Always set focus to managed window when requested.
by Rémi Bernon 23 Dec '19

23 Dec '19

Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented. We used the WM_MOUSEACTIVATE even when changing focus using Alt-Tab for example, and in this case Windows changes focus regardless of the WM_MOUSEACTIVATE reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I expect this is going to break dinput mouse test on testbot again, as 71d35d8940118bc6de6522913fb8c473fa5b2c24 was "fixing" it. The problem came from the "set focus on mouse hover" setting, Windows has no such mechanism I believe, but then we shouldn't try to prevent focus from changing when using this setting. It should either be disabled, or taken into account in the test by not moving the mouse over another window. I can modify the test if that's what we want to do, but I'm assuming the test was moving the cursor over the original window on purpose. dlls/winex11.drv/event.c | 7 ++++++- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..69012e5b8cb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -700,7 +700,12 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); - if (can_activate_window(hwnd)) + if (is_managed(hwnd)) + { + set_focus( event->display, hwnd, event_time ); + return; + } + else if (can_activate_window(hwnd)) { /* simulate a mouse click on the caption to find out * whether the window wants to be activated */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..89ea42b7567 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -169,7 +169,7 @@ struct has_popup_result BOOL found; }; -static BOOL is_managed( HWND hwnd ) +BOOL is_managed( HWND hwnd ) { struct x11drv_win_data *data = get_win_data( hwnd ); BOOL ret = data && data->managed; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..d4f21024634 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -605,6 +605,7 @@ extern void change_systray_owner( Display *display, Window systray_window ) DECL extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL is_managed( HWND hwnd ) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { -- 2.24.1

3 2

[PATCH 1/3] ole32/tests: Use heap-based object for custom moniker.
by Nikolay Sivov 23 Dec '19

23 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 138 +++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 73 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 42bc094522..2e1e00adc8 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -34,6 +34,7 @@ #include "initguid.h" #include "wine/test.h" +#include "wine/heap.h" #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) @@ -246,9 +247,30 @@ static const IUnknownVtbl HeapUnknown_Vtbl = HeapUnknown_Release }; +struct test_moniker +{ + IMoniker IMoniker_iface; + IROTData IROTData_iface; + LONG refcount; + + BOOL no_IROTData; +}; + +static struct test_moniker *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IMoniker_iface); +} + +static struct test_moniker *impl_from_IROTData(IROTData *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IROTData_iface); +} + static HRESULT WINAPI -MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { + struct test_moniker *moniker = impl_from_IMoniker(iface); + if (!ppvObject) return E_INVALIDARG; @@ -260,7 +282,11 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IMoniker, riid)) *ppvObject = iface; if (IsEqualIID(&IID_IROTData, riid)) + { CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); + if (!moniker->no_IROTData) + *ppvObject = &moniker->IROTData_iface; + } if ((*ppvObject)==0) return E_NOINTERFACE; @@ -273,13 +299,20 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) static ULONG WINAPI Moniker_AddRef(IMoniker* iface) { - return 2; + struct test_moniker *moniker = impl_from_IMoniker(iface); + return InterlockedIncrement(&moniker->refcount); } static ULONG WINAPI Moniker_Release(IMoniker* iface) { - return 1; + struct test_moniker *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->refcount); + + if (!refcount) + heap_free(moniker); + + return refcount; } static HRESULT WINAPI @@ -457,53 +490,25 @@ Moniker_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) return S_FALSE; } -static const IMonikerVtbl MonikerNoROTDataVtbl = -{ - MonikerNoROTData_QueryInterface, - Moniker_AddRef, - Moniker_Release, - Moniker_GetClassID, - Moniker_IsDirty, - Moniker_Load, - Moniker_Save, - Moniker_GetSizeMax, - Moniker_BindToObject, - Moniker_BindToStorage, - Moniker_Reduce, - Moniker_ComposeWith, - Moniker_Enum, - Moniker_IsEqual, - Moniker_Hash, - Moniker_IsRunning, - Moniker_GetTimeOfLastChange, - Moniker_Inverse, - Moniker_CommonPrefixWith, - Moniker_RelativePathTo, - Moniker_GetDisplayName, - Moniker_ParseDisplayName, - Moniker_IsSystemMoniker -}; - -static IMoniker MonikerNoROTData = { &MonikerNoROTDataVtbl }; - -static IMoniker Moniker; - static HRESULT WINAPI ROTData_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - return IMoniker_QueryInterface(&Moniker, riid, ppvObject); + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppvObject); } static ULONG WINAPI ROTData_AddRef(IROTData *iface) { - return 2; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); } static ULONG WINAPI ROTData_Release(IROTData* iface) { - return 1; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_Release(&moniker->IMoniker_iface); } static HRESULT WINAPI @@ -529,35 +534,6 @@ static IROTDataVtbl ROTDataVtbl = ROTData_GetComparisonData }; -static IROTData ROTData = { &ROTDataVtbl }; - -static HRESULT WINAPI -Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - if (!ppvObject) - return E_INVALIDARG; - - *ppvObject = 0; - - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream,riid) || - IsEqualIID(&IID_IMoniker, riid)) - *ppvObject = iface; - if (IsEqualIID(&IID_IROTData, riid)) - { - CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); - *ppvObject = &ROTData; - } - - if ((*ppvObject)==0) - return E_NOINTERFACE; - - IMoniker_AddRef(iface); - - return S_OK; -} - static const IMonikerVtbl MonikerVtbl = { Moniker_QueryInterface, @@ -585,7 +561,17 @@ static const IMonikerVtbl MonikerVtbl = Moniker_IsSystemMoniker }; -static IMoniker Moniker = { &MonikerVtbl }; +static struct test_moniker *create_test_moniker(void) +{ + struct test_moniker *obj; + + obj = heap_alloc_zero(sizeof(*obj)); + obj->IMoniker_iface.lpVtbl = &MonikerVtbl; + obj->IROTData_iface.lpVtbl = &ROTDataVtbl; + obj->refcount = 1; + + return obj; +} static void test_ROT(void) { @@ -594,6 +580,7 @@ static void test_ROT(void) '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; IMoniker *pMoniker = NULL; + struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; DWORD dwCookie; static const char *methods_register_no_ROTData[] = @@ -634,19 +621,22 @@ static void test_ROT(void) hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); + test_moniker = create_test_moniker(); + test_moniker->no_IROTData = TRUE; + expected_method_list = methods_register_no_ROTData; external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &MonikerNoROTData, &dwCookie); - ok_ole_success(hr, IRunningObjectTable_Register); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + &test_moniker->IMoniker_iface, &dwCookie); + ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok(external_connections == 1, "external_connections = %d\n", external_connections); ok_more_than_one_lock(); expected_method_list = methods_isrunning_no_ROTData; - hr = IRunningObjectTable_IsRunning(pROT, &MonikerNoROTData); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -658,15 +648,16 @@ static void test_ROT(void) expected_method_list = methods_register; /* try with our own moniker */ + test_moniker->no_IROTData = FALSE; hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &Moniker, &dwCookie); + (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok_more_than_one_lock(); expected_method_list = methods_isrunning; - hr = IRunningObjectTable_IsRunning(pROT, &Moniker); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -719,6 +710,7 @@ static void test_ROT(void) ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); + IMoniker_Release(&test_moniker->IMoniker_iface); IRunningObjectTable_Release(pROT); } -- 2.24.0

1 2

[PATCH 1/2] dwrite/tests: Improve coverage of IsMonospacedFont() tests.
by Nikolay Sivov 23 Dec '19

23 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 130 ++++++++++++++++++++++++++------------- 1 file changed, 87 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index da75a7b70c..68e2c03baf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2018 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2019 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -37,7 +37,7 @@ #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') #define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') -#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') #define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') #define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') @@ -1961,7 +1961,7 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET memset(metrics, 0, sizeof(*metrics)); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2600,7 +2600,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "Failed to create font face, %#x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); @@ -4900,67 +4900,111 @@ static void test_GetDesignGlyphMetrics(void) DELETE_FONTFILE(path); } +static BOOL get_expected_is_monospaced(IDWriteFontFace1 *fontface, const DWRITE_PANOSE *panose) +{ + BOOL exists, is_monospaced = FALSE; + const TT_POST *tt_post; + void *post_context; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace1_TryGetFontTable(fontface, MS_POST_TAG, (const void **)&tt_post, &size, + &post_context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (tt_post) + { + is_monospaced = !!tt_post->fixed_pitch; + IDWriteFontFace1_ReleaseFontTable(fontface, post_context); + } + + if (!is_monospaced) + is_monospaced |= panose->text.proportion == DWRITE_PANOSE_PROPORTION_MONOSPACED; + + return is_monospaced; +} + static void test_IsMonospacedFont(void) { - static const WCHAR courierW[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; IDWriteFontCollection *collection; - IDWriteFactory *factory; - UINT32 index; - BOOL exists; + IDWriteFactory1 *factory; + UINT32 count, i; HRESULT hr; ULONG ref; - factory = create_factory(); + factory = create_factory_iid(&IID_IDWriteFactory1); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (!factory) + { + win_skip("IsMonospacedFont() is not supported.\n"); + return; + } - exists = FALSE; - hr = IDWriteFontCollection_FindFamilyName(collection, courierW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (exists) { + hr = IDWriteFactory1_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Failed to get font collection, hr %#x.\n", hr); + + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; IDWriteFontFamily *family; - IDWriteFont1 *font1; - IDWriteFont *font; + UINT32 font_count, j; + WCHAR nameW[256]; - hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteFontFamily_Release(family); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); - hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); - if (hr == S_OK) { + font_count = IDWriteFontFamily_GetFontCount(family); + + for (j = 0; j < font_count; ++j) + { + BOOL is_monospaced_font, is_monospaced_face, is_monospaced_expected; IDWriteFontFace1 *fontface1; IDWriteFontFace *fontface; - BOOL is_monospaced; + DWRITE_PANOSE panose; + IDWriteFont1 *font1; + IDWriteFont *font; - is_monospaced = IDWriteFont1_IsMonospacedFont(font1); - ok(is_monospaced, "got %d\n", is_monospaced); + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void **)&font1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFont_Release(font); hr = IDWriteFont1_CreateFontFace(font1, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); - ok(hr == S_OK, "got 0x%08x\n", hr); - is_monospaced = IDWriteFontFace1_IsMonospacedFont(fontface1); - ok(is_monospaced, "got %d\n", is_monospaced); - IDWriteFontFace1_Release(fontface1); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IDWriteFontFace_Release(fontface); + + is_monospaced_font = IDWriteFont1_IsMonospacedFont(font1); + is_monospaced_face = IDWriteFontFace1_IsMonospacedFont(fontface1); + ok(is_monospaced_font == is_monospaced_face, "Unexpected monospaced flag.\n"); + + IDWriteFont1_GetPanose(font1, &panose); + + /* FIXME: failures disabled on Wine for now */ + is_monospaced_expected = get_expected_is_monospaced(fontface1, &panose); + todo_wine_if(is_monospaced_expected != is_monospaced_face) + ok(is_monospaced_expected == is_monospaced_face, "Unexpected is_monospaced flag %d for %s, font %d.\n", + is_monospaced_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace1_Release(fontface1); IDWriteFont1_Release(font1); } - else - win_skip("IsMonospacedFont() is not supported.\n"); - IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); } - else - skip("Courier New font not found.\n"); IDWriteFontCollection_Release(collection); - ref = IDWriteFactory_Release(factory); + ref = IDWriteFactory1_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); } @@ -6276,7 +6320,7 @@ static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) hr = IDWriteFont1_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) { @@ -7211,7 +7255,7 @@ static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) UINT32 size; HRESULT hr; - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, hr %#x.\n", hr); if (tt_os2) @@ -7848,7 +7892,7 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) { -- 2.24.0

2 3

[PATCH v2] include: Declare _STGMEDIUM_UNION type except when it violates C spec.
by Jeff Smith 23 Dec '19

23 Dec '19

Fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d Based on a patch from Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: Take NONAMELESSUNION definition into consideration in determining what to do with _STGMEDIUM_UNION. include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..a86ceb8b1d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* When NONAMELESSUNION is not defined, the presence of _STGMEDIUM_UNION + * violates the C spec, but is necessary for C++. Avoid C spec violation. */ + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#define _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1440,6 +1446,10 @@ interface IAdviseSink : IUnknown IUnknown *pUnkForRelease; } userSTGMEDIUM; + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.23.0

1 0

Unix FD to Windows File Handles mapping.
by Bruno Albuquerque 22 Dec '19

22 Dec '19

Is the way that wine maps file handles from Unix (Linux, more specifically) to Windows predictable? I have this Linux program that forks Wine to run a Windows program. The Windows program can easily access stdin/stdout/stderr the way one would expect in a forked Unix program but I am trying to pass one extra file descriptor to the windows program but I am not sure how to do that. In the Unix program, the FD will be, say, 3. As I am forking then exec'ing Wine, wine itself will have access to this FD and, from Wine's point of view, it should also be 3. The problem is that it seems file handles in Windows are not like in Unix (for example, stdin is not 0, stdout is not 1 and stderr is not 2) so I am assuming that to make this FD available to the WIndows program, it is somehow mapped to a file handle with a different number too. I need to know which one it si to be able to use it. Any pointers on how to do that? If I compile a C program with winegcc/winelib and fork/exec it, it looks like file handles and file descriptors match so one option is to use it. But I prefer to create the program in a different language so winelib is not ideal. Any help would be much appreciated.

5 8

Re: [PATCH] dxgidebug: add missing debug API
by Fabian Maurer 22 Dec '19

22 Dec '19

Hi Steve, FYI, wine-patches is deprecated - please send patches and other mail to wine- devel in the future. AFAIK this time it should still be okay though. Are those flags already needed somewhere? Regards, Fabian Maurer

2 1

[PATCH] winegstreamer: Recognize the "video/x-cinepak" type.
by Zebediah Figura 22 Dec '19

22 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 42 ++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..3641cb5635 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -833,6 +868,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * { static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; const char *typename; + AM_MEDIA_TYPE mt; char *name; GstCaps *caps; GstStructure *arg; @@ -853,12 +889,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); -- 2.24.1

1 0

[PATCH] ntdll: Drop support for floating point numbers in sscanf.
by Erich E. Hoover 22 Dec '19

22 Dec '19

Takes care of one more use of "long double". Best, Erich

1 0

Wine staging 5.0 rc2 release
by Alistair Leslie-Hughes 21 Dec '19

21 Dec '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc2 (835 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [30155] Improve support for SafeDisc v2.05.030. * [47507] Send a WM_ACTIVATE message after restoring a minimized window. * [48289] Grand Theft Auto 5 crashes after loading. Updated: * winebuild-Fake_Dlls * dmime-PChannel-range Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] dmstyle: Avoid cloning the IStream in parse_style_form()
by Michael Stefaniuc 20 Dec '19

20 Dec '19

It can be an application provided IStream with unimplemented Clone() method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- That fixes the last crash and the "No One Lives Forever" demo seems playable now. dlls/dmstyle/style.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5ebe6589d4..3e480028b9 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -778,23 +778,21 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK ListCount[0] = 0; switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { - LPSTREAM pClonedStream = NULL; + ULARGE_INTEGER save; struct style_band *pNewBand; TRACE_(dmfile)(": BAND RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - + + /* Can be application provided IStream without Clone method */ liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + IStream_Seek(pStm, liMove, STREAM_SEEK_CUR, &save); - hr = load_band(pClonedStream, &pBand); + hr = load_band(pStm, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; } - IStream_Release (pClonedStream); pNewBand = heap_alloc_zero(sizeof(*pNewBand)); if (NULL == pNewBand) { @@ -808,9 +806,9 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release it as it's inserted */ /** now safely move the cursor */ - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - + liMove.QuadPart = save.QuadPart - liMove.QuadPart + ListSize[0]; + IStream_Seek(pStm, liMove, STREAM_SEEK_SET, NULL); + break; } default: { -- 2.24.1

1 0

[PATCH] msvcrt: Only export __p__* functions on i386
by Martin Storsjo 20 Dec '19

20 Dec '19

The previous specification, -arch=win32, is incorrect - these functions aren't available on arm. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b9..4f55bcb45a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -245,35 +245,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc -@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv -@ cdecl -arch=win32 __p___initenv() -@ cdecl -arch=win32 __p___mb_cur_max() -@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv -@ cdecl -arch=win32 __p___winitenv() -@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln -@ cdecl -arch=win32 __p__amblksiz() -@ cdecl -arch=win32 __p__commode() -@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight -@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias -@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ -@ stub -arch=win32 __p__fileinfo() -@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=i386 __p___argc() MSVCRT___p___argc +@ cdecl -arch=i386 __p___argv() MSVCRT___p___argv +@ cdecl -arch=i386 __p___initenv() +@ cdecl -arch=i386 __p___mb_cur_max() +@ cdecl -arch=i386 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=i386 __p___winitenv() +@ cdecl -arch=i386 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=i386 __p__amblksiz() +@ cdecl -arch=i386 __p__commode() +@ cdecl -arch=i386 __p__daylight() MSVCRT___p__daylight +@ cdecl -arch=i386 __p__dstbias() MSVCRT___p__dstbias +@ cdecl -arch=i386 __p__environ() MSVCRT___p__environ +@ stub -arch=i386 __p__fileinfo() +@ cdecl -arch=i386 __p__fmode() MSVCRT___p__fmode @ cdecl -arch=i386 __p__iob() __iob_func -@ stub -arch=win32 __p__mbcasemap() -@ cdecl -arch=win32 __p__mbctype() -@ cdecl -arch=win32 __p__osver() -@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype -@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr -@ stub -arch=win32 __p__pwctype() -@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone -@ cdecl -arch=win32 __p__tzname() -@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron -@ cdecl -arch=win32 __p__winmajor() -@ cdecl -arch=win32 __p__winminor() -@ cdecl -arch=win32 __p__winver() -@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr +@ stub -arch=i386 __p__mbcasemap() +@ cdecl -arch=i386 __p__mbctype() +@ cdecl -arch=i386 __p__osver() +@ cdecl -arch=i386 __p__pctype() MSVCRT___p__pctype +@ cdecl -arch=i386 __p__pgmptr() MSVCRT___p__pgmptr +@ stub -arch=i386 __p__pwctype() +@ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone +@ cdecl -arch=i386 __p__tzname() +@ cdecl -arch=i386 __p__wcmdln() MSVCRT___p__wcmdln +@ cdecl -arch=i386 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=i386 __p__winmajor() +@ cdecl -arch=i386 __p__winminor() +@ cdecl -arch=i386 __p__winver() +@ cdecl -arch=i386 __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() -- 2.17.1

1 0

WineTest regressions
by Francois Gouget 20 Dec '19

20 Dec '19

It looks like this patch caused two regressions: commit c8f338369695d360e021f2cbd82a18b2c0eb1514 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 15:54:38 2019 +0100 include: Allow using debug.h in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> * https://test.winehq.org/data/tests/kernel32:codepage.html Something between line 333 and 336 modifies LastError, setting it to ERROR_PROC_NOT_FOUND. Probably the call to wine_dbgstr_wn(). * https://test.winehq.org/data/tests/psapi:psapi_main.html Same thing between line 680 and 684 but this time the suspect is wine_dbgstr_w(). I see two options for fixing: * Modifying wine_dbgstr_*() so they don't modify LastError. If that's possible. * Test LastError before it has been modified (or store it for testing later). That would probably be good policy regardless. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Hell is empty and all the devils are here. -- Wm. Shakespeare, "The Tempest"

2 1

[PATCH 5/5] msvcrt: Add compatibility _set_invalid_parameter_handler importlib implementation.
by Jacek Caban 20 Dec '19

20 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/invalid_parameter.c | 38 +++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 5 files changed, 42 insertions(+) create mode 100644 dlls/msvcrt/invalid_parameter.c

1 0

[PATCH 4/5] msvcrt: Add compatibility __p__wcmdln importlib implementation.
by Jacek Caban 20 Dec '19

20 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/wcmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/wcmdln.c

1 0

[PATCH 3/5] msvcrt: Add compatibility __p__acmdln importlib implementation.
by Jacek Caban 20 Dec '19

20 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/acmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/acmdln.c

1 0

[PATCH 1/5] msvcrt: Introduce IMPORT_SYMBOL helper macro.
by Jacek Caban 20 Dec '19

20 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch series fixes builds with mingw configured to default to ucrt. In this case, symbols pulled by startup files were not present in our import lib, so symbols found in default importlib were used. Those four symbols are enough to get current llvm-mingw with default config to work with Wine. Eventually, we will have our own startup files, so we won't need to deal with problems like this. For our own startup code, some of symbols from this series may be useful as well. dlls/msvcrt/iob.c | 8 ++------ dlls/msvcrt/msvcrt.h | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[PATCH] po: Update some Russian strings.
by Nikolay Sivov 20 Dec '19

20 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 94 +++++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 69 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3292c450d0..aa5cd6b0c1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-28 11:30+0300\n" +"PO-Revision-Date: 2019-12-20 15:34+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -6829,10 +6829,8 @@ msgid "Begin request has already been made.\n" msgstr "Запрос уже был инициирован.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Объект не инициализирован.\n" +msgstr "Приёмник данных не был завершён.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7055,132 +7053,96 @@ msgid "No events available.\n" msgstr "Нет доступных событий.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition.\n" -msgstr "Данный смена состояний не поддерживается.\n" +msgstr "Некорректная смена состояний источника данных.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Достигнут конец потока данных.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Был вызван метод Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Длительность медиапотока не задана.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" msgstr "" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Набор свойств не найден.\n" +msgstr "Свойство не найдено.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only.\n" -msgstr "Пустое свойство\n" +msgstr "Свойство доступно только для чтения.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Некорректный тип свойства.\n" +msgstr "Недопустимое свойство.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ресурс занят.\n" +msgstr "Источник данных остановлен.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Данный формат не поддерживается.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Ресурс занят.\n" +msgstr "Некорректное состояние источника данных.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Не выбрано ни одного потока.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Характеристики данного источника данных не поддерживаются.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Приёмник данных был удалён.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" msgstr "" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Набор потоков данного приёмника данных фиксирован.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Домен уже существует.\n" +msgstr "Поток приёмника данных уже существует.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Операция была отменена.\n" +msgstr "Создание сэмпла было отменено.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Каталог не пуст.\n" +msgstr "Аллокатор сэмплов пуст.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Состояние часов уже установлено.\n" +msgstr "Приёмник данных уже был остановлен.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" msgstr "" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Потоки приёмника не выбраны.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Слишком длинное имя файла.\n" +msgstr "Превышена длина метаданных.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" @@ -8338,22 +8300,16 @@ msgid "Off" msgstr "Выключено" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "видео" +msgstr "Провайдер" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Выберите формат для экспорта:" +msgstr "Выберите формат для подключения:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Сво&йства" +msgstr "Свойства подключения" #: version.rc:37 msgid "OLE DB Provider(s)" -- 2.24.0

1 0

[PATCH] configure: Allow setting CROSSLDFLAGS by configure.
by Jacek Caban 20 Dec '19

20 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This may be used to configure Wine to generate .pdb files with llvm-mingw, but I think this is more generally useful (for .pdb files we should make build system be aware of them, but that's a post-code freeze thing). It's already possible to set it via make argument, but not configure. Makefile.in | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+)

1 0

[v2 PATCH] ole32/tests: Add a trivial test for IMoniker::Enum().
by Nikolay Sivov 20 Dec '19

20 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed 2 tests failing on XP. dlls/ole32/tests/moniker.c | 92 +++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e4d693b442..42bc094522 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1532,6 +1532,7 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { IMoniker *moniker, *inverse, *reduced; + IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; DWORD hash; @@ -1609,6 +1610,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); @@ -1617,6 +1633,7 @@ todo_wine static void test_file_moniker(WCHAR* path) { IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; + IEnumMoniker *enummoniker; DWORD moniker_type; IBindCtx *bind_ctx; IStream *stream; @@ -1673,6 +1690,21 @@ todo_wine ok(reduced == moniker1, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker1, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bind_ctx); IStream_Release(stream); @@ -1792,6 +1824,7 @@ static void test_item_moniker(void) static const WCHAR wszDelimiter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; + IEnumMoniker *enummoniker; WCHAR *display_name; LARGE_INTEGER pos; IStream *stream; @@ -1946,6 +1979,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); /* IsEqual */ @@ -1996,6 +2044,7 @@ static void test_anti_moniker(void) FILETIME filetime; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; + IEnumMoniker *enummoniker; IStream *stream; WCHAR *name; @@ -2169,11 +2218,27 @@ todo_wine IStream_Release(stream); + /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); @@ -2181,6 +2246,7 @@ todo_wine static void test_generic_composite_moniker(void) { + IEnumMoniker *enummoniker; HRESULT hr; IMoniker *moniker; IMoniker *moniker1; @@ -2265,18 +2331,31 @@ todo_wine ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } static void test_pointer_moniker(void) { + IMoniker *moniker, *inverse; + IEnumMoniker *enummoniker; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; IStream *stream; IROTData *rotdata; @@ -2383,6 +2462,15 @@ todo_wine IBindCtx_Release(bindctx); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } -- 2.24.0

1 0

[PATCH] dwrite/tests: Improve coverage of IsSymbolFont() tests.
by Nikolay Sivov 20 Dec '19

20 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 123 +++++++++++++++++++++++++++++++-------- 1 file changed, 99 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3dff4a6191..da75a7b70c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -446,6 +446,7 @@ enum opentype_cmap_table_platform enum opentype_cmap_table_encoding { + OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL = 0, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_BMP = 1, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_FULL = 10, }; @@ -7198,48 +7199,122 @@ static void test_CreateAlphaTexture(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) +{ + BOOL exists, is_symbol = FALSE; + struct dwrite_fonttable cmap; + const TT_OS2_V2 *tt_os2; + const BYTE *tables; + void *os2_context; + WORD num_tables; + unsigned int i; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "Failed to get OS/2 table, hr %#x.\n", hr); + + if (tt_os2) + { + if (tt_os2->version) + is_symbol = !!(GET_BE_DWORD(tt_os2->ulCodePageRange1) & FS_SYMBOL); + if (!is_symbol) + is_symbol = tt_os2->panose.bFamilyType == PAN_FAMILY_PICTORIAL; + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + if (is_symbol) + return is_symbol; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, (const void **)&cmap.data, + &cmap.size, &cmap.context, &exists); + if (FAILED(hr) || !exists) + return is_symbol; + + num_tables = table_read_be_word(&cmap, 0, FIELD_OFFSET(struct cmap_header, numTables)); + tables = cmap.data + FIELD_OFFSET(struct cmap_header, tables); + + for (i = 0; i < num_tables; ++i) + { + struct cmap_encoding_record *record = (struct cmap_encoding_record *)(tables + i * sizeof(*record)); + WORD platform, encoding; + + platform = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, platformID)); + encoding = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, encodingID)); + + if (platform == OPENTYPE_CMAP_TABLE_PLATFORM_WIN && encoding == OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL) + { + is_symbol = TRUE; + break; + } + } + + IDWriteFontFace_ReleaseFontTable(fontface, cmap.context); + + return is_symbol; +} + static void test_IsSymbolFont(void) { - static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; IDWriteFontCollection *collection; IDWriteFontFace *fontface; IDWriteFactory *factory; IDWriteFont *font; + UINT32 count, i; HRESULT hr; ULONG ref; - BOOL ret; factory = create_factory(); - /* Tahoma */ - fontface = create_fontface(factory); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(!ret, "got %d\n", ret); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 font_count, j; + WCHAR nameW[256]; - ret = IDWriteFont_IsSymbolFont(font); - ok(!ret, "got %d\n", ret); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - IDWriteFontCollection_Release(collection); - IDWriteFont_Release(font); - IDWriteFontFace_Release(fontface); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); - /* Symbol */ - font = get_font(factory, symbolW, DWRITE_FONT_STYLE_NORMAL); - ret = IDWriteFont_IsSymbolFont(font); - ok(ret, "got %d\n", ret); + font_count = IDWriteFontFamily_GetFontCount(family); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(ret, "got %d\n", ret); - IDWriteFontFace_Release(fontface); - IDWriteFont_Release(font); + for (j = 0; j < font_count; ++j) + { + BOOL is_symbol_font, is_symbol_face, is_symbol_expected; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + is_symbol_font = IDWriteFont_IsSymbolFont(font); + is_symbol_face = IDWriteFontFace_IsSymbolFont(fontface); + ok(is_symbol_font == is_symbol_face, "Unexpected symbol flag.\n"); + + /* FIXME: failures disabled on Wine for now */ + is_symbol_expected = get_expected_is_symbol(fontface); + todo_wine_if(is_symbol_expected != is_symbol_face) + ok(is_symbol_expected == is_symbol_face, "Unexpected is_symbol flag %d for %s, font %d.\n", + is_symbol_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(collection); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); -- 2.24.0

1 0

[PATCH] wineserver: avoid spurious FD_WRITE on repeated calls to WSAEventSelect()
by Damjan Jovanovic 20 Dec '19

20 Dec '19

Repeated calls to WSAEventSelect() with FD_WRITE deliver spurious FD_WRITE events, as the flag isn't held, resulting in us unnecessarily polling the socket for writability, despite the fact FD_WRITE should only be delivered (1) initially on socket creation, and (2) after send[to]() fails with EWOULDBLOCK and buffer space becomes available. This breaks some applications (possibly #10204 and #24946). This patch prevents the spurious FD_WRITE by always holding FD_WRITE in WSAEventSelect()/set_socket_event(). It will be cleared from hmask in enable_socket_event() when a real FD_WRITE needs to be delivered. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++--- server/sock.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)

2 1

[PATCH] msvcrt: Implement wcstod without using 'long double'.
by Erich E. Hoover 20 Dec '19

20 Dec '19

Fix for the wide equivalent of strtod (see commit c22af971c287933a137c9fbecc81823812e12b7a). Best, Erich

1 0

[PATCH 3/3] dmime: Implement IDirectMusicPerformance8_PChannelInfo()
by Michael Stefaniuc 19 Dec '19

19 Dec '19

NOT FOR THE FREEZE ==> DEFER Not needed for the bugs referenced in patch 1 but to validate the tests from patch 2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/performance.c | 31 ++++++++++++++++++++++--------- dlls/dmime/tests/performance.c | 24 +++++++++++------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2124c1fe35..9f489f5e36 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -701,18 +701,29 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe } static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort **port, DWORD *group, DWORD *MChannel) + DWORD pchannel, IDirectMusicPort **port, DWORD *group, DWORD *channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PORTPARAMS8 port_params; - GUID default_port; + struct pchannel_block *block; + struct wine_rb_entry *entry; + DWORD block_num = pchannel / 16; + unsigned int index = pchannel % 16; - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, PChannel, port, group, MChannel); + TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); - port_params.dwSize = sizeof(DMUS_PORTPARAMS8); - port_params.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->dmusic, &default_port); - IDirectMusic8_CreatePort(This->dmusic, &default_port, &port_params, port, NULL); + entry = wine_rb_get(&This->pchannels, &block_num); + if (!entry) + return E_INVALIDARG; + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + if (port) { + *port = block->pchannel[index].port; + IDirectMusicPort_AddRef(*port); + } + if (group) + *group = block->pchannel[index].group; + if (channel) + *channel = block->pchannel[index].channel; return S_OK; } @@ -1102,7 +1113,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire return E_INVALIDARG; } - /* FIXME: Should we create one secondary buffer for each PChannel? */ + /* FIXME: Create a proper port with enough dwGroups for the PChannels */ + IDirectMusicPerformance8_AddPort(iface, NULL); + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &buffer, NULL); if (FAILED(hr)) return DSERR_BUFFERLOST; diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4c340252aa..adc20224c0 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -101,9 +101,9 @@ static HRESULT test_InitAudio(void) port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + todo_wine ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); @@ -129,7 +129,7 @@ static HRESULT test_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -344,7 +344,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); ok(hr == S_OK, "Init failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ hr = IDirectMusicPerformance8_AddPort(perf, NULL); @@ -355,18 +355,16 @@ static void test_pchannel(void) ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + ok(hr == S_OK && port == port2 && group == 1 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Unset PChannels fail to retrieve */ - todo_wine { hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); - } /* Channel group 0 can be set just fine */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); @@ -375,7 +373,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + ok(hr == S_OK && port == port2 && group == 0 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -406,7 +404,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + ok(hr == S_OK && port2 == port && group == 1 && channel == 7, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -416,7 +414,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -425,17 +423,17 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + ok(hr == S_OK && port2 == port && group == 1 && channel == 13, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + ok(hr == S_OK && port2 == port && group == 0 && channel == 8, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + ok(hr == S_OK && port2 == port && group == 0 && channel == 15, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); -- 2.24.1

1 0

[PATCH 2/3] dmime/tests: Add PChannel tests
by Michael Stefaniuc 19 Dec '19

19 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Tests crash reliable without patch 1. They crash with the patch in Staging too. dlls/dmime/tests/performance.c | 126 ++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 1d17e5200e..4c340252aa 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -100,10 +100,18 @@ static HRESULT test_InitAudio(void) return hr; port = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); - if (hr == S_OK && port != NULL) + hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); + if (port) IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); @@ -120,6 +128,8 @@ static HRESULT test_InitAudio(void) create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -322,6 +332,117 @@ static void test_createport(void) IDirectMusicPerformance_Release(perf); } +static void test_pchannel(void) +{ + IDirectMusicPerformance8 *perf; + IDirectMusicPort *port = NULL, *port2; + DWORD channel, group; + unsigned int i; + HRESULT hr; + + create_performance(&perf, NULL, NULL, FALSE); + hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + + /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ + hr = IDirectMusicPerformance8_AddPort(perf, NULL); + ok(hr == S_OK, "AddPort of default port failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, NULL, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Unset PChannels fail to retrieve */ + todo_wine { + hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + } + + /* Channel group 0 can be set just fine */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, 0, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Last PChannel Block can be set only individually but not read */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, MAXDWORD, port, 0, 3); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + port2 = (IDirectMusicPort *)0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD, port, 0); + ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 15; i < MAXDWORD; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + } + + /* Second to last PChannel Block can be set only individually and read */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 1, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 31; i < MAXDWORD - 15; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Third to last PChannel Block behaves normal */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 2, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* One PChannel set in a Block, rest is initialized too */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + + IDirectMusicPort_Release(port); + destroy_performance(perf, NULL, NULL); +} + static void test_COM(void) { IDirectMusicPerformance *dmp = (IDirectMusicPerformance*)0xdeadbeef; @@ -504,6 +625,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_pchannel(); test_notification_type(); CoUninitialize(); -- 2.24.1

1 0

[PATCH 1/3] dmime: Use a rbtree to store the PChannels of a performance
by Michael Stefaniuc 19 Dec '19

19 Dec '19

The PChannel id is a 32bit, potentially random identifier and not an array index. Fixes also the handling of channel group "dwGroup" 0. As it is invalid it is used to mark uninitialized PChannels. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17766 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24740 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Supersedes the Staging patch dmime-PChannel-range. Fixes memory corruption related crashes: - Fixes bug 17766, tested with Empire Earth Demo. - Should fix bug 24740 too as that is the origin of the workaround included in Staging. But BigFish GameLauncher is a pita so can't test. - Fixes the first crash in bug 31562 and lets the game continue until it hits the next crash (unrelated to PChannels). dlls/dmime/performance.c | 109 +++++++++++++++++++++++++++------------ 1 file changed, 75 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 615a3f8b14..2124c1fe35 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -19,10 +19,18 @@ */ #include "dmime_private.h" +#include "wine/heap.h" +#include "wine/rbtree.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); +struct pchannel_block { + DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ + DMUSIC_PRIVATE_PCHANNEL pchannel[16]; + struct wine_rb_entry entry; +}; + typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; @@ -35,7 +43,7 @@ typedef struct IDirectMusicPerformance8Impl { float fMasterTempo; long lMasterVolume; /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[32]; + struct wine_rb_tree pchannels; /* IDirectMusicPerformance8Impl fields */ IDirectMusicAudioPath *pDefaultPath; HANDLE hNotification; @@ -192,6 +200,49 @@ static BOOL PostMessageToProcessMsgThread(IDirectMusicPerformance8Impl* This, UI return PostThreadMessageA(This->procThreadId, iMsg, 0, 0); } +static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); + + return *(DWORD *)key - b->block_num; +} + +static void pchannel_block_free(struct wine_rb_entry *entry, void *context) +{ + struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + heap_free(b); +} + +static struct pchannel_block *pchannel_block_set(struct wine_rb_tree *tree, DWORD block_num, + IDirectMusicPort *port, DWORD group, BOOL only_set_new) +{ + struct pchannel_block *block; + struct wine_rb_entry *entry; + unsigned int i; + + entry = wine_rb_get(tree, &block_num); + if (entry) { + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + if (only_set_new) + return block; + } else { + if (!(block = heap_alloc(sizeof(*block)))) + return NULL; + block->block_num = block_num; + } + + for (i = 0; i < 16; ++i) { + block->pchannel[i].port = port; + block->pchannel[i].group = group; + block->pchannel[i].channel = i; + } + if (!entry) + wine_rb_put(tree, &block->block_num, &block->entry); + + return block; +} + static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(IDirectMusicPerformance8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface); @@ -236,6 +287,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); This->safe.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->safe); HeapFree(GetProcessHeap(), 0, This); @@ -579,7 +631,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman GUID port_guid; IDirectMusicPort* pDefaultPort = NULL; DMUS_PORTPARAMS params; - int i, j; hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); if (FAILED(hr)) return hr; ZeroMemory(&params, sizeof(params)); @@ -591,15 +642,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman if (FAILED(hr)) return hr; hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } - j = 0; - for (i = 0; i < 16; ++i) { - if (NULL == This->PChannel[i].port) { - This->PChannel[i].port = pPort; - This->PChannel[i].group = 0; - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - } + IDirectMusicPerformance8_AssignPChannelBlock(iface, 0, pDefaultPort, 1); } else { IDirectMusicPort_AddRef(pPort); } @@ -621,41 +664,38 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RemovePort(IDirectMusicPerfor } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMusicPerformance8 *iface, - DWORD dwBlockNum, IDirectMusicPort *pPort, DWORD dwGroup) + DWORD block_num, IDirectMusicPort *port, DWORD group) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - int i, j, range /* min value in range */; - - FIXME("(%p, %d, %p, %d): semi-stub\n", This, dwBlockNum, pPort, dwGroup-1); - if (NULL == pPort) return E_POINTER; - - range = 16 * dwBlockNum; - j = 0; - for (i = range; i < range+16; i++) { - /*TRACE("Setting PChannel[%i] to port %p, group %ld, MIDI port %i\n", i, pPort, dwGroup-1, j); */ - This->PChannel[i].port = pPort; - This->PChannel[i].group = dwGroup - 1; /* first index is always zero */ - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - /*if (dwGroup > 2) return S_FALSE;*/ + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - return S_OK; + FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + + if (!port) + return E_POINTER; + if (block_num > MAXDWORD / 16) + return E_INVALIDARG; + + pchannel_block_set(&This->pchannels, block_num, port, group, FALSE); + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort *port, DWORD group, DWORD MChannel) + DWORD pchannel, IDirectMusicPort *port, DWORD group, DWORD channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + struct pchannel_block *block; - TRACE("(%p)->(%d, %p, %d, %d)\n", This, PChannel, port, group, MChannel); + FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; - This->PChannel[PChannel].port = port; - This->PChannel[PChannel].group = group; - This->PChannel[PChannel].channel = MChannel; + block = pchannel_block_set(&This->pchannels, pchannel / 16, port, 0, TRUE); + if (block) { + block->pchannel[pchannel % 16].group = group; + block->pchannel[pchannel % 16].channel = channel; + } return S_OK; } @@ -1211,6 +1251,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe"); + wine_rb_init(&obj->pchannels, pchannel_block_compare); obj->rtLatencyTime = 100; /* 100 ms TO FIX */ obj->dwBumperLength = 50; /* 50 ms default */ -- 2.24.1

1 0

[PATCH v2] msvcrt: Implement strtod without using 'long double'.
by Erich E. Hoover 19 Dec '19

19 Dec '19

v2: Fix test results on 32-bit Debian *sigh* Fixes the "regression" with cl.exe caused by 0e183cc3c0d3b6f89f79047cdd71c389afc75073. ( https://bugs.winehq.org/show_bug.cgi?id=48160 ) Best, Erich

2 3

[PATCH] include: Define the _STGMEDIUM_UNION type for C++ only.
by Jeff Smith 19 Dec '19

19 Dec '19

Fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d Based on a patch from Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- This is like https://source.winehq.org/patches/data/175999 except that this version uses #define to blank-out _STGMEDIUM_UNION for non-C++, rather than having an idl version of the enclosing struct for C++ and a baked version of that struct for non-C++. include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..844b94af86 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when + * NONAMELESSUNION is not defined, so only define it for C++. */ + cpp_quote("#ifndef __cplusplus") + cpp_quote("#define _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1440,6 +1446,10 @@ interface IAdviseSink : IUnknown IUnknown *pUnkForRelease; } userSTGMEDIUM; + cpp_quote("#ifndef __cplusplus") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.23.0

2 1

[PATCH] dmime: IDirectMusicPerformance8_FreePMsg Release the unknown pointer.
by Alistair Leslie-Hughes 19 Dec '19

19 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/performance.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 9dbb469f388..a63bd3b4517 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -479,7 +479,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma DMUS_ItemRemoveFromQueue( This, pItem ); LeaveCriticalSection(&This->safe); - /** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */ + if (pPMSG->punkUser) + IUnknown_Release(pPMSG->punkUser); + HeapFree(GetProcessHeap(), 0, pItem); return S_OK; } -- 2.24.0

2 3

[PATCH] configure: Don't check for gssapi-krb5 if krb5 is missing
by Andrew Eikum 19 Dec '19

19 Dec '19

This works around a broken krb5 package in CentOS which is missing a dependency. configure would find gssapi-krb5, but not krb5, which would cause a build failure later in <dlls/kerberos>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48314 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 8a121bce016..c8399de6ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -1825,21 +1825,24 @@ WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) dnl **** Check for gssapi **** -if test "x$with_gssapi" != "xno" +if test "x$ac_cv_lib_soname_krb5" != "x" -o "x$with_gssapi" = "xyes" then - WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, - [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], - [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], - [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) - if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" - then - WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) - else - GSSAPI_CFLAGS="" - fi]) + if test "x$with_gssapi" != "xno" + then + WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, + [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], + [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) + if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" + then + WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) + else + GSSAPI_CFLAGS="" + fi]) + fi + WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], + [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) fi -WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], - [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) dnl **** Check for libjpeg **** if test "x$with_jpeg" != "xno" -- 2.24.1

1 0

[PATCH 1/2] ole32/tests: Add some tests for Reduce().
by Nikolay Sivov 19 Dec '19

19 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 47 +++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b65c0115ca..e4d693b442 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1531,12 +1531,11 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { + IMoniker *moniker, *inverse, *reduced; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; - IMoniker *inverse; IUnknown *unknown; FILETIME filetime; @@ -1597,8 +1596,6 @@ todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown); - IBindCtx_Release(bindctx); - hr = IMoniker_Inverse(moniker, &inverse); ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); @@ -1606,13 +1603,22 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); } static void test_file_moniker(WCHAR* path) { - IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse; + IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; DWORD moniker_type; + IBindCtx *bind_ctx; IStream *stream; IUnknown *unk; HRESULT hr; @@ -1654,6 +1660,21 @@ todo_wine hr = IMoniker_IsEqual(moniker1, moniker2); ok_ole_success(hr, IsEqual); + /* Reduce() */ + hr = CreateBindCtx(0, &bind_ctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, NULL, MKRREDUCE_ALL, NULL, &reduced); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker1, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bind_ctx); + IStream_Release(stream); if (moniker1) IMoniker_Release(moniker1); @@ -1761,7 +1782,7 @@ static void test_item_moniker(void) { L"%", L"A", 0x41 }, { L"%", L"a", 0x41 }, }; - IMoniker *moniker, *moniker2; + IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; DWORD hash; @@ -1919,6 +1940,12 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IMoniker_Release(moniker); /* IsEqual */ @@ -1961,13 +1988,12 @@ static void stream_write_dword(IStream *stream, DWORD value) static void test_anti_moniker(void) { - IMoniker *moniker, *moniker2, *moniker3; + IMoniker *moniker, *moniker2, *moniker3, *inverse, *reduced; HRESULT hr; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; IStream *stream; @@ -2143,6 +2169,11 @@ todo_wine IStream_Release(stream); + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); -- 2.24.0

2 3

[PATCH 2/2] wininet: Don't set default gopher protocol in InternetCrackUrlW.
by Jacek Caban 19 Dec '19

19 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 3 --- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH] wininet: Add missing schemes to url_schemes.
by Jacek Caban 19 Dec '19

19 Dec '19

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 20 ++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 14 insertions(+), 11 deletions(-)

3 3

[PATCH v2 1/2] wininet: Add missing schemes to url_schemes.
by Jacek Caban 19 Dec '19

19 Dec '19

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 23 +++++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 17 insertions(+), 11 deletions(-)

1 0

[PATCH] rpcrt4: Support VT_BSTR in get_param_pointer_info.
by Jacek Caban 19 Dec '19

19 Dec '19

Fixes a leak in typelib marshaller. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This was reported as a typelib marshaller rewrite regression. dlls/rpcrt4/ndr_typelib.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH 0/3] RFC: Implement MemoryWorkingSetExInformation.
by Andrew Wesie 19 Dec '19

19 Dec '19

A stub for bug 45667 has been sitting in staging for a while. It is sufficient for League of Legends, but it is not correct by any definition. The challenge with MemoryWorkingSetExInformation is that it requires information that is not exposed by the Linux kernel. One option was to allocate valloc memory with PROT_NONE, then handle the faults in virtual_handle_fault and keep our own statistics. This implies a SIGSEGV signal for *every* VirtualAlloc page, which sounded slow. This patchset implements an optimized version of this by using /proc/pid/pagemap to handle demand-zero pages, which would have been the most common complicated case. The remaining complicated cases (e.g. VirtualProtect from PAGE_NOACCESS to PAGE_READONLY, ...) are handled by deferring changing the page protection until virtual_handle_fault. It is possible that this patchset will introduce a performance regression if an application heavily uses PAGE_NOACCESS or PAGE_GUARD protections. Also, this patch reverts to the staging stub's behavior if pagemaps is not available. If someone has an alternative approach, or there is appetite using the staging stub in upstream Wine, that would be very welcome feedback. Andrew Wesie (3): ntdll: Implement NtQueryVirtualMemory(MemoryWorkingSetExInformation). kernel32: QueryWorkingSetEx should use MemoryWorkingSetExInformation. psapi/tests: Test QueryWorkingSetEx. dlls/kernel32/process.c | 2 +- dlls/ntdll/virtual.c | 78 +++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 84 +++++++++++++++++++++++++++++++++++ include/psapi.h | 18 ++++++++ include/winternl.h | 21 ++++++++- 5 files changed, 196 insertions(+), 7 deletions(-) -- 2.17.1

5 14

[PATCH] ws2_32: enable a WSAEnumNetworkEvents test that never runs
by Damjan Jovanovic 19 Dec '19

19 Dec '19

In test_WSAEnumNetworkEvents(), a test's condition is always false as the preceding "if" requires the opposite condition. The test already passes. Enable it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

2 1

[PATCH] msvcrt: Implement strtod without using 'long double'.
by Erich E. Hoover 18 Dec '19

18 Dec '19

Fixes the "regression" with cl.exe caused by 0e183cc3c0d3b6f89f79047cdd71c389afc75073. ( https://bugs.winehq.org/show_bug.cgi?id=48160 ) Best, Erich

2 1

[PATCH] include: Define the _STGMEDIUM_UNION type for C++.
by Zebediah Figura 18 Dec '19

18 Dec '19

This fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/objidl.idl | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..a5466c3698 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,11 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; +/* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when + * NONAMELESSUNION is not defined, so only define it for C++. */ +cpp_quote("#ifdef __cplusplus") typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1439,6 +1442,23 @@ interface IAdviseSink : IUnknown } DUMMYUNIONNAME; IUnknown *pUnkForRelease; } userSTGMEDIUM; +cpp_quote("#else") +cpp_quote("typedef struct _userSTGMEDIUM {") +cpp_quote(" struct {") +cpp_quote(" DWORD tymed;") +cpp_quote(" union {") +cpp_quote(" wireHMETAFILEPICT hMetaFilePict;") +cpp_quote(" wireHENHMETAFILE hHEnhMetaFile;") +cpp_quote(" GDI_OBJECT *hGdiHandle;") +cpp_quote(" wireHGLOBAL hGlobal;") +cpp_quote(" LPOLESTR lpszFileName;") +cpp_quote(" BYTE_BLOB *pstm;") +cpp_quote(" BYTE_BLOB *pstg;") +cpp_quote(" } u;") +cpp_quote(" } DUMMYUNIONNAME;") +cpp_quote(" IUnknown *pUnkForRelease;") +cpp_quote("} userSTGMEDIUM;") +cpp_quote("#endif") typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.24.1

2 2

[PATCH] kernel32: update version to win7
by Louis Lenders 18 Dec '19

18 Dec '19

https://bugs.winehq.org/show_bug.cgi?id=48304 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/version.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc index d4b994f28d..82287e5da7 100644 --- a/dlls/kernel32/version.rc +++ b/dlls/kernel32/version.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #define WINE_FILEDESCRIPTION_STR "Wine kernel DLL" #define WINE_FILENAME_STR "kernel32.dll" -/* these values come from Windows XP SP2 */ -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.01.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.01.2600.2180" +/* these values come from Windows 7 SP1 */ +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" #include "wine/wine_common_ver.rc" -- 2.24.1

4 3

[PATCH] dmime: IDirectMusicAudioPath Release primary buffer.
by Alistair Leslie-Hughes 18 Dec '19

18 Dec '19

In IDirectMusicAudioPath CreateStandardAudioPath we create a AudioPath object and assign it a primary buffer object which needs to be released. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36272 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/audiopath.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index ac3121c0e0a..1aadba92aea 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -108,6 +108,8 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + if (This->pPrimary) + IDirectSoundBuffer_Release(This->pPrimary); if (This->pDSBuffer) IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; -- 2.24.0

2 1

[PATCH] rpcrt4: Fix implicit in attribute handling in write_param_fs.
by Jacek Caban 18 Dec '19

18 Dec '19

Fixes regression caused by typelib marshaling rewrite. Spotted by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/tmarshal.c | 13 +++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++++ dlls/rpcrt4/ndr_typelib.c | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH v2 1/2] winemac.drv: Pass the CAMetalLayer to MoltenVK.
by Chip Davis 18 Dec '19

18 Dec '19

It isn't safe to access the view object from any thread other than the main thread. In fact, if you try to call vkCreateMacOSSurfaceMVK() from any other thread, MoltenVK prints out a big, scary warning telling you not to do this! Instead, get the layer from the view ourselves and pass that to MoltenVK. Recent versions of MoltenVK can accept either the view or the layer. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Don't check for the main thread. dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/vulkan.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 877653ea0078..edbfab518e3c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3796,6 +3796,18 @@ macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_devi return (macdrv_metal_view)metalView; } +macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) +{ + WineMetalView* view = (WineMetalView*)v; + __block CAMetalLayer* layer; + + OnMainThread(^{ + layer = (CAMetalLayer*)view.layer; + }); + + return (macdrv_metal_layer)layer; +} + void macdrv_view_release_metal_view(macdrv_metal_view v) { WineMetalView* view = (WineMetalView*)v; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 676adb435bb3..b02ad79f0259 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -140,6 +140,7 @@ #ifdef HAVE_METAL_METAL_H typedef struct macdrv_opaque_metal_device* macdrv_metal_device; typedef struct macdrv_opaque_metal_view* macdrv_metal_view; +typedef struct macdrv_opaque_metal_layer* macdrv_metal_layer; #endif typedef struct macdrv_opaque_status_item* macdrv_status_item; struct macdrv_event; @@ -587,6 +588,7 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat extern macdrv_metal_device macdrv_create_metal_device(void) DECLSPEC_HIDDEN; extern void macdrv_release_metal_device(macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) DECLSPEC_HIDDEN; +extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) DECLSPEC_HIDDEN; extern void macdrv_view_release_metal_view(macdrv_metal_view v) DECLSPEC_HIDDEN; #endif extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index cc7f22f67880..21e93827c156 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -282,7 +282,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ - create_info_host.pView = mac_surface->view; + create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); if (res != VK_SUCCESS) -- 2.24.0

2 3

[PATCH 1/5] avicap32: Define NONAMELESSUNION in files that include objidl.h.
by Zebediah Figura 18 Dec '19

18 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is not currently necessary, but will be with the prescribed solution for bug 47710, viz. defining the type _STGMEDIUM_UNION. dlls/avicap32/avicap32_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 9e2a99d4c7c..0178dc87edb 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -43,6 +43,7 @@ # include <unistd.h> #endif +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wingdi.h" -- 2.24.0

3 10

[PATCH] include: Add I1 vector definitions for PROPVARIANT.
by Nikolay Sivov 18 Dec '19

18 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/propidl.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/propidl.idl b/include/propidl.idl index 71401cb454..f3d517d6b0 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -85,6 +85,7 @@ interface IPropertyStorage : IUnknown type *pElems; \ } name + TYPEDEF_CA(char, CAC); TYPEDEF_CA(unsigned char, CAUB); TYPEDEF_CA(short, CAI); TYPEDEF_CA(USHORT, CAUI); @@ -143,6 +144,7 @@ interface IPropertyStorage : IUnknown [case(VT_LPWSTR)] LPWSTR pwszVal; [case(VT_UNKNOWN)] IUnknown *punkVal; [case(VT_DISPATCH)] IDispatch *pdispVal; + [case(VT_I1|VT_VECTOR)] CAC cac; [case(VT_UI1|VT_VECTOR)] CAUB caub; [case(VT_I2|VT_VECTOR)] CAI cai; [case(VT_UI2|VT_VECTOR)] CAUI caui; -- 2.24.0

1 0

[PATCH] testbot/LogUtils: Highlight TestLauncher errors.
by Francois Gouget 18 Dec '19

18 Dec '19

Such as when it cannot parse the subtests list (typically because a missing library prevented the test from running at all). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 18b1b1841..54d15af1f 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -190,6 +190,7 @@ sub GetLogLineCategory($) $Line =~ /^[a-zA-Z.]+:error: / or # TestBot error $Line =~ /^BotError:/ or + $Line =~ /^Error:/ or # X errors $Line =~ /^X Error of failed request: / or $Line =~ / opcode of failed request: /) -- 2.20.1

1 0

[PATCH 1/3] ole32/tests: Add equality tests for antimonikers.
by Nikolay Sivov 18 Dec '19

18 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7b4bf5c0fa..7e77847837 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2025,6 +2025,9 @@ todo_wine IMoniker_Release(moniker2); /* Load with composed number > 1. */ + hr = CreateAntiMoniker(&moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); @@ -2034,6 +2037,14 @@ todo_wine todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); todo_wine @@ -2076,6 +2087,14 @@ todo_wine todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); todo_wine @@ -2087,10 +2106,27 @@ todo_wine ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); + /* Back to initial value. */ + stream_write_dword(stream, 1); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IStream_Release(stream); IBindCtx_Release(bindctx); IMoniker_Release(moniker); + IMoniker_Release(moniker2); } static void test_generic_composite_moniker(void) -- 2.24.0

1 2

[PATCH] tests: Trace elapsed time when $WINETEST_TIME is set.
by Francois Gouget 17 Dec '19

17 Dec '19

This simplifies narrowing down where a test gets stuck or is slow if it times out but prints few messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48094 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- If this approach is acceptable I'll add support for it on the TestBot and on the test.winehq.org site: allowing to set $WINETEST_TIME and recognizing the modified failure lines. include/wine/test.h | 72 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 17 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index aeb9a55dee2..dea94fa60f0 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -58,6 +58,9 @@ /* debug level */ extern int winetest_debug; +/* trace timing information */ +extern int winetest_time; + /* running in interactive mode? */ extern int winetest_interactive; @@ -216,6 +219,10 @@ extern const struct test winetest_testlist[]; /* debug level */ int winetest_debug = 1; +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + /* interactive mode? */ int winetest_interactive = 0; @@ -304,11 +311,27 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +const char *winetest_elapsed(void) +{ + DWORD now; + char *res; + + if (!winetest_time) + return ""; + + now = GetTickCount(); + winetest_last_time = now; + res = get_temp_buffer( 11 ); /* enough for a day */ + sprintf( res, "%.3f", (now - winetest_start_time) / 1000.0); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} + void winetest_subtest( const char* name ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Subtest %s\n", - data->current_file, data->current_line, name); + printf( "%s:%d:%s Subtest %s\n", + data->current_file, data->current_line, name, winetest_elapsed()); } int broken( int condition ) @@ -334,8 +357,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test succeeded inside todo block: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -344,8 +367,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test marked todo: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -356,17 +379,20 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d: Test failed: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test failed: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success) - printf( "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + if (winetest_report_success || + (winetest_time && GetTickCount() >= winetest_last_time + 1000)) + { + printf( "%s:%d:%s Test succeeded\n", + data->current_file, data->current_line, winetest_elapsed() ); + } InterlockedIncrement(&successes); return 1; } @@ -389,7 +415,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_debug > 0) { - printf( "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -400,7 +426,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); skipped++; } @@ -630,8 +656,8 @@ static int run_test( const char *name ) if (winetest_debug) { - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", @@ -656,8 +682,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) struct tls_data *data = get_tls_data(); if (data->current_file) - printf( "%s:%d: this is the last test seen before the exception\n", - data->current_file, data->current_line ); + printf( "%s:%d:%s this is the last test seen before the exception\n", + data->current_file, data->current_line, winetest_elapsed() ); printf( "%04x:%s: unhandled exception %08x at %p\n", GetCurrentProcessId(), current_test->name, ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); @@ -695,6 +721,18 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_START_TIME", p, sizeof(p) )) + winetest_start_time = atoi(p); + else + { + char time_str[11]; + winetest_start_time = GetTickCount(); + /* Export the test start time for child processes */ + sprintf( time_str, "%u", winetest_start_time ); + SetEnvironmentVariableA( "WINETEST_START_TIME", time_str ); + } + winetest_last_time = winetest_start_time; if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); -- 2.20.1

2 2

[PATCH v2] dmloader: Use wide-char string literals
by Michael Stefaniuc 17 Dec '19

17 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Keep some variables to avoid casts. Alexandre, feel free to just apply the test portion. I'll resubmit after the freeze; better for my commit count anyway ;) bye michael dlls/dmloader/loader.c | 8 ++++---- dlls/dmloader/tests/loader.c | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 51eeb57879..c5f5094fab 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -621,7 +621,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *iface, REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - static const WCHAR wszAny[] = {'*',0}; WIN32_FIND_DATAW FileData; HANDLE hSearch; WCHAR wszSearchString[MAX_PATH]; @@ -643,11 +642,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * p = wszSearchString + lstrlenW(wszSearchString); if (p > wszSearchString && p[-1] != '\\') *p++ = '\\'; *p++ = '*'; /* any file */ - if (lstrcmpW (pwzFileExtension, wszAny)) *p++ = '.'; /* if we have actual extension, put a dot */ + if (lstrcmpW (pwzFileExtension, L"*")) + *p++ = '.'; /* if we have actual extension, put a dot */ lstrcpyW (p, pwzFileExtension); - + TRACE(": search string: %s\n", debugstr_w(wszSearchString)); - + hSearch = FindFirstFileW (wszSearchString, &FileData); if (hSearch == INVALID_HANDLE_VALUE) { TRACE(": no files found\n"); diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 0ab2e9eaba..418a4ebb7a 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -48,10 +48,10 @@ static void test_directory(void) { IDirectMusicLoader8 *loader = NULL; HRESULT hr; - WCHAR con[] = {'c', 'o', 'n', 0}; + WCHAR con[] = L"con"; + WCHAR empty[] = L""; + WCHAR invalid_path[] = L"/invalid path"; WCHAR path[MAX_PATH]; - WCHAR empty[] = {0}; - WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0}; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); @@ -477,7 +477,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc; HRESULT hr; DWORD valid; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -562,7 +561,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -596,7 +595,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

1 0

[PATCH v3 1/2] ntdll: Try mapping free memory region outside of reserved regions.
by Rémi Bernon 17 Dec '19

17 Dec '19

We assumed that all mapped regions are known by Wine view tree, which is obviously not the case with external allocations. This could lead to memory corruption when find_free_area returns an expected free region which is already mapped. Using MAP_FIXED forces mmap to succeed and corrupts the mapping. This patch uses safe mmap calls to check if the expected free memory is actually free, and iterates over the expected free ranges until it succeeds. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/virtual.c | 64 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 68249de902e..60838c68a55 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,6 +496,35 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } +/*********************************************************************** + * try_map_free_area + * + * Try mmaping some expected free memory region, eventually stepping and + * retrying inside it, and return where it actually succeeded, or NULL. + */ +static void* try_map_free_area( void *base, void *end, ptrdiff_t step, + void *start, size_t size, int unix_prot ) +{ + void *ptr; + + while (start && base <= start && (char*)start + size <= (char*)end) + { + if ((ptr = wine_anon_mmap( start, size, unix_prot, 0 )) == start) + return start; + TRACE( "Found free area is already mapped, start %p.\n", start ); + + if (ptr != (void *)-1) + munmap( ptr, size ); + + if ((step > 0 && (char *)end - (char *)start < step) || + (step < 0 && (char *)start - (char *)base < -step) || + step == 0) + break; + start = (char *)start + step; + } + + return NULL; +} /*********************************************************************** * find_free_area @@ -503,9 +532,11 @@ static struct file_view *find_view_range( const void *addr, size_t size ) * Find a free area between views inside the specified range. * The csVirtual section must be held by caller. */ -static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down, + int map_area, int unix_prot ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; + ptrdiff_t step = top_down ? -(mask + 1) : (mask + 1); void *start; /* find the first (resp. last) view inside the range */ @@ -538,7 +569,10 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base + view->size <= (char *)start) break; + if (!map_area && (char *)view->base + view->size <= (char *)start) break; + if (map_area && (start = try_map_free_area( (char *)view->base + view->size, + (char *)start + size, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base - size, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || start < base) return NULL; @@ -554,13 +588,17 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base >= (char *)start + size) break; + if (!map_area && (char *)view->base >= (char *)start + size) break; + if (map_area && (start = try_map_free_area( start, view->base, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base + view->size + mask, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || (char *)end - (char *)start < size) return NULL; first = wine_rb_next( first ); } } + + if (!first && map_area) return try_map_free_area( base, end, step, start, size, unix_prot ); return start; } @@ -1054,13 +1092,13 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) { /* range is split in two by the preloader reservation, try first part */ if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, - alloc->mask, alloc->top_down ))) + alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; /* then fall through to try second part */ start = preload_reserve_end; } } - if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; return 0; @@ -1148,6 +1186,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { size_t view_size = size + mask + 1; struct alloc_area alloc; + int unix_prot = VIRTUAL_GetUnixProt(vprot); alloc.size = size; alloc.mask = mask; @@ -1158,19 +1197,22 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); - if (wine_anon_mmap( ptr, size, VIRTUAL_GetUnixProt(vprot), MAP_FIXED ) != ptr) + if (wine_anon_mmap( ptr, size, unix_prot, MAP_FIXED ) != ptr) return STATUS_INVALID_PARAMETER; goto done; } - for (;;) + if (zero_bits_64) { - if (!zero_bits_64) - ptr = NULL; - else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + if (!(ptr = find_free_area( (void*)0, alloc.limit, size, mask, top_down, TRUE, unix_prot ))) return STATUS_NO_MEMORY; + TRACE( "got mem with find_free_area %p-%p\n", ptr, (char *)ptr + size ); + goto done; + } - if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1) + for (;;) + { + if ((ptr = wine_anon_mmap( NULL, view_size, unix_prot, 0 )) == (void *)-1) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; -- 2.24.0.rc2

1 2

[PATCH] rpcrt4: Fix ITypeInfo ref count handling.
by Jacek Caban 17 Dec '19

17 Dec '19

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/ndr_typelib.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)

2 2

[PATCH 1/5] ole32/tests: Add tests for system moniker identification queries.
by Nikolay Sivov 17 Dec '19

17 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 64 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d911ce57e9..4fec233a57 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -31,6 +31,7 @@ #include "ocidl.h" #include "comcat.h" #include "olectl.h" +#include "initguid.h" #include "wine/test.h" @@ -62,6 +63,13 @@ static const CLSID CLSID_TestMoniker = {0xb9, 0x3e, 0x2f, 0xf9, 0xc8, 0x32, 0x23, 0xd7} }; +DEFINE_OLEGUID(CLSID_FileMoniker, 0x303, 0, 0); +DEFINE_OLEGUID(CLSID_ItemMoniker, 0x304, 0, 0); +DEFINE_OLEGUID(CLSID_AntiMoniker, 0x305, 0, 0); +DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0); +DEFINE_OLEGUID(CLSID_ClassMoniker, 0x31a, 0, 0); +DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); + static LONG cLocks; static void LockModule(void) @@ -1543,7 +1551,15 @@ static void test_class_moniker(void) hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); ok_ole_success(hr, CreateClassMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_ClassMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } test_moniker("class moniker", moniker, expected_class_moniker_marshal_data, sizeof(expected_class_moniker_marshal_data), @@ -1603,11 +1619,21 @@ static void test_file_moniker(WCHAR* path) { IStream *stream; IMoniker *moniker1 = NULL, *moniker2 = NULL; + IUnknown *unk; HRESULT hr; hr = CreateFileMoniker(path, &moniker1); ok_ole_success(hr, CreateFileMoniker); + hr = IMoniker_QueryInterface(moniker1, &CLSID_FileMoniker, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unk == (IUnknown *)moniker1, "Unexpected interface.\n"); + IUnknown_Release(unk); + } + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok_ole_success(hr, CreateStreamOnHGlobal); @@ -1719,6 +1745,15 @@ static void test_item_moniker(void) hr = CreateItemMoniker(NULL, wszObjectName, &moniker); ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); + hr = IMoniker_QueryInterface(moniker, &CLSID_ItemMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } + test_moniker("item moniker 2", moniker, expected_item_moniker_marshal_data2, sizeof(expected_item_moniker_marshal_data2), expected_item_moniker_saved_data2, sizeof(expected_item_moniker_saved_data2), @@ -1860,7 +1895,15 @@ static void test_anti_moniker(void) hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_AntiMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } test_moniker("anti moniker", moniker, expected_anti_moniker_marshal_data, sizeof(expected_anti_moniker_marshal_data), @@ -1932,6 +1975,13 @@ static void test_generic_composite_moniker(void) hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok_ole_success(hr, CreateGenericComposite); + /* Generic composite is special, as it does not addref in this case. */ + hr = IMoniker_QueryInterface(moniker, &CLSID_CompositeMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + test_moniker("generic composite moniker", moniker, expected_gc_moniker_marshal_data, sizeof(expected_gc_moniker_marshal_data), expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), @@ -2007,7 +2057,15 @@ static void test_pointer_moniker(void) hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); ok_ole_success(hr, CreatePointerMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } ok_more_than_one_lock(); -- 2.24.0

1 4

[PATCH] oledb32/tests: Add PromptNew interactive test.
by Alistair Leslie-Hughes 17 Dec '19

17 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/database.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 8ff55b9d2a..3a6a582f56 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -939,6 +939,26 @@ static void test_dslocator(void) hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRpcOptions, (void **)&opts); ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + if (winetest_interactive) + { + IDispatch *disp = NULL; + + hr = IDataSourceLocator_PromptNew(dslocator, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IDataSourceLocator_PromptNew(dslocator, &disp); + if (hr == S_OK) + { + ok(disp != NULL, "got %08x\n", hr); + IDispatch_Release(disp); + } + else + { + ok(hr == S_FALSE, "got %08x\n", hr); + ok(!disp, "got %08x\n", hr); + } + } IDataInitialize_Release(datainit2); IDataInitialize_Release(datainit); -- 2.17.1

1 0

[PATCH 1/2] winemac.drv: Pass the CAMetalLayer to MoltenVK.
by Chip Davis 17 Dec '19

17 Dec '19

It isn't safe to access the view object from any thread other than the main thread. In fact, if you try to call vkCreateMacOSSurfaceMVK() from any other thread, MoltenVK prints out a big, scary warning telling you not to do this! Instead, get the layer from the view ourselves and pass that to MoltenVK. Recent versions of MoltenVK can accept either the view or the layer. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 14 ++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/vulkan.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 877653ea007..6ac30843025 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3796,6 +3796,20 @@ macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_devi return (macdrv_metal_view)metalView; } +macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) +{ + WineMetalView* view = (WineMetalView*)v; + __block CAMetalLayer* layer; + + if ([NSThread isMainThread]) + layer = (CAMetalLayer*)view.layer; + else OnMainThread(^{ + layer = (CAMetalLayer*)view.layer; + }); + + return (macdrv_metal_layer)layer; +} + void macdrv_view_release_metal_view(macdrv_metal_view v) { WineMetalView* view = (WineMetalView*)v; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 676adb435bb..b02ad79f025 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -140,6 +140,7 @@ #ifdef HAVE_METAL_METAL_H typedef struct macdrv_opaque_metal_device* macdrv_metal_device; typedef struct macdrv_opaque_metal_view* macdrv_metal_view; +typedef struct macdrv_opaque_metal_layer* macdrv_metal_layer; #endif typedef struct macdrv_opaque_status_item* macdrv_status_item; struct macdrv_event; @@ -587,6 +588,7 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat extern macdrv_metal_device macdrv_create_metal_device(void) DECLSPEC_HIDDEN; extern void macdrv_release_metal_device(macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) DECLSPEC_HIDDEN; +extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) DECLSPEC_HIDDEN; extern void macdrv_view_release_metal_view(macdrv_metal_view v) DECLSPEC_HIDDEN; #endif extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index cc7f22f6788..21e93827c15 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -282,7 +282,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ - create_info_host.pView = mac_surface->view; + create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); if (res != VK_SUCCESS) -- 2.24.0

2 3

[PATCH 1/3] ddraw/tests: Allow for no-texture-hardware error.
by Jeff Smith 17 Dec '19

17 Dec '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- This series cleans up failures seen on the XP test machine using the "VMware SVGA II" driver, which seems to lack various features, such as 3D texture support. dlls/ddraw/tests/ddraw1.c | 3 +++ dlls/ddraw/tests/ddraw2.c | 3 +++ dlls/ddraw/tests/ddraw4.c | 3 +++ dlls/ddraw/tests/ddraw7.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b513121fbb..b1045e2854 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5488,6 +5488,9 @@ static void test_create_surface_pitch(void) } if ((test_data[i].caps & DDSCAPS_VIDEOMEMORY) && hr == DDERR_NODIRECTDRAWHW) continue; + if (((test_data[i].caps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) == + (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) && hr == DDERR_NOTEXTUREHW) + continue; ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 541362c748..5a26d4eec4 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6430,6 +6430,9 @@ static void test_create_surface_pitch(void) } if ((test_data[i].caps & DDSCAPS_VIDEOMEMORY) && hr == DDERR_NODIRECTDRAWHW) continue; + if (((test_data[i].caps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) == + (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) && hr == DDERR_NOTEXTUREHW) + continue; ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8cadfae52a..33e3db259a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -8266,6 +8266,9 @@ static void test_create_surface_pitch(void) } if ((test_data[i].caps & DDSCAPS_VIDEOMEMORY) && hr == DDERR_NODIRECTDRAWHW) continue; + if (((test_data[i].caps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) == + (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) && hr == DDERR_NOTEXTUREHW) + continue; ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f4a709711b..8ad1e859fa 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8110,6 +8110,9 @@ static void test_create_surface_pitch(void) } if ((test_data[i].caps & DDSCAPS_VIDEOMEMORY) && hr == DDERR_NODIRECTDRAWHW) continue; + if (((test_data[i].caps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) == + (DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE)) && hr == DDERR_NOTEXTUREHW) + continue; if (is_ddraw64 && (test_data[i].caps & DDSCAPS_TEXTURE) && SUCCEEDED(test_data[i].hr)) todo_wine ok(hr == E_NOINTERFACE, "Test %u: Got unexpected hr %#x.\n", i, hr); else -- 2.23.0

1 2

[PATCH 1/2] kernel32: Forward OpenThreadToken() to kernelbase.
by Chip Davis 16 Dec '19

16 Dec '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 408ea415401a..466ef5e52a16 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1132,7 +1132,7 @@ @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr) @ stdcall -import OpenThread(long long long) -# @ stub OpenThreadToken +@ stdcall -import OpenThreadToken(long long long ptr) @ stdcall -i386 OpenVxDHandle(long) @ stdcall OpenWaitableTimerA(long long str) @ stdcall -import OpenWaitableTimerW(long long wstr) -- 2.24.0

3 4

[PATCH] dswave/tests: Use wide-char string literals
by Michael Stefaniuc 16 Dec '19

16 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dswave/tests/dswave.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index d9bdc85ea7..62a76f1806 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -190,7 +190,6 @@ static void test_parsedescriptor(void) IStream *stream; DMUS_OBJECTDESC desc = {0}; HRESULT hr; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, mmioFOURCC('W','A','V','E'), DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -279,7 +278,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -291,7 +290,7 @@ static void test_parsedescriptor(void) ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

1 0

[PATCH] dmstyle/tests: Use wide-char string literals
by Michael Stefaniuc 16 Dec '19

16 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a63d1dbd1c..5130af773c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -475,8 +475,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc = {0}; HRESULT hr; DWORD valid; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -550,7 +548,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -562,7 +560,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -583,7 +581,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

1 0

[PATCH] dmime/tests: Use wide-char string literals
by Michael Stefaniuc 16 Dec '19

16 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 5bb3a8b5b3..99295f391b 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -956,8 +956,6 @@ static void test_parsedescriptor(void) HRESULT hr; DWORD valid; unsigned int i; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; - const WCHAR s_inam[] = {'I','\0'}; /* fourcc ~0 will be replaced later on */ FOURCC alldesc[] = { @@ -1092,7 +1090,7 @@ static void test_parsedescriptor(void) "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); if (forms[i].form != mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -1130,7 +1128,7 @@ static void test_parsedescriptor(void) valid |= DMUS_OBJ_NAME; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'I'\n", + ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

1 0

[PATCH v2] dmloader: Release objects on error paths (Coverity)
by Michael Stefaniuc 16 Dec '19

16 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> CID: 1448587 CID: 1449363 CID: 1448601 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: - Add missing {} to an if - Whitespace fixes dlls/dmloader/loader.c | 12 ++++++++++++ dlls/dmloader/loaderstream.c | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 66c0f92b1b..c5f5094fab 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -384,18 +384,24 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* create object */ result = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(result)) { + IStream_Release(pStream); ERR(": could not create object\n"); return result; } /* acquire PersistStream interface */ result = IDirectMusicObject_QueryInterface (pObject, &IID_IPersistStream, (LPVOID*)&pPersistStream); if (FAILED(result)) { + IStream_Release(pStream); + IDirectMusicObject_Release(pObject); ERR("failed to Query\n"); return result; } /* load */ result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { + IStream_Release(pStream); + IPersistStream_Release(pPersistStream); + IDirectMusicObject_Release(pObject); WARN(": failed to (completely) load object (%08x)\n", result); return result; } @@ -408,6 +414,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac lstrcpyW (GotDesc.wszFileName, pDesc->wszFileName); } if (FAILED(result)) { + IStream_Release(pStream); + IPersistStream_Release(pPersistStream); + IDirectMusicObject_Release(pObject); ERR(": failed to get descriptor\n"); return result; } @@ -524,6 +533,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* create object */ hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(hr)) { + IStream_Release(pStream); ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr); return DMUS_E_LOADER_FAILEDOPEN; } @@ -537,6 +547,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { + IStream_Release(pStream); + IDirectMusicObject_Release(pObject); ERR(": couldn't parse descriptor\n"); return DMUS_E_LOADER_FORMATNOTSUPPORTED; } diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 855203ec3e..150a53524a 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -663,10 +663,11 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if TRACE("(%p, %p)\n", iface, ppstm); result = DMUSIC_CreateDirectMusicLoaderGenericStream ((LPVOID*)&pOther); if (FAILED(result)) return result; - - if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) + + if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) { + IStream_Release(pOther); return E_FAIL; - + } IDirectMusicLoaderGenericStream_Attach (pOther, pLowLevel, This->pLoader); TRACE(": succeeded\n"); -- 2.23.0

1 0

[PATCH] dmband/tests: Use wide-char string literals
by Michael Stefaniuc 16 Dec '19

16 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/tests/dmband.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index dce8a47ba4..4b8aaf6120 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -392,8 +392,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc = {0}; HRESULT hr; DWORD valid; - const WCHAR s_inam[] = {'I','N','A','M','\0'}; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -477,7 +475,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, @@ -492,7 +490,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -513,7 +511,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

1 0

[PATCH] jscript/tests: Allow GetTypeInfo calls.
by Jacek Caban 16 Dec '19

16 Dec '19

It's called by some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/activex.c | 4 +--- dlls/jscript/tests/caller.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)

1 0

Code freeze
by Alexandre Julliard 16 Dec '19

16 Dec '19

Folks, As you know, we are now in code freeze towards 5.0. This means that patches will only be accepted if they are small enough, and fix an actual bug. Please make sure to mention in the patch which bug you are fixing, so that I can assess the benefit/risk ratio of the changes. Patches that can't go in will be marked as "deferred", and will have to be resubmitted once 5.0 is out. Changes to the tests are still welcome as long as they don't touch the code outside the tests, so this is a good opportunity to work on making the test results look better... As usual, I'll be making rc releases every week until the final 5.0, which I expect to be ready in the second half of January. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.
by Dmitry Timoshkov 16 Dec '19

16 Dec '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/Makefile.in | 1 + dlls/adsldp/tests/ldap.c | 76 +++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 dlls/adsldp/tests/ldap.c diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 777d2aa9de..52141139d5 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = adsldp.dll IMPORTS = ole32 oleaut32 secur32 advapi32 uuid C_SRCS = \ + ldap.c \ sysinfo.c diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c new file mode 100644 index 0000000000..9e4dc2c1eb --- /dev/null +++ b/dlls/adsldp/tests/ldap.c @@ -0,0 +1,76 @@ +/* + * LDAPNamespace Tests + * + * Copyright 2019 Dmitry Timoshkov + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "iads.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + +static void test_LDAP(void) +{ + HRESULT hr; + IUnknown *unk; + IADs *ads; + IADsOpenDSObject *ads_open; + IDispatch *disp; + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); + ok(hr == S_OK, "got %#x\n", hr); + IADs_Release(ads); + + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&disp); + ok(hr == S_OK, "got %#x\n", hr); + IDispatch_Release(disp); + + hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open); + ok(hr == S_OK, "got %#x\n", hr); + IADsOpenDSObject_Release(ads_open); + + hr = IADsOpenDSObject_OpenDSObject(ads_open, (BSTR)L"LDAP:", NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +if (hr == S_OK) + IDispatch_Release(disp); + + IUnknown_Release(unk); +} + +START_TEST(ldap) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#x\n", hr); + + test_LDAP(); +} -- 2.20.1

6 9

[PATCH v3 1/3] qedit/samplegrabber: Clean up the pins in sample_grabber_destroy().
by Zebediah Figura 16 Dec '19

16 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/samplegrabber.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bbd43e79bfd..fb6c0b71e47 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -111,6 +111,8 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) SG_Impl *filter = impl_from_strmbase_filter(iface); SampleGrabber_cleanup(filter); + strmbase_sink_cleanup(&filter->sink); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); } -- 2.24.0

2 4

[PATCH 2/5] activeds: Implement ADsOpenObject.
by Dmitry Timoshkov 16 Dec '19

16 Dec '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/Makefile.in | 1 + dlls/activeds/activeds_main.c | 68 ++++++++++++++++++++++++++++++++--- include/iads.idl | 14 ++++++++ 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index 20578a93bc..076a2b5693 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -1,5 +1,6 @@ MODULE = activeds.dll IMPORTLIB = activeds +IMPORTS = advapi32 ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 69c5c447dc..a280f50c2f 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -30,8 +30,10 @@ #include "winuser.h" #include "objbase.h" +#include "initguid.h" #include "iads.h" #include "adshlp.h" +#include "adserr.h" #include "wine/debug.h" @@ -112,11 +114,69 @@ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, /***************************************************** * ADsOpenObject [ACTIVEDS.9] */ -HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD reserved, REFIID riid, void **obj) { - FIXME("(%s,%s,%u,%s,%p)!stub\n", debugstr_w(lpszPathName), - debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject); - return E_NOTIMPL; + HRESULT hr; + HKEY hkey, hprov; + WCHAR provider[MAX_PATH], progid[MAX_PATH]; + DWORD idx = 0; + + TRACE("(%s,%s,%u,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj); + + if (!path || !riid || !obj) + return E_INVALIDARG; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return E_ADS_BAD_PATHNAME; + + hr = E_ADS_BAD_PATHNAME; + + for (;;) + { + if (RegEnumKeyW(hkey, idx++, provider, ARRAY_SIZE(provider))) + break; + + TRACE("provider %s\n", debugstr_w(provider)); + + if (!wcsnicmp(path, provider, wcslen(provider)) && path[wcslen(provider)] == ':') + { + LONG size; + + if (RegOpenKeyExW(hkey, provider, 0, KEY_READ, &hprov)) + break; + + size = ARRAY_SIZE(progid); + if (!RegQueryValueW(hprov, NULL, progid, &size)) + { + CLSID clsid; + + if (CLSIDFromProgID(progid, &clsid) == S_OK) + { + IADsOpenDSObject *adsopen; + IDispatch *disp; + + TRACE("ns %s => clsid %s\n", debugstr_w(progid), wine_dbgstr_guid(&clsid)); + if (CoCreateInstance(&clsid, 0, CLSCTX_INPROC_SERVER, &IID_IADsOpenDSObject, (void **)&adsopen) == S_OK) + { + hr = IADsOpenDSObject_OpenDSObject(adsopen, (BSTR)path, (BSTR)user, (BSTR)password, reserved, &disp); + if (hr == S_OK) + { + hr = IDispatch_QueryInterface(disp, riid, obj); + IDispatch_Release(disp); + } + + IADsOpenDSObject_Release(adsopen); + } + } + } + + RegCloseKey(hprov); + } + } + + RegCloseKey(hkey); + + return hr; } /***************************************************** diff --git a/include/iads.idl b/include/iads.idl index 6931b6f734..add52571c7 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -794,6 +794,20 @@ interface IDirectorySearch : IUnknown HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } +/***************************************************************************** + * IID_IADsOpenDSObject interface + */ +[ + odl, + uuid(ddf2891e-0f9c-11d0-8ad4-00c04fd8d503), + dual, + oleautomation +] +interface IADsOpenDSObject : IDispatch +{ + HRESULT OpenDSObject([in] BSTR path, [in] BSTR user, [in] BSTR password, [in] long reserved, [out,retval] IDispatch **obj); +} + /***************************************************************************** * IADsADSystemInfo interface */ -- 2.20.1

4 7

[PATCH 2/2] kernelbase: Use translated Unicode default char to check invalid chars.
by Akihiro Sagawa 16 Dec '19

16 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48288 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 3 +++ dlls/kernelbase/locale.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests.
by Akihiro Sagawa 16 Dec '19

16 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH] dmloader: Release objects on error paths (Coverity)
by Alistair Leslie-Hughes 16 Dec '19

16 Dec '19

CID: 1448587 CID: 1449363 CID: 1448601 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 12 ++++++++++++ dlls/dmloader/loaderstream.c | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index cd7f6ff7ee3..2af4de9fc80 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -383,18 +383,24 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* create object */ result = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(result)) { + IStream_Release (pStream); ERR(": could not create object\n"); return result; } /* acquire PersistStream interface */ result = IDirectMusicObject_QueryInterface (pObject, &IID_IPersistStream, (LPVOID*)&pPersistStream); if (FAILED(result)) { + IStream_Release (pStream); + IDirectMusicObject_Release (pObject); ERR("failed to Query\n"); return result; } /* load */ result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { + IStream_Release (pStream); + IPersistStream_Release (pPersistStream); + IDirectMusicObject_Release (pObject); WARN(": failed to (completely) load object (%08x)\n", result); return result; } @@ -407,6 +413,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac lstrcpyW (GotDesc.wszFileName, pDesc->wszFileName); } if (FAILED(result)) { + IStream_Release (pStream); + IPersistStream_Release (pPersistStream); + IDirectMusicObject_Release (pObject); ERR(": failed to get descriptor\n"); return result; } @@ -523,6 +532,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* create object */ hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); if (FAILED(hr)) { + IStream_Release (pStream); ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr); return DMUS_E_LOADER_FAILEDOPEN; } @@ -536,6 +546,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { + IStream_Release (pStream); + IDirectMusicObject_Release (pObject); ERR(": couldn't parse descriptor\n"); return DMUS_E_LOADER_FORMATNOTSUPPORTED; } diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 855203ec3e8..b306672771f 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -665,6 +665,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if if (FAILED(result)) return result; if (FAILED(IStream_Clone (This->pStream, &pLowLevel))) + IStream_Release(pOther); return E_FAIL; IDirectMusicLoaderGenericStream_Attach (pOther, pLowLevel, This->pLoader); -- 2.24.0

1 0

[PATCH] msado15: Implement _Recordset get_CursorLocation and put_CursorLocation.
by Hans Leidekker 16 Dec '19

16 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1d28d6b957..1f16add4c3 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -43,6 +43,7 @@ struct recordset LONG allocated; LONG index; VARIANT *data; + CursorLocationEnum cursor_location; }; struct fields @@ -1229,14 +1230,24 @@ static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affec static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = recordset->cursor_location; + + return S_OK; } static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + recordset->cursor_location = cursor_loc; + + return S_OK; } static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set ) @@ -1524,6 +1535,7 @@ HRESULT Recordset_create( void **obj ) recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->cursor_location = adUseServer; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..917d131063 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -65,6 +65,7 @@ static void test_Recordset(void) Field *field; LONG refs, count, state; VARIANT missing, val, index; + CursorLocationEnum location; BSTR name; HRESULT hr; @@ -132,6 +133,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %d\n", state ); + location = -1; + hr = _Recordset_get_CursorLocation( recordset, &location ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( location == adUseServer, "got %d\n", location ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 4/5] adsldp: Add IADsOpenDSObject stub.
by Dmitry Timoshkov 16 Dec '19

16 Dec '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index ef62aad279..bdce30c143 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -260,6 +260,7 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) typedef struct { IADs IADs_iface; + IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; } LDAP_namespace; @@ -270,6 +271,8 @@ static inline LDAP_namespace *impl_from_IADs(IADs *iface) static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) { + LDAP_namespace *ldap = impl_from_IADs(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); if (!riid || !obj) return E_INVALIDARG; @@ -283,6 +286,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IADsOpenDSObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IADsOpenDSObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -436,6 +446,97 @@ static const IADsVtbl IADs_vtbl = ldapns_GetInfoEx }; +static inline LDAP_namespace *impl_from_IADsOpenDSObject(IADsOpenDSObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADsOpenDSObject_iface); +} + +static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IADsOpenDSObject) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IADsOpenDSObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) +{ + LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, ldap); + } + + return ref; +} + +static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetTypeInfo(IADsOpenDSObject *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_GetIDsOfNames(IADsOpenDSObject *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, + LONG reserved, IDispatch **obj) +{ + FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), + reserved, obj); + return E_NOTIMPL; +} + +static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = +{ + openobj_QueryInterface, + openobj_AddRef, + openobj_Release, + openobj_GetTypeInfoCount, + openobj_GetTypeInfo, + openobj_GetIDsOfNames, + openobj_Invoke, + openobj_OpenDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -445,6 +546,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) if (!ldap) return E_OUTOFMEMORY; ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); -- 2.20.1

1 0

[PATCH 3/5] adsldp: Add LDAPNamespace stubs.
by Dmitry Timoshkov 16 Dec '19

16 Dec '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 5 +- dlls/adsldp/adsldp.c | 295 ++++++++++++++++++++++++++++++++++++---- dlls/adsldp/adsldp.idl | 9 ++ dlls/adsldp/adsldp.rgs | 16 +++ dlls/adsldp/rsrc.rc | 20 +++ 5 files changed, 319 insertions(+), 26 deletions(-) create mode 100644 dlls/adsldp/adsldp.rgs create mode 100644 dlls/adsldp/rsrc.rc diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 4dce14fd0d..7bf07fce2c 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,10 +1,13 @@ MODULE = adsldp.dll -IMPORTS = oleaut32 secur32 +IMPORTS = oleaut32 secur32 rpcrt4 EXTRADLLFLAGS = -mno-cygwin +dlldata_EXTRADEFS = -DENTRY_PREFIX=ADSLDP_ C_SRCS = \ adsldp.c IDL_SRCS = \ adsldp.idl + +RC_SRCS = rsrc.rc diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 4fc0de41eb..ef62aad279 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -31,10 +31,15 @@ #define SECURITY_WIN32 #include "security.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp); +DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); + +extern HRESULT WINAPI ADSLDP_DllGetClassObject(REFCLSID,REFIID,void **) DECLSPEC_HIDDEN; + static HMODULE adsldp_hinst; typedef struct @@ -235,31 +240,239 @@ static const IADsADSystemInfoVtbl IADsADSystemInfo_vtbl = sysinfo_GetTrees }; -static HRESULT ADSystemInfo_create(void **obj) +static HRESULT ADSystemInfo_create(REFIID riid, void **obj) { AD_sysinfo *sysinfo; + HRESULT hr; sysinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*sysinfo)); if (!sysinfo) return E_OUTOFMEMORY; sysinfo->IADsADSystemInfo_iface.lpVtbl = &IADsADSystemInfo_vtbl; sysinfo->ref = 1; - *obj = &sysinfo->IADsADSystemInfo_iface; - TRACE("created %p\n", *obj); + hr = IADsADSystemInfo_QueryInterface(&sysinfo->IADsADSystemInfo_iface, riid, obj); + IADsADSystemInfo_Release(&sysinfo->IADsADSystemInfo_iface); - return S_OK; + return hr; } +typedef struct +{ + IADs IADs_iface; + LONG ref; +} LDAP_namespace; + +static inline LDAP_namespace *impl_from_IADs(IADs *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IADs_iface); +} + +static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IADs)) + { + IADs_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ldapns_AddRef(IADs *iface) +{ + LDAP_namespace *ldap = impl_from_IADs(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI ldapns_Release(IADs *iface) +{ + LDAP_namespace *ldap = impl_from_IADs(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, ldap); + } + + return ref; +} + +static HRESULT WINAPI ldapns_GetTypeInfoCount(IADs *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetTypeInfo(IADs *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetIDsOfNames(IADs *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Invoke(IADs *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Name(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Class(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_GUID(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_ADsPath(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Parent(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_get_Schema(IADs *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetInfo(IADs *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_SetInfo(IADs *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_Put(IADs *iface, BSTR name, VARIANT prop) +{ + FIXME("%p,%s,%s: stub\n", iface, debugstr_w(name), wine_dbgstr_variant(&prop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetEx(IADs *iface, BSTR name, VARIANT *prop) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_PutEx(IADs *iface, LONG code, BSTR name, VARIANT prop) +{ + FIXME("%p,%d,%s,%s: stub\n", iface, code, debugstr_w(name), wine_dbgstr_variant(&prop)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) +{ + FIXME("%p,%s,%d: stub\n", iface, wine_dbgstr_variant(&prop), reserved); + return E_NOTIMPL; +} + +static const IADsVtbl IADs_vtbl = +{ + ldapns_QueryInterface, + ldapns_AddRef, + ldapns_Release, + ldapns_GetTypeInfoCount, + ldapns_GetTypeInfo, + ldapns_GetIDsOfNames, + ldapns_Invoke, + ldapns_get_Name, + ldapns_get_Class, + ldapns_get_GUID, + ldapns_get_ADsPath, + ldapns_get_Parent, + ldapns_get_Schema, + ldapns_GetInfo, + ldapns_SetInfo, + ldapns_Get, + ldapns_Put, + ldapns_GetEx, + ldapns_PutEx, + ldapns_GetInfoEx +}; + +static HRESULT LDAPNamespace_create(REFIID riid, void **obj) +{ + LDAP_namespace *ldap; + HRESULT hr; + + ldap = heap_alloc(sizeof(*ldap)); + if (!ldap) return E_OUTOFMEMORY; + + ldap->IADs_iface.lpVtbl = &IADs_vtbl; + ldap->ref = 1; + + hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); + IADs_Release(&ldap->IADs_iface); + + return hr; +} + +static const struct class_info +{ + const CLSID *clsid; + HRESULT (*constructor)(REFIID, void **); +} class_info[] = +{ + { &CLSID_ADSystemInfo, ADSystemInfo_create }, + { &CLSID_LDAPNamespace, LDAPNamespace_create }, +}; + typedef struct { IClassFactory IClassFactory_iface; - HRESULT (*constructor)(void **); -} ADSystemInfo_factory; + LONG ref; + const struct class_info *info; +} class_factory; -static inline ADSystemInfo_factory *impl_from_IClassFactory(IClassFactory *iface) +static inline class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, ADSystemInfo_factory, IClassFactory_iface); + return CONTAINING_RECORD(iface, class_factory, IClassFactory_iface); } static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *obj) @@ -283,19 +496,30 @@ static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, static ULONG WINAPI factory_AddRef(IClassFactory *iface) { - return 2; + class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&factory->ref); + + TRACE("(%p) ref %u\n", iface, ref); + + return ref; } static ULONG WINAPI factory_Release(IClassFactory *iface) { - return 1; + class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&factory->ref); + + TRACE("(%p) ref %u\n", iface, ref); + + if (!ref) + heap_free(factory); + + return ref; } static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - ADSystemInfo_factory *factory = impl_from_IClassFactory(iface); - IUnknown *unknown; - HRESULT hr; + class_factory *factory = impl_from_IClassFactory(iface); TRACE("%p,%s,%p\n", outer, debugstr_guid(riid), obj); @@ -304,13 +528,7 @@ static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *out *obj = NULL; if (outer) return CLASS_E_NOAGGREGATION; - hr = factory->constructor((void **)&unknown); - if (hr == S_OK) - { - hr = IUnknown_QueryInterface(unknown, riid, obj); - IUnknown_Release(unknown); - } - return hr; + return factory->info->constructor(riid, obj); } static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) @@ -328,21 +546,48 @@ static const struct IClassFactoryVtbl factory_vtbl = factory_LockServer }; -static ADSystemInfo_factory ADSystemInfo_cf = { { &factory_vtbl }, ADSystemInfo_create }; +static HRESULT factory_constructor(const struct class_info *info, REFIID riid, void **obj) +{ + class_factory *factory; + HRESULT hr; + + factory = heap_alloc(sizeof(*factory)); + if (!factory) return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &factory_vtbl; + factory->ref = 1; + factory->info = info; + + hr = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, obj); + IClassFactory_Release(&factory->IClassFactory_iface); + + return hr; +} HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) { + const struct class_info *info = NULL; + int i; + TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj); if (!clsid || !iid || !obj) return E_INVALIDARG; *obj = NULL; - if (IsEqualGUID(clsid, &CLSID_ADSystemInfo)) - return IClassFactory_QueryInterface(&ADSystemInfo_cf.IClassFactory_iface, iid, obj); + for (i = 0; i < ARRAY_SIZE(class_info); i++) + { + if (IsEqualCLSID(class_info[i].clsid, clsid)) + { + info = &class_info[i]; + break; + } + } + + if (info) + return factory_constructor(info, iid, obj); - FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); - return CLASS_E_CLASSNOTAVAILABLE; + return ADSLDP_DllGetClassObject(clsid, iid, obj); } HRESULT WINAPI DllCanUnloadNow(void) diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl index c2f7504d0c..634aa36327 100644 --- a/dlls/adsldp/adsldp.idl +++ b/dlls/adsldp/adsldp.idl @@ -18,8 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy #pragma makedep register +[ + helpstring("LDAP Namespace Object"), + progid("LDAPNamespace"), + uuid(228d9a82-c302-11cf-9aa4-00aa004a5691), + threading(both) +] +coclass ADs { } + [ helpstring("AD System Info Object"), uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e), diff --git a/dlls/adsldp/adsldp.rgs b/dlls/adsldp/adsldp.rgs new file mode 100644 index 0000000000..0da0946832 --- /dev/null +++ b/dlls/adsldp/adsldp.rgs @@ -0,0 +1,16 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove ADs + { + NoRemove Providers + { + ForceRemove 'LDAP' = s 'LDAPNamespace' + } + } + } + } +} diff --git a/dlls/adsldp/rsrc.rc b/dlls/adsldp/rsrc.rc new file mode 100644 index 0000000000..914fe0b2f3 --- /dev/null +++ b/dlls/adsldp/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * 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 + */ + +/* @makedep: adsldp.rgs */ +1 WINE_REGISTRY adsldp.rgs -- 2.20.1

1 0

[PATCH 1/5] include: Add adserr.h.
by Dmitry Timoshkov 16 Dec '19

16 Dec '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/adserr.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 include/adserr.h diff --git a/include/adserr.h b/include/adserr.h new file mode 100644 index 0000000000..83da568763 --- /dev/null +++ b/include/adserr.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2019 Dmitry Timoshkov + * + * 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 + */ + +#ifndef __ADSERR_H +#define __ADSERR_H + +#ifdef RC_INVOKED +#define _HRESULT_TYPEDEF_(x) (x) +#else +#define _HRESULT_TYPEDEF_(x) ((HRESULT)x) +#endif + +#define E_ADS_BAD_PATHNAME _HRESULT_TYPEDEF_(0x80005000) +#define E_ADS_INVALID_DOMAIN_OBJECT _HRESULT_TYPEDEF_(0x80005001) +#define E_ADS_INVALID_USER_OBJECT _HRESULT_TYPEDEF_(0x80005002) +#define E_ADS_INVALID_COMPUTER_OBJECT _HRESULT_TYPEDEF_(0x80005003) +#define E_ADS_UNKNOWN_OBJECT _HRESULT_TYPEDEF_(0x80005004) +#define E_ADS_PROPERTY_NOT_SET _HRESULT_TYPEDEF_(0x80005005) +#define E_ADS_PROPERTY_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80005006) +#define E_ADS_PROPERTY_INVALID _HRESULT_TYPEDEF_(0x80005007) +#define E_ADS_BAD_PARAMETER _HRESULT_TYPEDEF_(0x80005008) +#define E_ADS_OBJECT_UNBOUND _HRESULT_TYPEDEF_(0x80005009) +#define E_ADS_PROPERTY_NOT_MODIFIED _HRESULT_TYPEDEF_(0x8000500A) +#define E_ADS_PROPERTY_MODIFIED _HRESULT_TYPEDEF_(0x8000500B) +#define E_ADS_CANT_CONVERT_DATATYPE _HRESULT_TYPEDEF_(0x8000500C) +#define E_ADS_PROPERTY_NOT_FOUND _HRESULT_TYPEDEF_(0x8000500D) +#define E_ADS_OBJECT_EXISTS _HRESULT_TYPEDEF_(0x8000500E) +#define E_ADS_SCHEMA_VIOLATION _HRESULT_TYPEDEF_(0x8000500F) +#define E_ADS_COLUMN_NOT_SET _HRESULT_TYPEDEF_(0x80005010) +#define S_ADS_ERRORSOCCURRED _HRESULT_TYPEDEF_(0x00005011) +#define S_ADS_NOMORE_ROWS _HRESULT_TYPEDEF_(0x00005012) +#define S_ADS_NOMORE_COLUMNS _HRESULT_TYPEDEF_(0x00005013) +#define E_ADS_INVALID_FILTER _HRESULT_TYPEDEF_(0x80005014) + +#endif /* __ADSERR_H */ -- 2.20.1

1 0

[PATCH] msado15: Implement _Recordset get_CursorLocation and put_CursorLocation.
by Alistair Leslie-Hughes 16 Dec '19

16 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 5 +++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1d28d6b957..1f16add4c3 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -43,6 +43,7 @@ struct recordset LONG allocated; LONG index; VARIANT *data; + CursorLocationEnum cursor_location; }; struct fields @@ -1229,14 +1230,24 @@ static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affec static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = recordset->cursor_location; + + return S_OK; } static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + recordset->cursor_location = cursor_loc; + + return S_OK; } static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set ) @@ -1524,6 +1535,7 @@ HRESULT Recordset_create( void **obj ) recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->cursor_location = adUseServer; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..215617e1ef 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -65,6 +65,7 @@ static void test_Recordset(void) Field *field; LONG refs, count, state; VARIANT missing, val, index; + CursorLocationEnum location; BSTR name; HRESULT hr; @@ -132,6 +133,10 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %d\n", state ); + hr = _Recordset_get_CursorLocation( recordset, &location ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( location == adUseServer, "got %d\n", location ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.17.1

1 0

[PATCH v2 1/3] qedit/samplegrabber: Clean up the pins in sample_grabber_destroy().
by Zebediah Figura 16 Dec '19

16 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/samplegrabber.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index f8d90a5c0df..bf968fe2129 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -111,6 +111,8 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) SG_Impl *filter = impl_from_strmbase_filter(iface); SampleGrabber_cleanup(filter); + strmbase_sink_cleanup(&filter->sink); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); } -- 2.24.0

2 4

[PATCH 1/3] qedit/samplegrabber: Clean up the pins in sample_grabber_destroy().
by Zebediah Figura 15 Dec '19

15 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/samplegrabber.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 63dab8f9ed5..115beec8822 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -109,6 +109,8 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) SG_Impl *filter = impl_from_strmbase_filter(iface); SampleGrabber_cleanup(filter); + strmbase_sink_cleanup(&filter->sink); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); } -- 2.24.0

2 4

[PATCH] winegstreamer: Clear the "reader" and "allocator" fields if connection fails.
by Zebediah Figura 15 Dec '19

15 Dec '19

This fixes a regression introduced by dafe81dfcb2b8896024e9d071e4bf4553e4a4018. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3945d9da8f..869a15b619 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1393,6 +1393,8 @@ static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, co if (FAILED(hr = IMemAllocator_Commit(filter->alloc))) { WARN("Failed to commit allocator, hr %#x.\n", hr); + IMemAllocator_Release(filter->alloc); + filter->alloc = NULL; goto err; } @@ -1400,6 +1402,7 @@ static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, co err: GST_RemoveOutputPins(filter); IAsyncReader_Release(filter->reader); + filter->reader = NULL; return hr; } -- 2.24.1

1 0

[PATCH] ntdll: Return -1 from Unix code page conversion functions if an error was encountered.
by Zebediah Figura 15 Dec '19

15 Dec '19

If 0 is returned, the caller has no way of determining this. This fixes a test failure in kernel32:change introduced by f46fa9c92. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 4c95169366..d9e4e8086e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -643,7 +643,7 @@ int ntdll_umbstowcs( DWORD flags, const char *src, int srclen, WCHAR *dst, int d if (!dstlen) dst = NULL; status = RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - if (status && status != STATUS_SOME_NOT_MAPPED) return 0; + if (status && status != STATUS_SOME_NOT_MAPPED) return -1; reslen /= sizeof(WCHAR); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ if (reslen && dst) RtlNormalizeString( NormalizationC, dst, reslen, dst, (int *)&reslen ); @@ -666,7 +666,7 @@ int ntdll_wcstoumbs( DWORD flags, const WCHAR *src, int srclen, char *dst, int d if (used) *used = 0; /* all chars are valid for UTF-8 */ if (!dstlen) dst = NULL; status = RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); - if (status && status != STATUS_SOME_NOT_MAPPED) return 0; + if (status && status != STATUS_SOME_NOT_MAPPED) return -1; return reslen; } -- 2.24.1

1 0

[PATCH] rpcrt4: Fix RpcNetworkIsProtseqValid[AW] spec file entries
by André Hentschel 15 Dec '19

15 Dec '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 6d7d0fbf7ac..5d558bff753 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -413,8 +413,8 @@ @ stdcall RpcMgmtWaitServerListen() @ stdcall RpcNetworkInqProtseqsA(ptr) @ stdcall RpcNetworkInqProtseqsW(ptr) -@ stdcall RpcNetworkIsProtseqValidA(ptr) -@ stdcall RpcNetworkIsProtseqValidW(ptr) +@ stdcall RpcNetworkIsProtseqValidA(str) +@ stdcall RpcNetworkIsProtseqValidW(wstr) @ stub RpcNsBindingInqEntryNameA @ stub RpcNsBindingInqEntryNameW @ stub RpcObjectInqType -- 2.17.1

1 0

[PATCH] mapi32: Fix some spec file entries
by André Hentschel 15 Dec '19

15 Dec '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/mapi32/mapi32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 0b5acbb7372..32d0b7a458b 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -95,7 +95,7 @@ 152 stub OpenTnefStreamEx 153 stub GetTnefStreamCodepage@12 154 stub GetTnefStreamCodepage -155 stdcall UlFromSzHex@4(ptr) UlFromSzHex +155 stdcall UlFromSzHex@4(wstr) UlFromSzHex 156 stub UNKOBJ_ScAllocate@12 157 stub UNKOBJ_ScAllocateMore@16 158 stub UNKOBJ_Free@8 @@ -144,7 +144,7 @@ 204 stub EncodeID@12 205 stub FDecodeID@12 206 stub CchOfEncoding@4 -207 stdcall CbOfEncoded@4(ptr) CbOfEncoded +207 stdcall CbOfEncoded@4(str) CbOfEncoded 208 stdcall MAPISendDocuments(long str str str long) 209 stdcall MAPILogon(long str str long long ptr) 210 stdcall MAPILogoff(ptr long long long) -- 2.17.1

1 0

[PATCH] kernel32: Fix some spec file entries
by André Hentschel 15 Dec '19

15 Dec '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/kernel32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 408ea415401..b62058a0a8b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1558,8 +1558,8 @@ @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @ stdcall VerifyConsoleIoHandle(long) # @ stub VerifyScripts -@ stdcall VerifyVersionInfoA(long long int64) -@ stdcall VerifyVersionInfoW(long long int64) +@ stdcall VerifyVersionInfoA(ptr long int64) +@ stdcall VerifyVersionInfoW(ptr long int64) @ stdcall -import VirtualAlloc(ptr long long long) @ stdcall -import VirtualAllocEx(long ptr long long long) @ stdcall -import VirtualAllocExNuma(long ptr long long long long) @@ -1632,7 +1632,7 @@ @ stdcall WritePrivateProfileStructW(wstr wstr ptr long wstr) @ stdcall -import WriteProcessMemory(long ptr ptr long ptr) @ stdcall WriteProfileSectionA(str str) -@ stdcall WriteProfileSectionW(str str) +@ stdcall WriteProfileSectionW(wstr wstr) @ stdcall WriteProfileStringA(str str str) @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) -- 2.17.1

2 1

Wine staging 5.0 rc1 release
by Alistair Leslie-Hughes 14 Dec '19

14 Dec '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc1 (825 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * kernel32: Convert scsi device type in SCSI_getprocentry. * kernel32: Add support for reading scsi devices from sysfs. * wusa: Implement basic installation logic. * wusa: Ignore systemProtection subkey of registry key. * wusa: Treat empty update list as error. * wusa: Implement WOW64 support. * wusa: Improve tracing of installation process. * wusa: Print warning when encountering msdelta compressed files. * wined3d: Silence extremely noisy FIXME in wined3d_texture_add_dirty_region. * ole32: Correctly parse unicode property storage dictionaries. Added: * none Updated: * d2d1-ID2D1Factory1 * Compiler_Warnings * kernelbase-ReOpenFile * wintab32-improvements * winebuild-Fake_Dlls patchset Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 5/5] wined3d: Implement mapping Vulkan buffers.
by Henri Verbeet 13 Dec '19

13 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 56 ++++++++++-- dlls/wined3d/context.c | 195 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/resource.c | 26 ++++++ dlls/wined3d/wined3d_private.h | 23 +++++ 4 files changed, 293 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7d501b4b08f..87e21b0b41f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -233,6 +233,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_vk->vk_device = vk_device; VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); + device_vk->vk_queue_family_index = queue_family_index; device_vk->vk_info = *vk_info; #define LOAD_DEVICE_PFN(name) \ @@ -490,20 +491,65 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) static void *adapter_vk_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { - if (data->buffer_object) + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + VkCommandBuffer vk_command_buffer; + VkBufferMemoryBarrier vk_barrier; + struct wined3d_bo_vk *bo; + void *map_ptr; + VkResult vr; + + if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + return data->addr; + + vk_info = context_vk->vk_info; + device_vk = wined3d_device_vk(context->device); + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return NULL; + } + + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); + vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = bo->vk_buffer; + vk_barrier.offset = (uintptr_t)data->addr; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + wined3d_context_vk_submit_command_buffer(context_vk); + wined3d_context_vk_wait_command_buffer(context_vk, context_vk->current_command_buffer.id - 1); + + if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, + (uintptr_t)data->addr, size, 0, &map_ptr))) < 0) { - ERR("Unsupported buffer object %#lx.\n", data->buffer_object); + ERR("Failed to map buffer, vr %s.\n", wined3d_debug_vkresult(vr)); return NULL; } - return data->addr; + return map_ptr; } static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges) { - if (data->buffer_object) - ERR("Unsupported buffer object %#lx.\n", data->buffer_object); + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + struct wined3d_bo_vk *bo; + + if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + return; + + vk_info = wined3d_context_vk(context)->vk_info; + device_vk = wined3d_device_vk(context->device); + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); } static void adapter_vk_copy_bo_address(struct wined3d_context *context, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5d88d4463f9..e4eee88a37e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1561,8 +1561,52 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); } +static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + SIZE_T i = 0; + + while (i < context_vk->submitted.buffer_count) + { + buffer = &context_vk->submitted.buffers[i]; + if (VK_CALL(vkGetFenceStatus(device_vk->vk_device, buffer->vk_fence)) == VK_NOT_READY) + { + ++i; + continue; + } + + TRACE("Command buffer %p with id 0x%s has finished.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + + if (buffer->id > context_vk->completed_command_buffer_id) + context_vk->completed_command_buffer_id = buffer->id; + *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; + } +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) { + struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + if (buffer->vk_command_buffer) + { + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + buffer->vk_command_buffer = VK_NULL_HANDLE; + } + VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); + + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = buffer->id; + wined3d_context_vk_cleanup_resources(context_vk); + heap_free(context_vk->submitted.buffers); wined3d_context_cleanup(&context_vk->c); } @@ -1965,6 +2009,135 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } +VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkCommandBufferAllocateInfo command_buffer_info; + struct wined3d_command_buffer_vk *buffer; + VkCommandBufferBeginInfo begin_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (buffer->vk_command_buffer) + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } + + command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + command_buffer_info.pNext = NULL; + command_buffer_info.commandPool = context_vk->vk_command_pool; + command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + command_buffer_info.commandBufferCount = 1; + if ((vr = VK_CALL(vkAllocateCommandBuffers(device_vk->vk_device, + &command_buffer_info, &buffer->vk_command_buffer))) < 0) + { + WARN("Failed to allocate Vulkan command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_NULL_HANDLE; + } + + begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; + begin_info.pNext = NULL; + begin_info.flags = 0; + begin_info.pInheritanceInfo = NULL; + if ((vr = VK_CALL(vkBeginCommandBuffer(buffer->vk_command_buffer, &begin_info))) < 0) + { + WARN("Failed to begin command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, context_vk->vk_command_pool, + 1, &buffer->vk_command_buffer)); + return buffer->vk_command_buffer = VK_NULL_HANDLE; + } + + TRACE("Created new command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + return buffer->vk_command_buffer; +} + +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + VkFenceCreateInfo fence_desc; + VkSubmitInfo submit_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (!buffer->vk_command_buffer) + return; + + TRACE("Submitting command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); + + fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_desc.pNext = NULL; + fence_desc.flags = 0; + if ((vr = VK_CALL(vkCreateFence(device_vk->vk_device, &fence_desc, NULL, &buffer->vk_fence))) < 0) + ERR("Failed to create fence, vr %s.\n", wined3d_debug_vkresult(vr)); + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &buffer->vk_command_buffer; + submit_info.signalSemaphoreCount = 0; + submit_info.pSignalSemaphores = NULL; + + if ((vr = VK_CALL(vkQueueSubmit(device_vk->vk_queue, 1, &submit_info, buffer->vk_fence))) < 0) + ERR("Failed to submit command buffer %p, vr %s.\n", + buffer->vk_command_buffer, wined3d_debug_vkresult(vr)); + + if (!wined3d_array_reserve((void **)&context_vk->submitted.buffers, &context_vk->submitted.buffers_size, + context_vk->submitted.buffer_count + 1, sizeof(*context_vk->submitted.buffers))) + ERR("Failed to grow submitted command buffer array.\n"); + + context_vk->submitted.buffers[context_vk->submitted.buffer_count++] = *buffer; + + buffer->vk_command_buffer = VK_NULL_HANDLE; + /* We don't expect this to ever happen, but handle it anyway. */ + if (!++buffer->id) + { + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = 0; + buffer->id = 1; + } + wined3d_context_vk_cleanup_resources(context_vk); +} + +void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + SIZE_T i; + + if (id <= context_vk->completed_command_buffer_id) + return; + + for (i = 0; i < context_vk->submitted.buffer_count; ++i) + { + if (context_vk->submitted.buffers[i].id != id) + continue; + + VK_CALL(vkWaitForFences(device_vk->vk_device, 1, + &context_vk->submitted.buffers[i].vk_fence, VK_TRUE, UINT64_MAX)); + wined3d_context_vk_cleanup_resources(context_vk); + return; + } + + ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); +} + static void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; @@ -2412,13 +2585,31 @@ fail: HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { + VkCommandPoolCreateInfo command_pool_info; + const struct wined3d_vk_info *vk_info; struct wined3d_adapter_vk *adapter_vk; + struct wined3d_device_vk *device_vk; + VkResult vr; TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); wined3d_context_init(&context_vk->c, swapchain); - adapter_vk = wined3d_adapter_vk(swapchain->device->adapter); - context_vk->vk_info = &adapter_vk->vk_info; + device_vk = wined3d_device_vk(swapchain->device); + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + context_vk->vk_info = vk_info = &adapter_vk->vk_info; + + command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + command_pool_info.pNext = NULL; + command_pool_info.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; + command_pool_info.queueFamilyIndex = device_vk->vk_queue_family_index; + if ((vr = VK_CALL(vkCreateCommandPool(device_vk->vk_device, + &command_pool_info, NULL, &context_vk->vk_command_pool))) < 0) + { + ERR("Failed to create Vulkan command pool, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_context_cleanup(&context_vk->c); + return E_FAIL; + } + context_vk->current_command_buffer.id = 1; return WINED3D_OK; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index bba940f42cb..bbb892b328d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -549,3 +549,29 @@ unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *re return resource->multisample_type; } + +VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) +{ + VkAccessFlags flags = 0; + + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + flags |= VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT; + if (bind_flags & WINED3D_BIND_INDEX_BUFFER) + flags |= VK_ACCESS_INDEX_READ_BIT; + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + flags |= VK_ACCESS_UNIFORM_READ_BIT; + if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) + flags |= VK_ACCESS_SHADER_READ_BIT; + if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + flags |= VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT; + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER) + flags |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT; + if (bind_flags & WINED3D_BIND_RENDER_TARGET) + flags |= VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) + flags |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + FIXME("Ignoring some bind flags %#x.\n", bind_flags); + + return flags; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 934a422ede1..5beaa927d77 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -294,6 +294,7 @@ extern const struct min_lookup minMipLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HI extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; +VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { @@ -2158,11 +2159,29 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_command_buffer_vk +{ + uint64_t id; + VkCommandBuffer vk_command_buffer; + VkFence vk_fence; +}; + struct wined3d_context_vk { struct wined3d_context c; const struct wined3d_vk_info *vk_info; + + VkCommandPool vk_command_pool; + struct wined3d_command_buffer_vk current_command_buffer; + uint64_t completed_command_buffer_id; + + struct + { + struct wined3d_command_buffer_vk *buffers; + SIZE_T buffers_size; + SIZE_T buffer_count; + } submitted; }; static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_context *context) @@ -2175,8 +2194,11 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); @@ -3350,6 +3372,7 @@ struct wined3d_device_vk VkDevice vk_device; VkQueue vk_queue; + uint32_t vk_queue_family_index; struct wined3d_vk_info vk_info; }; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs().
by Henri Verbeet 13 Dec '19

13 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89134207243..cdc65a6fa71 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1002,13 +1002,15 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) context_release(context); return; } - wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); + + context_gl = wined3d_context_gl(context); + + wined3d_ffp_blitter_create(&device->blitter, context_gl->gl_info); if (!wined3d_glsl_blitter_create(&device->blitter, device)) wined3d_arbfp_blitter_create(&device->blitter, device); - wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); - wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); + wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); + wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - context_gl = wined3d_context_gl(context); wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); wined3d_device_create_default_samplers(device, context); context_release(context); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Store a gl_info pointer in struct shader_arb_ctx_priv.
by Henri Verbeet 13 Dec '19

13 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 7 +++++-- dlls/wined3d/shader.c | 1 - dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9d98c79ce51..14ca883e761 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -237,6 +237,7 @@ struct shader_arb_ctx_priv NV3 } target_version; + const struct wined3d_gl_info *gl_info; const struct arb_vs_compile_args *cur_vs_args; const struct arb_ps_compile_args *cur_ps_args; const struct arb_ps_compiled_shader *compiled_fprog; @@ -1438,7 +1439,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD case WINED3D_SHADER_RESOURCE_TEXTURE_2D: if (pshader && priv->cur_ps_args->super.np2_fixup & (1u << sampler_idx) - && ins->ctx->gl_info->supported[ARB_TEXTURE_RECTANGLE]) + && priv->gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; else tex_type = "2D"; @@ -3301,7 +3302,7 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins) if(vshader) { if (priv->in_main_func) vshader_add_footer(priv, shader->backend_data, - priv->cur_vs_args, ins->ctx->reg_maps, ins->ctx->gl_info, buffer); + priv->cur_vs_args, ins->ctx->reg_maps, priv->gl_info, buffer); } shader_addline(buffer, "RET;\n"); @@ -3555,6 +3556,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.compiled_fprog = compiled; priv_ctx.cur_np2fixup_info = &compiled->np2fixup_info; @@ -4113,6 +4115,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); init_output_registers(shader, ps_input_sig, &priv_ctx, compiled); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3b9a96abc69..757631a73ef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2624,7 +2624,6 @@ HRESULT shader_generate_code(const struct wined3d_shader *shader, struct wined3d state.in_subroutine = FALSE; ctx.shader = shader; - ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.tex_mx = &tex_mx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 583d970eca8..934a422ede1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -79,6 +79,7 @@ struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; +struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; struct wined3d_texture_gl; @@ -1084,7 +1085,6 @@ struct wined3d_shader_parser_state struct wined3d_shader_context { const struct wined3d_shader *shader; - const struct wined3d_gl_info *gl_info; const struct wined3d_shader_reg_maps *reg_maps; struct wined3d_string_buffer *buffer; struct wined3d_shader_tex_mx *tex_mx; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Store a gl_info pointer in struct shader_glsl_ctx_priv.
by Henri Verbeet 13 Dec '19

13 Dec '19

Since the one in struct wined3d_shader_context is going away. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f05631ec595..25e97723255 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -271,7 +271,9 @@ struct glsl_program_key GLuint cs_id; }; -struct shader_glsl_ctx_priv { +struct shader_glsl_ctx_priv +{ + const struct wined3d_gl_info *gl_info; const struct vs_compile_args *cur_vs_args; const struct ds_compile_args *cur_ds_args; const struct ps_compile_args *cur_ps_args; @@ -2651,8 +2653,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader *shader = ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ctx->backend_data; const char *prefix = shader_glsl_get_prefix(version->type); + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param rel_param0, rel_param1; if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) @@ -2674,8 +2677,6 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INCONTROLPOINT: if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - struct shader_glsl_ctx_priv *priv = ctx->backend_data; - if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); if (is_swizzled && priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) @@ -3353,7 +3354,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { enum wined3d_shader_resource_type resource_type; struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; BOOL texrect = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL @@ -3854,8 +3855,9 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param src0_param; DWORD write_mask; @@ -4979,9 +4981,10 @@ static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); - if (!ins->ctx->gl_info->supported[ARB_CLIP_CONTROL]) + if (!priv->gl_info->supported[ARB_CLIP_CONTROL]) shader_glsl_fixup_position(ins->ctx->buffer, reg_maps->viewport_array); if (!stream) @@ -5186,7 +5189,8 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, dx_param, dy_param; struct glsl_sample_function sample_function; DWORD sampler_idx; @@ -5214,7 +5218,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *shader_version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD swizzle = ins->src[1].swizzle; @@ -5769,8 +5774,9 @@ static BOOL is_mipmapped(enum wined3d_shader_resource_type resource_type) static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; enum wined3d_shader_resource_type resource_type; enum wined3d_shader_register_type reg_type; unsigned int resource_idx, bind_idx, i; @@ -5858,7 +5864,8 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader_dst_param *dst = ins->dst; const struct wined3d_shader_src_param *src = ins->src; @@ -6060,9 +6067,10 @@ static void shader_glsl_gen_sample_c_lz_emulation(const struct wined3d_shader_in static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; unsigned int resource_idx, sampler_idx, sampler_bind_idx; const struct wined3d_shader_resource_info *resource_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; @@ -6110,8 +6118,9 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) unsigned int resource_param_idx, resource_idx, sampler_idx, sampler_bind_idx, component_idx; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct glsl_src_param coord_param, compare_param, offset_param; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; const struct wined3d_shader_resource_info *resource_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; unsigned int coord_size, offset_size; @@ -7574,6 +7583,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ DWORD map; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; @@ -7927,6 +7937,7 @@ static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; priv_ctx.string_buffers = string_buffers; @@ -8071,6 +8082,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl * unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8164,6 +8176,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ds_args = args; priv_ctx.string_buffers = string_buffers; @@ -8262,6 +8275,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8351,7 +8365,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_context *ctx) { const struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ctx->buffer; const struct wined3d_shader *shader = ctx->shader; @@ -8388,6 +8402,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Create Vulkan buffers.
by Henri Verbeet 13 Dec '19

13 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 17 ++++++++++ dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/context.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 21 ++++++++++++ 4 files changed, 173 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4ec68013017..7d501b4b08f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -555,6 +555,23 @@ static void adapter_vk_destroy_swapchain(struct wined3d_swapchain *swapchain) heap_free(swapchain); } +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) +{ + const VkPhysicalDeviceMemoryProperties *memory_info = &adapter_vk->memory_properties; + unsigned int i; + + for (i = 0; i < memory_info->memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + if ((memory_info->memoryTypes[i].propertyFlags & flags) == flags) + return i; + } + + return ~0u; +} + static HRESULT adapter_vk_create_buffer(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5da6aec4fb8..4f3c28fe0b1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1554,6 +1554,44 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } +static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_resource *resource = &buffer_vk->b.resource; + uint32_t bind_flags = resource->bind_flags; + VkMemoryPropertyFlags memory_type; + VkBufferUsageFlags usage; + + usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + usage |= VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_INDEX_BUFFER) + usage |= VK_BUFFER_USAGE_INDEX_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + usage |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) + usage |= VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + usage |= VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER) + usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; + if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) + FIXME("Ignoring some bind flags %#x.\n", bind_flags); + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT + | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + { + WARN("Failed to create Vulkan buffer.\n"); + return FALSE; + } + + buffer_vk->b.buffer_object = (uintptr_t)&buffer_vk->bo; + buffer_invalidate_bo_range(&buffer_vk->b, 0, 0); + + return TRUE; +} + static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { @@ -1563,8 +1601,10 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, return wined3d_resource_prepare_sysmem(&buffer->resource); case WINED3D_LOCATION_BUFFER: - /* The Vulkan buffer is created during resource creation. */ - return TRUE; + if (buffer->buffer_object) + return TRUE; + + return wined3d_buffer_vk_create_buffer_object(wined3d_buffer_vk(buffer), wined3d_context_vk(context)); default: FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); @@ -1575,7 +1615,24 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { - FIXME("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(buffer); + + TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + + switch (location) + { + case WINED3D_LOCATION_BUFFER: + wined3d_context_vk_destroy_bo(context_vk, &buffer_vk->bo); + buffer_vk->bo.vk_buffer = VK_NULL_HANDLE; + buffer_vk->bo.vk_memory = VK_NULL_HANDLE; + buffer_vk->b.buffer_object = 0u; + break; + + default: + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + break; + } } static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, @@ -1605,6 +1662,9 @@ HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined TRACE("buffer_vk %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", buffer_vk, device, desc, data, parent, parent_ops); + if (desc->access & WINED3D_RESOURCE_ACCESS_GPU) + buffer_vk->b.flags |= WINED3D_BUFFER_USE_BO; + return wined3d_buffer_init(&buffer_vk->b, device, desc, data, parent, parent_ops, &wined3d_buffer_vk_ops); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 95769014af6..5d88d4463f9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,6 +1493,74 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryRequirements memory_requirements; + struct wined3d_adapter_vk *adapter_vk; + VkMemoryAllocateInfo allocate_info; + VkBufferCreateInfo create_info; + VkResult vr; + + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.size = size; + create_info.usage = usage; + create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + create_info.queueFamilyIndexCount = 0; + create_info.pQueueFamilyIndices = NULL; + + if ((vr = VK_CALL(vkCreateBuffer(device_vk->vk_device, &create_info, NULL, &bo->vk_buffer))) < 0) + { + ERR("Failed to create Vulkan buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return FALSE; + } + + VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_requirements.size; + allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_requirements.memoryTypeBits, memory_type); + if (allocate_info.memoryTypeIndex == ~0u) + { + ERR("Failed to find suitable memory type.\n"); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) + { + ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) + { + ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + return TRUE; +} + +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) { wined3d_context_cleanup(&context_vk->c); @@ -2344,9 +2412,13 @@ fail: HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { + struct wined3d_adapter_vk *adapter_vk; + TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); wined3d_context_init(&context_vk->c, swapchain); + adapter_vk = wined3d_adapter_vk(swapchain->device->adapter); + context_vk->vk_info = &adapter_vk->vk_info; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21f17736ec7..583d970eca8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1512,6 +1512,12 @@ do { \ #define checkGLcall(A) do {} while(0) #endif +struct wined3d_bo_vk +{ + VkBuffer vk_buffer; + VkDeviceMemory vk_memory; +}; + struct wined3d_bo_address { UINT_PTR buffer_object; @@ -2155,9 +2161,20 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context struct wined3d_context_vk { struct wined3d_context c; + + const struct wined3d_vk_info *vk_info; }; +static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_vk, c); +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, + const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -2929,6 +2946,8 @@ static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapt struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; struct wined3d_caps_gl_ctx { @@ -4208,6 +4227,8 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined struct wined3d_buffer_vk { struct wined3d_buffer b; + + struct wined3d_bo_vk bo; }; static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer) -- 2.11.0

1 0

[PATCH] dmloader: Use wide-char string literals
by Michael Stefaniuc 13 Dec '19

13 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/loader.c | 8 ++++---- dlls/dmloader/tests/loader.c | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index a267d2d6b2..66c0f92b1b 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -609,7 +609,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *iface, REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - static const WCHAR wszAny[] = {'*',0}; WIN32_FIND_DATAW FileData; HANDLE hSearch; WCHAR wszSearchString[MAX_PATH]; @@ -631,11 +630,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * p = wszSearchString + lstrlenW(wszSearchString); if (p > wszSearchString && p[-1] != '\\') *p++ = '\\'; *p++ = '*'; /* any file */ - if (lstrcmpW (pwzFileExtension, wszAny)) *p++ = '.'; /* if we have actual extension, put a dot */ + if (lstrcmpW (pwzFileExtension, L"*")) + *p++ = '.'; /* if we have actual extension, put a dot */ lstrcpyW (p, pwzFileExtension); - + TRACE(": search string: %s\n", debugstr_w(wszSearchString)); - + hSearch = FindFirstFileW (wszSearchString, &FileData); if (hSearch == INVALID_HANDLE_VALUE) { TRACE(": no files found\n"); diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 0ab2e9eaba..bd6797f135 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -48,23 +48,22 @@ static void test_directory(void) { IDirectMusicLoader8 *loader = NULL; HRESULT hr; - WCHAR con[] = {'c', 'o', 'n', 0}; WCHAR path[MAX_PATH]; - WCHAR empty[] = {0}; - WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0}; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); /* ScanDirectory without a previous SetSearchDirectory isn't failing */ - hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, + (WCHAR *)L"con", NULL); ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); /* SetSearchDirectory with invalid path */ hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, NULL, 0); ok(hr == E_POINTER, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, invalid_path, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, + (WCHAR *)L"/invalid path", 0); ok(hr == DMUS_E_LOADER_BADPATH, "SetSearchDirectory failed with %#x\n", hr); /* SetSearchDirectory with the current directory */ @@ -88,7 +87,7 @@ static void test_directory(void) IDirectMusicLoader_SetSearchDirectory(loader, NULL, path, 0); /* Crashes on Windows */ hr = IDirectMusicLoader_SetSearchDirectory(loader, &IID_IDirectMusicLoader8, path, 0); ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_ScanDirectory(loader, &GUID_DirectMusicAllTypes, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"con", NULL); ok(hr == REGDB_E_CLASSNOTREG, "ScanDirectory failed, received %#x\n", hr); /* NULL extension is not an error */ @@ -101,11 +100,12 @@ static void test_directory(void) hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"", 0); ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"", 0); ok(hr == S_FALSE, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, + (WCHAR *)L"con", NULL); ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); IDirectMusicLoader_Release(loader); } @@ -477,7 +477,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc; HRESULT hr; DWORD valid; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -562,7 +561,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -596,7 +595,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

1 0

[PATCH v2 2/2] gdiplus: GdipGraphicsClear() should overwrite pixels, not alpha blend
by Damjan Jovanovic 13 Dec '19

13 Dec '19

All sample code in the Python Pyglet library suffers from terrible text corruption, caused by the inability to erase the background between rendering sequential font glyphs, resulting in leftovers from previous letters mixing with the image of new letters. This is because it attempts to erase the background by calling GdipGraphicsClear() with ARGB color 0x00000000 (completely transparent black), and in our gdiplus alpha blending that into the background has no effect. It should be using CompositeModeSourceCopy to overwrite the background with that brush instead. Try 2 split the patch. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30506 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/tests/image.c | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+)

2 1

[PATCH v2 1/2] gdiplus: start implementing CompositingModeSourceCopy
by Damjan Jovanovic 13 Dec '19

13 Dec '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30506 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdiplus/graphics.c | 22 +++++++++++++++------- dlls/gdiplus/tests/image.c | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-)

2 1

[PATCH 01/11] jscript: Implement ScriptTypeInfo_GetNames.
by Gabriel Ivăncescu 13 Dec '19

13 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 85 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6cc6df5..9e33737 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -625,6 +625,44 @@ typedef struct { jsdisp_t *jsdisp; } ScriptTypeInfo; +static struct typeinfo_func *get_func_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_funcs; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + MEMBERID func_memid = prop_to_id(typeinfo->jsdisp, typeinfo->funcs[i].prop); + + if (memid == func_memid) + return &typeinfo->funcs[i]; + else if (memid < func_memid) + b = i; + else + a = i + 1; + } + return NULL; +} + +static dispex_prop_t *get_var_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_vars; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + MEMBERID var_memid = prop_to_id(typeinfo->jsdisp, typeinfo->vars[i]); + + if (memid == var_memid) + return typeinfo->vars[i]; + else if (memid < var_memid) + b = i; + else + a = i + 1; + } + return NULL; +} + static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) { return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); @@ -786,10 +824,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, UINT cMaxNames, UINT *pcNames) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + struct typeinfo_func *func; + ITypeInfo *disp_typeinfo; + dispex_prop_t *var; + HRESULT hr; + UINT i = 0; - FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); - return E_NOTIMPL; + if (!rgBstrNames || !pcNames) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func) + { + var = get_var_from_memid(This, memid); + if (!var) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetNames(disp_typeinfo, memid, rgBstrNames, cMaxNames, pcNames); + } + } + + *pcNames = 0; + if (!cMaxNames) return S_OK; + + rgBstrNames[0] = SysAllocString(func ? func->prop->name : var->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + i++; + + if (func) + { + unsigned num = min(cMaxNames, func->code->param_cnt + 1); + + for (; i < num; i++) + { + if (!(rgBstrNames[i] = SysAllocString(func->code->params[i - 1]))) + { + do SysFreeString(rgBstrNames[--i]); while (i); + return E_OUTOFMEMORY; + } + } + } + + *pcNames = i; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) -- 2.21.0

2 21

[PATCH 8/8] msado15: Prevent multiple Open/Close of a _Recordset.
by Hans Leidekker 13 Dec '19

13 Dec '19

Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 5 +++++ dlls/msado15/tests/msado15.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 56cdee6652..1d28d6b957 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1035,6 +1035,8 @@ static HRESULT WINAPI recordset_Close( _Recordset *iface ) TRACE( "%p\n", recordset ); + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + close_recordset( recordset ); recordset->state = adStateClosed; return S_OK; @@ -1106,6 +1108,9 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); + if (!recordset->fields) return MAKE_ADO_HRESULT( adErrInvalidConnection ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->state = adStateOpen; return S_OK; } diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a3bce0b471..cba3d5fafc 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -114,6 +114,9 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !count, "got %d\n", count ); + hr = _Recordset_Close( recordset ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); @@ -135,7 +138,7 @@ static void test_Recordset(void) V_VT( &missing ) = VT_ERROR; V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); - todo_wine ok( hr == MAKE_ADO_HRESULT( adErrInvalidConnection ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidConnection ), "got %08x\n", hr ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); @@ -155,6 +158,9 @@ static void test_Recordset(void) ok( is_eof( recordset ), "not eof\n" ); ok( is_bof( recordset ), "not bof\n" ); + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08x\n", hr ); + state = -1; hr = _Recordset_get_State( recordset, &state ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 7/8] msado15: Add ISupportErrorInfo support to Field, Fields and _Recordset.
by Hans Leidekker 13 Dec '19

13 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 188 +++++++++++++++++++++++++++++------ dlls/msado15/tests/msado15.c | 32 ++++++ 2 files changed, 192 insertions(+), 28 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index cd623d0dc8..56cdee6652 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -34,36 +34,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct fields; struct recordset { - _Recordset Recordset_iface; - LONG refs; - LONG state; - struct fields *fields; - LONG count; - LONG allocated; - LONG index; - VARIANT *data; + _Recordset Recordset_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + LONG state; + struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields { - Fields Fields_iface; - LONG refs; - Field **field; - ULONG count; - ULONG allocated; - struct recordset *recordset; + Fields Fields_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + Field **field; + ULONG count; + ULONG allocated; + struct recordset *recordset; }; struct field { - Field Field_iface; - LONG refs; - WCHAR *name; - DataTypeEnum type; - LONG defined_size; - LONG attrs; - LONG index; - struct recordset *recordset; + Field Field_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + WCHAR *name; + DataTypeEnum type; + LONG defined_size; + LONG attrs; + LONG index; + struct recordset *recordset; }; static inline struct field *impl_from_Field( Field *iface ) @@ -95,6 +98,7 @@ static ULONG WINAPI field_Release( Field *iface ) static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **obj ) { + struct field *field = impl_from_Field( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID_Field ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -102,6 +106,10 @@ static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **ob { *obj = iface; } + else if (IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &field->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -368,12 +376,51 @@ static const struct FieldVtbl field_vtbl = field_get_Status }; +static inline struct field *field_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct field, ISupportErrorInfo_iface ); +} + +static HRESULT WINAPI field_supporterrorinfo_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + return Field_QueryInterface( &field->Field_iface, riid, obj ); +} + +static ULONG WINAPI field_supporterrorinfo_AddRef( ISupportErrorInfo *iface ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + return Field_AddRef( &field->Field_iface ); +} + +static ULONG WINAPI field_supporterrorinfo_Release( ISupportErrorInfo *iface ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + return Field_Release( &field->Field_iface ); +} + +static HRESULT WINAPI field_supporterrorinfo_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", field, debugstr_guid(riid) ); + return S_FALSE; +} + +static const ISupportErrorInfoVtbl field_supporterrorinfo_vtbl = +{ + field_supporterrorinfo_QueryInterface, + field_supporterrorinfo_AddRef, + field_supporterrorinfo_Release, + field_supporterrorinfo_InterfaceSupportsErrorInfo +}; + static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *recordset, Field **obj ) { struct field *field; if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; field->Field_iface.lpVtbl = &field_vtbl; + field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; if (!(field->name = strdupW( name ))) { heap_free( field ); @@ -416,6 +463,7 @@ static ULONG WINAPI fields_Release( Fields *iface ) static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void **obj ) { + struct fields *fields = impl_from_Fields( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID_Fields ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -423,6 +471,10 @@ static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void ** { *obj = iface; } + else if (IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &fields->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -626,12 +678,51 @@ static const struct FieldsVtbl fields_vtbl = fields_CancelUpdate }; +static inline struct fields *fields_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct fields, ISupportErrorInfo_iface ); +} + +static HRESULT WINAPI fields_supporterrorinfo_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + return Fields_QueryInterface( &fields->Fields_iface, riid, obj ); +} + +static ULONG WINAPI fields_supporterrorinfo_AddRef( ISupportErrorInfo *iface ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + return Fields_AddRef( &fields->Fields_iface ); +} + +static ULONG WINAPI fields_supporterrorinfo_Release( ISupportErrorInfo *iface ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + return Fields_Release( &fields->Fields_iface ); +} + +static HRESULT WINAPI fields_supporterrorinfo_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", fields, debugstr_guid(riid) ); + return S_FALSE; +} + +static const ISupportErrorInfoVtbl fields_supporterrorinfo_vtbl = +{ + fields_supporterrorinfo_QueryInterface, + fields_supporterrorinfo_AddRef, + fields_supporterrorinfo_Release, + fields_supporterrorinfo_InterfaceSupportsErrorInfo +}; + static HRESULT fields_create( struct recordset *recordset, struct fields **ret ) { struct fields *fields; if (!(fields = heap_alloc_zero( sizeof(*fields) ))) return E_OUTOFMEMORY; fields->Fields_iface.lpVtbl = &fields_vtbl; + fields->ISupportErrorInfo_iface.lpVtbl = &fields_supporterrorinfo_vtbl; fields->refs = 1; fields->recordset = recordset; _Recordset_AddRef( &fields->recordset->Recordset_iface ); @@ -686,18 +777,20 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, void **obj ) { + struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IDispatch) || - IsEqualIID(riid, &IID__ADO) || - IsEqualIID(riid, &IID_Recordset15) || - IsEqualIID(riid, &IID_Recordset20) || - IsEqualIID(riid, &IID_Recordset21) || + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || IsEqualIID(riid, &IID_Recordset15) || + IsEqualIID(riid, &IID_Recordset20) || IsEqualIID(riid, &IID_Recordset21) || IsEqualIID(riid, &IID__Recordset)) { *obj = iface; } + else if (IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &recordset->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -1379,12 +1472,51 @@ static const struct _RecordsetVtbl recordset_vtbl = recordset_Save }; +static inline struct recordset *recordset_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ISupportErrorInfo_iface ); +} + +static HRESULT WINAPI recordset_supporterrorinfo_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + return _Recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI recordset_supporterrorinfo_AddRef( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + return _Recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI recordset_supporterrorinfo_Release( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + return _Recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI recordset_supporterrorinfo_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", recordset, debugstr_guid(riid) ); + return S_FALSE; +} + +static const ISupportErrorInfoVtbl recordset_supporterrorinfo_vtbl = +{ + recordset_supporterrorinfo_QueryInterface, + recordset_supporterrorinfo_AddRef, + recordset_supporterrorinfo_Release, + recordset_supporterrorinfo_InterfaceSupportsErrorInfo +}; + HRESULT Recordset_create( void **obj ) { struct recordset *recordset; if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; + recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->refs = 1; recordset->index = -1; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 61040f691e..a3bce0b471 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -60,6 +60,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; LONG refs, count, state; @@ -70,6 +71,16 @@ static void test_Recordset(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + /* _Recordset object supports ISupportErrorInfo */ + errorinfo = NULL; + hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + if (errorinfo) ISupportErrorInfo_Release( errorinfo ); + refs = get_refs_recordset( recordset ); + ok( refs == 1, "got %d\n", refs ); + /* handing out fields object increases recordset refcount */ refs = get_refs_recordset( recordset ); ok( refs == 1, "got %d\n", refs ); @@ -255,6 +266,7 @@ static void test_Recordset(void) static void test_Fields(void) { _Recordset *recordset; + ISupportErrorInfo *errorinfo; Fields *fields; Field *field, *field2; VARIANT val, index; @@ -270,6 +282,16 @@ static void test_Fields(void) hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); + /* Fields object supports ISupportErrorInfo */ + errorinfo = NULL; + hr = Fields_QueryInterface( fields, &IID_ISupportErrorInfo, (void **)&errorinfo ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_fields( fields ); + ok( refs == 2, "got %d\n", refs ); + if (errorinfo) ISupportErrorInfo_Release( errorinfo ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + count = -1; hr = Fields_get_Count( fields, &count ); ok( !count, "got %d\n", count ); @@ -324,6 +346,16 @@ static void test_Fields(void) Field_Release( field2 ); SysFreeString( name ); + /* Field object supports ISupportErrorInfo */ + errorinfo = NULL; + hr = Field_QueryInterface( field, &IID_ISupportErrorInfo, (void **)&errorinfo ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_field( field ); + ok( refs == 2, "got %d\n", refs ); + if (errorinfo) ISupportErrorInfo_Release( errorinfo ); + refs = get_refs_field( field ); + ok( refs == 1, "got %d\n", refs ); + /* verify values set with _Append */ hr = Field_get_Name( field, &name ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 6/8] msado15: Implement _Recordset_MoveFirst and _Recordset_MoveLast.
by Hans Leidekker 13 Dec '19

13 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 16 +++++-- dlls/msado15/tests/msado15.c | 84 +++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b2bc93bb9c..cd623d0dc8 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -987,14 +987,22 @@ static HRESULT WINAPI recordset_MovePrevious( _Recordset *iface ) static HRESULT WINAPI recordset_MoveFirst( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + recordset->index = 0; + return S_OK; } static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + recordset->index = (recordset->count > 0) ? recordset->count - 1 : 0; + return S_OK; } static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 992fb4e8ce..61040f691e 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,8 +61,9 @@ static void test_Recordset(void) { _Recordset *recordset; Fields *fields, *fields2; + Field *field; LONG refs, count, state; - VARIANT missing; + VARIANT missing, val, index; BSTR name; HRESULT hr; @@ -131,6 +132,11 @@ static void test_Recordset(void) name = SysAllocString( L"field" ); hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); + + V_VT( &index ) = VT_BSTR; + V_BSTR( &index ) = name; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( name ); hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); @@ -158,6 +164,81 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( count == 1, "got %d\n", count ); + /* get_Fields still returns the same object */ + hr = _Recordset_get_Fields( recordset, &fields2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( fields2 == fields, "expected same object\n" ); + Fields_Release( fields2 ); + + count = -1; + hr = Fields_get_Count( fields2, &count ); + ok( count == 1, "got %d\n", count ); + + hr = Field_get_Value( field, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_EMPTY, "got %u\n", V_VT( &val ) ); + + V_VT( &val ) = VT_I4; + V_I4( &val ) = -1; + hr = Field_put_Value( field, val ); + ok( hr == S_OK, "got %08x\n", hr ); + + V_VT( &val ) = VT_ERROR; + V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; + hr = Field_get_Value( field, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "got %u\n", V_VT( &val ) ); + ok( V_I4( &val ) == -1, "got %d\n", V_I4( &val ) ); + + hr = _Recordset_AddNew( recordset, missing, missing ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* field object returns different value after AddNew */ + V_VT( &val ) = VT_ERROR; + V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; + hr = Field_get_Value( field, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_EMPTY, "got %u\n", V_VT( &val ) ); + + ok( !is_eof( recordset ), "eof\n" ); + ok( !is_bof( recordset ), "bof\n" ); + hr = _Recordset_MoveFirst( recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !is_eof( recordset ), "eof\n" ); + ok( !is_bof( recordset ), "bof\n" ); + + V_VT( &val ) = VT_ERROR; + V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; + hr = Field_get_Value( field, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "got %u\n", V_VT( &val ) ); + ok( V_I4( &val ) == -1, "got %d\n", V_I4( &val ) ); + + hr = _Recordset_MoveNext( recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !is_eof( recordset ), "eof\n" ); + ok( !is_bof( recordset ), "not bof\n" ); + + hr = _Recordset_MoveNext( recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( is_eof( recordset ), "not eof\n" ); + ok( !is_bof( recordset ), "bof\n" ); + + hr = _Recordset_MoveFirst( recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !is_eof( recordset ), "eof\n" ); + ok( !is_bof( recordset ), "bof\n" ); + + hr = _Recordset_MovePrevious( recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !is_eof( recordset ), "eof\n" ); + ok( is_bof( recordset ), "not bof\n" ); + + /* try get value at BOF */ + VariantInit( &val ); + hr = Field_get_Value( field, &val ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08x\n", hr ); + hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr ); @@ -166,6 +247,7 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %d\n", state ); + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); } -- 2.20.1

1 0

[PATCH 5/8] msado15: Implement _Recordset_MoveNext and _Recordset_MovePrevious.
by Hans Leidekker 13 Dec '19

13 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index bb089cfded..b2bc93bb9c 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -967,14 +967,22 @@ static HRESULT WINAPI recordset_Move( _Recordset *iface, LONG num_records, VARIA static HRESULT WINAPI recordset_MoveNext( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + if (recordset->index < recordset->count) recordset->index++; + return S_OK; } static HRESULT WINAPI recordset_MovePrevious( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + if (recordset->index >= 0) recordset->index--; + return S_OK; } static HRESULT WINAPI recordset_MoveFirst( _Recordset *iface ) -- 2.20.1

1 0

[PATCH 4/8] msado15: Implement _Recordset_get_RecordCount.
by Hans Leidekker 13 Dec '19

13 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 8 ++++++-- dlls/msado15/tests/msado15.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e7c7cdc409..bb089cfded 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -873,8 +873,12 @@ static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, LONG max_reco static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, LONG *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, count ); + + *count = recordset->count; + return S_OK; } static HRESULT WINAPI recordset_putref_Source( _Recordset *iface, IDispatch *source ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f003c2bb0f..992fb4e8ce 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -143,11 +143,21 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %d\n", state ); + count = -1; + hr = _Recordset_get_RecordCount( recordset, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); + hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); + count = -1; + hr = _Recordset_get_RecordCount( recordset, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 1, "got %d\n", count ); + hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 3/8] msado15: Implement _Recordset_get_BOF and _Recordset_get_EOF.
by Hans Leidekker 13 Dec '19

13 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 0f0cb24759..e7c7cdc409 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -772,8 +772,12 @@ static HRESULT WINAPI recordset_get_ActiveConnection( _Recordset *iface, VARIANT static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) { - FIXME( "%p, %p\n", iface, bof ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, bof ); + + *bof = (recordset->index < 0) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark ) @@ -814,8 +818,12 @@ static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnu static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) { - FIXME( "%p, %p\n", iface, eof ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, eof ); + + *eof = (!recordset->count || recordset->index >= recordset->count) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 855f138e47..f003c2bb0f 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,20 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static BOOL is_bof( _Recordset *recordset ) +{ + VARIANT_BOOL bof = VARIANT_FALSE; + _Recordset_get_BOF( recordset, &bof ); + return bof == VARIANT_TRUE; +} + +static BOOL is_eof( _Recordset *recordset ) +{ + VARIANT_BOOL eof = VARIANT_FALSE; + _Recordset_get_EOF( recordset, &eof ); + return eof == VARIANT_TRUE; +} + static LONG get_refs_field( Field *field ) { Field_AddRef( field ); @@ -121,6 +135,8 @@ static void test_Recordset(void) hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); + ok( is_eof( recordset ), "not eof\n" ); + ok( is_bof( recordset ), "not bof\n" ); state = -1; hr = _Recordset_get_State( recordset, &state ); @@ -129,6 +145,8 @@ static void test_Recordset(void) hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); + ok( !is_eof( recordset ), "eof\n" ); + ok( !is_bof( recordset ), "bof\n" ); hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 2/8] msado15: Implement _Recordset_get_State.
by Hans Leidekker 13 Dec '19

13 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 8 ++++++-- dlls/msado15/tests/msado15.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index f1c864cdd9..0f0cb24759 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1075,8 +1075,12 @@ static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", recordset, state ); + + *state = recordset->state; + return S_OK; } static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 83bea8ca78..855f138e47 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -100,8 +100,8 @@ static void test_Recordset(void) state = -1; hr = _Recordset_get_State( recordset, &state ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( state == adStateClosed, "got %d\n", state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -124,8 +124,8 @@ static void test_Recordset(void) state = -1; hr = _Recordset_get_State( recordset, &state ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( state == adStateOpen, "got %d\n", state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateOpen, "got %d\n", state ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08x\n", hr ); @@ -133,6 +133,11 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr ); + state = -1; + hr = _Recordset_get_State( recordset, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); + Fields_Release( fields ); _Recordset_Release( recordset ); } -- 2.20.1

1 0

[PATCH 1/8] msado15: Implement _Recordset_AddNew.
by Hans Leidekker 13 Dec '19

13 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 29 +++++++++++++++++++++-- dlls/msado15/tests/msado15.c | 45 +++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e854b3e824..f1c864cdd9 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -887,10 +887,35 @@ static HRESULT WINAPI recordset_get_Source( _Recordset *iface, VARIANT *source ) return E_NOTIMPL; } +static BOOL resize_recordset( struct recordset *recordset, ULONG row_count ) +{ + ULONG row_size = get_column_count( recordset ) * sizeof(*recordset->data); + + if (row_count > recordset->allocated) + { + VARIANT *tmp; + ULONG count = max( row_count, recordset->allocated * 2 ); + if (!(tmp = heap_realloc_zero( recordset->data, count * row_size ))) return FALSE; + recordset->data = tmp; + recordset->allocated = count; + } + + recordset->count = row_count; + return TRUE; +} + static HRESULT WINAPI recordset_AddNew( _Recordset *iface, VARIANT field_list, VARIANT values ) { - FIXME( "%p, %s, %s\n", iface, debugstr_variant(&field_list), debugstr_variant(&values) ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %s, %s\n", recordset, debugstr_variant(&field_list), debugstr_variant(&values) ); + FIXME( "ignoring field list and values\n" ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + if (!resize_recordset( recordset, recordset->count + 1 )) return E_OUTOFMEMORY; + recordset->index++; + return S_OK; } static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f9a5377c50..83bea8ca78 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -47,7 +47,9 @@ static void test_Recordset(void) { _Recordset *recordset; Fields *fields, *fields2; - LONG refs, count; + LONG refs, count, state; + VARIANT missing; + BSTR name; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -92,6 +94,47 @@ static void test_Recordset(void) /* fields object still has a reference */ refs = Fields_Release( fields2 ); ok( refs == 1, "got %d\n", refs ); + + hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = -1; + hr = _Recordset_get_State( recordset, &state ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( state == adStateClosed, "got %d\n", state ); + + hr = _Recordset_AddNew( recordset, missing, missing ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + + V_VT( &missing ) = VT_ERROR; + V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); + todo_wine ok( hr == MAKE_ADO_HRESULT( adErrInvalidConnection ), "got %08x\n", hr ); + + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + + name = SysAllocString( L"field" ); + hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = -1; + hr = _Recordset_get_State( recordset, &state ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( state == adStateOpen, "got %d\n", state ); + + hr = _Recordset_AddNew( recordset, missing, missing ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Recordset_Close( recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + Fields_Release( fields ); + _Recordset_Release( recordset ); } static void test_Fields(void) -- 2.20.1

1 0

[PATCH v2 1/3] dwmapi: Improve DwmGetWindowAttribute stub.
by Gabriel Ivăncescu 13 Dec '19

13 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a09..e976fda 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -205,9 +205,31 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + if (!hwnd) return E_HANDLE; + if (!pv_attribute) return E_INVALIDARG; - return E_NOTIMPL; + switch (attribute) + { + case DWMWA_NCRENDERING_ENABLED: + if (size < sizeof(BOOL)) return E_INVALIDARG; + + WARN("DWMWA_NCRENDERING_ENABLED: always returning FALSE.\n"); + *(BOOL*)(pv_attribute) = FALSE; + break; + + case DWMWA_CLOAKED: + if (size < sizeof(DWORD)) return E_INVALIDARG; + + WARN("DWMWA_CLOAKED: always returning 0.\n"); + *(DWORD*)(pv_attribute) = 0; + break; + + default: + FIXME("unimplemented attribute %d, size %u, for hwnd %p.\n", attribute, size, hwnd); + return E_INVALIDARG; + } + + return S_OK; } /********************************************************************** -- 2.21.0

1 2

[PATCH 1/3] dwmapi: Improve DwmGetWindowAttribute stub.
by Gabriel Ivăncescu 13 Dec '19

13 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a09..e976fda 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -205,9 +205,31 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + if (!hwnd) return E_HANDLE; + if (!pv_attribute) return E_INVALIDARG; - return E_NOTIMPL; + switch (attribute) + { + case DWMWA_NCRENDERING_ENABLED: + if (size < sizeof(BOOL)) return E_INVALIDARG; + + WARN("DWMWA_NCRENDERING_ENABLED: always returning FALSE.\n"); + *(BOOL*)(pv_attribute) = FALSE; + break; + + case DWMWA_CLOAKED: + if (size < sizeof(DWORD)) return E_INVALIDARG; + + WARN("DWMWA_CLOAKED: always returning 0.\n"); + *(DWORD*)(pv_attribute) = 0; + break; + + default: + FIXME("unimplemented attribute %d, size %u, for hwnd %p.\n", attribute, size, hwnd); + return E_INVALIDARG; + } + + return S_OK; } /********************************************************************** -- 2.21.0

2 5

[PATCH v3 1/4] kernelbase: Support PROC_THREAD_ATTRIBUTE_PARENT_PROCESS in CreateProcessInternalW().
by Paul Gofman 13 Dec '19

13 Dec '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - don't use INVALID_HANDLE_VALUE to return an error on zero parent; v3: - no changes. dlls/kernelbase/process.c | 88 ++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 90ea299416..d6106eb5f6 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -244,7 +244,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename */ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, - RTL_USER_PROCESS_INFORMATION *info ) + RTL_USER_PROCESS_INFORMATION *info, HANDLE parent ) { NTSTATUS status; UNICODE_STRING nameW; @@ -257,7 +257,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES status = RtlCreateUserProcess( &nameW, OBJ_CASE_INSENSITIVE, params, psa ? psa->lpSecurityDescriptor : NULL, tsa ? tsa->lpSecurityDescriptor : NULL, - 0, inherit, 0, 0, info ); + parent, inherit, 0, 0, info ); RtlFreeUnicodeString( &nameW ); } return status; @@ -288,7 +288,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -316,7 +316,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -368,7 +368,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserW( HANDLE token, const WCHAR *a inherit, flags, env, cur_dir, startup_info, info, NULL ); } - /********************************************************************** * CreateProcessInternalA (kernelbase.@) */ @@ -382,7 +381,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; UNICODE_STRING desktopW, titleW; - STARTUPINFOW infoW; + STARTUPINFOEXW infoW; desktopW.Buffer = NULL; titleW.Buffer = NULL; @@ -393,12 +392,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); - memcpy( &infoW, startup_info, sizeof(infoW) ); - infoW.lpDesktop = desktopW.Buffer; - infoW.lpTitle = titleW.Buffer; + memcpy( &infoW.StartupInfo, startup_info, sizeof(infoW.StartupInfo) ); + infoW.StartupInfo.lpDesktop = desktopW.Buffer; + infoW.StartupInfo.lpTitle = titleW.Buffer; + + if (flags & EXTENDED_STARTUPINFO_PRESENT) + infoW.lpAttributeList = ((STARTUPINFOEXW *)startup_info)->lpAttributeList; ret = CreateProcessInternalW( token, app_nameW, cmd_lineW, process_attr, thread_attr, - inherit, flags, env, cur_dirW, &infoW, info, new_token ); + inherit, flags, env, cur_dirW, (STARTUPINFOW *)&infoW, info, new_token ); done: RtlFreeHeap( GetProcessHeap(), 0, app_nameW ); RtlFreeHeap( GetProcessHeap(), 0, cmd_lineW ); @@ -408,6 +410,22 @@ done: return ret; } +struct proc_thread_attr +{ + DWORD_PTR attr; + SIZE_T size; + void *value; +}; + +struct _PROC_THREAD_ATTRIBUTE_LIST +{ + DWORD mask; /* bitmask of items in list */ + DWORD size; /* max number of items in list */ + DWORD count; /* number of items in list */ + DWORD pad; + DWORD_PTR unk; + struct proc_thread_attr attrs[1]; +}; /********************************************************************** * CreateProcessInternalW (kernelbase.@) @@ -423,6 +441,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR WCHAR *p, *tidy_cmdline = cmd_line; RTL_USER_PROCESS_PARAMETERS *params = NULL; RTL_USER_PROCESS_INFORMATION rtl_info; + HANDLE parent = NULL; NTSTATUS status; /* Process the AppName and/or CmdLine to get module name and path */ @@ -473,7 +492,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR goto done; } - status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info ); + if (flags & EXTENDED_STARTUPINFO_PRESENT) + { + struct _PROC_THREAD_ATTRIBUTE_LIST *attrs = + (struct _PROC_THREAD_ATTRIBUTE_LIST *)((STARTUPINFOEXW *)startup_info)->lpAttributeList; + unsigned int i; + + if (attrs) + { + for (i = 0; i < attrs->count; ++i) + { + switch(attrs->attrs[i].attr) + { + case PROC_THREAD_ATTRIBUTE_PARENT_PROCESS: + parent = *(HANDLE *)attrs->attrs[i].value; + TRACE("PROC_THREAD_ATTRIBUTE_PARENT_PROCESS parent %p.\n", parent); + if (!parent) + { + status = STATUS_INVALID_HANDLE; + goto done; + } + break; + default: + FIXME("Unsupported attribute %#lx.\n", attrs->attrs[i].attr); + break; + } + } + } + } + + status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent ); switch (status) { case STATUS_SUCCESS: @@ -1301,24 +1349,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val * Process/thread attribute lists ***********************************************************************/ - -struct proc_thread_attr -{ - DWORD_PTR attr; - SIZE_T size; - void *value; -}; - -struct _PROC_THREAD_ATTRIBUTE_LIST -{ - DWORD mask; /* bitmask of items in list */ - DWORD size; /* max number of items in list */ - DWORD count; /* number of items in list */ - DWORD pad; - DWORD_PTR unk; - struct proc_thread_attr attrs[1]; -}; - /*********************************************************************** * InitializeProcThreadAttributeList (kernelbase.@) */ -- 2.23.0

3 8

[PATCH v4 0/2] Add emulation for UMIP instructions
by Brendan Shanks 13 Dec '19

13 Dec '19

This patch adds emulation for instructions protected by User-Mode Instruction Prevention (currently implemented by AMD Ryzen 3000 CPUs and some rare Intel CPUs). Changes from previous patch: removed CPUID checking and Linux #ifdefs Brendan Shanks (2): ntdll: Add emulation for UMIP instructions. ntdll/tests: Add tests for UMIP instructions. dlls/ntdll/signal_i386.c | 311 ++++++++++++++++++++++++++++- dlls/ntdll/signal_x86_64.c | 350 +++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 375 +++++++++++++++++++++++++++++++++++ 3 files changed, 1020 insertions(+), 16 deletions(-) -- 2.23.0

2 3

[PATCH 1/4] ole32: Use more appropriate type for codepage arguments.
by Nikolay Sivov 13 Dec '19

13 Dec '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/stg_prop.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 84eaa2aac4..8421353155 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -130,7 +130,7 @@ static void PropertyStorage_DestroyDictionaries(PropertyStorage_impl *); * string using PropertyStorage_StringCopy. */ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, - const PROPVARIANT *propvar, LCID targetCP, LCID srcCP); + const PROPVARIANT *propvar, UINT targetCP, UINT srcCP); /* Copies the string src, which is encoded using code page srcCP, and returns * it in *dst, in the code page specified by targetCP. The returned string is @@ -139,8 +139,8 @@ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, * is CP_UNICODE, the returned string is in fact an LPWSTR. * Returns S_OK on success, something else on failure. */ -static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, - LCID targetCP); +static HRESULT PropertyStorage_StringCopy(LPCSTR src, UINT srcCP, LPSTR *dst, + UINT targetCP); static const IPropertyStorageVtbl IPropertyStorage_Vtbl; @@ -533,8 +533,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple( return hr; } -static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, - LCID dstCP) +static HRESULT PropertyStorage_StringCopy(LPCSTR src, UINT srcCP, LPSTR *dst, UINT dstCP) { HRESULT hr = S_OK; int len; @@ -617,8 +616,8 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, return hr; } -static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, - const PROPVARIANT *propvar, LCID targetCP, LCID srcCP) +static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, const PROPVARIANT *propvar, + UINT targetCP, UINT srcCP) { HRESULT hr = S_OK; @@ -644,7 +643,7 @@ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, * a version 1-only property. */ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, - PROPID propid, const PROPVARIANT *propvar, LCID lcid) + PROPID propid, const PROPVARIANT *propvar, UINT cp) { HRESULT hr = S_OK; PROPVARIANT *prop = PropertyStorage_FindProperty(This, propid); @@ -665,8 +664,7 @@ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, if (prop) { PropVariantClear(prop); - hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, - lcid); + hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, cp); } else { @@ -674,8 +672,7 @@ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, sizeof(PROPVARIANT)); if (prop) { - hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, - lcid); + hr = PropertyStorage_PropVariantCopy(prop, propvar, This->codePage, cp); if (SUCCEEDED(hr)) { dictionary_insert(This->propid_to_prop, UlongToPtr(propid), prop); @@ -699,7 +696,7 @@ static HRESULT PropertyStorage_StorePropWithId(PropertyStorage_impl *This, * Doesn't validate id. */ static HRESULT PropertyStorage_StoreNameWithId(PropertyStorage_impl *This, - LPCSTR srcName, LCID cp, PROPID id) + LPCSTR srcName, UINT cp, PROPID id) { LPSTR name; HRESULT hr; -- 2.24.0

2 4

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 13 Dec '19

13 Dec '19

1 0

[PATCH] wine.inf: add powershell location to the path (resend)
by Louis Lenders 13 Dec '19

13 Dec '19

(now with signed-off header) On win7 the location of powershell is present in the path (could not check on other versions) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d324461c6e..d62fd5065b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -624,7 +624,7 @@ HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" -HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" +HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem;%11%\WindowsPowershell\v1.0" HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%" -- 2.24.0

1 0

[PATCH v3 3/3] msado15: Prevent Multiple Open/Close of a _Recordset.
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Currently closing twice or Close/Release would cause a crash. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 15 +++++++++++---- dlls/msado15/tests/msado15.c | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 9bf6b60df1..0dc8a496c0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -664,9 +664,12 @@ static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count = get_column_count( recordset ); - recordset->fields->recordset = NULL; - Fields_Release( &recordset->fields->Fields_iface ); - recordset->fields = NULL; + if (recordset->fields) + { + recordset->fields->recordset = NULL; + Fields_Release( &recordset->fields->Fields_iface ); + recordset->fields = NULL; + } for (row = 0; row < recordset->count; row++) for (col = 0; col < col_count; col++) VariantClear( &recordset->data[row * col_count + col] ); @@ -674,6 +677,7 @@ static void close_recordset( struct recordset *recordset ) recordset->count = recordset->allocated = recordset->index = 0; heap_free( recordset->data ); recordset->data = NULL; + recordset->state = adStateClosed; } static ULONG WINAPI recordset_Release( _Recordset *iface ) @@ -916,8 +920,9 @@ static HRESULT WINAPI recordset_Close( _Recordset *iface ) TRACE( "%p\n", recordset ); + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + close_recordset( recordset ); - recordset->state = adStateClosed; return S_OK; } @@ -971,6 +976,8 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->state = adStateOpen; return S_OK; } diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1fae811d10..b80600a676 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -96,6 +96,9 @@ static void test_Recordset(void) ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); ISupportErrorInfo_Release(errorinfo); + hr = _Recordset_Close( recordset ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH v3 2/3] msado15: Add ISupportErrorInfo support to _Recordset.
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 61 +++++++++++++++++++++++++++++++----- dlls/msado15/tests/msado15.c | 5 +++ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 4b61b552f0..9bf6b60df1 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -34,14 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct fields; struct recordset { - _Recordset Recordset_iface; - LONG refs; - LONG state; - struct fields *fields; - LONG count; - LONG allocated; - LONG index; - VARIANT *data; + _Recordset Recordset_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + LONG state; + struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields @@ -646,6 +647,11 @@ static inline struct recordset *impl_from_Recordset( _Recordset *iface ) return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); } +static inline struct recordset *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ISupportErrorInfo_iface ); +} + static ULONG WINAPI recordset_AddRef( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -686,6 +692,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, void **obj ) { + struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); if (IsEqualIID(riid, &IID_IUnknown) || @@ -698,6 +705,10 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = iface; } + else if(IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &recordset->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -1235,6 +1246,39 @@ static HRESULT WINAPI recordset_Save( _Recordset *iface, VARIANT destination, Pe return E_NOTIMPL; } +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", recordset, debugstr_guid(riid) ); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + static const struct _RecordsetVtbl recordset_vtbl = { recordset_QueryInterface, @@ -1330,6 +1374,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; + recordset->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; recordset->refs = 1; recordset->index = -1; recordset->state = adStateClosed; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index d6bb50f44e..1fae811d10 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -46,6 +46,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + ISupportErrorInfo *errorinfo; Fields *fields, *fields2; LONG refs, count, state; HRESULT hr; @@ -91,6 +92,10 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !count, "got %d\n", count ); + hr = _Recordset_QueryInterface(recordset, &IID_ISupportErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + ISupportErrorInfo_Release(errorinfo); + refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH v3 1/3] msado15: Implement _Recordset get_State
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Please Ignore the last patchset, the _Open wasn't meant to be sent. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 7 +++++-- dlls/msado15/tests/msado15.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e854b3e824..4b61b552f0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1050,8 +1050,10 @@ static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", recordset, state ); + *state = recordset->state; + return S_OK; } static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) @@ -1330,6 +1332,7 @@ HRESULT Recordset_create( void **obj ) recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->state = adStateClosed; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f9a5377c50..d6bb50f44e 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -47,12 +47,17 @@ static void test_Recordset(void) { _Recordset *recordset; Fields *fields, *fields2; - LONG refs, count; + LONG refs, count, state; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + state = -1; + hr = _Recordset_get_State( recordset, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); + /* handing out fields object increases recordset refcount */ refs = get_refs_recordset( recordset ); ok( refs == 1, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH v2 3/3] msado15: Add ISupportErrorInfo support to _Recordset.
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 61 +++++++++++++++++++++++++++++++----- dlls/msado15/tests/msado15.c | 5 +++ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 4b61b552f0..9bf6b60df1 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -34,14 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct fields; struct recordset { - _Recordset Recordset_iface; - LONG refs; - LONG state; - struct fields *fields; - LONG count; - LONG allocated; - LONG index; - VARIANT *data; + _Recordset Recordset_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + LONG state; + struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields @@ -646,6 +647,11 @@ static inline struct recordset *impl_from_Recordset( _Recordset *iface ) return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); } +static inline struct recordset *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ISupportErrorInfo_iface ); +} + static ULONG WINAPI recordset_AddRef( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -686,6 +692,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, void **obj ) { + struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); if (IsEqualIID(riid, &IID_IUnknown) || @@ -698,6 +705,10 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = iface; } + else if(IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &recordset->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -1235,6 +1246,39 @@ static HRESULT WINAPI recordset_Save( _Recordset *iface, VARIANT destination, Pe return E_NOTIMPL; } +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", recordset, debugstr_guid(riid) ); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + static const struct _RecordsetVtbl recordset_vtbl = { recordset_QueryInterface, @@ -1330,6 +1374,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; + recordset->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; recordset->refs = 1; recordset->index = -1; recordset->state = adStateClosed; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index d6bb50f44e..1fae811d10 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -46,6 +46,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + ISupportErrorInfo *errorinfo; Fields *fields, *fields2; LONG refs, count, state; HRESULT hr; @@ -91,6 +92,10 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !count, "got %d\n", count ); + hr = _Recordset_QueryInterface(recordset, &IID_ISupportErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + ISupportErrorInfo_Release(errorinfo); + refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH v2 2/3] msado15: Implement _Connection Open
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/Makefile.in | 2 +- dlls/msado15/connection.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/msado15/main.c | 1 + 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 9852e0863d..e64da60547 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,5 +1,5 @@ MODULE = msado15.dll -IMPORTS = oleaut32 +IMPORTS = oleaut32 ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..2408000abc 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -21,6 +21,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" @@ -34,6 +35,8 @@ struct connection { _Connection Connection_iface; ISupportErrorInfo ISupportErrorInfo_iface; + IDataInitialize *datainit; + IDBInitialize *dbinit; LONG refs; ObjectStateEnum state; LONG timeout; @@ -61,6 +64,11 @@ static ULONG WINAPI connection_Release( _Connection *iface ) LONG refs = InterlockedDecrement( &connection->refs ); if (!refs) { + if (connection->dbinit) + IDBInitialize_Release(connection->dbinit); + if (connection->datainit) + IDataInitialize_Release(connection->datainit); + TRACE( "destroying %p\n", connection ); heap_free( connection ); } @@ -203,9 +211,33 @@ static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, LONG options ) { - FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + + TRACE( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options ); - return E_NOTIMPL; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&connection->datainit); + if (FAILED(hr)) + { + WARN("Failed to create IDataInitialize object\n"); + return hr; + } + + hr = IDataInitialize_GetDataSource(connection->datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, + &IID_IDBInitialize, (IUnknown**)&connection->dbinit); + if (FAILED(hr)) + { + WARN("Failed to create IDBInitialize object\n"); + + IDataInitialize_Release(connection->datainit); + connection->datainit = NULL; + return hr; + } + + connection->state = adStateOpen; + + return hr; } static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) @@ -392,6 +424,8 @@ HRESULT Connection_create( void **obj ) connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; + connection->datainit = NULL; + connection->dbinit = NULL; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3115474b84..83c4a20566 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -21,6 +21,7 @@ #include "winbase.h" #include "initguid.h" #define COBJMACROS +#include "msdasc.h" #include "objbase.h" #include "rpcproxy.h" #include "msado15_backcompat.h" -- 2.17.1

1 0

[PATCH v2 1/3] msado15: Implement _Recordset get_State
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 7 +++++-- dlls/msado15/tests/msado15.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e854b3e824..4b61b552f0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1050,8 +1050,10 @@ static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", recordset, state ); + *state = recordset->state; + return S_OK; } static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) @@ -1330,6 +1332,7 @@ HRESULT Recordset_create( void **obj ) recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->state = adStateClosed; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f9a5377c50..d6bb50f44e 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -47,12 +47,17 @@ static void test_Recordset(void) { _Recordset *recordset; Fields *fields, *fields2; - LONG refs, count; + LONG refs, count, state; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + state = -1; + hr = _Recordset_get_State( recordset, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); + /* handing out fields object increases recordset refcount */ refs = get_refs_recordset( recordset ); ok( refs == 1, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH 3/3] msado15: Add ISupportErrorInfo support to _Recordset.
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 61 +++++++++++++++++++++++++++++++----- dlls/msado15/tests/msado15.c | 5 +++ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 8a5f7aad41..0dc8a496c0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -34,14 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct fields; struct recordset { - _Recordset Recordset_iface; - LONG refs; - LONG state; - struct fields *fields; - LONG count; - LONG allocated; - LONG index; - VARIANT *data; + _Recordset Recordset_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + LONG state; + struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields @@ -646,6 +647,11 @@ static inline struct recordset *impl_from_Recordset( _Recordset *iface ) return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); } +static inline struct recordset *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ISupportErrorInfo_iface ); +} + static ULONG WINAPI recordset_AddRef( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -690,6 +696,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, void **obj ) { + struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); if (IsEqualIID(riid, &IID_IUnknown) || @@ -702,6 +709,10 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = iface; } + else if(IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &recordset->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -1242,6 +1253,39 @@ static HRESULT WINAPI recordset_Save( _Recordset *iface, VARIANT destination, Pe return E_NOTIMPL; } +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + return recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct recordset *recordset = impl_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", recordset, debugstr_guid(riid) ); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + static const struct _RecordsetVtbl recordset_vtbl = { recordset_QueryInterface, @@ -1337,6 +1381,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; + recordset->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; recordset->refs = 1; recordset->index = -1; recordset->state = adStateClosed; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index d3c1f30f6d..c25c7fc3cb 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -46,6 +46,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + ISupportErrorInfo *errorinfo; Fields *fields, *fields2; LONG refs, count, state; HRESULT hr; @@ -93,6 +94,10 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + + hr = _Recordset_QueryInterface(recordset, &IID_ISupportErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + ISupportErrorInfo_Release(errorinfo); refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); -- 2.17.1

2 1

[PATCH 2/3] msado15: Implement _Connection Open
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/Makefile.in | 2 +- dlls/msado15/connection.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/msado15/main.c | 1 + 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 9852e0863d..e64da60547 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,5 +1,5 @@ MODULE = msado15.dll -IMPORTS = oleaut32 +IMPORTS = oleaut32 ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..2408000abc 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -21,6 +21,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" @@ -34,6 +35,8 @@ struct connection { _Connection Connection_iface; ISupportErrorInfo ISupportErrorInfo_iface; + IDataInitialize *datainit; + IDBInitialize *dbinit; LONG refs; ObjectStateEnum state; LONG timeout; @@ -61,6 +64,11 @@ static ULONG WINAPI connection_Release( _Connection *iface ) LONG refs = InterlockedDecrement( &connection->refs ); if (!refs) { + if (connection->dbinit) + IDBInitialize_Release(connection->dbinit); + if (connection->datainit) + IDataInitialize_Release(connection->datainit); + TRACE( "destroying %p\n", connection ); heap_free( connection ); } @@ -203,9 +211,33 @@ static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, LONG options ) { - FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + + TRACE( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options ); - return E_NOTIMPL; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&connection->datainit); + if (FAILED(hr)) + { + WARN("Failed to create IDataInitialize object\n"); + return hr; + } + + hr = IDataInitialize_GetDataSource(connection->datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, + &IID_IDBInitialize, (IUnknown**)&connection->dbinit); + if (FAILED(hr)) + { + WARN("Failed to create IDBInitialize object\n"); + + IDataInitialize_Release(connection->datainit); + connection->datainit = NULL; + return hr; + } + + connection->state = adStateOpen; + + return hr; } static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) @@ -392,6 +424,8 @@ HRESULT Connection_create( void **obj ) connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; + connection->datainit = NULL; + connection->dbinit = NULL; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3115474b84..83c4a20566 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -21,6 +21,7 @@ #include "winbase.h" #include "initguid.h" #define COBJMACROS +#include "msdasc.h" #include "objbase.h" #include "rpcproxy.h" #include "msado15_backcompat.h" -- 2.17.1

1 0

[PATCH 1/3] msado15: Implement _Recordset get_State
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 7 +++++-- dlls/msado15/tests/msado15.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index f0bb1591aa..8a5f7aad41 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1057,8 +1057,10 @@ static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", recordset, state ); + *state = recordset->state; + return S_OK; } static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) @@ -1337,6 +1339,7 @@ HRESULT Recordset_create( void **obj ) recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->state = adStateClosed; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 494f1be463..d3c1f30f6d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -47,12 +47,17 @@ static void test_Recordset(void) { _Recordset *recordset; Fields *fields, *fields2; - LONG refs, count; + LONG refs, count, state; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + state = -1; + hr = _Recordset_get_State( recordset, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); + /* handing out fields object increases recordset refcount */ refs = get_refs_recordset( recordset ); ok( refs == 1, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH v3 1/8] wineqtdecoder: Store the sink as a strmbase_sink structure.
by Zebediah Figura 13 Dec '19

13 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 43 ++++++++++++++------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index d861110f5f1..c8a34cbf95e 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -138,7 +138,7 @@ typedef struct QTOutPin { } QTOutPin; typedef struct QTInPin { - struct strmbase_pin pin; + struct strmbase_sink pin; GUID subType; IAsyncReader *pReader; @@ -199,7 +199,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) static inline QTInPin *impl_from_IPin(IPin *iface) { - return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); + return CONTAINING_RECORD(iface, QTInPin, pin.pin.IPin_iface); } /* @@ -211,7 +211,7 @@ static struct strmbase_pin *qt_splitter_get_pin(struct strmbase_filter *base, un QTSplitter *filter = impl_from_strmbase_filter(base); if (index == 0) - return &filter->pInputPin.pin; + return &filter->pInputPin.pin.pin; else if (index == 1) { if (filter->pVideo_Pin) @@ -232,18 +232,15 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ + if (filter->pInputPin.pin.pin.peer) + IPin_Disconnect(filter->pInputPin.pin.pin.peer); - if (filter->pInputPin.pin.peer) - IPin_Disconnect(filter->pInputPin.pin.peer); - - FreeMediaType(&filter->pInputPin.pin.mt); if (filter->pInputPin.pAlloc) IMemAllocator_Release(filter->pInputPin.pAlloc); filter->pInputPin.pAlloc = NULL; if (filter->pInputPin.pReader) IAsyncReader_Release(filter->pInputPin.pReader); filter->pInputPin.pReader = NULL; - filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; if (filter->pQTMovie) { @@ -274,6 +271,7 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); + strmbase_sink_cleanup(&filter->pInputPin.pin); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -333,10 +331,10 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE return S_FALSE; } -static const BasePinFuncTable sink_ops = +static const struct strmbase_sink_ops sink_ops = { - .pin_query_accept = sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) @@ -357,6 +355,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) ZeroMemory(This,sizeof(*This)); strmbase_filter_init(&This->filter, outer, &CLSID_QTSplitter, &filter_ops); + strmbase_sink_init(&This->pInputPin.pin, &QT_InputPin_Vtbl, &This->filter, + wcsInputPinName, &sink_ops, NULL); InitializeCriticalSection(&This->csReceive); This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive"); @@ -366,13 +366,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->aSession = NULL; This->runEvent = CreateEventW(NULL, 0, 0, NULL); - This->pInputPin.pin.dir = PINDIR_INPUT; - This->pInputPin.pin.filter = &This->filter; - lstrcpynW(This->pInputPin.pin.name, wcsInputPinName, ARRAY_SIZE(This->pInputPin.pin.name)); - This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; - This->pInputPin.pin.peer = NULL; - This->pInputPin.pin.pFuncsTable = &sink_ops; - *phr = S_OK; return &This->filter.IUnknown_inner; } @@ -984,7 +977,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, EnterCriticalSection(&filter->filter.csFilter); This->pReader = NULL; - if (This->pin.peer) + if (This->pin.pin.peer) hr = VFW_E_ALREADY_CONNECTED; else if (IPin_QueryAccept(iface, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -1066,22 +1059,22 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface) { HRESULT hr; QTInPin *This = impl_from_IPin(iface); - QTSplitter *filter = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *filter = impl_from_strmbase_filter(This->pin.pin.filter); FILTER_STATE state; TRACE("()\n"); hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state); EnterCriticalSection(&filter->filter.csFilter); - if (This->pin.peer) + if (This->pin.pin.peer) { - QTSplitter *Parser = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *Parser = impl_from_strmbase_filter(This->pin.pin.filter); if (SUCCEEDED(hr) && state == State_Stopped) { IMemAllocator_Decommit(This->pAlloc); - IPin_Disconnect(This->pin.peer); - IPin_Release(This->pin.peer); - This->pin.peer = NULL; + IPin_Disconnect(This->pin.pin.peer); + IPin_Release(This->pin.pin.peer); + This->pin.pin.peer = NULL; hr = QT_RemoveOutputPins(Parser); } else -- 2.24.0

1 7

[PATCH 1/3] dbghelp: Fix reading the address of the target's dyld image info from its PEB.
by Ken Thomases 13 Dec '19

13 Dec '19

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9d83b006b7c..8eda11ab91c 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1366,7 +1366,7 @@ static ULONG_PTR get_dyld_image_info_address(struct process* pcs) if (status == STATUS_SUCCESS) { /* Read dyld image info address from PEB */ - if (!pcs->is_64bit) + if (pcs->is_64bit) ret = ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], &dyld_image_info_address, sizeof(dyld_image_info_address), NULL); else -- 2.21.0

1 2

[PATCH 2/2] msado15: Implement _Recordset get_State
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 7 +++++-- dlls/msado15/tests/msado15.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index f0bb1591aa..8a5f7aad41 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1057,8 +1057,10 @@ static HRESULT WINAPI recordset_get_Status( _Recordset *iface, LONG *status ) static HRESULT WINAPI recordset_get_State( _Recordset *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", recordset, state ); + *state = recordset->state; + return S_OK; } static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) @@ -1337,6 +1339,7 @@ HRESULT Recordset_create( void **obj ) recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->state = adStateClosed; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 494f1be463..d3c1f30f6d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -47,12 +47,17 @@ static void test_Recordset(void) { _Recordset *recordset; Fields *fields, *fields2; - LONG refs, count; + LONG refs, count, state; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + state = -1; + hr = _Recordset_get_State( recordset, &state ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == adStateClosed, "got %d\n", state ); + /* handing out fields object increases recordset refcount */ refs = get_refs_recordset( recordset ); ok( refs == 1, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH 1/2] msado15: Prevent Multiple Open/Close of a _Recordset.
by Alistair Leslie-Hughes 13 Dec '19

13 Dec '19

Currently closing twice or Close/Release would cause a crash. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 15 +++++++++++---- dlls/msado15/tests/msado15.c | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e854b3e824..f0bb1591aa 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -658,9 +658,12 @@ static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count = get_column_count( recordset ); - recordset->fields->recordset = NULL; - Fields_Release( &recordset->fields->Fields_iface ); - recordset->fields = NULL; + if (recordset->fields) + { + recordset->fields->recordset = NULL; + Fields_Release( &recordset->fields->Fields_iface ); + recordset->fields = NULL; + } for (row = 0; row < recordset->count; row++) for (col = 0; col < col_count; col++) VariantClear( &recordset->data[row * col_count + col] ); @@ -668,6 +671,7 @@ static void close_recordset( struct recordset *recordset ) recordset->count = recordset->allocated = recordset->index = 0; heap_free( recordset->data ); recordset->data = NULL; + recordset->state = adStateClosed; } static ULONG WINAPI recordset_Release( _Recordset *iface ) @@ -905,8 +909,9 @@ static HRESULT WINAPI recordset_Close( _Recordset *iface ) TRACE( "%p\n", recordset ); + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + close_recordset( recordset ); - recordset->state = adStateClosed; return S_OK; } @@ -960,6 +965,8 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->state = adStateOpen; return S_OK; } diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f9a5377c50..494f1be463 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -86,6 +86,9 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !count, "got %d\n", count ); + hr = _Recordset_Close( recordset ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); -- 2.17.1

1 0

[PATCH 1/3] dmloader: Get rid of single use debugstr_dmreturn()
by Michael Stefaniuc 13 Dec '19

13 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/debug.c | 148 ----------------------------------------- dlls/dmloader/debug.h | 2 - dlls/dmloader/loader.c | 2 +- 3 files changed, 1 insertion(+), 151 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 0d274394aa..398ce690d1 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -43,154 +43,6 @@ const char *resolve_STREAM_SEEK (DWORD flag) { } } -/* returns name of given error code */ -const char *debugstr_dmreturn (DWORD code) { - static const flag_info codes[] = { - FE(S_OK), - FE(S_FALSE), - FE(DMUS_S_PARTIALLOAD), - FE(DMUS_S_PARTIALDOWNLOAD), - FE(DMUS_S_REQUEUE), - FE(DMUS_S_FREE), - FE(DMUS_S_END), - FE(DMUS_S_STRING_TRUNCATED), - FE(DMUS_S_LAST_TOOL), - FE(DMUS_S_OVER_CHORD), - FE(DMUS_S_UP_OCTAVE), - FE(DMUS_S_DOWN_OCTAVE), - FE(DMUS_S_NOBUFFERCONTROL), - FE(DMUS_S_GARBAGE_COLLECTED), - FE(E_NOTIMPL), - FE(E_NOINTERFACE), - FE(E_POINTER), - FE(CLASS_E_NOAGGREGATION), - FE(CLASS_E_CLASSNOTAVAILABLE), - FE(REGDB_E_CLASSNOTREG), - FE(E_OUTOFMEMORY), - FE(E_FAIL), - FE(E_INVALIDARG), - FE(DMUS_E_DRIVER_FAILED), - FE(DMUS_E_PORTS_OPEN), - FE(DMUS_E_DEVICE_IN_USE), - FE(DMUS_E_INSUFFICIENTBUFFER), - FE(DMUS_E_BUFFERNOTSET), - FE(DMUS_E_BUFFERNOTAVAILABLE), - FE(DMUS_E_NOTADLSCOL), - FE(DMUS_E_INVALIDOFFSET), - FE(DMUS_E_ALREADY_LOADED), - FE(DMUS_E_INVALIDPOS), - FE(DMUS_E_INVALIDPATCH), - FE(DMUS_E_CANNOTSEEK), - FE(DMUS_E_CANNOTWRITE), - FE(DMUS_E_CHUNKNOTFOUND), - FE(DMUS_E_INVALID_DOWNLOADID), - FE(DMUS_E_NOT_DOWNLOADED_TO_PORT), - FE(DMUS_E_ALREADY_DOWNLOADED), - FE(DMUS_E_UNKNOWN_PROPERTY), - FE(DMUS_E_SET_UNSUPPORTED), - FE(DMUS_E_GET_UNSUPPORTED), - FE(DMUS_E_NOTMONO), - FE(DMUS_E_BADARTICULATION), - FE(DMUS_E_BADINSTRUMENT), - FE(DMUS_E_BADWAVELINK), - FE(DMUS_E_NOARTICULATION), - FE(DMUS_E_NOTPCM), - FE(DMUS_E_BADWAVE), - FE(DMUS_E_BADOFFSETTABLE), - FE(DMUS_E_UNKNOWNDOWNLOAD), - FE(DMUS_E_NOSYNTHSINK), - FE(DMUS_E_ALREADYOPEN), - FE(DMUS_E_ALREADYCLOSED), - FE(DMUS_E_SYNTHNOTCONFIGURED), - FE(DMUS_E_SYNTHACTIVE), - FE(DMUS_E_CANNOTREAD), - FE(DMUS_E_DMUSIC_RELEASED), - FE(DMUS_E_BUFFER_EMPTY), - FE(DMUS_E_BUFFER_FULL), - FE(DMUS_E_PORT_NOT_CAPTURE), - FE(DMUS_E_PORT_NOT_RENDER), - FE(DMUS_E_DSOUND_NOT_SET), - FE(DMUS_E_ALREADY_ACTIVATED), - FE(DMUS_E_INVALIDBUFFER), - FE(DMUS_E_WAVEFORMATNOTSUPPORTED), - FE(DMUS_E_SYNTHINACTIVE), - FE(DMUS_E_DSOUND_ALREADY_SET), - FE(DMUS_E_INVALID_EVENT), - FE(DMUS_E_UNSUPPORTED_STREAM), - FE(DMUS_E_ALREADY_INITED), - FE(DMUS_E_INVALID_BAND), - FE(DMUS_E_TRACK_HDR_NOT_FIRST_CK), - FE(DMUS_E_TOOL_HDR_NOT_FIRST_CK), - FE(DMUS_E_INVALID_TRACK_HDR), - FE(DMUS_E_INVALID_TOOL_HDR), - FE(DMUS_E_ALL_TOOLS_FAILED), - FE(DMUS_E_ALL_TRACKS_FAILED), - FE(DMUS_E_NOT_FOUND), - FE(DMUS_E_NOT_INIT), - FE(DMUS_E_TYPE_DISABLED), - FE(DMUS_E_TYPE_UNSUPPORTED), - FE(DMUS_E_TIME_PAST), - FE(DMUS_E_TRACK_NOT_FOUND), - FE(DMUS_E_TRACK_NO_CLOCKTIME_SUPPORT), - FE(DMUS_E_NO_MASTER_CLOCK), - FE(DMUS_E_LOADER_NOCLASSID), - FE(DMUS_E_LOADER_BADPATH), - FE(DMUS_E_LOADER_FAILEDOPEN), - FE(DMUS_E_LOADER_FORMATNOTSUPPORTED), - FE(DMUS_E_LOADER_FAILEDCREATE), - FE(DMUS_E_LOADER_OBJECTNOTFOUND), - FE(DMUS_E_LOADER_NOFILENAME), - FE(DMUS_E_INVALIDFILE), - FE(DMUS_E_ALREADY_EXISTS), - FE(DMUS_E_OUT_OF_RANGE), - FE(DMUS_E_SEGMENT_INIT_FAILED), - FE(DMUS_E_ALREADY_SENT), - FE(DMUS_E_CANNOT_FREE), - FE(DMUS_E_CANNOT_OPEN_PORT), - FE(DMUS_E_CANNOT_CONVERT), - FE(DMUS_E_DESCEND_CHUNK_FAIL), - FE(DMUS_E_NOT_LOADED), - FE(DMUS_E_SCRIPT_LANGUAGE_INCOMPATIBLE), - FE(DMUS_E_SCRIPT_UNSUPPORTED_VARTYPE), - FE(DMUS_E_SCRIPT_ERROR_IN_SCRIPT), - FE(DMUS_E_SCRIPT_CANTLOAD_OLEAUT32), - FE(DMUS_E_SCRIPT_LOADSCRIPT_ERROR), - FE(DMUS_E_SCRIPT_INVALID_FILE), - FE(DMUS_E_INVALID_SCRIPTTRACK), - FE(DMUS_E_SCRIPT_VARIABLE_NOT_FOUND), - FE(DMUS_E_SCRIPT_ROUTINE_NOT_FOUND), - FE(DMUS_E_SCRIPT_CONTENT_READONLY), - FE(DMUS_E_SCRIPT_NOT_A_REFERENCE), - FE(DMUS_E_SCRIPT_VALUE_NOT_SUPPORTED), - FE(DMUS_E_INVALID_SEGMENTTRIGGERTRACK), - FE(DMUS_E_INVALID_LYRICSTRACK), - FE(DMUS_E_INVALID_PARAMCONTROLTRACK), - FE(DMUS_E_AUDIOVBSCRIPT_SYNTAXERROR), - FE(DMUS_E_AUDIOVBSCRIPT_RUNTIMEERROR), - FE(DMUS_E_AUDIOVBSCRIPT_OPERATIONFAILURE), - FE(DMUS_E_AUDIOPATHS_NOT_VALID), - FE(DMUS_E_AUDIOPATHS_IN_USE), - FE(DMUS_E_NO_AUDIOPATH_CONFIG), - FE(DMUS_E_AUDIOPATH_INACTIVE), - FE(DMUS_E_AUDIOPATH_NOBUFFER), - FE(DMUS_E_AUDIOPATH_NOPORT), - FE(DMUS_E_NO_AUDIOPATH), - FE(DMUS_E_INVALIDCHUNK), - FE(DMUS_E_AUDIOPATH_NOGLOBALFXBUFFER), - FE(DMUS_E_INVALID_CONTAINER_OBJECT) - }; - - unsigned int i; - for (i = 0; i < ARRAY_SIZE(codes); i++) { - if (code == codes[i].val) - return codes[i].name; - } - - /* if we didn't find it, return value */ - return wine_dbg_sprintf("0x%08X", code); -} - - /* generic flag-dumping function */ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ static char buffer[128] = "", *ptr = &buffer[0]; diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index fec35cfbff..43f48e832c 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -39,8 +39,6 @@ typedef struct { extern BOOL IS_VALID_DMFORM (FOURCC chunkID) DECLSPEC_HIDDEN; /* translate STREAM_SEEK flag to string */ extern const char *resolve_STREAM_SEEK (DWORD flag) DECLSPEC_HIDDEN; -/* returns name of given error code */ -extern const char *debugstr_dmreturn (DWORD code) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) DECLSPEC_HIDDEN; diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 60dd6f844b..a267d2d6b2 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -396,7 +396,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* load */ result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { - WARN(": failed to (completely) load object (%s)\n", debugstr_dmreturn(result)); + WARN(": failed to (completely) load object (%08x)\n", result); return result; } /* get descriptor */ -- 2.23.0

2 1

[PATCH 3/3] dmloader: Simplify tracing of DMUS_CONTAINED_OBJF_KEEP flag
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/debug.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30e3fd69cc..1be92e72af 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -43,33 +43,6 @@ const char *resolve_STREAM_SEEK (DWORD flag) { } } -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) { - if ((flags & names[i].val)) { - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - ptr = &buffer[0]; - return ptr; -} - -/* dump DMUS_CONTAINED_OBJF flags */ -static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_CONTAINED_OBJF_KEEP) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { char buffer[1024], *ptr = buffer; @@ -90,7 +63,8 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID)); - ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINED_OBJF_FLAGS (pHeader->dwFlags)); + ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags, + pHeader->dwFlags & DMUS_CONTAINED_OBJF_KEEP ? " (DMUS_CONTAINED_OBJF_KEEP)" : ""); ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); -- 2.23.0

1 0

[PATCH 2/3] dmloader: Simplify tracing of the DMUS_CONTAINER_NOLOADS flag
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/debug.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 398ce690d1..30e3fd69cc 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -62,14 +62,6 @@ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t n return ptr; } -/* dump DMUS_CONTAINER flags */ -static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_CONTAINER_NOLOADS) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - /* dump DMUS_CONTAINED_OBJF flags */ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { static const flag_info flags[] = { @@ -81,10 +73,11 @@ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { char buffer[1024], *ptr = buffer; - + ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); - ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - + ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags, + pHeader->dwFlags & DMUS_CONTAINER_NOLOADS ? " (DMUS_CONTAINER_NOLOADS)" : ""); + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); -- 2.23.0

1 0

[PATCH] testbot/LogUtils: Fix the ParseTaskLog() Perl documentation formatting.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4a17857f8..17a028604 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -81,6 +81,7 @@ Either 'ok' if the task was successful or a code indicating why it failed. =item NoLog Contains an error message if the task log could not be read. +=back =back =cut -- 2.20.1

1 0

[PATCH] urlmon/tests: Fix the spelling of a comment.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5788ff9160a..84dd5345be4 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3160,7 +3160,7 @@ static void test_file_protocol(void) { lstrcatW(buf, fragmentW); test_file_protocol_url(buf); - /* Fragment part is considered a part of the file name, if the file exsists. */ + /* Fragment part is considered a part of the file name, if the file exists. */ len = lstrlenW(file_name_buf); lstrcpyW(file_name_buf+len, fragmentW); file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, -- 2.20.1

2 1

[PATCH] quartz: Fix the name of a type in a comment.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d5442e21fc1..1ed41bdcec5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -176,7 +176,7 @@ typedef struct _IFilterGraphImpl { /* IFilterMapper2 */ /* IQueueCommand */ /* IRegisterServiceProvider */ - /* IResourceMananger */ + /* IResourceManager */ /* IServiceProvider */ /* IVideoFrameStep */ -- 2.20.1

2 1

[PATCH] dswave: Use the debug functions provided by dmobject.[ch]
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Patch 174775 is now fully superseded with this one. dlls/dswave/dmobject.c | 247 ++++++++++++++++++++++++++++++- dlls/dswave/dmobject.h | 14 +- dlls/dswave/dswave.c | 3 +- dlls/dswave/dswave_main.c | 271 +---------------------------------- dlls/dswave/dswave_private.h | 21 --- 5 files changed, 256 insertions(+), 300 deletions(-) diff --git a/dlls/dswave/dmobject.c b/dlls/dswave/dmobject.c index 25f3198d2b..9ea31ab32a 100644 --- a/dlls/dswave/dmobject.c +++ b/dlls/dswave/dmobject.c @@ -25,22 +25,257 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -/* RIFF format parsing */ -#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} -static inline const char *debugstr_fourcc(DWORD fourcc) +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) { - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); } + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dswave/dmobject.h b/dlls/dswave/dmobject.h index 4a721cc152..d347020691 100644 --- a/dlls/dswave/dmobject.h +++ b/dlls/dswave/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,15 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 4f1481ce5b..a561660cfa 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -124,7 +124,8 @@ static HRESULT WINAPI wave_IDirectMusicObject_ParseDescriptor(IDirectMusicObject if (FAILED(hr)) return hr; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC(desc)); + TRACE("returning descriptor:\n"); + dump_DMUS_OBJECTDESC(desc); return S_OK; } diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 4f3a73d9e9..12df6da861 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -35,6 +35,7 @@ #include "dmusici.h" #include "dswave_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dswave); @@ -176,273 +177,3 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance ); } - -/****************************************************************** - * Helper functions - * - * - */ -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion(const DMUS_VERSION *version) -{ - if (!version) - return "'null'"; - return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", - HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) - { - if ((flags & names[i].val) || /* standard flag*/ - ((!flags) && (!names[i].val))) { /* zero value only */ - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - return wine_dbg_sprintf("%s", buffer); -} - -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -/* dump whole DMUS_OBJECTDESC struct */ -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = %d\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = FIXME\n"); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } -} diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 3554cde36c..10560d0254 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -60,25 +60,4 @@ typedef struct _DMUS_PRIVATE_CHUNK { DWORD dwSize; /* size of the chunk */ } DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; -/* used for generic dumping (copied from ddraw) */ -typedef struct { - DWORD val; - const char* name; -} flag_info; - -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - -#define FE(x) { x, #x } -#define GE(x) { &x, #x } - -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -/* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; - #endif /* __WINE_DSWAVE_PRIVATE_H */ -- 2.23.0

1 0

[PATCH] dmusic: Use the debug functions provided by dmobject.[ch]
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/buffer.c | 1 + dlls/dmusic/clock.c | 1 + dlls/dmusic/dmobject.c | 247 ++++++++++++++++++++++++++++++++++- dlls/dmusic/dmobject.h | 14 +- dlls/dmusic/dmusic.c | 1 + dlls/dmusic/dmusic_main.c | 239 +-------------------------------- dlls/dmusic/dmusic_private.h | 12 -- dlls/dmusic/download.c | 1 + dlls/dmusic/instrument.c | 1 + dlls/dmusic/port.c | 1 + 10 files changed, 260 insertions(+), 258 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 9b0ca848a6..e17bad90dc 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -20,6 +20,7 @@ */ #include "dmusic_private.h" +#include "dmobject.h" #include "initguid.h" #include "dmksctrl.h" diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 2086bfa3f1..8a4cc9112a 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -19,6 +19,7 @@ */ #include "dmusic_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 25f3198d2b..9ea31ab32a 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -25,22 +25,257 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -/* RIFF format parsing */ -#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} -static inline const char *debugstr_fourcc(DWORD fourcc) +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) { - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); } + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index 4a721cc152..d347020691 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,15 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index cc798ce4d9..0d1f5269a4 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -22,6 +22,7 @@ #include <stdio.h> #include "dmusic_private.h" +#include "dmobject.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 0951cb9e95..b7b1a8bc2d 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -35,6 +35,7 @@ #include "dmusici.h" #include "dmusic_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -215,207 +216,6 @@ int even_or_odd (DWORD number) { return (number & 0x1); /* basically, check if bit 0 is set ;) */ } -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion(const DMUS_VERSION *version) -{ - if (!version) - return "'null'"; - return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", - HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - /* generic flag-dumping function */ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ char buffer[128] = "", *ptr = &buffer[0]; @@ -436,43 +236,6 @@ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t n return wine_dbg_sprintf("%s", buffer); } -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -/* Dump whole DMUS_OBJECTDESC struct */ -void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) -{ - TRACE("DMUS_OBJECTDESC (%p):\n", desc); - TRACE(" - dwSize = %d\n", desc->dwSize); - TRACE(" - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (desc->dwValidData)); - if (desc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); - if (desc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); - if (desc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = FIXME\n"); - if (desc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&desc->vVersion)); - if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); - if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); - if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); - if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); -} - /* Dump DMUS_PORTPARAMS flags */ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 4863aad80b..ea6b7482f3 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -242,13 +242,7 @@ typedef struct { const char* name; } flag_info; -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - #define FE(x) { x, #x } -#define GE(x) { &x, #x } /* dwPatch from MIDILOCALE */ extern DWORD MIDILOCALE2Patch (const MIDILOCALE *pLocale) DECLSPEC_HIDDEN; @@ -257,12 +251,6 @@ extern void Patch2MIDILOCALE (DWORD dwPatch, LPMIDILOCALE pLocale) DECLSPEC_HIDD /* check whether the given DWORD is even (return 0) or odd (return 1) */ extern int even_or_odd (DWORD number) DECLSPEC_HIDDEN; -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -/* Dump whole DMUS_OBJECTDESC struct */ -extern void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) DECLSPEC_HIDDEN; /* Dump whole DMUS_PORTPARAMS struct */ extern void dump_DMUS_PORTPARAMS(LPDMUS_PORTPARAMS params) DECLSPEC_HIDDEN; diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index a88ec2c584..6ce650d780 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -19,6 +19,7 @@ */ #include "dmusic_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 87b31c1ed6..baa4a2f571 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -19,6 +19,7 @@ */ #include "dmusic_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 91913a716f..7bd2afdb9a 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -21,6 +21,7 @@ #include <assert.h> #include "dmusic_private.h" +#include "dmobject.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); -- 2.23.0

1 0

[PATCH] dmstyle: Use the debug functions provided by dmobject.[ch]
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/dmobject.c | 247 ++++++++++++++++++++++++++++- dlls/dmstyle/dmobject.h | 14 +- dlls/dmstyle/dmstyle_main.c | 1 + dlls/dmstyle/dmutils.c | 302 +----------------------------------- dlls/dmstyle/dmutils.h | 26 ---- 5 files changed, 255 insertions(+), 335 deletions(-) diff --git a/dlls/dmstyle/dmobject.c b/dlls/dmstyle/dmobject.c index 25f3198d2b..9ea31ab32a 100644 --- a/dlls/dmstyle/dmobject.c +++ b/dlls/dmstyle/dmobject.c @@ -25,22 +25,257 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -/* RIFF format parsing */ -#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} -static inline const char *debugstr_fourcc(DWORD fourcc) +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) { - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); } + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmstyle/dmobject.h b/dlls/dmstyle/dmobject.h index 4a721cc152..d347020691 100644 --- a/dlls/dmstyle/dmobject.h +++ b/dlls/dmstyle/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,15 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 11e3f62ea9..60f7c3bfbf 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -33,6 +33,7 @@ #include "dmusici.h" #include "dmstyle_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 70b810a8df..d12d64f76d 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -38,9 +38,9 @@ #include "dmusics.h" #include "dmutils.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmfile); -WINE_DECLARE_DEBUG_CHANNEL(dmime); HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { @@ -215,303 +215,3 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } - -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - -/* month number into month name (for debugstr_filetime) */ -static const char *debugstr_month (DWORD dwMonth) { - switch (dwMonth) { - case 1: return "January"; - case 2: return "February"; - case 3: return "March"; - case 4: return "April"; - case 5: return "May"; - case 6: return "June"; - case 7: return "July"; - case 8: return "August"; - case 9: return "September"; - case 10: return "October"; - case 11: return "November"; - case 12: return "December"; - default: return "Invalid"; - } -} - -/* FILETIME struct to string conversion for debug messages */ -static const char *debugstr_filetime (const FILETIME *time) { - SYSTEMTIME sysTime; - - if (!time) return "'null'"; - - FileTimeToSystemTime (time, &sysTime); - - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", - sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, - sysTime.wHour, sysTime.wMinute, sysTime.wSecond); -} - -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) { - if ((flags & names[i].val)) { - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - ptr = &buffer[0]; - return ptr; -} - -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) -{ - if (!TRACE_ON(dmime)) - return; - - if (pDesc) { - TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc); - TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize); - TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) - TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) - TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) - TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) - TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) - TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), - pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) - TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); - } -} diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index f2b469806f..2f13c4b1f4 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -34,30 +34,4 @@ extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_C extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; -/** - * Debug utilities - */ -/* used for generic dumping (copied from ddraw) */ -typedef struct { - DWORD val; - const char* name; -} flag_info; - -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - -/* used for initialising structs */ -#define FE(x) { x, #x } -#define GE(x) { &x, #x } - -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; - -/* dump whole DMUS_OBJECTDESC struct */ -extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN; - #endif /* __WINE_DMUTILS_H */ -- 2.23.0

1 0

[PATCH] dmscript: Use the debug functions provided by dmobject.[ch]
by Michael Stefaniuc 12 Dec '19

12 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/dmobject.c | 247 +++++++++++++++++++++++++++- dlls/dmscript/dmobject.h | 14 +- dlls/dmscript/dmscript_main.c | 272 +------------------------------ dlls/dmscript/dmscript_private.h | 21 --- dlls/dmscript/script.c | 3 +- dlls/dmscript/scripttrack.c | 1 + 6 files changed, 257 insertions(+), 301 deletions(-) diff --git a/dlls/dmscript/dmobject.c b/dlls/dmscript/dmobject.c index 25f3198d2b..9ea31ab32a 100644 --- a/dlls/dmscript/dmobject.c +++ b/dlls/dmscript/dmobject.c @@ -25,22 +25,257 @@ #include "objbase.h" #include "dmusici.h" #include "dmusicf.h" +#include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -/* RIFF format parsing */ -#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) +/* Debugging helpers */ +const char *debugstr_dmguid(const GUID *id) { + unsigned int i; +#define X(guid) { &guid, #guid } + static const struct { + const GUID *guid; + const char *name; + } guids[] = { + /* CLSIDs */ + X(CLSID_AudioVBScript), + X(CLSID_DirectMusic), + X(CLSID_DirectMusicAudioPathConfig), + X(CLSID_DirectMusicAuditionTrack), + X(CLSID_DirectMusicBand), + X(CLSID_DirectMusicBandTrack), + X(CLSID_DirectMusicChordMapTrack), + X(CLSID_DirectMusicChordMap), + X(CLSID_DirectMusicChordTrack), + X(CLSID_DirectMusicCollection), + X(CLSID_DirectMusicCommandTrack), + X(CLSID_DirectMusicComposer), + X(CLSID_DirectMusicContainer), + X(CLSID_DirectMusicGraph), + X(CLSID_DirectMusicLoader), + X(CLSID_DirectMusicLyricsTrack), + X(CLSID_DirectMusicMarkerTrack), + X(CLSID_DirectMusicMelodyFormulationTrack), + X(CLSID_DirectMusicMotifTrack), + X(CLSID_DirectMusicMuteTrack), + X(CLSID_DirectMusicParamControlTrack), + X(CLSID_DirectMusicPatternTrack), + X(CLSID_DirectMusicPerformance), + X(CLSID_DirectMusicScript), + X(CLSID_DirectMusicScriptAutoImpSegment), + X(CLSID_DirectMusicScriptAutoImpPerformance), + X(CLSID_DirectMusicScriptAutoImpSegmentState), + X(CLSID_DirectMusicScriptAutoImpAudioPathConfig), + X(CLSID_DirectMusicScriptAutoImpAudioPath), + X(CLSID_DirectMusicScriptAutoImpSong), + X(CLSID_DirectMusicScriptSourceCodeLoader), + X(CLSID_DirectMusicScriptTrack), + X(CLSID_DirectMusicSection), + X(CLSID_DirectMusicSegment), + X(CLSID_DirectMusicSegmentState), + X(CLSID_DirectMusicSegmentTriggerTrack), + X(CLSID_DirectMusicSegTriggerTrack), + X(CLSID_DirectMusicSeqTrack), + X(CLSID_DirectMusicSignPostTrack), + X(CLSID_DirectMusicSong), + X(CLSID_DirectMusicStyle), + X(CLSID_DirectMusicStyleTrack), + X(CLSID_DirectMusicSynth), + X(CLSID_DirectMusicSynthSink), + X(CLSID_DirectMusicSysExTrack), + X(CLSID_DirectMusicTemplate), + X(CLSID_DirectMusicTempoTrack), + X(CLSID_DirectMusicTimeSigTrack), + X(CLSID_DirectMusicWaveTrack), + X(CLSID_DirectSoundWave), + /* IIDs */ + X(IID_IDirectMusic), + X(IID_IDirectMusic2), + X(IID_IDirectMusic8), + X(IID_IDirectMusicAudioPath), + X(IID_IDirectMusicBand), + X(IID_IDirectMusicBuffer), + X(IID_IDirectMusicChordMap), + X(IID_IDirectMusicCollection), + X(IID_IDirectMusicComposer), + X(IID_IDirectMusicContainer), + X(IID_IDirectMusicDownload), + X(IID_IDirectMusicDownloadedInstrument), + X(IID_IDirectMusicGetLoader), + X(IID_IDirectMusicGraph), + X(IID_IDirectMusicInstrument), + X(IID_IDirectMusicLoader), + X(IID_IDirectMusicLoader8), + X(IID_IDirectMusicObject), + X(IID_IDirectMusicPatternTrack), + X(IID_IDirectMusicPerformance), + X(IID_IDirectMusicPerformance2), + X(IID_IDirectMusicPerformance8), + X(IID_IDirectMusicPort), + X(IID_IDirectMusicPortDownload), + X(IID_IDirectMusicScript), + X(IID_IDirectMusicSegment), + X(IID_IDirectMusicSegment2), + X(IID_IDirectMusicSegment8), + X(IID_IDirectMusicSegmentState), + X(IID_IDirectMusicSegmentState8), + X(IID_IDirectMusicStyle), + X(IID_IDirectMusicStyle8), + X(IID_IDirectMusicSynth), + X(IID_IDirectMusicSynth8), + X(IID_IDirectMusicSynthSink), + X(IID_IDirectMusicThru), + X(IID_IDirectMusicTool), + X(IID_IDirectMusicTool8), + X(IID_IDirectMusicTrack), + X(IID_IDirectMusicTrack8), + X(IID_IUnknown), + X(IID_IPersistStream), + X(IID_IStream), + X(IID_IClassFactory), + /* GUIDs */ + X(GUID_DirectMusicAllTypes), + X(GUID_NOTIFICATION_CHORD), + X(GUID_NOTIFICATION_COMMAND), + X(GUID_NOTIFICATION_MEASUREANDBEAT), + X(GUID_NOTIFICATION_PERFORMANCE), + X(GUID_NOTIFICATION_RECOMPOSE), + X(GUID_NOTIFICATION_SEGMENT), + X(GUID_BandParam), + X(GUID_ChordParam), + X(GUID_CommandParam), + X(GUID_CommandParam2), + X(GUID_CommandParamNext), + X(GUID_IDirectMusicBand), + X(GUID_IDirectMusicChordMap), + X(GUID_IDirectMusicStyle), + X(GUID_MuteParam), + X(GUID_Play_Marker), + X(GUID_RhythmParam), + X(GUID_TempoParam), + X(GUID_TimeSignature), + X(GUID_Valid_Start_Time), + X(GUID_Clear_All_Bands), + X(GUID_ConnectToDLSCollection), + X(GUID_Disable_Auto_Download), + X(GUID_DisableTempo), + X(GUID_DisableTimeSig), + X(GUID_Download), + X(GUID_DownloadToAudioPath), + X(GUID_Enable_Auto_Download), + X(GUID_EnableTempo), + X(GUID_EnableTimeSig), + X(GUID_IgnoreBankSelectForGM), + X(GUID_SeedVariations), + X(GUID_StandardMIDIFile), + X(GUID_Unload), + X(GUID_UnloadFromAudioPath), + X(GUID_Variations), + X(GUID_PerfMasterTempo), + X(GUID_PerfMasterVolume), + X(GUID_PerfMasterGrooveLevel), + X(GUID_PerfAutoDownload), + X(GUID_DefaultGMCollection), + X(GUID_Synth_Default), + X(GUID_Buffer_Reverb), + X(GUID_Buffer_EnvReverb), + X(GUID_Buffer_Stereo), + X(GUID_Buffer_3D_Dry), + X(GUID_Buffer_Mono), + X(GUID_DMUS_PROP_GM_Hardware), + X(GUID_DMUS_PROP_GS_Capable), + X(GUID_DMUS_PROP_GS_Hardware), + X(GUID_DMUS_PROP_DLS1), + X(GUID_DMUS_PROP_DLS2), + X(GUID_DMUS_PROP_Effects), + X(GUID_DMUS_PROP_INSTRUMENT2), + X(GUID_DMUS_PROP_LegacyCaps), + X(GUID_DMUS_PROP_MemorySize), + X(GUID_DMUS_PROP_SampleMemorySize), + X(GUID_DMUS_PROP_SamplePlaybackRate), + X(GUID_DMUS_PROP_SetSynthSink), + X(GUID_DMUS_PROP_SinkUsesDSound), + X(GUID_DMUS_PROP_SynthSink_DSOUND), + X(GUID_DMUS_PROP_SynthSink_WAVE), + X(GUID_DMUS_PROP_Volume), + X(GUID_DMUS_PROP_WavesReverb), + X(GUID_DMUS_PROP_WriteLatency), + X(GUID_DMUS_PROP_WritePeriod), + X(GUID_DMUS_PROP_XG_Capable), + X(GUID_DMUS_PROP_XG_Hardware) + }; +#undef X + + if (!id) + return "(null)"; + + for (i = 0; i < ARRAY_SIZE(guids); i++) + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + + return debugstr_guid(id); +} -static inline const char *debugstr_fourcc(DWORD fourcc) +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) { - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); } + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmscript/dmobject.h b/dlls/dmscript/dmobject.h index 4a721cc152..d347020691 100644 --- a/dlls/dmscript/dmobject.h +++ b/dlls/dmscript/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,15 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 55bc11b29a..163dd67185 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -34,6 +34,7 @@ #include "dmusici.h" #include "dmscript_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmscript); @@ -236,274 +237,3 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance ); } - -/****************************************************************** - * Helper functions - * - * - */ - -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion(const DMUS_VERSION *version) -{ - if (!version) - return "'null'"; - return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", - HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - -/* returns name of given GUID */ -const char *debugstr_dmguid (const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_AudioVBScript), - GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPathConfig), - GE(CLSID_DirectMusicAuditionTrack), - GE(CLSID_DirectMusicBand), - GE(CLSID_DirectMusicBandTrack), - GE(CLSID_DirectMusicChordMapTrack), - GE(CLSID_DirectMusicChordMap), - GE(CLSID_DirectMusicChordTrack), - GE(CLSID_DirectMusicCollection), - GE(CLSID_DirectMusicCommandTrack), - GE(CLSID_DirectMusicComposer), - GE(CLSID_DirectMusicContainer), - GE(CLSID_DirectMusicGraph), - GE(CLSID_DirectMusicLoader), - GE(CLSID_DirectMusicLyricsTrack), - GE(CLSID_DirectMusicMarkerTrack), - GE(CLSID_DirectMusicMelodyFormulationTrack), - GE(CLSID_DirectMusicMotifTrack), - GE(CLSID_DirectMusicMuteTrack), - GE(CLSID_DirectMusicParamControlTrack), - GE(CLSID_DirectMusicPatternTrack), - GE(CLSID_DirectMusicPerformance), - GE(CLSID_DirectMusicScript), - GE(CLSID_DirectMusicScriptAutoImpSegment), - GE(CLSID_DirectMusicScriptAutoImpPerformance), - GE(CLSID_DirectMusicScriptAutoImpSegmentState), - GE(CLSID_DirectMusicScriptAutoImpAudioPathConfig), - GE(CLSID_DirectMusicScriptAutoImpAudioPath), - GE(CLSID_DirectMusicScriptAutoImpSong), - GE(CLSID_DirectMusicScriptSourceCodeLoader), - GE(CLSID_DirectMusicScriptTrack), - GE(CLSID_DirectMusicSection), - GE(CLSID_DirectMusicSegment), - GE(CLSID_DirectMusicSegmentState), - GE(CLSID_DirectMusicSegmentTriggerTrack), - GE(CLSID_DirectMusicSegTriggerTrack), - GE(CLSID_DirectMusicSeqTrack), - GE(CLSID_DirectMusicSignPostTrack), - GE(CLSID_DirectMusicSong), - GE(CLSID_DirectMusicStyle), - GE(CLSID_DirectMusicStyleTrack), - GE(CLSID_DirectMusicSynth), - GE(CLSID_DirectMusicSynthSink), - GE(CLSID_DirectMusicSysExTrack), - GE(CLSID_DirectMusicTemplate), - GE(CLSID_DirectMusicTempoTrack), - GE(CLSID_DirectMusicTimeSigTrack), - GE(CLSID_DirectMusicWaveTrack), - GE(CLSID_DirectSoundWave), - /* IIDs */ - GE(IID_IDirectMusic), - GE(IID_IDirectMusic2), - GE(IID_IDirectMusic8), - GE(IID_IDirectMusicAudioPath), - GE(IID_IDirectMusicBand), - GE(IID_IDirectMusicBuffer), - GE(IID_IDirectMusicChordMap), - GE(IID_IDirectMusicCollection), - GE(IID_IDirectMusicComposer), - GE(IID_IDirectMusicContainer), - GE(IID_IDirectMusicDownload), - GE(IID_IDirectMusicDownloadedInstrument), - GE(IID_IDirectMusicGetLoader), - GE(IID_IDirectMusicGraph), - GE(IID_IDirectMusicInstrument), - GE(IID_IDirectMusicLoader), - GE(IID_IDirectMusicLoader8), - GE(IID_IDirectMusicObject), - GE(IID_IDirectMusicPatternTrack), - GE(IID_IDirectMusicPerformance), - GE(IID_IDirectMusicPerformance2), - GE(IID_IDirectMusicPerformance8), - GE(IID_IDirectMusicPort), - GE(IID_IDirectMusicPortDownload), - GE(IID_IDirectMusicScript), - GE(IID_IDirectMusicSegment), - GE(IID_IDirectMusicSegment2), - GE(IID_IDirectMusicSegment8), - GE(IID_IDirectMusicSegmentState), - GE(IID_IDirectMusicSegmentState8), - GE(IID_IDirectMusicStyle), - GE(IID_IDirectMusicStyle8), - GE(IID_IDirectMusicSynth), - GE(IID_IDirectMusicSynth8), - GE(IID_IDirectMusicSynthSink), - GE(IID_IDirectMusicThru), - GE(IID_IDirectMusicTool), - GE(IID_IDirectMusicTool8), - GE(IID_IDirectMusicTrack), - GE(IID_IDirectMusicTrack8), - GE(IID_IUnknown), - GE(IID_IPersistStream), - GE(IID_IStream), - GE(IID_IClassFactory), - /* GUIDs */ - GE(GUID_DirectMusicAllTypes), - GE(GUID_NOTIFICATION_CHORD), - GE(GUID_NOTIFICATION_COMMAND), - GE(GUID_NOTIFICATION_MEASUREANDBEAT), - GE(GUID_NOTIFICATION_PERFORMANCE), - GE(GUID_NOTIFICATION_RECOMPOSE), - GE(GUID_NOTIFICATION_SEGMENT), - GE(GUID_BandParam), - GE(GUID_ChordParam), - GE(GUID_CommandParam), - GE(GUID_CommandParam2), - GE(GUID_CommandParamNext), - GE(GUID_IDirectMusicBand), - GE(GUID_IDirectMusicChordMap), - GE(GUID_IDirectMusicStyle), - GE(GUID_MuteParam), - GE(GUID_Play_Marker), - GE(GUID_RhythmParam), - GE(GUID_TempoParam), - GE(GUID_TimeSignature), - GE(GUID_Valid_Start_Time), - GE(GUID_Clear_All_Bands), - GE(GUID_ConnectToDLSCollection), - GE(GUID_Disable_Auto_Download), - GE(GUID_DisableTempo), - GE(GUID_DisableTimeSig), - GE(GUID_Download), - GE(GUID_DownloadToAudioPath), - GE(GUID_Enable_Auto_Download), - GE(GUID_EnableTempo), - GE(GUID_EnableTimeSig), - GE(GUID_IgnoreBankSelectForGM), - GE(GUID_SeedVariations), - GE(GUID_StandardMIDIFile), - GE(GUID_Unload), - GE(GUID_UnloadFromAudioPath), - GE(GUID_Variations), - GE(GUID_PerfMasterTempo), - GE(GUID_PerfMasterVolume), - GE(GUID_PerfMasterGrooveLevel), - GE(GUID_PerfAutoDownload), - GE(GUID_DefaultGMCollection), - GE(GUID_Synth_Default), - GE(GUID_Buffer_Reverb), - GE(GUID_Buffer_EnvReverb), - GE(GUID_Buffer_Stereo), - GE(GUID_Buffer_3D_Dry), - GE(GUID_Buffer_Mono), - GE(GUID_DMUS_PROP_GM_Hardware), - GE(GUID_DMUS_PROP_GS_Capable), - GE(GUID_DMUS_PROP_GS_Hardware), - GE(GUID_DMUS_PROP_DLS1), - GE(GUID_DMUS_PROP_DLS2), - GE(GUID_DMUS_PROP_Effects), - GE(GUID_DMUS_PROP_INSTRUMENT2), - GE(GUID_DMUS_PROP_LegacyCaps), - GE(GUID_DMUS_PROP_MemorySize), - GE(GUID_DMUS_PROP_SampleMemorySize), - GE(GUID_DMUS_PROP_SamplePlaybackRate), - GE(GUID_DMUS_PROP_SetSynthSink), - GE(GUID_DMUS_PROP_SinkUsesDSound), - GE(GUID_DMUS_PROP_SynthSink_DSOUND), - GE(GUID_DMUS_PROP_SynthSink_WAVE), - GE(GUID_DMUS_PROP_Volume), - GE(GUID_DMUS_PROP_WavesReverb), - GE(GUID_DMUS_PROP_WriteLatency), - GE(GUID_DMUS_PROP_WritePeriod), - GE(GUID_DMUS_PROP_XG_Capable), - GE(GUID_DMUS_PROP_XG_Hardware) - }; - - unsigned int i; - - if (!id) return "(null)"; - - for (i = 0; i < ARRAY_SIZE(guids); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} - -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) - { - if ((flags & names[i].val) || /* standard flag*/ - ((!flags) && (!names[i].val))) { /* zero value only */ - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - return wine_dbg_sprintf("%s", buffer); -} - -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -/* dump whole DMUS_OBJECTDESC struct */ -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = %d\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = FIXME\n"); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } -} diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 1ff88a9ef7..a6723e36aa 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -64,25 +64,4 @@ typedef struct _DMUS_PRIVATE_CHUNK { DWORD dwSize; /* size of the chunk */ } DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; -/* used for generic dumping (copied from ddraw) */ -typedef struct { - DWORD val; - const char* name; -} flag_info; - -typedef struct { - const GUID *guid; - const char* name; -} guid_info; - -#define FE(x) { x, #x } -#define GE(x) { &x, #x } - -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; -/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -/* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; - #endif /* __WINE_DMSCRIPT_PRIVATE_H */ diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 94fd28207b..a3eceafb5e 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -234,7 +234,8 @@ static HRESULT WINAPI script_IDirectMusicObject_ParseDescriptor(IDirectMusicObje desc->dwValidData |= DMUS_OBJ_CLASS; } - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC(desc)); + TRACE("returning descriptor:\n"); + dump_DMUS_OBJECTDESC(desc); return S_OK; } diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 608e36bd90..ad5617f414 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -18,6 +18,7 @@ */ #include "dmscript_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmscript); -- 2.23.0

1 0

[PATCH] user32: Fix the spelling of a comment.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b407b518117..2ff5b2f9099 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2133,7 +2133,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, /* Tell it "disabled" */ if (lpAnimInfo && lpAnimInfo->cbSize == sizeof(ANIMATIONINFO)) { - lpAnimInfo->iMinAnimate = 0; /* Minimise and restore animation is disabled (nonzero == enabled) */ + lpAnimInfo->iMinAnimate = 0; /* Minimize and restore animation is disabled (nonzero == enabled) */ ret = TRUE; } break; -- 2.20.1

2 1

[PATCH] iphlpapi: Use res_getservers() if available to get the DNS server list.
by Chip Davis 12 Dec '19

12 Dec '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 15 +++++++++++++ dlls/iphlpapi/iphlpapi_main.c | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/configure.ac b/configure.ac index d53321a8f7f..5b9a787e18a 100644 --- a/configure.ac +++ b/configure.ac @@ -1544,6 +1544,21 @@ then AC_DEFINE(HAVE_RESOLV, 1) AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;; esac + + if test "x$ac_cv_have_resolv" != "xnot found" + then + AC_CACHE_CHECK([for res_getservers],wine_cv_have_res_getservers, + [ac_save_LIBS="$LIBS" + test "x$ac_cv_have_resolv" = "xnone required" || \ + LIBS="$ac_cv_have_resolv $LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include <resolv.h>]],[[res_getservers(NULL, NULL, 0);]])],[wine_cv_have_res_getservers=yes],[wine_cv_have_res_getservers=no]) + LIBS="$ac_save_LIBS"]) + if test "$wine_cv_have_res_getservers" = "yes" + then + AC_DEFINE(HAVE_RES_GETSERVERS, 1, [Define to 1 if you have the `res_getservers' function.]) + fi + fi fi dnl **** Check for LittleCMS *** diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8c7c9018c48..f90879e0523 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1281,6 +1281,47 @@ static void initialise_resolver(void) LeaveCriticalSection(&res_init_cs); } +#ifdef HAVE_RES_GETSERVERS +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) +{ + struct __res_state *state = &_res; + int i, found = 0, total; + SOCKADDR_STORAGE *addr = servers; + union res_sockaddr_union *buf; + + initialise_resolver(); + + total = res_getservers( state, NULL, 0 ); + + if ((!servers || !num) && !ip4_only) return total; + + buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(union res_sockaddr_union) ); + total = res_getservers( state, buf, total ); + + for (i = 0; i < total; i++) + { + if (buf[i].sin6.sin6_family == AF_INET6 && ip4_only) continue; + if (buf[i].sin.sin_family != AF_INET && buf[i].sin6.sin6_family != AF_INET6) continue; + + found++; + if (!servers || !num) continue; + + if (buf[i].sin6.sin6_family == AF_INET6) + { + sockaddr_in6_to_WS_storage( addr, &buf[i].sin6 ); + } + else + { + sockaddr_in_to_WS_storage( addr, &buf[i].sin ); + } + if (++addr >= servers + num) break; + } + + HeapFree( GetProcessHeap(), 0, buf ); + return found; +} +#else + static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) { int i, ip6_count = 0; @@ -1316,6 +1357,7 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } return addr - servers; } +#endif #elif defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS) static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) -- 2.24.0

1 0

[PATCH] shell32: Tweak / fix the MS-DOS name in a comment.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Codespell and Wikipedia say it should have a hyphen. dlls/shell32/iconcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 44422ab4ff5..d1be5408fbb 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -876,7 +876,7 @@ HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD l } if( hIcon == (HICON)1 ) - *lpiIcon = 2; /* MSDOS icon - we found .exe but no icons in it */ + *lpiIcon = 2; /* MS-DOS icon - we found .exe but no icons in it */ else *lpiIcon = 6; /* generic icon - found nothing */ -- 2.20.1

1 0

[PATCH] winevulkan: Fix the spelling of an ERR() message.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 725bdf019e2..59472bcef89 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1050,7 +1050,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, command_buffers = heap_calloc(num_command_buffers, sizeof(*submits_host)); if (!command_buffers) { - ERR("Unable to allocate memory for comman buffers!\n"); + ERR("Unable to allocate memory for command buffers!\n"); res = VK_ERROR_OUT_OF_HOST_MEMORY; goto done; } -- 2.20.1

1 0

[PATCH] winevulkan: Fix the spelling of a make_vulkan comment.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b8335ca3ad6..f9b1e1cf961 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -235,7 +235,7 @@ class VkBaseType(object): Args: name (:obj:'str'): Name of the base type. - _type (:obj:'str'): Underlaying type + _type (:obj:'str'): Underlying type alias (bool): type is an alias or not. requires (:obj:'str', optional): Other types required. Often bitmask values pull in a *FlagBits type. -- 2.20.1

1 0

[PATCH] shlwapi: Fix the spelling of a couple of comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index fbdd83a4251..c5c4fa14add 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4635,7 +4635,7 @@ static const struct objcompat_entry objcompat_table[] = { * in registry for CLSID under ShellCompatibility subkey. * * PARAMS - * pUnk: pointer to object IUnknown interface, idetifies CLSID + * pUnk: pointer to object IUnknown interface, identifies CLSID * clsid: pointer to CLSID to retrieve data for * * RETURNS diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 6781b09432f..135d82ead1c 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1485,7 +1485,7 @@ static void test_IConnectionPoint(void) rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, (IUnknown*)container, &cookie, NULL); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); -/* MSDN says this should be required but it crashs on XP +/* MSDN says this should be required but it crashes on XP IUnknown_Release(point); */ ref = IUnknown_Release((IUnknown*)container); -- 2.20.1

1 0

[PATCH 1/3] iphlpapi: Set the SpecificPortBind bit if the caller wants it on BSD.
by Chip Davis 12 Dec '19

12 Dec '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5a5275305d5..b885957d1f2 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2575,6 +2575,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ row.u.dwFlags = 0; + row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; -- 2.24.0

1 2

[PATCH] gdiplus: GdipGraphicsClear() should overwrite pixels, not alpha blend
by Damjan Jovanovic 12 Dec '19

12 Dec '19

All sample code in the Python Pyglet library suffers from terrible text corruption, caused by the inability to erase the background between rendering sequential font glyphs, resulting in leftovers from previous letters mixing with the image of new letters. This is because it attempts to erase the background by calling GdipGraphicsClear() with ARGB color 0x00000000 (completely transparent black), and in our gdiplus alpha blending that into the background has no effect. It should be using CompositeModeSourceCopy to overwrite the background with that brush instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30506 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdiplus/graphics.c | 26 +++++++++++++++------ dlls/gdiplus/tests/image.c | 47 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 9 deletions(-)

2 1

[PATCH v2 1/8] wineqtdecoder: Store the sink as a strmbase_sink structure.
by Zebediah Figura 12 Dec '19

12 Dec '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 43 ++++++++++++++------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index d861110f5f1..c8a34cbf95e 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -138,7 +138,7 @@ typedef struct QTOutPin { } QTOutPin; typedef struct QTInPin { - struct strmbase_pin pin; + struct strmbase_sink pin; GUID subType; IAsyncReader *pReader; @@ -199,7 +199,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) static inline QTInPin *impl_from_IPin(IPin *iface) { - return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); + return CONTAINING_RECORD(iface, QTInPin, pin.pin.IPin_iface); } /* @@ -211,7 +211,7 @@ static struct strmbase_pin *qt_splitter_get_pin(struct strmbase_filter *base, un QTSplitter *filter = impl_from_strmbase_filter(base); if (index == 0) - return &filter->pInputPin.pin; + return &filter->pInputPin.pin.pin; else if (index == 1) { if (filter->pVideo_Pin) @@ -232,18 +232,15 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ + if (filter->pInputPin.pin.pin.peer) + IPin_Disconnect(filter->pInputPin.pin.pin.peer); - if (filter->pInputPin.pin.peer) - IPin_Disconnect(filter->pInputPin.pin.peer); - - FreeMediaType(&filter->pInputPin.pin.mt); if (filter->pInputPin.pAlloc) IMemAllocator_Release(filter->pInputPin.pAlloc); filter->pInputPin.pAlloc = NULL; if (filter->pInputPin.pReader) IAsyncReader_Release(filter->pInputPin.pReader); filter->pInputPin.pReader = NULL; - filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; if (filter->pQTMovie) { @@ -274,6 +271,7 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); + strmbase_sink_cleanup(&filter->pInputPin.pin); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -333,10 +331,10 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE return S_FALSE; } -static const BasePinFuncTable sink_ops = +static const struct strmbase_sink_ops sink_ops = { - .pin_query_accept = sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) @@ -357,6 +355,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) ZeroMemory(This,sizeof(*This)); strmbase_filter_init(&This->filter, outer, &CLSID_QTSplitter, &filter_ops); + strmbase_sink_init(&This->pInputPin.pin, &QT_InputPin_Vtbl, &This->filter, + wcsInputPinName, &sink_ops, NULL); InitializeCriticalSection(&This->csReceive); This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive"); @@ -366,13 +366,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->aSession = NULL; This->runEvent = CreateEventW(NULL, 0, 0, NULL); - This->pInputPin.pin.dir = PINDIR_INPUT; - This->pInputPin.pin.filter = &This->filter; - lstrcpynW(This->pInputPin.pin.name, wcsInputPinName, ARRAY_SIZE(This->pInputPin.pin.name)); - This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; - This->pInputPin.pin.peer = NULL; - This->pInputPin.pin.pFuncsTable = &sink_ops; - *phr = S_OK; return &This->filter.IUnknown_inner; } @@ -984,7 +977,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, EnterCriticalSection(&filter->filter.csFilter); This->pReader = NULL; - if (This->pin.peer) + if (This->pin.pin.peer) hr = VFW_E_ALREADY_CONNECTED; else if (IPin_QueryAccept(iface, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; @@ -1066,22 +1059,22 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface) { HRESULT hr; QTInPin *This = impl_from_IPin(iface); - QTSplitter *filter = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *filter = impl_from_strmbase_filter(This->pin.pin.filter); FILTER_STATE state; TRACE("()\n"); hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state); EnterCriticalSection(&filter->filter.csFilter); - if (This->pin.peer) + if (This->pin.pin.peer) { - QTSplitter *Parser = impl_from_strmbase_filter(This->pin.filter); + QTSplitter *Parser = impl_from_strmbase_filter(This->pin.pin.filter); if (SUCCEEDED(hr) && state == State_Stopped) { IMemAllocator_Decommit(This->pAlloc); - IPin_Disconnect(This->pin.peer); - IPin_Release(This->pin.peer); - This->pin.peer = NULL; + IPin_Disconnect(This->pin.pin.peer); + IPin_Release(This->pin.pin.peer); + This->pin.pin.peer = NULL; hr = QT_RemoveOutputPins(Parser); } else -- 2.24.0

2 8

[PATCH vkd3d] vkd3d: Save and restore the last stencil reference value.
by Rémi Bernon 12 Dec '19

12 Dec '19

This fixes The Turing Test rendering on NVIDIA GPUs. It also fixes this Vulkan validation error: Dynamic stencil reference state not set for this command buffer.. The Vulkan spec states: If the VkPipeline object bound to the pipeline bind point used by this command requires any dynamic state, that state must have been set for commandBuffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- libs/vkd3d/command.c | 5 +++++ libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 6 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index c6e08744..b0147607 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2397,6 +2397,7 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->is_predicated = false; + list->current_stencil_ref = 0; list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->pso_render_pass = VK_NULL_HANDLE; @@ -2602,6 +2603,8 @@ static bool d3d12_command_list_update_graphics_pipeline(struct d3d12_command_lis VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); list->current_pipeline = vk_pipeline; + VK_CALL(vkCmdSetStencilReference(list->vk_command_buffer, VK_STENCIL_FRONT_AND_BACK, list->current_stencil_ref)); + return true; } @@ -3793,6 +3796,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsC TRACE("iface %p, stencil_ref %u.\n", iface, stencil_ref); + list->current_stencil_ref = stencil_ref; + vk_procs = &list->device->vk_procs; VK_CALL(vkCmdSetStencilReference(list->vk_command_buffer, VK_STENCIL_FRONT_AND_BACK, stencil_ref)); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d9290db7..a5ffbb4b 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -961,6 +961,7 @@ struct d3d12_command_list bool is_predicated; + uint32_t current_stencil_ref; VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass pso_render_pass; -- 2.24.0

1 0

[PATCH 5/5] wined3d: Store Vulkan physical device memory properties in the wined3d_adapter_vk structure.
by Henri Verbeet 12 Dec '19

12 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 94eb1382c56..4ec68013017 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1100,9 +1100,10 @@ static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor } } -static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, - const VkPhysicalDeviceProperties *properties, const VkPhysicalDeviceMemoryProperties *memory_properties) +static void adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, + const VkPhysicalDeviceProperties *properties) { + const VkPhysicalDeviceMemoryProperties *memory_properties = &adapter_vk->memory_properties; const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; UINT64 vram_bytes, sysmem_bytes; @@ -1144,7 +1145,7 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, gpu_description = &description; } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes, sysmem_bytes); + wined3d_driver_info_init(&adapter_vk->a.driver_info, gpu_description, vram_bytes, sysmem_bytes); } static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter *adapter, uint32_t wined3d_creation_flags) @@ -1162,7 +1163,6 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - VkPhysicalDeviceMemoryProperties memory_properties; struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; @@ -1193,9 +1193,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); adapter_vk->device_limits = properties2.properties.limits; - VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &memory_properties)); + VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &adapter_vk->memory_properties)); - adapter_vk_init_driver_info(adapter, &properties2.properties, &memory_properties); + adapter_vk_init_driver_info(adapter_vk, &properties2.properties); adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60ddf74a0ec..444b576b63f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2919,6 +2919,7 @@ struct wined3d_adapter_vk VkPhysicalDevice physical_device; VkPhysicalDeviceLimits device_limits; + VkPhysicalDeviceMemoryProperties memory_properties; }; static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) -- 2.11.0

2 1

[PATCH 4/5] wined3d: Introduce WINED3D_BIND_INDIRECT_BUFFER.
by Henri Verbeet 12 Dec '19

12 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 25 ++++++++++++++++++++++--- dlls/d3d11/texture.c | 6 +++--- dlls/wined3d/buffer.c | 4 ++++ dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 1 + 6 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index ed9ee133118..f2b950f357f 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -448,7 +448,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.byte_width = buffer->desc.ByteWidth; wined3d_desc.usage = wined3d_usage_from_d3d11(buffer->desc.Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(buffer->desc.BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(buffer->desc.BindFlags, buffer->desc.MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(buffer->desc.Usage, buffer->desc.CPUAccessFlags); wined3d_desc.misc_flags = buffer->desc.MiscFlags; wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 22196809b64..1e8d86fede0 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -92,14 +92,33 @@ HRESULT d3d_set_private_data(struct wined3d_private_store *store, HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; -static inline unsigned int wined3d_bind_flags_from_d3d11(UINT bind_flags) +static inline unsigned int wined3d_bind_flags_from_d3d11(UINT bind_flags, UINT misc_flags) { - return bind_flags; + unsigned int wined3d_flags = bind_flags & (D3D11_BIND_VERTEX_BUFFER + | D3D11_BIND_INDEX_BUFFER + | D3D11_BIND_CONSTANT_BUFFER + | D3D11_BIND_SHADER_RESOURCE + | D3D11_BIND_STREAM_OUTPUT + | D3D11_BIND_RENDER_TARGET + | D3D11_BIND_DEPTH_STENCIL + | D3D11_BIND_UNORDERED_ACCESS); + + if (misc_flags & D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS) + wined3d_flags |= WINED3D_BIND_INDIRECT_BUFFER; + + return wined3d_flags; } static inline UINT d3d11_bind_flags_from_wined3d(unsigned int bind_flags) { - return bind_flags; + return bind_flags & (WINED3D_BIND_VERTEX_BUFFER + | WINED3D_BIND_INDEX_BUFFER + | WINED3D_BIND_CONSTANT_BUFFER + | WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_STREAM_OUTPUT + | WINED3D_BIND_RENDER_TARGET + | WINED3D_BIND_DEPTH_STENCIL + | WINED3D_BIND_UNORDERED_ACCESS); } /* ID3D11Texture1D, ID3D10Texture1D */ diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index d54f22f35c9..36d07beb23d 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -454,7 +454,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags, desc->MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; @@ -1008,7 +1008,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags, desc->MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; @@ -1467,7 +1467,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); - wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); + wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags, desc->MiscFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); wined3d_desc.width = desc->Width; diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 35248ce9fa5..5da6aec4fb8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1300,6 +1300,10 @@ GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *g if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) return GL_TRANSFORM_FEEDBACK_BUFFER; + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER + && gl_info->supported[ARB_DRAW_INDIRECT]) + return GL_DRAW_INDIRECT_BUFFER; + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) FIXME("Unhandled bind flags %#x.\n", bind_flags); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 453bee62565..d5fe1c239bf 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4687,6 +4687,7 @@ const char *wined3d_debug_bind_flags(DWORD bind_flags) BIND_FLAG_TO_STR(WINED3D_BIND_RENDER_TARGET); BIND_FLAG_TO_STR(WINED3D_BIND_DEPTH_STENCIL); BIND_FLAG_TO_STR(WINED3D_BIND_UNORDERED_ACCESS); + BIND_FLAG_TO_STR(WINED3D_BIND_INDIRECT_BUFFER); #undef BIND_FLAG_TO_STR if (bind_flags) FIXME("Unrecognised bind flag(s) %#x.\n", bind_flags); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db88e110327..9cdf18633c7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,6 +914,7 @@ enum wined3d_shader_type #define WINED3D_BIND_RENDER_TARGET 0x00000020 #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 +#define WINED3D_BIND_INDIRECT_BUFFER 0x00000100 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 #define WINED3DUSAGE_DONOTCLIP 0x00000020 -- 2.11.0

2 1

[PATCH] include: update dxva2api.idl
by Biswapriyo Nath 12 Dec '19

12 Dec '19

1 0

[PATCH 3/5] wined3d: Avoid accessing gl_info in wined3d_buffer_init().
by Henri Verbeet 12 Dec '19

12 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 89dab8ebfdd..35248ce9fa5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1311,9 +1311,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; - BOOL dynamic_buffer_ok; HRESULT hr; TRACE("buffer %p, device %p, desc byte_width %u, usage %s, bind_flags %s, " @@ -1364,28 +1362,6 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer->locations = WINED3D_LOCATION_SYSMEM; } - /* Observations show that draw_primitive_immediate_mode() is faster on - * dynamic vertex buffers than converting + draw_primitive_arrays(). - * (Half-Life 2 and others.) */ - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; - - if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) - { - TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); - } - else if (!(desc->access & WINED3D_RESOURCE_ACCESS_GPU)) - { - TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); - } - else if (!dynamic_buffer_ok && (resource->usage & WINED3DUSAGE_DYNAMIC)) - { - TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); - } - else - { - buffer->flags |= WINED3D_BUFFER_USE_BO; - } - if (buffer->locations & WINED3D_LOCATION_SYSMEM || !(buffer->flags & WINED3D_BUFFER_USE_BO)) { if (!wined3d_resource_prepare_sysmem(&buffer->resource)) @@ -1557,6 +1533,18 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined TRACE("buffer_gl %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", buffer_gl, device, desc, data, parent, parent_ops); + /* Observations show that draw_primitive_immediate_mode() is faster on + * dynamic vertex buffers than converting + draw_primitive_arrays(). + * (Half-Life 2 and others.) */ + if (!(desc->access & WINED3D_RESOURCE_ACCESS_GPU)) + TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); + else if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) + TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); + else if (!(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]) + && (desc->usage & WINED3DUSAGE_DYNAMIC)) + TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); + else + buffer_gl->b.flags |= WINED3D_BUFFER_USE_BO; buffer_gl->buffer_type_hint = wined3d_buffer_gl_binding_from_bind_flags(gl_info, desc->bind_flags); return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); -- 2.11.0

1 0

[PATCH 2/5] wined3d: Destroy GPU resources from the CS thread in adapter_vk_uninit_3d().
by Henri Verbeet 12 Dec '19

12 Dec '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4a501292824..94eb1382c56 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -448,27 +448,42 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return WINED3D_OK; } -static void adapter_vk_uninit_3d(struct wined3d_device *device) +static void adapter_vk_uninit_3d_cs(void *object) { + struct wined3d_device_vk *device_vk = object; struct wined3d_context_vk *context_vk; + struct wined3d_device *device; struct wined3d_shader *shader; - TRACE("device %p.\n", device); + TRACE("device_vk %p.\n", device_vk); - context_vk = &wined3d_device_vk(device)->context_vk; + context_vk = &device_vk->context_vk; + device = &device_vk->d; LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); } + device->blitter->ops->blitter_destroy(device->blitter, NULL); + device->shader_backend->shader_free_private(device, &context_vk->c); wined3d_device_destroy_default_samplers(device, &context_vk->c); +} - device->blitter->ops->blitter_destroy(device->blitter, NULL); +static void adapter_vk_uninit_3d(struct wined3d_device *device) +{ + struct wined3d_context_vk *context_vk; + struct wined3d_device_vk *device_vk; + + TRACE("device %p.\n", device); + device_vk = wined3d_device_vk(device); + context_vk = &device_vk->context_vk; + + wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + device_context_remove(device, &context_vk->c); - device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); } -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a pointer to the counter buffer to wined3d_view_gl_destroy().
by Henri Verbeet 12 Dec '19

12 Dec '19

If adapter_gl_destroy_unordered_access_view() is called before wined3d_unordered_access_view_gl_cs_init() has finished executing, the "counter_bo" field may still be 0. More generally, we shouldn't access the "counter_bo" field from outside the CS thread. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a8a8e93c0b2..7e6f8a2817c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4801,7 +4801,7 @@ struct wined3d_view_gl_destroy_ctx { struct wined3d_device *device; const struct wined3d_gl_view *gl_view; - GLuint counter_bo; + GLuint *counter_bo; void *object; struct wined3d_view_gl_destroy_ctx *free; }; @@ -4825,7 +4825,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (ctx->counter_bo) - GL_EXTCALL(glDeleteBuffers(1, &ctx->counter_bo)); + GL_EXTCALL(glDeleteBuffers(1, ctx->counter_bo)); checkGLcall("delete resources"); context_release(context); } @@ -4835,7 +4835,7 @@ static void wined3d_view_gl_destroy_object(void *object) } static void wined3d_view_gl_destroy(struct wined3d_device *device, - const struct wined3d_gl_view *gl_view, GLuint counter_bo, void *object) + const struct wined3d_gl_view *gl_view, GLuint *counter_bo, void *object) { struct wined3d_view_gl_destroy_ctx *ctx, c; @@ -4867,7 +4867,7 @@ static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4913,7 +4913,7 @@ static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resour if (swapchain_count) wined3d_device_incref(device); wined3d_shader_resource_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4959,7 +4959,7 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac if (swapchain_count) wined3d_device_incref(device); wined3d_unordered_access_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl->counter_bo, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, &view_gl->counter_bo, view_gl); if (swapchain_count) wined3d_device_decref(device); } -- 2.11.0

1 0

[PATCH] wined3d: Fix the spelling of some comments.
by Francois Gouget 12 Dec '19

12 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 34c3f061a94..9d98c79ce51 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1472,7 +1472,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) mod = "_SAT"; else mod = ""; - /* Fragment samplers always have indentity mapping */ + /* Fragment samplers always have identity mapping */ if(sampler_idx >= WINED3D_MAX_FRAGMENT_SAMPLERS) { sampler_idx = priv->cur_vs_args->vertex.samplers[sampler_idx - WINED3D_MAX_FRAGMENT_SAMPLERS]; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c5d2eeaa477..95769014af6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4487,7 +4487,7 @@ static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl * * this for now. * * Shouldn't be too hard to support with OpenGL, in theory just call - * glDrawArrays() instead of drawElements(). But the stream fequency value + * glDrawArrays() instead of drawElements(). But the stream frequency value * has a different meaning in that situation. */ if (!idx_size) { diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 81032745a06..c5df45541e4 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -216,7 +216,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->position_transformed = TRUE; /* Find the streams used in the declaration. The vertex buffers have - * to be loaded when drawing, but filter tesselation pseudo streams. */ + * to be loaded when drawing, but filter tessellation pseudo streams. */ if (e->input_slot >= WINED3D_MAX_STREAMS) continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60ddf74a0ec..b73d5c7fecf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3132,7 +3132,7 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; - struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tesselated pseudo-stream */]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tessellated pseudo-stream */]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; unsigned int index_offset; -- 2.20.1

2 1

[PATCH] ieframe/tests: Fix a typo in ok() message.
by Andrey Gusev 12 Dec '19

12 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9ec54a7077..0195851bda 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2665,7 +2665,7 @@ static void test_Extent(IWebBrowser2 *unk) trace("dpi: %d / %d\n", dpi_y, dpi_y); hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not get IOleObkect: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); if(FAILED(hres)) return; -- 2.23.0

2 1

[PATCH v4 1/9] jscript: Store the necessary function and variable info in the TypeInfo.
by Gabriel Ivăncescu 12 Dec '19

12 Dec '19

The TypeInfo is built when it is retrieved and frozen at that moment, even if the script changes after that and more identifiers are added to it, or existing ones deleted. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 110 ++++++++++++++++++++++++++++++++++++++++ dlls/jscript/function.c | 31 +++++++++++ dlls/jscript/jscript.h | 1 + 3 files changed, 142 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 92e9b96..6c6d25a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -19,6 +19,7 @@ #include <assert.h> #include "jscript.h" +#include "engine.h" #include "wine/debug.h" @@ -70,6 +71,20 @@ static inline dispex_prop_t *get_prop(jsdisp_t *This, DISPID id) return This->props+id; } +static inline BOOL is_function_prop(dispex_prop_t *prop) +{ + BOOL ret = FALSE; + + if (is_object_instance(prop->u.val)) + { + jsdisp_t *jsdisp = iface_to_jsdisp(get_object(prop->u.val)); + + if (jsdisp) ret = is_class(jsdisp, JSCLASS_FUNCTION); + jsdisp_release(jsdisp); + } + return ret; +} + static DWORD get_flags(jsdisp_t *This, dispex_prop_t *prop) { if(prop->type == PROP_PROTREF) { @@ -590,9 +605,21 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } +struct typeinfo_func { + dispex_prop_t *prop; + function_code_t *code; +}; + typedef struct { ITypeInfo ITypeInfo_iface; LONG ref; + + UINT num_funcs; + UINT num_vars; + struct typeinfo_func *funcs; + dispex_prop_t **vars; + + jsdisp_t *jsdisp; } ScriptTypeInfo; static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) @@ -632,11 +659,17 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); LONG ref = InterlockedDecrement(&This->ref); + UINT i; TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + for (i = This->num_funcs; i--;) + release_bytecode(This->funcs[i].code->bytecode); + IDispatchEx_Release(&This->jsdisp->IDispatchEx_iface); + heap_free(This->funcs); + heap_free(This->vars); heap_free(This); } return ref; @@ -897,17 +930,94 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC ITypeInfo **ppTInfo) { jsdisp_t *This = impl_from_IDispatchEx(iface); + dispex_prop_t *prop, *cur, *end, **typevar; + UINT num_funcs = 0, num_vars = 0; + struct typeinfo_func *typefunc; + function_code_t *func_code; ScriptTypeInfo *typeinfo; + unsigned pos; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); if (iTInfo != 0) return DISP_E_BADINDEX; + for (prop = This->props, end = prop + This->prop_cnt; prop != end; prop++) + { + if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + continue; + + /* If two identifiers differ only by case, the TypeInfo fails */ + pos = This->props[get_props_idx(This, prop->hash)].bucket_head; + while (pos) + { + cur = This->props + pos; + + if (prop->hash == cur->hash && prop != cur && + cur->type == PROP_JSVAL && (cur->flags & PROPF_ENUMERABLE) && + !wcsicmp(prop->name, cur->name)) + { + return TYPE_E_AMBIGUOUSNAME; + } + pos = cur->bucket_next; + } + + if (is_function_prop(prop)) + { + if (Function_get_code(as_jsdisp(get_object(prop->u.val)))) + num_funcs++; + } + else num_vars++; + } + if (!(typeinfo = heap_alloc(sizeof(*typeinfo)))) return E_OUTOFMEMORY; typeinfo->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; typeinfo->ref = 1; + typeinfo->num_vars = num_vars; + typeinfo->num_funcs = num_funcs; + typeinfo->jsdisp = This; + + typeinfo->funcs = heap_alloc(sizeof(*typeinfo->funcs) * num_funcs); + if (!typeinfo->funcs) + { + heap_free(typeinfo); + return E_OUTOFMEMORY; + } + + typeinfo->vars = heap_alloc(sizeof(*typeinfo->vars) * num_vars); + if (!typeinfo->vars) + { + heap_free(typeinfo->funcs); + heap_free(typeinfo); + return E_OUTOFMEMORY; + } + + typefunc = typeinfo->funcs; + typevar = typeinfo->vars; + for (prop = This->props; prop != end; prop++) + { + if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + continue; + + if (is_function_prop(prop)) + { + func_code = Function_get_code(as_jsdisp(get_object(prop->u.val))); + if (!func_code) continue; + + typefunc->prop = prop; + typefunc->code = func_code; + typefunc++; + + /* The function may be deleted, so keep a ref */ + bytecode_addref(func_code->bytecode); + } + else + *typevar++ = prop; + } + + /* Keep a ref to the props and their names */ + IDispatchEx_AddRef(&This->IDispatchEx_iface); *ppTInfo = &typeinfo->ITypeInfo_iface; return S_OK; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7a44f50..52c1267 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -37,6 +37,7 @@ typedef struct { struct _function_vtbl_t { HRESULT (*call)(script_ctx_t*,FunctionInstance*,IDispatch*,unsigned,unsigned,jsval_t*,jsval_t*); HRESULT (*toString)(FunctionInstance*,jsstr_t**); + function_code_t* (*get_code)(FunctionInstance*); void (*destructor)(FunctionInstance*); }; @@ -524,6 +525,16 @@ static HRESULT Function_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval return S_OK; } +function_code_t *Function_get_code(jsdisp_t *jsthis) +{ + FunctionInstance *function; + + assert(is_class(jsthis, JSCLASS_FUNCTION)); + function = function_from_jsdisp(jsthis); + + return function->vtbl->get_code(function); +} + static void Function_destructor(jsdisp_t *dispex) { FunctionInstance *function = function_from_jsdisp(dispex); @@ -638,6 +649,11 @@ static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) return S_OK; } +static function_code_t *NativeFunction_get_code(FunctionInstance *function) +{ + return NULL; +} + static void NativeFunction_destructor(FunctionInstance *function) { } @@ -645,6 +661,7 @@ static void NativeFunction_destructor(FunctionInstance *function) static const function_vtbl_t NativeFunctionVtbl = { NativeFunction_call, NativeFunction_toString, + NativeFunction_get_code, NativeFunction_destructor }; @@ -749,6 +766,13 @@ static HRESULT InterpretedFunction_toString(FunctionInstance *func, jsstr_t **re return *ret ? S_OK : E_OUTOFMEMORY; } +static function_code_t *InterpretedFunction_get_code(FunctionInstance *func) +{ + InterpretedFunction *function = (InterpretedFunction*)func; + + return function->func_code; +} + static void InterpretedFunction_destructor(FunctionInstance *func) { InterpretedFunction *function = (InterpretedFunction*)func; @@ -761,6 +785,7 @@ static void InterpretedFunction_destructor(FunctionInstance *func) static const function_vtbl_t InterpretedFunctionVtbl = { InterpretedFunction_call, InterpretedFunction_toString, + InterpretedFunction_get_code, InterpretedFunction_destructor }; @@ -842,6 +867,11 @@ static HRESULT BindFunction_toString(FunctionInstance *function, jsstr_t **ret) return *ret ? S_OK : E_OUTOFMEMORY; } +static function_code_t *BindFunction_get_code(FunctionInstance *function) +{ + return NULL; +} + static void BindFunction_destructor(FunctionInstance *func) { BindFunction *function = (BindFunction*)func; @@ -858,6 +888,7 @@ static void BindFunction_destructor(FunctionInstance *func) static const function_vtbl_t BindFunctionVtbl = { BindFunction_call, BindFunction_toString, + BindFunction_get_code, BindFunction_destructor }; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 5d635b7..7174db8 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -307,6 +307,7 @@ HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DE HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value} HRESULT throw_eval_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; -- 2.21.0

4 29

[PATCH] ntoskrnl.exe/tests: Fix typos in ok() messages.
by Andrey Gusev 12 Dec '19

12 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6827b74a3c..10f3865515 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -800,7 +800,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); @@ -824,7 +824,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); ok(status == STATUS_TIMEOUT, "got %#x\n", status); -- 2.23.0

2 1

[PATCH] ole32: Fix typos in comments.
by Andrey Gusev 12 Dec '19

12 Dec '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ole32/compobj.c | 2 +- dlls/ole32/storage32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a91067fcb7..daa405356f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4763,7 +4763,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, * PARAMS * pszName [I] String representing the object. * pBindOptions [I] Parameters affecting the binding to the named object. - * riid [I] Interface to bind to on the objecct. + * riid [I] Interface to bind to on the object. * ppv [O] On output, the interface riid of the object represented * by pszName. * diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 515880ec36..6b05669a5e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8622,7 +8622,7 @@ end: * pwcsName [ I] Unicode string with filename (can be relative or NULL) * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) * reserved [ ?] unused?, usually 0 - * ppstgOpen [IO] A pointer to IStorage pointer to the new onject + * ppstgOpen [IO] A pointer to IStorage pointer to the new object * * RETURNS * S_OK if the file was successfully created -- 2.23.0

1 0

[PATCH 5/5] msado15: Implement _Recordset_Open and _Recordset_Close.
by Hans Leidekker 12 Dec '19

12 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b214f9d077..e854b3e824 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -901,8 +901,13 @@ static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) static HRESULT WINAPI recordset_Close( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + close_recordset( recordset ); + recordset->state = adStateClosed; + return S_OK; } static HRESULT WINAPI recordset_Delete( _Recordset *iface, AffectEnum affect_records ) @@ -950,9 +955,13 @@ static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { - FIXME( "%p, %s, %s, %d, %d, %d\n", iface, debugstr_variant(&source), debugstr_variant(&active_connection), + struct recordset *recordset = impl_from_Recordset( iface ); + + FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - return E_NOTIMPL; + + recordset->state = adStateOpen; + return S_OK; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) -- 2.20.1

1 0

[PATCH 4/5] msado15: Implement Field_get_Value and Field_put_Value.
by Hans Leidekker 12 Dec '19

12 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 67 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b262243d89..b214f9d077 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -36,7 +36,12 @@ struct recordset { _Recordset Recordset_iface; LONG refs; + LONG state; struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields @@ -187,16 +192,51 @@ static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) return S_OK; } +static LONG get_column_count( struct recordset *recordset ) +{ + return recordset->fields->count; +} + static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) { - FIXME( "%p, %p\n", iface, val ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %p\n", field, val ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &field->recordset->data[row * col_count + col] )) != S_OK) return hr; + + *val = copy; + return S_OK; } static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&val) ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %s\n", field, debugstr_variant(&val) ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &val )) != S_OK) return hr; + + field->recordset->data[row * col_count + col] = copy; + return S_OK; } static HRESULT WINAPI field_get_Precision( Field *iface, unsigned char *precision ) @@ -614,6 +654,22 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) return refs; } +static void close_recordset( struct recordset *recordset ) +{ + ULONG row, col, col_count = get_column_count( recordset ); + + recordset->fields->recordset = NULL; + Fields_Release( &recordset->fields->Fields_iface ); + recordset->fields = NULL; + + for (row = 0; row < recordset->count; row++) + for (col = 0; col < col_count; col++) VariantClear( &recordset->data[row * col_count + col] ); + + recordset->count = recordset->allocated = recordset->index = 0; + heap_free( recordset->data ); + recordset->data = NULL; +} + static ULONG WINAPI recordset_Release( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -622,7 +678,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) if (!refs) { TRACE( "destroying %p\n", recordset ); - recordset->fields->recordset = NULL; + close_recordset( recordset ); heap_free( recordset ); } return refs; @@ -1264,6 +1320,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; + recordset->index = -1; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); -- 2.20.1

1 0

[PATCH 3/5] msado15: Implement Field_get_Attributes and Field_get_DefinedSize.
by Hans Leidekker 12 Dec '19

12 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 22 +++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ff06b8789a..b262243d89 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -147,14 +147,22 @@ static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) { - TRACE( "%p, %p\n", iface, attrs ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, attrs ); + + *attrs = field->attrs; + return S_OK; } static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, size ); + + *size = field->defined_size; + return S_OK; } static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 800eb236fe..f9a5377c50 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -101,7 +101,9 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG refs, count; + LONG refs, count, size; + DataTypeEnum type; + FieldAttributeEnum attrs; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -164,6 +166,24 @@ static void test_Fields(void) Field_Release( field2 ); SysFreeString( name ); + /* verify values set with _Append */ + hr = Field_get_Name( field, &name ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( name, L"field" ), "got %s\n", wine_dbgstr_w(name) ); + SysFreeString( name ); + type = 0xdead; + hr = Field_get_Type( field, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adInteger, "got %d\n", type ); + size = -1; + hr = Field_get_DefinedSize( field, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 4, "got %d\n", size ); + attrs = 0xdead; + hr = Field_get_Attributes( field, &attrs ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !attrs, "got %d\n", attrs ); + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); -- 2.20.1

1 0

[PATCH 2/5] msado15: Implement Fields_get_Item.
by Hans Leidekker 12 Dec '19

12 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 42 ++++++++++++++++++++++++++++++++++-- dlls/msado15/tests/msado15.c | 42 ++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a20d5920da..ff06b8789a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -433,10 +433,48 @@ static HRESULT WINAPI fields_Refresh( Fields *iface ) return E_NOTIMPL; } +static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) +{ + ULONG i; + + if (V_VT( index ) != VT_BSTR) + { + FIXME( "variant type %u not supported\n", V_VT( index ) ); + return E_INVALIDARG; + } + + for (i = 0; i < fields->count; i++) + { + BSTR name; + BOOL match; + HRESULT hr; + + if ((hr = Field_get_Name( fields->field[i], &name )) != S_OK) return hr; + match = !wcsicmp( V_BSTR( index ), name ); + SysFreeString( name ); + if (match) + { + *ret = i; + return S_OK; + } + } + + return E_INVALIDARG; +} + static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) { - FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), obj ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + HRESULT hr; + ULONG i; + + TRACE( "%p, %s, %p\n", fields, debugstr_variant(&index), obj ); + + if ((hr = map_index( fields, &index, &i )) != S_OK) return hr; + + Field_AddRef( fields->field[i] ); + *obj = fields->field[i]; + return S_OK; } static BOOL resize_fields( struct fields *fields, ULONG count ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 03b2828d9f..800eb236fe 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,12 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static LONG get_refs_field( Field *field ) +{ + Field_AddRef( field ); + return Field_Release( field ); +} + static LONG get_refs_fields( Fields *fields ) { Fields_AddRef( fields ); @@ -92,9 +98,10 @@ static void test_Fields(void) { _Recordset *recordset; Fields *fields; - VARIANT val; + Field *field, *field2; + VARIANT val, index; BSTR name; - LONG count; + LONG refs, count; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -127,6 +134,37 @@ static void test_Fields(void) hr = Fields_get_Count( fields, &count ); ok( count == 2, "got %d\n", count ); + /* handing out field object doesn't add reference to fields or recordset object */ + name = SysAllocString( L"field" ); + V_VT( &index ) = VT_BSTR; + V_BSTR( &index ) = name; + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_field( field ); + ok( refs == 1, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* calling get_Item again returns the same object and adds reference */ + hr = Fields_get_Item( fields, index, &field2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( field2 == field, "expected same object\n" ); + refs = get_refs_field( field2 ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + Field_Release( field2 ); + SysFreeString( name ); + + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); } -- 2.20.1

1 0

[PATCH 1/5] msado15: Implement Field_get_Name and Field_get_Type.
by Hans Leidekker 12 Dec '19

12 Dec '19

Applies after 175712. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 78d13d1577..a20d5920da 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -159,14 +159,24 @@ static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + BSTR name; + + TRACE( "%p, %p\n", field, str ); + + if (!(name = SysAllocString( field->name ))) return E_OUTOFMEMORY; + *str = name; + return S_OK; } static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, type ); + + *type = field->type; + return S_OK; } static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) -- 2.20.1

1 0

[PATCH 2/2] msado15: Add _Command stub interface.
by Hans Leidekker 12 Dec '19

12 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/Makefile.in | 1 + dlls/msado15/command.c | 313 +++++++++++++++++++++++++++++++ dlls/msado15/main.c | 5 + dlls/msado15/msado15_classes.idl | 8 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/tests/msado15.c | 27 +++ 6 files changed, 355 insertions(+) create mode 100644 dlls/msado15/command.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 604f9ff018..9852e0863d 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + command.c \ connection.c \ main.c \ recordset.c \ diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c new file mode 100644 index 0000000000..a96fd73990 --- /dev/null +++ b/dlls/msado15/command.c @@ -0,0 +1,313 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct command +{ + _Command Command_iface; + LONG ref; +}; + +static inline struct command *impl_from_Command( _Command *iface ) +{ + return CONTAINING_RECORD( iface, struct command, Command_iface ); +} + +static HRESULT WINAPI command_QueryInterface( _Command *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Command15) || + IsEqualIID(riid, &IID_Command25) || + IsEqualIID(riid, &IID__Command)) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + + _Command_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI command_AddRef( _Command *iface ) +{ + struct command *command = impl_from_Command( iface ); + return InterlockedIncrement( &command->ref ); +} + +static ULONG WINAPI command_Release( _Command *iface ) +{ + struct command *command = impl_from_Command( iface ); + LONG ref = InterlockedDecrement( &command->ref ); + if (!ref) + { + TRACE( "destroying %p\n", command ); + heap_free( command ); + } + return ref; +} + +static HRESULT WINAPI command_GetTypeInfoCount( _Command *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetTypeInfo( _Command *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetIDsOfNames( _Command *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **props ) +{ + FIXME( "%p, %p\n", iface, props ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&connection) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandText( _Command *iface, BSTR *text ) +{ + FIXME( "%p, %p\n", iface, text ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandText( _Command *iface, BSTR text ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(text) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandTimeout( _Command *iface, LONG *timeout ) +{ + FIXME( "%p, %p\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandTimeout( _Command *iface, LONG timeout ) +{ + FIXME( "%p, %d\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Prepared( _Command *iface, VARIANT_BOOL *prepared ) +{ + FIXME( "%p, %p\n", iface, prepared ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Prepared( _Command *iface, VARIANT_BOOL prepared ) +{ + FIXME( "%p, %d\n", iface, prepared ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIANT *parameters, + LONG options, _Recordset **recordset ) +{ + FIXME( "%p, %p, %p, %d, %p\n", iface, affected, parameters, options, recordset ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataTypeEnum type, + ParameterDirectionEnum direction, LONG size, VARIANT value, + _Parameter **parameter ) +{ + FIXME( "%p, %s, %d, %d, %d, %p\n", iface, debugstr_w(name), type, direction, size, parameter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **parameters ) +{ + FIXME( "%p, %p\n", iface, parameters ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) +{ + FIXME( "%p, %d\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) +{ + FIXME( "%p, %p\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) +{ + FIXME( "%p, %p\n", iface, name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Name( _Command *iface, BSTR name ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(name) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_State( _Command *iface, LONG *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Cancel( _Command *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_CommandStream( _Command *iface, IUnknown *stream ) +{ + FIXME( "%p, %p\n", iface, stream ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandStream( _Command *iface, VARIANT *stream ) +{ + FIXME( "%p, %p\n", iface, stream ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Dialect( _Command *iface, BSTR dialect ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(dialect) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Dialect( _Command *iface, BSTR *dialect ) +{ + FIXME( "%p, %p\n", iface, dialect ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_NamedParameters( _Command *iface, VARIANT_BOOL parameters ) +{ + FIXME( "%p, %d\n", iface, parameters ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_NamedParameters( _Command *iface, VARIANT_BOOL *parameters ) +{ + FIXME( "%p, %p\n", iface, parameters ); + return E_NOTIMPL; +} + +static const struct _CommandVtbl command_vtbl = +{ + command_QueryInterface, + command_AddRef, + command_Release, + command_GetTypeInfoCount, + command_GetTypeInfo, + command_GetIDsOfNames, + command_Invoke, + command_get_Properties, + command_get_ActiveConnection, + command_putref_ActiveConnection, + command_put_ActiveConnection, + command_get_CommandText, + command_put_CommandText, + command_get_CommandTimeout, + command_put_CommandTimeout, + command_get_Prepared, + command_put_Prepared, + command_Execute, + command_CreateParameter, + command_get_Parameters, + command_put_CommandType, + command_get_CommandType, + command_get_Name, + command_put_Name, + command_get_State, + command_Cancel, + command_putref_CommandStream, + command_get_CommandStream, + command_put_Dialect, + command_get_Dialect, + command_put_NamedParameters, + command_get_NamedParameters +}; + +HRESULT Command_create( void **obj ) +{ + struct command *command; + + if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; + command->Command_iface.lpVtbl = &command_vtbl; + command->ref = 1; + + *obj = &command->Command_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 32ae252337..3115474b84 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -117,6 +117,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = msadocf_LockServer }; +static struct msadocf command_cf = { { &msadocf_vtbl }, Command_create }; static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; static struct msadocf stream_cf = { { &msadocf_vtbl }, Stream_create }; @@ -142,6 +143,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &stream_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Command )) + { + cf = &command_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index 5ede180240..51f8bd77db 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -18,6 +18,14 @@ #pragma makedep register +[ + threading(apartment), + progid("ADODB.Command.6.0"), + vi_progid("ADODB.Command"), + uuid(00000507-0000-0010-8000-00aa006d2ea4) +] +coclass Command { interface _Command; } + [ threading(apartment), progid("ADODB.Connection.6.0"), diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 7239e48b53..f6c60f0304 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -21,6 +21,7 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +HRESULT Command_create( void ** ) DECLSPEC_HIDDEN; HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 5a1813694b..03b2828d9f 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -444,6 +444,32 @@ if (0) /* Crashes on windows */ _Connection_Release(connection); } +static void test_Command(void) +{ + HRESULT hr; + _Command *command; + _ADO *ado; + Command15 *command15; + Command25 *command25; + + hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Command_QueryInterface( command, &IID__ADO, (void **)&ado ); + ok( hr == S_OK, "got %08x\n", hr ); + _ADO_Release( ado ); + + hr = _Command_QueryInterface( command, &IID_Command15, (void **)&command15 ); + ok( hr == S_OK, "got %08x\n", hr ); + Command15_Release( command15 ); + + hr = _Command_QueryInterface( command, &IID_Command25, (void **)&command25 ); + ok( hr == S_OK, "got %08x\n", hr ); + Command25_Release( command25 ); + + _Command_Release( command ); +} + START_TEST(msado15) { CoInitialize( NULL ); @@ -451,5 +477,6 @@ START_TEST(msado15) test_Fields(); test_Recordset(); test_Stream(); + test_Command(); CoUninitialize(); } -- 2.20.1

2 1

[PATCH tools] winegecko.php: Update for new file name scheme.
by Jacek Caban 12 Dec '19

12 Dec '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- winegecko.php | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] msado15: Add ISupportErrorInfo support to _Connection.
by Hans Leidekker 12 Dec '19

12 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 56 ++++++++++++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 5 ++-- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 037ab52199..73b225628c 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,11 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct connection { - _Connection Connection_iface; - LONG refs; - - ObjectStateEnum state; - LONG timeout; + _Connection Connection_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + ObjectStateEnum state; + LONG timeout; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -44,6 +44,11 @@ static inline struct connection *impl_from_Connection( _Connection *iface ) return CONTAINING_RECORD( iface, struct connection, Connection_iface ); } +static inline struct connection *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, ISupportErrorInfo_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -64,13 +69,18 @@ static ULONG WINAPI connection_Release( _Connection *iface ) static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid, void **obj ) { - TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface; } + else if(IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &connection->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -339,12 +349,46 @@ static const struct _ConnectionVtbl connection_vtbl = connection_Cancel }; +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", connection, debugstr_guid(riid) ); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; + connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 4ef4762ac6..5a1813694b 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -414,9 +414,8 @@ static void test_Connection(void) ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); - todo_wine ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); - if (hr == S_OK) - ISupportErrorInfo_Release(errorinfo); + ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + ISupportErrorInfo_Release(errorinfo); if (0) /* Crashes on windows */ { -- 2.20.1

1 0

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-devel