April 2019 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dxdiagn: Remove useless cast to self.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 0004deba435d0dfa1306b5775989acd6633ea2b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0004deba435d0dfa1306b577… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:59 2019 +0200 dxdiagn: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index ede7344..46193e9 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1627,7 +1627,7 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc if (FAILED(hr)) goto cleanup; - hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&ppRF); + hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, &ppRF); if (FAILED(hr)) goto cleanup; pRF = ((REGFILTER2**)ppRF)[0];

1 0

Detlef Riekenberg : kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE).
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: c26a3a011649b92fb665e412fd70910ef6667765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c26a3a011649b92fb665e412… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 31 07:52:01 2019 +0200 kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE). FormatMessageA/W sets last error to ERROR_NO_WORK_DONE when nothing was done, after Sep 2015, but before or with Win10 v1709. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 20 ++++++++++++-------- include/winerror.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78a..9214e3e 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -155,7 +155,7 @@ static void test_message_from_string_wide(void) error = GetLastError(); ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==0, "succeeded: r=%d\n", r); - ok(error==0xdeadbeef, "last error %u\n", error); + ok((error==0xdeadbeef) || (error == ERROR_NO_WORK_DONE), "last error %u\n", error); /* format placeholder with no specifier */ SetLastError(0xdeadbeef); @@ -443,7 +443,7 @@ static void test_message_from_string(void) r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); - ok(GetLastError()==0xdeadbeef, + ok((GetLastError()==0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), "last error %u\n", GetLastError()); /* format placeholder with no specifier */ @@ -745,7 +745,8 @@ static void test_message_ignore_inserts(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out, @@ -855,7 +856,8 @@ static void test_message_ignore_inserts_wide(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret); ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out)); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out, @@ -1294,8 +1296,8 @@ static void test_message_allocate_buffer(void) "", 0, 0, (char *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (char *)0xdeadbeef; ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1391,8 +1393,8 @@ static void test_message_allocate_buffer_wide(void) empty, 0, 0, (WCHAR *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1522,6 +1524,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, @@ -1533,6 +1536,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, diff --git a/include/winerror.h b/include/winerror.h index d78c91e..79be438 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -291,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_NO_DATA 232 #define ERROR_PIPE_NOT_CONNECTED 233 #define ERROR_MORE_DATA 234 +#define ERROR_NO_WORK_DONE 235 #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255

1 0

Huw Davies : wineps: Include the meta region in the clip region.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 18102e9c12a15af81fb863a741d72536167055fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=18102e9c12a15af81fb863a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 5 13:52:14 2019 +0100 wineps: Include the meta region in the clip region. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/clipping.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/clipping.c b/dlls/wineps.drv/clipping.c index 59c8817..62022c9 100644 --- a/dlls/wineps.drv/clipping.c +++ b/dlls/wineps.drv/clipping.c @@ -88,8 +88,8 @@ void PSDRV_SetClip( PHYSDEV dev ) return; } - hrgn = CreateRectRgn(0,0,0,0); - if (GetClipRgn(dev->hdc, hrgn)) + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(dev->hdc, hrgn, 3) == 1) /* clip && meta */ { PSDRV_WriteGSave(dev); PSDRV_AddClip( dev, hrgn ); @@ -104,11 +104,12 @@ void PSDRV_SetClip( PHYSDEV dev ) void PSDRV_ResetClip( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - HRGN hrgn = CreateRectRgn(0,0,0,0); - BOOL empty; + HRGN hrgn; + + if (physDev->pathdepth) return; - empty = !GetClipRgn(dev->hdc, hrgn); - if(!empty && !physDev->pathdepth) + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(dev->hdc, hrgn, 3) == 1) /* clip && meta */ PSDRV_WriteGRestore(dev); DeleteObject(hrgn); }

1 0

Józef Kucia : wined3d: Introduce support for Vulkan formats.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 55429b09fecae016c4826ea7f32994e3147b2f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=55429b09fecae016c4826ea7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 5 10:52:09 2019 +0200 wined3d: Introduce support for Vulkan formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/utils.c | 159 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 +++- 3 files changed, 172 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55429b09fecae016c482…

