January 2020 - Wine-Commits

Jacek Caban : kernel32/tests: Don't use blackbox for crashing process.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 79d58362c7c05af73064a572bd199a5430b89520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d58362c7c05af73064a572… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 3 18:48:30 2020 +0100 kernel32/tests: Don't use blackbox for crashing process. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 92ab98b1ca..cd982a2014 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -174,12 +174,7 @@ static void run_background_thread(void) CloseHandle(thread); } -typedef struct -{ - DWORD pid; -} crash_blackbox_t; - -static void doCrash(int argc, char** argv) +static void doCrash(void) { volatile char* p; @@ -189,13 +184,6 @@ static void doCrash(int argc, char** argv) run_background_thread(); - if (argc >= 4) - { - crash_blackbox_t blackbox; - blackbox.pid=GetCurrentProcessId(); - save_blackbox(argv[3], &blackbox, sizeof(blackbox), NULL); - } - /* Just crash */ trace("child: crashing...\n"); p=NULL; @@ -567,11 +555,9 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) HANDLE start_event, done_event; char* cmd; char dbglog[MAX_PATH]; - char childlog[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; DWORD exit_code; - crash_blackbox_t crash_blackbox; debugger_blackbox_t dbg_blackbox; DWORD wait_code; @@ -599,9 +585,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(ret == ERROR_SUCCESS, "unable to set AeDebug/debugger: ret=%d\n", ret); HeapFree(GetProcessHeap(), 0, cmd); - get_file_name(childlog); - cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+16+strlen(dbglog)+2+1); - sprintf(cmd, "%s debugger crash \"%s\"", argv0, childlog); + cmd = HeapAlloc(GetProcessHeap(), 0, strlen(argv0) + 16); + sprintf(cmd, "%s debugger crash", argv0); trace("running %s...\n", dbgtasks); memset(&startup, 0, sizeof(startup)); @@ -625,7 +610,6 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) WaitForSingleObject(info.hProcess, 5000); CloseHandle(info.hProcess); DeleteFileA(dbglog); - DeleteFileA(childlog); win_skip("Giving up on child process\n"); return; } @@ -661,18 +645,16 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) if (skip_crash_and_debug) { DeleteFileA(dbglog); - DeleteFileA(childlog); win_skip("Giving up on debugger\n"); return; } #endif ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the debugger\n"); - ok(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox)), "failed to open: %s\n", childlog); ok(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox)), "failed to open: %s\n", dbglog); ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc); - ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid); + ok(dbg_blackbox.pid == info.dwProcessId, "the child and debugged pids don't match: %d != %d\n", info.dwProcessId, dbg_blackbox.pid); ok(dbg_blackbox.debug_rc, "debugger: SetEvent(debug_event) failed err=%d\n", dbg_blackbox.debug_err); ok(dbg_blackbox.attach_rc, "DebugActiveProcess(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.attach_err); ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err); @@ -680,7 +662,6 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(!dbg_blackbox.failures, "debugger reported %u failures\n", dbg_blackbox.failures); DeleteFileA(dbglog); - DeleteFileA(childlog); } static void crash_and_winedbg(HKEY hkey, const char* argv0) @@ -1476,7 +1457,7 @@ START_TEST(debugger) myARGC=winetest_get_mainargs(&myARGV); if (myARGC >= 3 && strcmp(myARGV[2], "crash") == 0) { - doCrash(myARGC, myARGV); + doCrash(); } else if (myARGC >= 3 && strncmp(myARGV[2], "dbg,", 4) == 0) {

1 0

Jacek Caban : kernel32/tests: Use WAIT_EVENT_TIMEOUT in wait_for_breakpoint.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: f4e232430bf7973157d330d53ac34f34f7f022c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e232430bf7973157d330d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 3 18:48:23 2020 +0100 kernel32/tests: Use WAIT_EVENT_TIMEOUT in wait_for_breakpoint. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index c4d2ce7115..92ab98b1ca 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -390,13 +390,13 @@ static void next_event_(unsigned line, struct debugger_context *ctx, unsigned ti #define wait_for_breakpoint(a) wait_for_breakpoint_(__LINE__,a) static void wait_for_breakpoint_(unsigned line, struct debugger_context *ctx) { - do next_event_(line, ctx, 2000); + do next_event_(line, ctx, WAIT_EVENT_TIMEOUT); while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT); - ok(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); - ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", - ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); + ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); + ok_(__FILE__,line)(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); } static void process_attach_events(struct debugger_context *ctx, BOOL pass_exception)

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: c2e82c640228d0bd2771b0c1badf6d0eecb15688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e82c640228d0bd2771b0c1… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Jan 3 16:55:56 2020 +0100 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 110 ++++++++++++++++-------------------------------------------- 1 file changed, 28 insertions(+), 82 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 083c3e11cd..2e95616fe1 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-11-01 22:38+0100\n" +"PO-Revision-Date: 2020-01-03 16:23+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -662,11 +662,9 @@ msgid "&Define Custom Colors >>" msgstr "&Definer egendefinerte farger >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Nei" +msgstr "&o" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" @@ -6832,34 +6830,24 @@ msgid "Sink has not been finalized.\n" msgstr "Fant ikke objekt-UUID'en.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "Installasjonsplattformen støttes ikke.\n" +msgstr "Media Foundation plattformen er ikke lastet.\n" #: mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Antall byte er for lavt.\n" +msgstr "For lite hurtigminne.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Ugyldig syntaks for spørring.\n" +msgstr "Ugyldig forespørsel.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Ugyldig segmentnummer.\n" +msgstr "Ugyldig strømnummer.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "Ugyldig datatype.\n" +msgstr "Ugyldig mediatype.\n" #: mferror.mc:67 #, fuzzy @@ -6868,44 +6856,32 @@ msgid "No more input is accepted.\n" msgstr "Ingen flere oppføringer.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "Fant ikke objekt-UUID'en.\n" +msgstr "Objekt er ikke lastet.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "Operasjonen støttes ikke.\n" +msgstr "Representasjonen støttes ikke.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" msgstr "" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Tjenesten støttes ikke.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Uventet nettverksfeil.\n" +msgstr "Uventet feil.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Ugyldig tid.\n" +msgstr "Ugyldig type.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Ugyldig format for bildepunkt.\n" +msgstr "Ugyldig filformat.\n" #: mferror.mc:137 #, fuzzy @@ -6914,10 +6890,8 @@ msgid "Invalid timestamp.\n" msgstr "Ugyldig tid.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Skjemaet støttes ikke.\n" #: mferror.mc:151 #, fuzzy @@ -6926,10 +6900,8 @@ msgid "Unsupported bytestream type.\n" msgstr "Typen støttes ikke.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Tidsformatet støttes ikke.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" @@ -6940,16 +6912,12 @@ msgid "No duration set for the sample.\n" msgstr "" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Ugyldig data.\n" +msgstr "Ugyldig strømdata.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "Ingen hjelp er ikke tilgjengelig." +msgstr "Sanntidsstøtte er ikke tilgjengelig.\n" #: mferror.mc:193 #, fuzzy @@ -6980,22 +6948,16 @@ msgid "Rate change was preempted.\n" msgstr "" #: mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "Fant ikke objekt-UUID'en.\n" +msgstr "Fant ikke objekt eller verdi.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Ingen hjelp er ikke tilgjengelig." +msgstr "Verdi er ikke tilgjengelig.\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "Ingen hjelp er ikke tilgjengelig." +msgstr "Klokken er ikke tilgjengelig.\n" #: mferror.mc:263 #, fuzzy @@ -7022,10 +6984,8 @@ msgid "Unsupported state transition.\n" msgstr "Godkjenningsnivået støttes ikke.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "En intern feil har oppstått.\n" +msgstr "En ugjenopprettelig feil har oppstått.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" @@ -7038,10 +6998,8 @@ msgid "Sample is not writable.\n" msgstr "Mappen for midlertidige filer kan ikke skrives til.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Stien er ugyldig.\n" +msgstr "Nøkkelen er ugyldig.\n" #: mferror.mc:319 #, fuzzy @@ -7056,16 +7014,12 @@ msgid "Unsupported caption.\n" msgstr "Typen støttes ikke.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Ugyldig arbeidsstasjon.\n" +msgstr "Ugyldig posisjon.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Fant ikke filen.\n" +msgstr "Fant ikke egenskapen.\n" #: mferror.mc:347 #, fuzzy @@ -7102,10 +7056,8 @@ msgid "Vector property is required.\n" msgstr "" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Operasjonen ble avbrutt av brukeren.\n" +msgstr "Operasjonen ble avbrutt.\n" #: mferror.mc:396 #, fuzzy @@ -7190,16 +7142,12 @@ msgid "Property is not allowed.\n" msgstr "Hook-typen er ikke tillat.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ressursen er i bruk.\n" +msgstr "Mediakilden er ikke startet.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Mediaformatet støttes ikke.\n" #: mferror.mc:515 #, fuzzy @@ -8450,10 +8398,8 @@ msgid "Off" msgstr "Av" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "video" +msgstr "Tilbyder" #: version.rc:45 #, fuzzy

1 0

Gabriel Ivăncescu : wined3d: Return FALSE rather than E_FAIL in wined3d_context_gl_create_wgl_ctx.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: a6606d0dae89c4f0e6dbecc369e4cadd391355cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6606d0dae89c4f0e6dbecc3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 3 14:00:12 2020 +0200 wined3d: Return FALSE rather than E_FAIL in wined3d_context_gl_create_wgl_ctx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 95769014af..458343ce4a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2049,7 +2049,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) { ERR("Failed to retrieve the backup device context.\n"); - return E_FAIL; + return FALSE; } context_gl->dc_is_private = TRUE;

