September 2015 - Wine-commits

Dmitry Timoshkov : winhttp/tests: Add more IWinHttpRequest_Invoke tests.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: 25c78aac08b0c2f4d360290512f858b284d7c5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c78aac08b0c2f4d36029051… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 2 13:44:50 2015 +0800 winhttp/tests: Add more IWinHttpRequest_Invoke tests. --- dlls/winhttp/tests/winhttp.c | 203 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c3a3f11..05993f0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2,6 +2,7 @@ * WinHTTP - tests * * Copyright 2008 Google (Zac Brown) + * Copyright 2015 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3542,6 +3543,27 @@ static void test_IWinHttpRequest(void) CoUninitialize(); } +static void request_get_property(IWinHttpRequest *request, int property, VARIANT *ret) +{ + DISPPARAMS params; + VARIANT arg; + HRESULT hr; + + memset(&params, 0, sizeof(params)); + params.cNamedArgs = 0; + params.rgdispidNamedArgs = NULL; + params.cArgs = 1; + params.rgvarg = &arg; + VariantInit(&arg); + V_VT(&arg) = VT_I4; + V_I4(&arg) = property; + VariantInit(ret); + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, + DISPATCH_PROPERTYGET, &params, ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); +} + static void test_IWinHttpRequest_Invoke(void) { static const WCHAR utf8W[] = {'U','T','F','-','8',0}; @@ -3582,6 +3604,72 @@ static void test_IWinHttpRequest_Invoke(void) ok(hr == S_OK, "error %#x\n", hr); ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %u\n", id); + request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + + memset(&params, 0, sizeof(params)); + params.cArgs = 2; + params.cNamedArgs = 0; + params.rgvarg = arg; + V_VT(&arg[0]) = VT_I4; + V_I4(&arg[0]) = 1252; + V_VT(&arg[1]) = VT_R8; + V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, + DISPATCH_METHOD, &params, NULL, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + + memset(&params, 0, sizeof(params)); + params.cArgs = 2; + params.cNamedArgs = 0; + params.rgvarg = arg; + V_VT(&arg[0]) = VT_I4; + V_I4(&arg[0]) = 1252; + V_VT(&arg[1]) = VT_R8; + V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, + DISPATCH_METHOD | DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + + memset(&params, 0, sizeof(params)); + params.cArgs = 2; + params.cNamedArgs = 0; + params.rgvarg = arg; + V_VT(&arg[0]) = VT_I4; + V_I4(&arg[0]) = 1252; + V_VT(&arg[1]) = VT_R8; + V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, + DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + memset(&params, 0, sizeof(params)); params.cArgs = 2; params.cNamedArgs = 0; @@ -3590,17 +3678,128 @@ static void test_IWinHttpRequest_Invoke(void) utf8 = SysAllocString(utf8W); V_BSTR(&arg[0]) = utf8; V_VT(&arg[1]) = VT_R8; - V_R8(&arg[1]) = 2.0; - VariantInit(&ret); + V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); todo_wine ok(hr == S_OK, "error %#x\n", hr); + request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, &err); todo_wine ok(hr == S_OK, "error %#x\n", hr); + request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + hr = IWinHttpRequest_Invoke(request, 255, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "error %#x\n", hr); + + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); +todo_wine + ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); + + VariantInit(&ret); +if (0) /* crashes */ + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err); + + params.cArgs = 1; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); +todo_wine + ok(hr == DISP_E_TYPEMISMATCH, "error %#x\n", hr); + + VariantInit(&arg[2]); + params.cArgs = 3; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + VariantInit(&arg[0]); + VariantInit(&arg[1]); + VariantInit(&arg[2]); + + params.cArgs = 1; + V_VT(&arg[0]) = VT_I4; + V_I4(&arg[0]) = WinHttpRequestOption_URLCodePage; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + V_VT(&ret) = 0xdead; + V_I4(&ret) = 0xbeef; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + + V_VT(&ret) = 0xdead; + V_I4(&ret) = 0xbeef; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); +todo_wine + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); +todo_wine + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + V_VT(&ret) = 0xdead; + V_I4(&ret) = 0xbeef; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); +todo_wine + ok(V_VT(&ret) == VT_EMPTY, "expected VT_EMPTY, got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 0xbeef || V_I4(&ret) == 0 /* Win8 */, "expected 0xdead, got %d\n", V_I4(&ret)); + + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, NULL, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); +todo_wine + ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); + + params.cArgs = 2; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + params.cArgs = 0; + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); +todo_wine + ok(hr == DISP_E_PARAMNOTFOUND, "error %#x\n", hr); + SysFreeString(utf8); IWinHttpRequest_Release(request);

1 0

Gerald Pfeifer : winex11: Make a constant unsigned to avoid shift overflow in get_locale_kbd_layout.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: 2b42ddf68a98ae5cbff5d05d1b064d299f7a03de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b42ddf68a98ae5cbff5d05d1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Aug 31 16:55:57 2015 +0200 winex11: Make a constant unsigned to avoid shift overflow in get_locale_kbd_layout. --- dlls/winex11.drv/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index bd24961..3d68d66 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1592,7 +1592,7 @@ static HKL get_locale_kbd_layout(void) */ langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* IME */ + layout = MAKELONG( layout, 0xe001 ); /* IME */ else layout |= layout << 16;

1 0

André Hentschel : wpcap: Partially implement pcap_parsesrcstr.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: 04d72a3e47c3fa70bd128fa1c9dd8a150a891326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d72a3e47c3fa70bd128fa1c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 31 20:52:13 2015 +0200 wpcap: Partially implement pcap_parsesrcstr. --- dlls/wpcap/wpcap.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index da545a8..ae9e482 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -27,6 +27,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); +#ifndef PCAP_SRC_FILE_STRING +#define PCAP_SRC_FILE_STRING "file://" +#endif +#ifndef PCAP_SRC_FILE +#define PCAP_SRC_FILE 2 +#endif +#ifndef PCAP_SRC_IF_STRING +#define PCAP_SRC_IF_STRING "rpcap://" +#endif +#ifndef PCAP_SRC_IFLOCAL +#define PCAP_SRC_IFLOCAL 3 +#endif + void CDECL wine_pcap_breakloop(pcap_t *p) { TRACE("(%p)\n", p); @@ -239,6 +252,44 @@ pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); } +int CDECL wine_pcap_parsesrcstr(const char *source, int *type, char *host, char *port, char *name, char *errbuf) +{ + int t = PCAP_SRC_IFLOCAL; + const char *p = source; + + FIXME("(%s %p %p %p %p %p): partial stub\n", debugstr_a(source), type, host, port, name, errbuf); + + if (host) + *host = '\0'; + if (port) + *port = '\0'; + if (name) + *name = '\0'; + + if (!strncmp(p, PCAP_SRC_IF_STRING, strlen(PCAP_SRC_IF_STRING))) + p += strlen(PCAP_SRC_IF_STRING); + else if (!strncmp(p, PCAP_SRC_FILE_STRING, strlen(PCAP_SRC_FILE_STRING))) + { + p += strlen(PCAP_SRC_FILE_STRING); + t = PCAP_SRC_FILE; + } + + if (type) + *type = t; + + if (!*p) + { + if (errbuf) + sprintf(errbuf, "The name has not been specified in the source string."); + return -1; + } + + if (name) + strcpy(name, p); + + return 0; +} + int CDECL wine_pcap_sendpacket(pcap_t *p, const unsigned char *buf, int size) { TRACE("(%p %p %i)\n", p, buf, size); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index c7d2cd1..0e1e208 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -51,7 +51,7 @@ @ stub pcap_open_dead @ cdecl pcap_open_live(str long long long ptr) wine_pcap_open_live @ stub pcap_open_offline -@ stub pcap_parsesrcstr +@ cdecl pcap_parsesrcstr(str ptr ptr ptr ptr ptr) wine_pcap_parsesrcstr @ stub pcap_perror @ stub pcap_read @ stub pcap_remoteact_accept

