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