1 0

Zebediah Figura : d3dcompiler/tests: Load d3dx9_36.dll dynamically.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: ae274b25e2f17c7b92d945a49e0fc8b4e671b1af URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae274b25e2f17c7b92d945a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 15:01:11 2020 -0600 d3dcompiler/tests: Load d3dx9_36.dll dynamically. Windows 7 Professional ships d3dcompiler_47 by default, but no version of d3dx9. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47894 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 16 ++++++++++++++-- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 3b4b7a5a42..51b1f93483 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3dcompiler_43.dll -IMPORTS = d3d9 d3dx9 user32 +IMPORTS = d3d9 user32 EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index f169f681ca..8985cd51bb 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -24,6 +24,9 @@ static pD3DCompile ppD3DCompile; +static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); +static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); + struct vertex { float x, y, z; @@ -182,7 +185,7 @@ static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, co errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); if (FAILED(hr)) return NULL; - hr = D3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); @@ -197,7 +200,7 @@ static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuff HRESULT hr; D3DXMATRIX projection_matrix; - D3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); + pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); @@ -641,6 +644,7 @@ START_TEST(hlsl) IDirect3DVertexDeclaration9 *vdeclaration; IDirect3DVertexBuffer9 *quad_geometry; IDirect3DVertexShader9 *vshader_passthru; + HMODULE mod; if (!load_d3dcompiler()) { @@ -648,6 +652,14 @@ START_TEST(hlsl) return; } + if (!(mod = LoadLibraryA("d3dx9_36.dll"))) + { + win_skip("Failed to load d3dx9_36.dll.\n"); + return; + } + pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); + pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); + device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); if (!device) return; diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index a4e3798bed..401ed30b0f 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3dcompiler_47.dll -IMPORTS = d3d9 d3dx9 user32 +IMPORTS = d3d9 user32 EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../../d3dcompiler_43/tests

1 0

Nikolay Sivov : ole32/tests: Add some return value checks (Coverity).
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: d024b33ca1abffd88f1af07e8c117f529f86190c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d024b33ca1abffd88f1af07e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 22:43:42 2020 +0300 ole32/tests: Add some return value checks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index b97c2646bf..0a087aff84 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1000,7 +1000,8 @@ static void test_set_clipboard(void) test_cf_dataobject(NULL); - ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "Failed to clear clipboard, hr = 0x%08x\n", hr); OpenClipboard(NULL); h = GetClipboardData(cf_onemore); @@ -1180,7 +1181,8 @@ static void test_consumer_refs(void) ok(get1 != get2, "data objects match\n"); - OleSetClipboard(NULL); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "Failed to clear clipboard, hr %#x.\n", hr); hr = OleGetClipboard(&get3); ok(hr == S_OK, "got %08x\n", hr); @@ -1260,7 +1262,8 @@ static void test_consumer_refs(void) refs = count_refs(src2); ok(refs == old_refs + 1, "%d %d\n", refs, old_refs); - OleSetClipboard(NULL); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "Failed to clear clipboard, hr %#x.\n", hr); refs = count_refs(src2); ok(refs == 2, "%d\n", refs); @@ -1274,7 +1277,8 @@ static void test_consumer_refs(void) old_refs = count_refs(src); ok(old_refs == 1, "%d\n", old_refs); - OleSetClipboard(src); + hr = OleSetClipboard(src); + ok(hr == S_OK, "Failed to clear clipboard, hr %#x.\n", hr); refs = count_refs(src); ok(refs > old_refs, "%d %d\n", refs, old_refs);

1 0