1 0

Jacek Caban : ole32: Quote executable name in CreateProcess call.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: c784e346936b3e8f227615dd0348f5d4f5cec5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c784e346936b3e8f227615dd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 11:20:08 2015 +0200 ole32: Quote executable name in CreateProcess call. Fixes tests on VMs that have spaces in executable path. --- dlls/ole32/tests/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index d0f9c71..a4006d0 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2969,7 +2969,7 @@ static HANDLE create_target_process(const char *arg) pi.hThread = NULL; pi.hProcess = NULL; winetest_get_mainargs( &argv ); - sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], arg); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed with error: %u\n", GetLastError()); if (pi.hThread) CloseHandle(pi.hThread);

1 0

Jacek Caban : ole32: Catch crashes in stub object destructors when destroying stub manager.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: cb183688bb0fc0bd52e0ca94edcadd41bb15c686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb183688bb0fc0bd52e0ca94e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 2 11:21:16 2015 +0200 ole32: Catch crashes in stub object destructors when destroying stub manager. --- dlls/ole32/stubmanager.c | 15 ++++++++- dlls/ole32/tests/marshal.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 3b9086d..668d46f 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -36,6 +36,8 @@ #include "rpc.h" #include "wine/debug.h" +#include "wine/exception.h" + #include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -254,7 +256,18 @@ static void stub_manager_delete(struct stub_manager *m) IExternalConnection_Release(m->extern_conn); CoTaskMemFree(m->oxid_info.psa); - IUnknown_Release(m->object); + + /* Some broken apps crash in object destructors. We have a test showing + * that on winxp+ those crashes are caught and ignored. */ + __TRY + { + IUnknown_Release(m->object); + } + __EXCEPT_PAGE_FAULT + { + ERR("Got page fault when releasing stub!\n"); + } + __ENDTRY DEBUG_CLEAR_CRITSEC_NAME(&m->lock); DeleteCriticalSection(&m->lock); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index a4006d0..55c32d6 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -195,6 +195,24 @@ static const IUnknownVtbl TestUnknown_Vtbl = static IUnknown Test_Unknown = { &TestUnknown_Vtbl }; +static ULONG WINAPI TestCrash_IUnknown_Release(LPUNKNOWN iface) +{ + UnlockModule(); + if(!cLocks) { + trace("crashing...\n"); + *(int**)0xc = 0; + } + return 1; /* non-heap-based object */ +} + +static const IUnknownVtbl TestCrashUnknown_Vtbl = +{ + Test_IUnknown_QueryInterface, + Test_IUnknown_AddRef, + TestCrash_IUnknown_Release, +}; + +static IUnknown TestCrash_Unknown = { &TestCrashUnknown_Vtbl }; static HRESULT WINAPI Test_IClassFactory_QueryInterface( LPCLASSFACTORY iface, @@ -1082,6 +1100,63 @@ static void test_no_couninitialize_client(void) end_host_object(host_tid, host_thread); } +static BOOL crash_thread_success; + +static DWORD CALLBACK crash_couninitialize_proc(void *p) +{ + IStream *stream; + HRESULT hr; + + cLocks = 0; + + CoInitialize(NULL); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + hr = CoMarshalInterface(stream, &IID_IUnknown, &TestCrash_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + + IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + + hr = CoReleaseMarshalData(stream); + ok_ole_success(hr, CoReleaseMarshalData); + + ok_no_locks(); + + hr = CoMarshalInterface(stream, &IID_IUnknown, &TestCrash_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + + ok_more_than_one_lock(); + + trace("CoUninitialize >>>\n"); + CoUninitialize(); + trace("CoUninitialize <<<\n"); + + ok_no_locks(); + + IStream_Release(stream); + crash_thread_success = TRUE; + return 0; +} + +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"); + CloseHandle(thread); + ok(crash_thread_success, "Crash thread failed\n"); +} + /* tests success case of a same-thread table-weak marshal, unmarshal, unmarshal */ static void test_tableweak_marshal_and_unmarshal_twice(void) { @@ -3549,6 +3624,7 @@ START_TEST(marshal) test_globalinterfacetable(); test_manualresetevent(); + test_crash_couninitialize(); /* must be last test as channel hooks can't be unregistered */ test_channel_hook();