1 0

Paul Gofman : kernel32: Add DECLSPEC_HOTPATCH to FindClose().
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: d62187105e37c0729775ae45d161ba74302ce5a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d62187105e37c0729775ae45… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 5 11:26:28 2019 +0300 kernel32: Add DECLSPEC_HOTPATCH to FindClose(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3214d72..c66073b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2236,7 +2236,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) /************************************************************************* * FindClose (KERNEL32.@) */ -BOOL WINAPI FindClose( HANDLE handle ) +BOOL WINAPI DECLSPEC_HOTPATCH FindClose( HANDLE handle ) { FIND_FIRST_INFO *info = handle;

1 0

Zebediah Figura : quartz/tests: Fix some VMR9 test failures.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 409c60f95c483102d87af39ee40ea677e9381ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409c60f95c483102d87af39e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:45 2019 -0500 quartz/tests: Fix some VMR9 test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f8e6f21..88b0562 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode) hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, mode); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); } return filter; @@ -65,7 +65,7 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -82,7 +82,7 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -134,7 +134,7 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -150,19 +150,30 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface_broken(a, b, c) check_interface_(__LINE__, a, b, c, TRUE) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported, BOOL is_broken) { - IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; - IUnknown *unk; + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; - expected_hr = supported ? S_OK : E_NOINTERFACE; + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } - hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(out); + return hr; } static void test_interfaces(void) @@ -188,7 +199,9 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -210,7 +223,7 @@ static void test_interfaces(void) IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); todo_wine check_interface(filter, &IID_IBasicVideo, FALSE);

1 0

Zebediah Figura : quartz/tests: Add tests for VMR9 pin interfaces.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: ea30abde1804c544ae967e791b6a342da65c840a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea30abde1804c544ae967e79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:46 2019 -0500 quartz/tests: Add tests for VMR9 pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 88b0562..a0d2ea1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -178,8 +178,10 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO static void test_interfaces(void) { + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; IBaseFilter *filter = create_vmr9(0); ULONG ref; + IPin *pin; check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); @@ -220,6 +222,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); @@ -236,6 +252,20 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Renderless); @@ -251,6 +281,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: f2deab4174270f03cdada49ff42f2752f2328b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2deab4174270f03cdada49f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Apr 5 06:56:51 2019 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/po/lt.po b/po/lt.po index a339fcf..8c6bb23 100644 --- a/po/lt.po +++ b/po/lt.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-04-02 10:23+0300\n" +"PO-Revision-Date: 2019-04-05 06:56+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7040,80 +7040,56 @@ msgid "No events available.\n" msgstr "Nėra pasiekiamų įvykių.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Invalid media source state transition\n" msgid "Invalid media source state transition.\n" -msgstr "Neteisingas medijos šaltinio būsenos perėjimas\n" +msgstr "Neteisingas medijos šaltinio būsenos perėjimas.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "End of media stream has been reached\n" msgid "End of media stream has been reached.\n" -msgstr "Pasiekta medijos srauto pabaiga\n" +msgstr "Pasiekta medijos srauto pabaiga.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Shutdown() buvo iškviesta.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Media stream has no duration set\n" msgid "Media stream has no duration set.\n" -msgstr "Medijos srautui nenustatyta trukmė\n" +msgstr "Medijos srautui nenustatyta trukmė.\n" #: mferror.mc:473 -#, fuzzy -#| msgid "Media format was recognized but is invalid\n" msgid "Media format was recognized but is invalid.\n" -msgstr "Medijos formatas atpažintas, bet neteisingas\n" +msgstr "Medijos formatas atpažintas, bet neteisingas.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property wasn't found\n" msgid "Property wasn't found.\n" -msgstr "Savybė nerasta\n" +msgstr "Savybė nerasta.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is read-only\n" msgid "Property is read-only.\n" -msgstr "Savybė tik skaitymui\n" +msgstr "Savybė tik skaitymui.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property is not allowed\n" msgid "Property is not allowed.\n" -msgstr "Savybė neleidžiama\n" +msgstr "Savybė neleidžiama.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Media source is not started\n" msgid "Media source is not started.\n" -msgstr "Medijos šaltinis nepradėtas\n" +msgstr "Medijos šaltinis nepradėtas.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported media format\n" msgid "Unsupported media format.\n" -msgstr "Nepalaikomas medijos formatas\n" +msgstr "Nepalaikomas medijos formatas.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Media source is in wrong state\n" msgid "Media source is in wrong state.\n" -msgstr "Medijos šaltinis neteisingoje būsenoje\n" +msgstr "Medijos šaltinis neteisingoje būsenoje.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No media streams were selected\n" msgid "No media streams were selected.\n" -msgstr "Nepasirinktas nė vienas medijos srautas\n" +msgstr "Nepasirinktas nė vienas medijos srautas.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported media source characteristics\n" msgid "Unsupported media source characteristics.\n" -msgstr "Nepalaikomos medijos šaltinio charakteristikos\n" +msgstr "Nepalaikomos medijos šaltinio charakteristikos.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n"