Matteo Bruni : d3dcompiler/tests: Load the correct d3dcompiler DLL in the HLSL tests.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 20b52b61c60afe433dc73063ee19b925cea93176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20b52b61c60afe433dc73063… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 3 20:52:33 2020 +0100 d3dcompiler/tests: Load the correct d3dcompiler DLL in the HLSL tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 8985cd51bb..868693838c 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -630,7 +630,11 @@ static BOOL load_d3dcompiler(void) { HMODULE module; +#if D3D_COMPILER_VERSION == 47 + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; +#else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; +#endif ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); return TRUE; @@ -648,7 +652,7 @@ START_TEST(hlsl) if (!load_d3dcompiler()) { - win_skip("Could not load d3dcompiler_43.dll\n"); + win_skip("Could not load DLL.\n"); return; }

1 0

Tag wine-5.0-rc4 : Alexandre Julliard : Release 5.0-rc4
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: refs/tags/wine-5.0-rc4 Tag: 17ffb257f3d62920c52e5b8cf9abf7f9e548f9a6 URL: https://source.winehq.org/git/wine.git/?a=tag;h=17ffb257f3d62920c52e5b8cf9a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 22:23:33 2020 +0100 Release 5.0-rc4

1 0

Alexandre Julliard : Release 5.0-rc4.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 0747fd29d8f429a3421207b52eabe11cfcdf877d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0747fd29d8f429a3421207b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 22:23:33 2020 +0100 Release 5.0-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 210 ++++++++++++++++++++++++++------------------------------------ VERSION | 2 +- configure | 18 +++--- 3 files changed, 99 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0747fd29d8f429a34212…

1 0

Piotr Caban : msvcrt: Update consumed in all scanf variants on end of input.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 1366dd69d5a0578299dc69365db972b0341456d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1366dd69d5a0578299dc6936… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 3 19:42:07 2020 +0100 msvcrt: Update consumed in all scanf variants on end of input. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 5f88839c91..934bd95953 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -79,9 +79,9 @@ #endif #ifdef STRING_LEN #ifdef WIDE_SCANF -#define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) +#define _GETC_(file) (consumed++, consumed>length ? '\0' : *file++) #else /* WIDE_SCANF */ -#define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++)) +#define _GETC_(file) (consumed++, consumed>length ? '\0' : (unsigned char)*file++) #endif /* WIDE_SCANF */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0)

1 0

Nikolay Sivov : strmbase: Fix fixed size buffer copy in JoinFilterGraph() (Coverity).
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: 4c58a2311aebdc595ea2ae0823d3d108b18b787c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c58a2311aebdc595ea2ae08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:19:52 2020 +0300 strmbase: Fix fixed size buffer copy in JoinFilterGraph() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 002bf11665..5242efe762 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -290,7 +290,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *p EnterCriticalSection(&This->csFilter); { if (pName) - lstrcpyW(This->filterInfo.achName, pName); + lstrcpynW(This->filterInfo.achName, pName, MAX_FILTER_NAME); else *This->filterInfo.achName = '\0'; This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */

1 0

Nikolay Sivov : kernelbase: Fix a typo in weights comparison helper (Coverity).
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: wine Branch: master Commit: ac72e61edf3e36c1b1e7bd8dfd48e338a349e06f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac72e61edf3e36c1b1e7bd8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:03:33 2020 +0300 kernelbase: Fix a typo in weights comparison helper (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c250c97968..da69e5a1f3 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2191,7 +2191,7 @@ static int compare_weights(int flags, const WCHAR *str1, int len1, inc_str_pos( &str1, &len1, &dpos1, &dlen1 ); skip = 1; } - if (get_table_entry( wctype_table, dstr2[dpos1] ) & (C1_PUNCT | C1_SPACE)) + if (get_table_entry( wctype_table, dstr2[dpos2] ) & (C1_PUNCT | C1_SPACE)) { inc_str_pos( &str2, &len2, &dpos2, &dlen2 ); skip = 1;

1 0

Francois Gouget : testbot/Janitor: Notify the administrator whenever an error occurs.
by Alexandre Julliard Jan. 3, 2020

Jan. 3, 2020

Module: tools Branch: master Commit: 42d96d82701972605d39a683086786b1b35be6bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=42d96d82701972605d39a68… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 3 11:32:43 2020 +0100 testbot/Janitor: Notify the administrator whenever an error occurs. Errors are also recorded in the general TestBot log but administrators would normally only read the log when something breaks the TestBot so that they would miss messages about unexpected TestAgentd.exe files for instance. Directly notifying the administrators about such issues makes it more likely that the Janitor script will remain up to date. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 35500e1..9ee5517 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -51,6 +51,7 @@ use WineTestBot::CGI::Sessions; use WineTestBot::RecordGroups; use WineTestBot::Tasks; use WineTestBot::Users; +use WineTestBot::Utils; use WineTestBot::VMs; @@ -65,10 +66,12 @@ sub Trace(@) LogMsg @_; } +my @Errors; sub Error(@) { print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; + push @Errors, "error: ". join("", @_); } @@ -363,3 +366,10 @@ if ($JobPurgeDays != 0) } } } + +if (@Errors) +{ + NotifyAdministrator("Errors occurred during the TestBot cleanup", + "Some errors occurred while cleaning up the TestBot database and directories:\n\n". + join("", @Errors)); +}

1 0