1 0

Hugh McMaster : regsvr32: Use correct exit code when GetProcAddress fails.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: 68a5642d5c9fce440aa8679614771af93b62034f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a5642d5c9fce440aa867961… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 2 21:12:26 2015 +1000 regsvr32: Use correct exit code when GetProcAddress fails. --- programs/regsvr32/regsvr32.c | 6 +++--- programs/regsvr32/regsvr32.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index f75825b..68cb949 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -127,7 +127,7 @@ static int RegisterDll(const WCHAR* strDll) pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle); if (!pfRegister) - return 0; + return GETPROCADDRESS_FAILED; hr = pfRegister(); if(FAILED(hr)) @@ -150,7 +150,7 @@ static int UnregisterDll(const WCHAR* strDll) pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle); if (!pfUnregister) - return 0; + return GETPROCADDRESS_FAILED; hr = pfUnregister(); if(FAILED(hr)) @@ -173,7 +173,7 @@ static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_li pfInstall = LoadProc(strDll, "DllInstall", &DllHandle); if (!pfInstall) - return 0; + return GETPROCADDRESS_FAILED; hr = pfInstall(install, command_line); if(FAILED(hr)) diff --git a/programs/regsvr32/regsvr32.h b/programs/regsvr32/regsvr32.h index e3b50eb..c021c55 100644 --- a/programs/regsvr32/regsvr32.h +++ b/programs/regsvr32/regsvr32.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Exit codes */ +#define GETPROCADDRESS_FAILED 4 + /* Resource strings */ #define STRING_HEADER 1000 #define STRING_USAGE 1001

