wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Hans Leidekker : msi/tests: Avoid test failure when running as an unprivileged user.
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: 90422f9bb59d4a2e34ad9cffbb4f04b896ab7235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90422f9bb59d4a2e34ad9cff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 10:06:53 2020 +0100 msi/tests: Avoid test failure when running as an unprivileged user. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3c547bf04a..3b7b11d81e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4054,7 +4054,6 @@ static void test_appsearch(void) r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, NULL, &hkey, NULL); - ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); if (r == ERROR_ACCESS_DENIED) { skip("insufficient rights\n"); @@ -4063,6 +4062,7 @@ static void test_appsearch(void) DeleteFileA(msifile); return; } + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", sizeof("c:\\windows\\system32\\notepad.exe"));

1 0

Zebediah Figura : d3dcompiler/tests: Load d3dx9_36.dll dynamically.
by Alexandre Julliard 03 Jan '20

03 Jan '20

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

Francois Gouget : testbot/Janitor: Notify the administrator whenever an error occurs.
by Alexandre Julliard 03 Jan '20

03 Jan '20

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

Vijay Kiran Kamuju : include: Add IWbemContext and IWbemCallResult interface and other class definitions.
by Alexandre Julliard 02 Jan '20

02 Jan '20

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

Zebediah Figura : mfplat/tests: Link dynamically to d3d11.
by Alexandre Julliard 02 Jan '20

02 Jan '20

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 : ntdll/tests: Fix some exception test failures.
by Alexandre Julliard 02 Jan '20

02 Jan '20

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

Zebediah Figura : winegstreamer: Catch errors while waiting for pin connection.
by Alexandre Julliard 02 Jan '20

02 Jan '20

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 scanf floats.
by Alexandre Julliard 02 Jan '20

02 Jan '20

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

Erich E. Hoover : msvcrt: Use parse_double for wcstod.
by Alexandre Julliard 02 Jan '20

02 Jan '20

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

Erich E. Hoover : msvcrt: Rework strtod_helper to be reusable.
by Alexandre Julliard 02 Jan '20

02 Jan '20

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2020