Zebediah Figura : ntdll/tests: Fix some exception test failures.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 7662fe0b47b5365f5092cf005fb43229c1911424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7662fe0b47b5365f5092cf00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:33:33 2020 -0600 ntdll/tests: Fix some exception test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 44df47466b..7b77cbb795 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -367,8 +367,9 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce trace("vect. handler %08x addr:%p context.Eip:%x\n", rec->ExceptionCode, rec->ExceptionAddress, context->Eip); - ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", - rec->ExceptionAddress, (char *)code_mem + 0xb); + ok(rec->ExceptionAddress == (char *)code_mem + 0xb + || broken(rec->ExceptionAddress == code_mem || !rec->ExceptionAddress) /* 2008 */, + "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); if (NtCurrentTeb()->Peb->BeingDebugged) ok((void *)context->Eax == pRtlRaiseException || @@ -403,8 +404,9 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR trace( "exception: %08x flags:%x addr:%p context: Eip:%x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip ); - ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", - rec->ExceptionAddress, (char *)code_mem + 0xb); + ok(rec->ExceptionAddress == (char *)code_mem + 0xb + || broken(rec->ExceptionAddress == code_mem || !rec->ExceptionAddress) /* 2008 */, + "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) || broken(context->ContextFlags == CONTEXT_FULL), /* win2003 */ @@ -515,8 +517,10 @@ static DWORD unwind_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECOR ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08x instead of %08x\n", rec->ExceptionCode, STATUS_UNWIND); - ok(rec->ExceptionAddress == (char *)code_mem + 0x22, "ExceptionAddress at %p instead of %p\n", - rec->ExceptionAddress, (char *)code_mem + 0x22); + ok(rec->ExceptionAddress == (char *)code_mem + 0x22 || broken(TRUE) /* Win10 1709 */, + "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0x22); + ok(context->Eip == (DWORD)code_mem + 0x22, "context->Eip is %08x instead of %08x\n", + context->Eip, (DWORD)code_mem + 0x22); ok(context->Eax == unwind_expected_eax, "context->Eax is %08x instead of %08x\n", context->Eax, unwind_expected_eax);

1 0

Lauri Kenttä : po: Update Finnish translations.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 34925faa7d0e28025bcf7344b608479ae6fa1fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34925faa7d0e28025bcf7344… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jan 2 09:06:36 2020 +0200 po: Update Finnish translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6ce7adb00b..aaa1c10adf 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8287,26 +8287,20 @@ msgid "Off" msgstr "Pois päältä" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "video" +msgstr "Tarjoaja" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Valitse käytettävä muoto:" +msgstr "Valitse data, johon haluat yhdistää:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Ominaisuudet" +msgstr "Datayhteyden ominaisuudet" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB -tarjoaja(t)" #: oledlg.rc:55 msgid "Insert Object"

1 0

Zebediah Figura : mfplat/tests: Link dynamically to d3d11.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: fe6ad8f88f78d2986f08bb8159b4626807175e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6ad8f88f78d2986f08bb81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 22:05:10 2020 -0600 mfplat/tests: Link dynamically to d3d11. Apparently the wxppro testbot has mfplat, but not d3d11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47894 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index dafb429142..c58a0463e5 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat mfuuid propsys uuid d3d11 +IMPORTS = ole32 mfplat mfuuid propsys uuid C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1db4d2dcc4..b61d91d14e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -59,6 +59,10 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); @@ -525,6 +529,11 @@ static void init_functions(void) X(MFRemovePeriodicCallback); #undef X + if ((mod = LoadLibraryA("d3d11.dll"))) + { + pD3D11CreateDevice = (void *)GetProcAddress(mod, "D3D11CreateDevice"); + } + is_win8_plus = pMFPutWaitingWorkItem != NULL; } @@ -3746,7 +3755,7 @@ static void test_dxgi_device_manager(void) ok(manager != manager2, "got wrong pointer: %p.\n", manager2); EXPECT_REF(manager, 1); - hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL); ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); EXPECT_REF(d3d11_dev, 1); @@ -3773,7 +3782,7 @@ static void test_dxgi_device_manager(void) EXPECT_REF(manager, 1); EXPECT_REF(d3d11_dev, 2); - hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &d3d11_dev2, NULL, NULL); ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); EXPECT_REF(d3d11_dev2, 1);

1 0

Zebediah Figura : winegstreamer: Catch errors while waiting for pin connection.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: a191a0c23a62288ba8906283c5727c5e5a2ccca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a191a0c23a62288ba8906283… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 20:28:41 2020 -0600 winegstreamer: Catch errors while waiting for pin connection. In the event that the user is missing GStreamer plugins this may allow the program to terminate gracefully rather than hanging in the init_gst() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e67efd58eb..7ae70d0a73 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -68,7 +68,7 @@ struct gstdemux GstBus *bus; guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; - HANDLE no_more_pads_event, duration_event; + HANDLE no_more_pads_event, duration_event, error_event; HANDLE push_thread; @@ -1139,6 +1139,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) ERR("%s\n", dbg_info); g_error_free(err); g_free(dbg_info); + SetEvent(filter->error_event); break; case GST_MESSAGE_WARNING: gst_message_parse_warning(msg, &err, &dbg_info); @@ -1225,6 +1226,7 @@ static void gstdemux_destroy(struct strmbase_filter *iface) CloseHandle(filter->no_more_pads_event); CloseHandle(filter->duration_event); + CloseHandle(filter->error_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ if (filter->sink.pin.peer) @@ -1498,12 +1500,14 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) for (i = 0; i < filter->cStreams; ++i) { struct gstdemux_source *pin = filter->ppPins[i]; + const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; } filter->ignore_flush = TRUE; @@ -1536,6 +1540,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = gstdecoder_init_gst; *phr = S_OK; @@ -2171,6 +2176,7 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) struct gstdemux_source *pin; GstElement *element; LONGLONG duration; + HANDLE events[2]; int ret; if (!(element = gst_element_factory_make("wavparse", NULL))) @@ -2214,7 +2220,10 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + events[0] = pin->caps_event; + events[1] = filter->error_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; filter->ignore_flush = TRUE; gst_element_set_state(filter->container, GST_STATE_READY); @@ -2246,6 +2255,7 @@ IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_init_gst; + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); *phr = S_OK; TRACE("Created WAVE parser %p.\n", object); @@ -2311,12 +2321,14 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) for (i = 0; i < filter->cStreams; ++i) { struct gstdemux_source *pin = filter->ppPins[i]; + const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; } filter->ignore_flush = TRUE; @@ -2349,6 +2361,7 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = avi_splitter_init_gst; *phr = S_OK; @@ -2383,6 +2396,7 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) struct gstdemux_source *pin; GstElement *element; LONGLONG duration; + HANDLE events[2]; int ret; if (!(element = gst_element_factory_make("mpegaudioparse", NULL))) @@ -2419,14 +2433,20 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) return FALSE; } - WaitForSingleObject(filter->duration_event, INFINITE); + events[0] = filter->duration_event; + events[1] = filter->error_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; + gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration); pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; if (!pin->seek.llDuration) pin->seek.dwCapabilities = 0; - WaitForSingleObject(pin->caps_event, INFINITE); + events[0] = pin->caps_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; filter->ignore_flush = TRUE; gst_element_set_state(filter->container, GST_STATE_READY); @@ -2486,6 +2506,7 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; object->duration_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = mpeg_splitter_init_gst; *phr = S_OK;

1 0

Erich E. Hoover : msvcrt: Use parse_double for wcstod.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 66c9c358ae5c50fc246cf4a4e280b401a5fc730b URL: https://source.winehq.org/git/wine.git/?a=commit;h=66c9c358ae5c50fc246cf4a4… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Dec 31 16:00:11 2019 -0700 msvcrt: Use parse_double for wcstod. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 130 ++++++++------------------------------------------- 2 files changed, 20 insertions(+), 111 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 84e3b013bc..244df7d23c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1073,6 +1073,7 @@ int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); int __cdecl MSVCRT_isleadbyte(int); int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); int __cdecl MSVCRT__isspace_l(int, MSVCRT__locale_t); +int __cdecl MSVCRT__iswspace_l(MSVCRT_wchar_t, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6d03997d9e..1abe28b7d9 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -381,15 +381,17 @@ int CDECL MSVCRT__wcsncoll(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str return MSVCRT__wcsncoll_l(str1, str2, count, NULL); } -static double MSVCRT_mul_pow10(double x, int exp) +static MSVCRT_wchar_t strtod_wstr_get(void *ctx) { - BOOL negexp = (exp < 0); - double ret; + const MSVCRT_wchar_t **p = ctx; + if (!**p) return MSVCRT_WEOF; + return *(*p)++; +} - if(negexp) - exp = -exp; - ret = pow(10.0, exp); - return (negexp ? x/ret : x*ret); +static void strtod_wstr_unget(void *ctx) +{ + const MSVCRT_wchar_t **p = ctx; + (*p)--; } /********************************************************************* @@ -398,121 +400,27 @@ static double MSVCRT_mul_pow10(double x, int exp) double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, MSVCRT__locale_t locale) { - int exp1=0, exp2=0, exp3=0, sign=1; MSVCRT_pthreadlocinfo locinfo; - unsigned __int64 d=0, hlp; - BOOL found_digit = FALSE; - unsigned fpcontrol; - const MSVCRT_wchar_t *p; + const MSVCRT_wchar_t *beg, *p; double ret; - if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; + if (!MSVCRT_CHECK_PMT(str != NULL)) { + if (end) *end = NULL; + return 0; + } - if(!locale) + if (!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; p = str; - while(isspaceW(*p)) - p++; - - if(*p == '-') { - sign = -1; - p++; - } else if(*p == '+') - p++; - - while(*p>='0' && *p<='9') { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) { - exp1++; - break; - } else - d = hlp; - } - while(*p>='0' && *p<='9') { - exp1++; - p++; - } - if(*p == *locinfo->lconv->decimal_point) + while(MSVCRT__iswspace_l(*p, locale)) p++; + beg = p; - while(*p>='0' && *p<='9') { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) - break; - - d = hlp; - exp1--; - } - while(*p>='0' && *p<='9') - p++; - - if(!found_digit) { - if(end) - *end = (MSVCRT_wchar_t*)str; - return 0.0; - } - - if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { - int e=0, s=1; - - p++; - if(*p == '-') { - s = -1; - p++; - } else if(*p == '+') - p++; - - if(*p>='0' && *p<='9') { - while(*p>='0' && *p<='9') { - if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) - e = INT_MAX; - p++; - } - e *= s; - - if(exp1<0 && e<0 && exp1+e>=0) exp1 = INT_MIN; - else if(exp1>0 && e>0 && exp1+e<0) exp1 = INT_MAX; - else exp3 += e; - } else { - if(*p=='-' || *p=='+') - p--; - p--; - } - } - - fpcontrol = _control87(0, 0); - _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT|MSVCRT__PC_64, - MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - - /* take the number without exponent and convert it into a double */ - ret = MSVCRT_mul_pow10(d, exp1); - /* shift the number to the representation where the first non-zero digit is in the ones place */ - exp2 = (ret != 0.0 ? (int)round(log10(ret)) : 0); - if (exp3-exp2 >= MSVCRT_FLT_MIN_10_EXP && exp3-exp2 <= MSVCRT_FLT_MAX_10_EXP) - exp2 = 0; /* only bother to take this extra step with very small or very large numbers */ - /* incorporate an additional shift to deal with floating point denormal values (if necessary) */ - if(exp3-exp2 < MSVCRT_DBL_MIN_10_EXP) - exp2 += exp3-exp2-MSVCRT_DBL_MIN_10_EXP; - ret = MSVCRT_mul_pow10(ret, exp2); - /* apply the exponent (and undo any shift) */ - ret = MSVCRT_mul_pow10(ret, exp3-exp2); - /* apply the sign bit */ - ret *= sign; - - _control87( fpcontrol, MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - - if((d && ret==0.0) || isinf(ret)) - *MSVCRT__errno() = MSVCRT_ERANGE; - - if(end) - *end = (MSVCRT_wchar_t*)p; - + ret = parse_double(strtod_wstr_get, strtod_wstr_unget, &p, locinfo, NULL); + if (end) *end = (p == beg ? (MSVCRT_wchar_t*)str : (MSVCRT_wchar_t*)p); return ret; }