1 0

Hugh McMaster : regsvr32: Use correct exit code when LoadLibraryEx fails.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: 4a4baf2566c595c0a79ef4cb4b6a0a4dbe1cc483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4baf2566c595c0a79ef4cb4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 2 21:12:27 2015 +1000 regsvr32: Use correct exit code when LoadLibraryEx fails. --- programs/regsvr32/regsvr32.c | 2 +- programs/regsvr32/regsvr32.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 68cb949..c0a9e13 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -107,7 +107,7 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan if(!*DllHandle) { output_write(STRING_DLL_LOAD_FAILED, strDll); - ExitProcess(1); + ExitProcess(LOADLIBRARY_FAILED); } proc = (VOID *) GetProcAddress(*DllHandle, procName); if(!proc) diff --git a/programs/regsvr32/regsvr32.h b/programs/regsvr32/regsvr32.h index c021c55..85b4a72 100644 --- a/programs/regsvr32/regsvr32.h +++ b/programs/regsvr32/regsvr32.h @@ -19,6 +19,7 @@ */ /* Exit codes */ +#define LOADLIBRARY_FAILED 3 #define GETPROCADDRESS_FAILED 4 /* Resource strings */

1 0

Hugh McMaster : regsvr32: Use INVALID_ARG define instead of magic 1.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: 99ecebe90de9ca502c43fbf62d0fbdd09c416b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ecebe90de9ca502c43fbf62… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 2 21:12:28 2015 +1000 regsvr32: Use INVALID_ARG define instead of magic 1. --- programs/regsvr32/regsvr32.c | 6 +++--- programs/regsvr32/regsvr32.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index c0a9e13..9f4764c 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -266,14 +266,14 @@ int wmain(int argc, WCHAR* argv[]) default: output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); output_write(STRING_USAGE); - return 1; + return INVALID_ARG; } argv[i] = NULL; } } if (!CallInstall && !CallRegister) /* flags: /n or /u /n */ - return 1; + return INVALID_ARG; for (i = 1; i < argc; i++) { @@ -309,7 +309,7 @@ int wmain(int argc, WCHAR* argv[]) { output_write(STRING_HEADER); output_write(STRING_USAGE); - return 1; + return INVALID_ARG; } OleUninitialize(); diff --git a/programs/regsvr32/regsvr32.h b/programs/regsvr32/regsvr32.h index 85b4a72..949d282 100644 --- a/programs/regsvr32/regsvr32.h +++ b/programs/regsvr32/regsvr32.h @@ -19,6 +19,7 @@ */ /* Exit codes */ +#define INVALID_ARG 1 #define LOADLIBRARY_FAILED 3 #define GETPROCADDRESS_FAILED 4

1 0

Thomas Faller : msxml3: Fix invalid read.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: f259ba33bb4b7f2a4a0bbf70063c4bef3d605709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f259ba33bb4b7f2a4a0bbf700… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Sep 1 14:25:51 2015 +0200 msxml3: Fix invalid read. --- dlls/msxml3/saxreader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3b5bd7c..2b087bc 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -690,12 +690,13 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) static void update_position(saxlocator *This, BOOL fix_column) { const xmlChar *p = This->pParserCtxt->input->cur-1; + const xmlChar *baseP = This->pParserCtxt->input->base; This->line = xmlSAX2GetLineNumber(This->pParserCtxt); if(fix_column) { This->column = 1; - for(; *p!='\n' && *p!='\r' && p>=This->pParserCtxt->input->base; p--) + for(;p>=baseP && *p!='\n' && *p!='\r'; p--) This->column++; } else

1 0

Sebastian Lackner : include: Fix copy and paste errors in wine_dbgstr_vt.
by Alexandre Julliard 02 Sep '15

02 Sep '15

Module: wine Branch: master Commit: 615ef9855561200678e541ec43d8afac026810ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=615ef9855561200678e541ec4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 1 14:59:38 2015 +0200 include: Fix copy and paste errors in wine_dbgstr_vt. --- include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 95d74d3..241e79b 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -244,7 +244,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) "|VT_ARRAY", "|VT_VECTOR|VT_ARRAY", "|VT_BYREF", - "|VT_VECTOR|VT_ARRAY", + "|VT_VECTOR|VT_BYREF", "|VT_ARRAY|VT_BYREF", "|VT_VECTOR|VT_ARRAY|VT_BYREF", "|VT_RESERVED", @@ -252,7 +252,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) "|VT_ARRAY|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_RESERVED", "|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_BYREF|VT_RESERVED", "|VT_ARRAY|VT_BYREF|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", };

1 0