1 0

Alexandre Julliard : winegcc: Use Wine's msvcrt for Windows builds.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 45bf872a435b8354a9919f87ab49a16c7aba950c URL: https://source.winehq.org/git/wine.git/?a=commit;h=45bf872a435b8354a9919f87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:28:19 2019 +0200 winegcc: Use Wine's msvcrt for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 79a4cbe..674d1a3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -972,11 +972,6 @@ static void build(struct options* opts) /* add the default libraries, if needed */ - if (!opts->nostdlib && opts->use_msvcrt && opts->target_platform != PLATFORM_WINDOWS) - { - if (!is_pe || !opts->shared) add_library(opts, lib_dirs, files, "msvcrt"); - } - if (!opts->wine_objdir && !opts->nodefaultlibs) { if (opts->gui_app) @@ -991,6 +986,7 @@ static void build(struct options* opts) if (!opts->nodefaultlibs) { + if (opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); add_library(opts, lib_dirs, files, "winecrt0"); if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); add_library(opts, lib_dirs, files, "kernel32"); @@ -1108,7 +1104,7 @@ static void build(struct options* opts) char *p = strrchr( lib, '/' ); *p++ = 0; - if (!strncmp( p, "lib", 3 )) + if (!strncmp( p, "lib", 3 ) && strcmp( p, "libmsvcrt.a" )) { char *ext = strrchr( p, '.' );

1 0

Alexandre Julliard : winecrt0: Avoid using wine/port.h.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: e78ee4f436ec2e5775a8e4e7826612f0a76642fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78ee4f436ec2e5775a8e4e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:59:54 2019 +0200 winecrt0: Avoid using wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 69a3ea7..f4b2573 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -20,11 +20,9 @@ #ifdef _WIN32 -#include "config.h" -#include "wine/port.h" - #include <stdio.h> #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -54,7 +52,7 @@ static void load_func( void **func, const char *name, void *def ) { HMODULE module = GetModuleHandleA( "ntdll.dll" ); void *proc = GetProcAddress( module, name ); - interlocked_xchg_ptr( func, proc ? proc : def ); + InterlockedExchangePointer( func, proc ? proc : def ); } } #define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) @@ -164,8 +162,8 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) char *ret = _strdup( str ); int idx; - idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); - free( interlocked_xchg_ptr( (void **)&list[idx], ret )); + idx = InterlockedIncrement( &pos ) % ARRAY_SIZE(list); + free( InterlockedExchangePointer( (void **)&list[idx], ret )); return ret; } @@ -174,7 +172,7 @@ static int __cdecl fallback__wine_dbg_output( const char *str ) size_t len = strlen( str ); if (!len) return 0; - interlocked_xchg( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); + InterlockedExchange( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); return fwrite( str, 1, len, stderr ); }

1 0