1 0

Hans Leidekker : qmgr/tests: Fix test failures on Windows XP.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: e82c5f65b0956ec75fb9464f27bcf9362fef4ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e82c5f65b0956ec75fb9464f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 2 16:36:00 2020 +0100 qmgr/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 6d8185a078..8bc82dd172 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -507,7 +507,7 @@ static void test_Cancel(void) static void test_HttpOptions(void) { static const WCHAR urlW[] = - {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; static const WCHAR winetestW[] = {'W','i','n','e',':',' ','t','e','s','t','\r','\n',0}; static const unsigned int timeout = 30;

1 0

Gabriel Ivăncescu : quartz: Reset the advise thread's timeout on each iteration.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 14435a6d31377bb8a5d190a93eb22be66080f9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14435a6d31377bb8a5d190a9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 2 15:07:44 2020 +0200 quartz: Reset the advise thread's timeout on each iteration. Fixes a regression introduced by 63a6b308e91232dd55dd107595a6181c70180dd4. Because the timeout value was always shrinked, it quickly went to 0 and then the entire advise thread used 100% of a CPU core in applications such as Media Player Classic by basically becoming a busy loop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 77e569d437..8122cc5b0b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -126,13 +126,14 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) struct system_clock *clock = param; struct advise_sink *sink, *cursor; REFERENCE_TIME current_time; - DWORD timeout = INFINITE; HANDLE handles[2] = {clock->stop_event, clock->notify_event}; TRACE("Starting advise thread for clock %p.\n", clock); for (;;) { + DWORD timeout = INFINITE; + EnterCriticalSection(&clock->cs); current_time = GetTickCount64() * 10000;

1 0

Jacek Caban : kernel32/tests: Get rid of no longer needed win9x checks.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 313fc40a97eb82a4164829f3d4539b0121b3bec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313fc40a97eb82a4164829f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 17:22:51 2020 +0100 kernel32/tests: Get rid of no longer needed win9x checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 195 ++++++++++++------------------------------ 1 file changed, 57 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=313fc40a97eb82a41648…

1 0

Erich E. Hoover : msvcrt: Use parse_double for scanf floats.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: f99d307a3e1f9beb7fd9dc8892b5cfabbabf816b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99d307a3e1f9beb7fd9dc88… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jan 2 19:01:56 2020 +0100 msvcrt: Use parse_double for scanf floats. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.c | 16 ++--- dlls/msvcrt/scanf.h | 183 ++++++++++++++++++++++----------------------------- dlls/msvcrt/string.c | 3 + 3 files changed, 90 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f99d307a3e1f9beb7fd9…

1 0

Vijay Kiran Kamuju : include: Add IWbemContext and IWbemCallResult interface and other class definitions.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 3b1c3e57fcac4e23c0f9b376a483c4949ee7739f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1c3e57fcac4e23c0f9b376… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jan 1 17:46:32 2020 +0100 include: Add IWbemContext and IWbemCallResult interface and other class definitions. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wbemcli.idl | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 54cdb886aa..5b5ca61bec 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3A,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") +cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3a,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") cpp_quote("DEFINE_GUID(CLSID_WbemStatusCode, 0xeb87e1bd,0x3233,0x11d2,0xae,0xc9,0x00,0xc0,0x4f,0xb6,0x88,0x20);") import "oaidl.idl"; @@ -333,6 +333,48 @@ typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE WBEM_FLAG_STRONG_VALIDATION = 0x100000 } WBEM_GENERIC_FLAG_TYPE; +[ + object, + restricted, + local, + uuid(44aca674-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemContext : IUnknown +{ + HRESULT Clone( + [out] IWbemContext **ppNewCopy); + + HRESULT GetNames( + [in] long lFlags, + [out] SAFEARRAY(BSTR) *pNames); + + HRESULT BeginEnumeration( + [in] long lFlags); + + HRESULT Next( + [in] long lFlags, + [out] BSTR *pstrName, + [out] VARIANT *pValue); + + HRESULT EndEnumeration(); + + HRESULT SetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [in] VARIANT *pValue); + + HRESULT GetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [out] VARIANT *pValue); + + HRESULT DeleteValue( + [in, string] LPCWSTR wszName, + [in] long lFlags); + + HRESULT DeleteAll(); +} + [ object, restricted, @@ -486,6 +528,30 @@ interface IWbemServices : IUnknown [in] IWbemObjectSink *pResponseHandler); } +[ + object, + restricted, + uuid(44aca675-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemCallResult : IUnknown +{ + HRESULT GetResultObject( + [in] long lTimeout, + [out] IWbemClassObject **ppResultObject); + + HRESULT GetResultString( + [in] long lTimeout, + [out] BSTR *pstrResultString); + + HRESULT GetResultServices( + [in] long lTimeout, + [out] IWbemServices **ppServices); + + HRESULT GetCallStatus( + [in] long lTimeout, + [out] long *plStatus); +} + [ object, restricted, @@ -703,3 +769,19 @@ coclass UnsecuredApartment interface IUnsecuredApartment; interface IWbemUnsecuredApartment; }; + +[ + uuid(9a653086-174f-11d2-b5f9-00104b703efd) +] +coclass WbemClassObject +{ + interface IWbemClassObject; +}; + +[ + uuid(eb87e1bd-3233-11d2-aec9-00c04fb68820) +] +coclass WbemStatusCodeText +{ + interface IWbemStatusCodeText; +};

1 0

Erich E. Hoover : msvcrt: Rework strtod_helper to be reusable.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: b12d6d405ab89477dee1083f4af4b858a118ff46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b12d6d405ab89477dee1083f… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Dec 31 11:19:07 2019 -0700 msvcrt: Rework strtod_helper to be reusable. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 265 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 163 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b12d6d405ab89477dee1…

1 0

Zebediah Figura : ntdll: Avoid debug traces in _vsnprintf().
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: d409ef0188ab2b04244f6c7ef0577252bcc5feed URL: https://source.winehq.org/git/wine.git/?a=commit;h=d409ef0188ab2b04244f6c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 20:30:32 2020 -0600 ntdll: Avoid debug traces in _vsnprintf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 4176f945f5..f61441b36b 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -452,7 +452,6 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis LPCWSTR q, p = format; pf_flags flags; - TRACE("format is %s\n",debugstr_w(format)); while (*p) { q = strchrW( p, '%' );

1 0

Zebediah Figura : ole32/tests: Make the tests less verbose by default.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 3772c620b0cb25dbca723693aeccaa376c995000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3772c620b0cb25dbca723693… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:02 2020 +0000 ole32/tests: Make the tests less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 59 +++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 6dbeb2d84d..b61ed31fc6 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -202,7 +202,7 @@ static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { - trace("add connection\n"); + if (winetest_debug > 1) trace("add connection\n"); return ++external_connections; } @@ -210,7 +210,7 @@ static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { - trace("release connection %d\n", fLastReleaseCloses); + if (winetest_debug > 1) trace("release connection %d\n", fLastReleaseCloses); last_release_closes = fLastReleaseCloses; return --external_connections; } @@ -2577,7 +2577,7 @@ static DWORD WINAPI MessageFilter_HandleInComingCall( { static int callcount = 0; DWORD ret; - trace("HandleInComingCall\n"); + if (winetest_debug > 1) trace("HandleInComingCall()\n"); switch (callcount) { case 0: @@ -2600,7 +2600,7 @@ static DWORD WINAPI MessageFilter_RetryRejectedCall( DWORD dwTickCount, DWORD dwRejectType) { - trace("RetryRejectedCall\n"); + if (winetest_debug > 1) trace("RetryRejectedCall()\n"); return 0; } @@ -2610,7 +2610,7 @@ static DWORD WINAPI MessageFilter_MessagePending( DWORD dwTickCount, DWORD dwPendingType) { - trace("MessagePending\n"); + if (winetest_debug > 1) trace("MessagePending()\n"); return PENDINGMSG_WAITNOPROCESS; } @@ -3165,7 +3165,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); } - if (size >= 3*sizeof(DWORD) + sizeof(GUID)) + if (size >= 3*sizeof(DWORD) + sizeof(GUID) && winetest_debug > 1) { trace("got guid data: %s\n", wine_dbgstr_guid((GUID *)marshal_data)); } @@ -3755,7 +3755,6 @@ again: if (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) { - trace("Message 0x%x\n", msg.message); TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -3941,7 +3940,6 @@ static void test_globalinterfacetable(void) IClassFactory *cf; ULONG ref; - trace("test_globalinterfacetable\n"); cLocks = 0; hr = pDllGetClassObject(&CLSID_StdGlobalInterfaceTable, &IID_IClassFactory, (void**)&cf); @@ -4243,30 +4241,6 @@ static void test_implicit_mta(void) CoUninitialize(); } -static const char *debugstr_iid(REFIID riid) -{ - static char name[256]; - HKEY hkeyInterface; - WCHAR bufferW[39]; - char buffer[39]; - LONG name_size = sizeof(name); - StringFromGUID2(riid, bufferW, ARRAY_SIZE(bufferW)); - WideCharToMultiByte(CP_ACP, 0, bufferW, ARRAY_SIZE(bufferW), buffer, sizeof(buffer), NULL, NULL); - if (RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_QUERY_VALUE, &hkeyInterface) != ERROR_SUCCESS) - { - memcpy(name, buffer, sizeof(buffer)); - goto done; - } - if (RegQueryValueA(hkeyInterface, buffer, name, &name_size) != ERROR_SUCCESS) - { - memcpy(name, buffer, sizeof(buffer)); - goto done; - } - RegCloseKey(hkeyInterface); -done: - return name; -} - static HRESULT WINAPI TestChannelHook_QueryInterface(IChannelHook *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IChannelHook)) @@ -4300,8 +4274,8 @@ static void WINAPI TestChannelHook_ClientGetSize( ULONG *pDataSize ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientGetSize\n"); - trace("\t%s\n", debugstr_iid(riid)); + + if (winetest_debug > 1) trace("IChannelHook::ClientGetSize(iid %s)\n", debugstr_guid(riid)); if (info->cbSize == sizeof(*info)) { @@ -4327,7 +4301,8 @@ static void WINAPI TestChannelHook_ClientFillBuffer( void *pDataBuffer ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientFillBuffer\n"); + + if (winetest_debug > 1) trace("IChannelHook::ClientFillBuffer()\n"); if (info->cbSize == sizeof(*info)) { @@ -4353,7 +4328,8 @@ static void WINAPI TestChannelHook_ClientNotify( HRESULT hrFault ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); + + if (winetest_debug > 1) trace("IChannelHook::ClientNotify(hr %#x)\n", hrFault); if (info->cbSize == sizeof(*info)) { @@ -4377,7 +4353,8 @@ static void WINAPI TestChannelHook_ServerNotify( DWORD lDataRep ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ServerNotify\n"); + + if (winetest_debug > 1) trace("IChannelHook::ServerNotify()\n"); if (info->cbSize == sizeof(*info)) { @@ -4400,8 +4377,8 @@ static void WINAPI TestChannelHook_ServerGetSize( ULONG *pDataSize ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ServerGetSize\n"); - trace("\t%s\n", debugstr_iid(riid)); + + if (winetest_debug > 1) trace("IChannelHook::ServerGetSize(iid %s, hr %#x)\n", debugstr_guid(riid), hrFault); if (info->cbSize == sizeof(*info)) { @@ -4412,9 +4389,6 @@ static void WINAPI TestChannelHook_ServerGetSize( } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); - if (hrFault != S_OK) - trace("\thrFault = 0x%08x\n", hrFault); - *pDataSize = 0; } @@ -4426,7 +4400,6 @@ static void WINAPI TestChannelHook_ServerFillBuffer( void *pDataBuffer, HRESULT hrFault ) { - trace("TestChannelHook_ServerFillBuffer\n"); ok(0, "TestChannelHook_ServerFillBuffer shouldn't be called\n"); }

1 0

Zebediah Figura : ole32/tests: Fix some failures on Windows 10.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: 261046fbb1c78b2db1d0ea063721689b5db6a770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=261046fbb1c78b2db1d0ea06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:24:59 2020 +0000 ole32/tests: Fix some failures on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2aaa34e51b..582b63f484 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -61,6 +61,7 @@ static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID CLSID_DfMarshal = { 0x0000030b, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static const GUID CLSID_ft_unmarshaler_1809 = {0x00000359, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -1392,7 +1393,7 @@ static ULONG WINAPI CustomMarshal_Release(IMarshal *iface) static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - CHECK_EXPECT(CustomMarshal_GetUnmarshalClass); + CHECK_EXPECT2(CustomMarshal_GetUnmarshalClass); *clsid = *unmarshal_class; return S_OK; } @@ -3329,8 +3330,8 @@ static void test_freethreadedmarshaler(void) hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL, &clsid); ok_ole_success(hr, IMarshal_GetUnmarshalClass); - ok(IsEqualIID(&clsid, &CLSID_StdMarshal), "clsid = %s\n", - wine_dbgstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &CLSID_StdMarshal) || IsEqualGUID(&clsid, &CLSID_ft_unmarshaler_1809) /* Win10 1809 */, + "clsid = %s\n", wine_dbgstr_guid(&clsid)); IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL);

1 0

Zebediah Figura : ole32/tests: Get rid of some workarounds for no longer supported versions of Windows.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: f3b9ecef12557b68a932d4c34ff2253f786d37c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b9ecef12557b68a932d4c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:01 2020 +0000 ole32/tests: Get rid of some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 58 +++++++--------------------------------------- 1 file changed, 9 insertions(+), 49 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e31a89a075..6dbeb2d84d 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1120,13 +1120,7 @@ static void test_proxy_marshal_and_unmarshal_strong(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); /* marshal the proxy */ hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLESTRONG); - ok(hr == S_OK /* WinNT */ || hr == E_INVALIDARG /* Win9x */, - "CoMarshalInterface should have return S_OK or E_INVALIDARG instead of 0x%08x\n", hr); - if (FAILED(hr)) - { - IUnknown_Release(pProxy); - goto end; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); ok_more_than_one_lock(); ok_non_zero_external_conn(); @@ -1147,7 +1141,6 @@ static void test_proxy_marshal_and_unmarshal_strong(void) ok_more_than_one_lock(); ok_non_zero_external_conn(); -end: IStream_Release(pStream); end_host_object(tid, thread); @@ -1831,11 +1824,6 @@ static void test_crash_couninitialize(void) HANDLE thread; DWORD tid; - if(!GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateActCtxW")) { - win_skip("Skipping crash tests on win2k.\n"); - return; - } - crash_thread_success = FALSE; thread = CreateThread(NULL, 0, crash_couninitialize_proc, NULL, 0, &tid); ok(!WaitForSingleObject(thread, 10000), "wait timed out\n"); @@ -2485,20 +2473,15 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) IUnknown * proxy = NULL; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); - todo_wine - ok(hr == CO_E_NOTINITIALIZED, - "COM should have failed with CO_E_NOTINITIALIZED on using proxy without apartment, but instead returned 0x%08x\n", - hr); + todo_wine ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr); hr = IClassFactory_QueryInterface(cf, &IID_IMultiQI, (LPVOID *)&proxy); - /* Win9x returns S_OK, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface for local interface without apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(proxy); hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); - /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface without apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(proxy); @@ -2511,8 +2494,7 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) hr); hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); - /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); /* now be really bad and release the proxy from the wrong apartment */ IClassFactory_Release(cf); @@ -2556,10 +2538,6 @@ static void test_proxy_used_in_wrong_thread(void) ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); CloseHandle(thread); - /* do release statement on Win9x that we should have done above */ - if (!GetProcAddress(GetModuleHandleA("ole32"), "CoRegisterSurrogateEx")) - IUnknown_Release(pProxy); - ok_no_locks(); end_host_object(tid, host_thread); @@ -3176,9 +3154,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * if (mshctx == MSHCTX_INPROC) { DWORD expected_size = round_global_size(3*sizeof(DWORD) + sizeof(GUID)); - ok(size == expected_size || - broken(size == (2*sizeof(DWORD))) /* Win9x & NT4 */, - "size should have been %d instead of %d\n", expected_size, size); + ok(size == expected_size, "expected size %u, got %u\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); @@ -3846,9 +3822,7 @@ static void test_local_server(void) * class in the registry */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - ok(hr == REGDB_E_CLASSNOTREG || /* NT */ - hr == S_OK /* Win9x */, - "CoGetClassObject should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + todo_wine ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); /* Resume the object suspended above ... */ hr = CoResumeClassObjects(); @@ -3883,10 +3857,7 @@ static void test_local_server(void) /* try to connect again after SCM has suspended registered class objects */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - ok(hr == CO_E_SERVER_STOPPING || /* NT */ - hr == REGDB_E_CLASSNOTREG || /* win2k */ - hr == S_OK /* Win9x */, - "CoGetClassObject should have returned CO_E_SERVER_STOPPING or REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + todo_wine ok(hr == CO_E_SERVER_STOPPING || hr == REGDB_E_CLASSNOTREG /* Win10 1709+ */, "Got hr %#x.\n", hr); hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); @@ -3943,13 +3914,7 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv) IClassFactory *cf; hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); - ok(hr == CO_E_NOTINITIALIZED || - broken(hr == E_UNEXPECTED) /* win2k */ || - broken(hr == S_OK) /* NT 4 */, - "IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED or E_UNEXPECTED instead of 0x%08x\n", - hr); - if (hr == S_OK) - IClassFactory_Release(cf); + ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr); CoInitialize(NULL); @@ -4535,11 +4500,6 @@ START_TEST(marshal) int argc; char **argv; - if (!GetProcAddress(hOle32, "CoRegisterSurrogateEx")) { - win_skip("skipping test on win9x\n"); - return; - } - pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject");

1 0

Zebediah Figura : ole32/tests: Only test the original SChannelHookCallInfo structure.
by Alexandre Julliard Jan. 2, 2020

Jan. 2, 2020

Module: wine Branch: master Commit: b181b0bbdec2ee84922b9176c3084aeaf24b5922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b181b0bbdec2ee84922b9176… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:00 2020 +0000 ole32/tests: Only test the original SChannelHookCallInfo structure. This in some sense reverts most of edaf60d71ad1b12315f512c65b3b8c8536e70935. Unless an application depends on the new hook structure, this seems far too much like testing internal behaviour. That the structure seems to have changed multiple times in Windows 10 makes this unlikely. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 84 ++++------------------------------------------ 1 file changed, 7 insertions(+), 77 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 582b63f484..e31a89a075 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4325,19 +4325,9 @@ static ULONG WINAPI TestChannelHook_Release(IChannelHook *iface) return 1; } -static BOOL new_hook_struct; -static int method, server_tid; +static int method; static GUID causality; -struct new_hook_info -{ - IID iid; - GUID causality; - DWORD server_pid; - DWORD server_tid; - WORD method; -}; - static void WINAPI TestChannelHook_ClientGetSize( IChannelHook *iface, REFGUID uExtent, @@ -4347,12 +4337,9 @@ static void WINAPI TestChannelHook_ClientGetSize( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientGetSize\n"); trace("\t%s\n", debugstr_iid(riid)); - if (info->cbSize != sizeof(*info)) - new_hook_struct = TRUE; - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(!info->pObject, "pObject should be NULL\n"); @@ -4361,19 +4348,6 @@ static void WINAPI TestChannelHook_ClientGetSize( else ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - if (method == 3) - causality = new_info->causality; - else - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -4390,24 +4364,13 @@ static void WINAPI TestChannelHook_ClientFillBuffer( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientFillBuffer\n"); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(!info->pObject, "pObject should be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -4427,9 +4390,8 @@ static void WINAPI TestChannelHook_ClientNotify( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); todo_wine { @@ -4437,16 +4399,6 @@ static void WINAPI TestChannelHook_ClientNotify( } ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); } @@ -4462,24 +4414,13 @@ static void WINAPI TestChannelHook_ServerNotify( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerNotify\n"); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(cbDataSize == 1, "cbDataSize should have been 1 instead of %d\n", cbDataSize); ok(*(unsigned char *)pDataBuffer == 0xcc, "pDataBuffer should have contained 0xcc instead of 0x%x\n", *(unsigned char *)pDataBuffer); @@ -4496,24 +4437,14 @@ static void WINAPI TestChannelHook_ServerGetSize( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerGetSize\n"); trace("\t%s\n", debugstr_iid(riid)); - if (!new_hook_struct) + + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); if (hrFault != S_OK) @@ -4571,7 +4502,6 @@ static void test_channel_hook(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream); ok_ole_success(hr, CreateStreamOnHGlobal); tid = start_host_object2(&object_data, &thread); - server_tid = tid; ok_more_than_one_lock();

1 0

Zebediah Figura : user32/tests: Work around a failure on Windows < Vista.
by Alexandre Julliard Jan. 1, 2020

Jan. 1, 2020

Module: wine Branch: master Commit: 6e4d441ce11739b145dae200d7b20743c64147de URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e4d441ce11739b145dae200… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 12:14:13 2020 -0600 user32/tests: Work around a failure on Windows < Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index aaa51d560a..4aa5565b96 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -51,7 +51,12 @@ static void register_class(void) WNDCLASSA cls; cls.style = CS_DBLCLKS; - cls.lpfnWndProc = DefWindowProcA; + /* Windows < Vista apparently checks lpfnWndProc against the address of + * DefWindowProcA(), and for some reason fails to change the thread desktop + * after creating and destroying a window if it doesn't match. Using an IAT + * (as is default) or a wrapper triggers this, so use GetProcAddress() as + * a workaround. */ + cls.lpfnWndProc = (void *)GetProcAddress(GetModuleHandleA("user32"), "DefWindowProcA"); cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0);

1 0

Nikolay Sivov : include: Update DWRITE_INFORMATIONAL_STRING_ID enum.
by Alexandre Julliard Jan. 1, 2020

Jan. 1, 2020

Module: wine Branch: master Commit: 456392f3e752e33f3f4b54600d382b2cc493baa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=456392f3e752e33f3f4b5460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 31 22:06:46 2019 +0300 include: Update DWRITE_INFORMATIONAL_STRING_ID enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite.idl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index bfb2c1b37d..b92b1544e0 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -127,12 +127,18 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_LICENSE_INFO_URL, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT, DWRITE_INFORMATIONAL_STRING_FULL_NAME, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, - DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME + DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME, + DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, + DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, + DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, + DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, } DWRITE_INFORMATIONAL_STRING_ID; typedef enum DWRITE_FONT_SIMULATIONS

1 0

Zebediah Figura : kernel32/tests: Fix a test failure on Windows 10.
by Alexandre Julliard Jan. 1, 2020

Jan. 1, 2020

Module: wine Branch: master Commit: 741b8f95047b8dad69598501b08bf8a09104574e URL: https://source.winehq.org/git/wine.git/?a=commit;h=741b8f95047b8dad69598501… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 31 16:37:34 2019 -0600 kernel32/tests: Fix a test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 952c1054c8..120e9f16f0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -122,8 +122,11 @@ static void test_VirtualAllocEx(void) ok( bytes_written == 0, "%lu bytes written\n", bytes_written ); b = ReadProcessMemory(hProcess, addr1, src, alloc_size, &bytes_read); ok( !b, "ReadProcessMemory succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); + ok( GetLastError() == ERROR_NOACCESS || + GetLastError() == ERROR_PARTIAL_COPY, /* win10 v1607+ */ + "wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_NOACCESS) + ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); b = VirtualProtect( src, 0x2000, PAGE_NOACCESS, &old_prot ); ok( b, "VirtualProtect failed error %u\n", GetLastError() ); @@ -135,8 +138,11 @@ static void test_VirtualAllocEx(void) ok( bytes_written == 0, "%lu bytes written\n", bytes_written ); b = ReadProcessMemory(hProcess, addr1, src, alloc_size, &bytes_read); ok( !b, "ReadProcessMemory succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); + ok( GetLastError() == ERROR_NOACCESS || + GetLastError() == ERROR_PARTIAL_COPY, /* win10 v1607+ */ + "wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_NOACCESS) + ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); b = pVirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError());

1 0

Alex Henrie : po: Fix typo in Catalan translation.
by Alexandre Julliard Jan. 1, 2020

Jan. 1, 2020

Module: wine Branch: master Commit: bc41f2a6857702ae9342b9a39b0b8d7568a23abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc41f2a6857702ae9342b9a3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 31 11:43:27 2019 -0700 po: Fix typo in Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ca.po b/po/ca.po index 7255f30d38..59c69ea6d3 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: 2019-12-26 18:54-0700\n" +"PO-Revision-Date: 2019-12-31 11:39-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -17115,7 +17115,7 @@ 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" +"[/K] Copiar els atributs de fitxer; sense això, no es 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"

1 0

Alexandre Julliard : Update copyright info for 2020.
by Alexandre Julliard Jan. 1, 2020

Jan. 1, 2020

Module: wine Branch: master Commit: 81dc6240e8e469c3bd527d48ef53bfa7c03018b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81dc6240e8e469c3bd527d48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 14:26:13 2020 +0100 Update copyright info for 2020. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 6269a3b77c..3452811370 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2019 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 74d7494342..12c377bc9f 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2019 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index b8d4c5cab9..35ea44773a 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2019 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Zebediah Figura : kernel32: Exclude IsBadStringPtrA() from relay traces.
by Alexandre Julliard Jan. 1, 2020

Jan. 1, 2020

Module: wine Branch: master Commit: 7a61bbaa6f312ed28d9e74baa22b221f0b97e50e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a61bbaa6f312ed28d9e74ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 30 17:18:07 2019 -0600 kernel32: Exclude IsBadStringPtrA() from relay traces. It messes up 16-bit relay traces due to krnl386's use of debugstr_a(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 a87747bf61..c115fd3d75 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -971,7 +971,7 @@ @ stdcall IsBadHugeReadPtr(ptr long) @ stdcall IsBadHugeWritePtr(ptr long) @ stdcall IsBadReadPtr(ptr long) -@ stdcall IsBadStringPtrA(ptr long) +@ stdcall -norelay IsBadStringPtrA(ptr long) @ stdcall IsBadStringPtrW(ptr long) @ stdcall IsBadWritePtr(ptr long) # @ stub IsCalendarLeapDay

1 0