September 2015 - Wine-Commits

Józef Kucia : d3d11: Implement d3d11_buffer_GetDesc() .
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 378bec23ef06707f65d131d7eda1aab0fab0902c URL: http://source.winehq.org/git/wine.git/?a=commit;h=378bec23ef06707f65d131d7e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:46 2015 +0200 d3d11: Implement d3d11_buffer_GetDesc(). --- dlls/d3d11/buffer.c | 14 +++++++++++--- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 10 +++++++++- dlls/d3d11/utils.c | 7 ------- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index d2e3156..02dfd9a 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -163,7 +163,11 @@ static UINT STDMETHODCALLTYPE d3d11_buffer_GetEvictionPriority(ID3D11Buffer *ifa static void STDMETHODCALLTYPE d3d11_buffer_GetDesc(ID3D11Buffer *iface, D3D11_BUFFER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = buffer->desc; } static const struct ID3D11BufferVtbl d3d11_buffer_vtbl = @@ -364,7 +368,7 @@ static const struct wined3d_parent_ops d3d10_buffer_wined3d_parent_ops = }; HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, - const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) + const D3D11_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) { struct wined3d_buffer_desc wined3d_desc; HRESULT hr; @@ -374,13 +378,17 @@ HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, buffer->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&buffer->private_store); + buffer->desc = *desc; wined3d_desc.byte_width = desc->ByteWidth; - wined3d_desc.usage = wined3d_usage_from_d3d10core(0, desc->Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(0, desc->Usage); wined3d_desc.bind_flags = desc->BindFlags; wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; wined3d_desc.misc_flags = desc->MiscFlags; + if (desc->StructureByteStride) + FIXME("Ignoring structure byte stride %u.\n", desc->StructureByteStride); + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, (const struct wined3d_sub_resource_data *)data, buffer, &d3d10_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 2f56a5a..eaf89af 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -63,7 +63,6 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; -DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; @@ -142,11 +141,12 @@ struct d3d_buffer struct wined3d_private_store private_store; struct wined3d_buffer *wined3d_buffer; + D3D11_BUFFER_DESC desc; ID3D11Device *device; }; HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, - const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; + const D3D11_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilView */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dee3c57..6194815 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1986,16 +1986,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Buffer **buffer) { struct d3d_device *This = impl_from_ID3D10Device(iface); + D3D11_BUFFER_DESC d3d11_desc; struct d3d_buffer *object; HRESULT hr; TRACE("iface %p, desc %p, data %p, buffer %p.\n", iface, desc, data, buffer); + d3d11_desc.ByteWidth = desc->ByteWidth; + d3d11_desc.Usage = d3d11_usage_from_d3d10_usage(desc->Usage); + d3d11_desc.BindFlags = d3d11_bind_flags_from_d3d10_bind_flags(desc->BindFlags); + d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); + d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); + d3d11_desc.StructureByteStride = 0; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - hr = d3d_buffer_init(object, This, desc, data); + hr = d3d_buffer_init(object, This, &d3d11_desc, data); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x.\n", hr); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 8e89c32..3d1da1f 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -367,13 +367,6 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) return wined3d_usage; } -DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) -{ - UINT d3d11_bind_flags = d3d11_bind_flags_from_d3d10_bind_flags(bind_flags); - enum D3D11_USAGE d3d11_usage = d3d11_usage_from_d3d10_usage(usage); - return wined3d_usage_from_d3d11(d3d11_bind_flags, d3d11_usage); -} - enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) { switch (usage)

1 0

Hugh McMaster : regsvr32: Process the next file in the array if an error occurs.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 07cc9a34a87cd08c87ae198e4aeb8c9bb7f55175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cc9a34a87cd08c87ae198e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 7 20:38:04 2015 +1000 regsvr32: Process the next file in the array if an error occurs. The Windows version stops processing the current file and moves to the next file on the first error. --- programs/regsvr32/regsvr32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ff6a3ae..a1b55a3 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -292,8 +292,9 @@ int wmain(int argc, WCHAR* argv[]) if (CallInstall && Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); + /* The Windows version stops processing the current file on the first error. */ if (res) - return res; + continue; if (!CallInstall || (CallInstall && CallRegister)) { @@ -304,14 +305,13 @@ int wmain(int argc, WCHAR* argv[]) } if (res) - return res; - /* Confirmed. The Windows version stops on the first error. */ + continue; if (CallInstall && !Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); if (res) - return res; + continue; } }

1 0

Jacek Caban : oleaut32: Clean up IPSFactoryBuffer instance.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 91bd7ffaa80bafa712aaba2d4fe51a9c91f41495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bd7ffaa80bafa712aaba2d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 7 13:38:32 2015 +0200 oleaut32: Clean up IPSFactoryBuffer instance. --- dlls/oleaut32/tmarshal.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6608aed..f4ce311 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2338,17 +2338,12 @@ static const IPSFactoryBufferVtbl psfacbufvtbl = { PSFacBuf_CreateStub }; -/* This is the whole PSFactoryBuffer object, just the vtableptr */ -static const IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl; +static IPSFactoryBuffer psfac = { &psfacbufvtbl }; /*********************************************************************** * TMARSHAL_DllGetClassObject */ -HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) +HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) { - if (IsEqualIID(iid,&IID_IPSFactoryBuffer)) { - *ppv = &lppsfac; - return S_OK; - } - return E_NOINTERFACE; + return IPSFactoryBuffer_QueryInterface(&psfac, iid, ppv); }

1 0

Hans Leidekker : advapi32/tests: Perform a case-insensitive match on domain names.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: ca32deb0d231d38cf1df874976cfc013c9def3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca32deb0d231d38cf1df87497… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:36:31 2015 +0200 advapi32/tests: Perform a case-insensitive match on domain names. --- dlls/advapi32/tests/security.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c48ffc9..ae9dd92 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2249,7 +2249,7 @@ static void test_LookupAccountName(void) ok(ret, "Failed to lookup account name\n"); ok(sid_size == GetLengthSid(psid), "Expected %d, got %d\n", GetLengthSid(psid), sid_size); ok(!lstrcmpA(account, user_name), "Expected %s, got %s\n", user_name, account); - ok(!lstrcmpA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); + ok(!lstrcmpiA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlenA(domain), domain_size); ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use); @@ -2267,7 +2267,7 @@ static void test_LookupAccountName(void) ok(ret, "Failed to lookup account name\n"); ok(sid_size != 0, "sid_size was zero\n"); ok(!lstrcmpA(account, "Everyone"), "Expected Everyone, got %s\n", account); - ok(!lstrcmpA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); + ok(!lstrcmpiA(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlenA(domain), domain_size); ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use); @@ -2332,9 +2332,8 @@ static void test_LookupAccountName(void) get_sid_info(psid, &account, &sid_dom); ok(ret, "Failed to lookup account name\n"); /* Using a fixed string will not work on different locales */ - ok(!lstrcmpA(account, domain), - "Got %s for account and %s for domain, these should be the same\n", - account, domain); + ok(!lstrcmpiA(account, domain), + "Got %s for account and %s for domain, these should be the same\n", account, domain); ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); HeapFree(GetProcessHeap(), 0, psid);

1 0

Hans Leidekker : advapi32/tests: Avoid test failures when running as an unprivileged user.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: b368cd1b713f5ee17186bc4589863c636f71ac37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b368cd1b713f5ee17186bc458… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:36:04 2015 +0200 advapi32/tests: Avoid test failures when running as an unprivileged user. --- dlls/advapi32/tests/security.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 46db49c..c48ffc9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5886,6 +5886,12 @@ static void test_system_security_access(void) /* ACCESS_SYSTEM_SECURITY requires special privilege */ res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); todo_wine ok( res == ERROR_PRIVILEGE_NOT_HELD, "got %d\n", res ); + if (res == ERROR_ACCESS_DENIED) + { + skip( "unprivileged user\n" ); + CloseHandle( token ); + return; + } priv.PrivilegeCount = 1; priv.Privileges[0].Luid = luid; @@ -5897,6 +5903,13 @@ static void test_system_security_access(void) res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); ok( !res, "got %d\n", res ); + if (res == ERROR_PRIVILEGE_NOT_HELD) + { + win_skip( "privilege not held\n" ); + HeapFree( GetProcessHeap(), 0, priv_prev ); + CloseHandle( token ); + return; + } /* restore privileges */ ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL );

1 0

Thomas Faller : reg: Implement binary data add operation.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 5c9526cb6c6151d0f9093c1ac6bb3b7333c64feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9526cb6c6151d0f9093c1ac… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sun Sep 6 16:07:18 2015 +0200 reg: Implement binary data add operation. --- programs/reg/reg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 6 +++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 4ec25bc..e4d121c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -158,6 +158,19 @@ static DWORD wchar_get_type(const WCHAR *type_name) return ~0u; } +/* hexchar_to_byte from programs/regedit/hexedit.c */ +static inline BYTE hexchar_to_byte(WCHAR ch) +{ + if (ch >= '0' && ch <= '9') + return ch - '0'; + else if (ch >= 'a' && ch <= 'f') + return ch - 'a' + 10; + else if (ch >= 'A' && ch <= 'F') + return ch - 'A' + 10; + else + return -1; +} + static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *reg_count) { LPBYTE out_data = NULL; @@ -187,6 +200,36 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r ((LPDWORD)out_data)[0] = val; break; } + case REG_BINARY: + { + static const WCHAR nohex[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','h','e','x',' ','d','a','t','a','.','\n',0}; + BYTE hex0, hex1; + int i = 0, destByteIndex = 0, datalen = lstrlenW(data); + *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); + out_data = HeapAlloc(GetProcessHeap(), 0, *reg_count); + if(datalen % 2) + { + hex1 = hexchar_to_byte(data[i++]); + if(hex1 == 0xFF) + goto no_hex_data; + out_data[destByteIndex++] = hex1; + } + for(;i + 1 < datalen;i += 2) + { + hex0 = hexchar_to_byte(data[i]); + hex1 = hexchar_to_byte(data[i + 1]); + if(hex0 == 0xFF || hex1 == 0xFF) + goto no_hex_data; + out_data[destByteIndex++] = (hex0 << 4) | hex1; + } + break; + no_hex_data: + /* cleanup, print error */ + HeapFree(GetProcessHeap(), 0, out_data); + reg_printfW(nohex); + out_data = NULL; + break; + } default: { static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index dbfce89..2880d37 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -214,7 +214,7 @@ static void test_add(void) run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_BINARY /d deadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); dword = 0xefbeadde; - verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), TODO_REG_SIZE); + verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -235,8 +235,8 @@ static void test_add(void) err = RegQueryValueExA(hkey, "bin4", NULL, &type, (void *) (buffer+12), &size); ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); ok(type == REG_BINARY, "got wrong type %u\n", type); - todo_wine ok(size == 6, "got wrong size %u\n", size); - todo_wine ok(memcmp(buffer, buffer+12, 6) == 0 || + ok(size == 6, "got wrong size %u\n", size); + ok(memcmp(buffer, buffer+12, 6) == 0 || broken(memcmp(buffer+6, buffer+12, 6) == 0 /* WinXP */), "got wrong data\n"); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin5 /d \"\" /f", &r);

1 0

Gerald Pfeifer : propsys: Cast to ULONGLONG instead of LONGLONG in test_intconversions test_intconversions to avoid shift overflow.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 519ad57cb5ebdb142bd755f924e8487985801315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519ad57cb5ebdb142bd755f92… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 4 21:47:36 2015 +0200 propsys: Cast to ULONGLONG instead of LONGLONG in test_intconversions test_intconversions to avoid shift overflow. --- dlls/propsys/tests/propsys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 99d1c460..0dd052c 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -765,11 +765,11 @@ static void test_intconversions(void) PropVariantClear(&propvar); propvar.vt = VT_I8; - propvar.u.hVal.QuadPart = (LONGLONG)1 << 63; + propvar.u.hVal.QuadPart = (ULONGLONG)1 << 63; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == (LONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);

1 0

Vincent Povirk : mscoree: Send Mono's debug output to Unix stderr.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 2ecd3772e3805992f48bb806fd6a595048441011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecd3772e3805992f48bb806f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 14:05:00 2015 -0500 mscoree: Send Mono's debug output to Unix stderr. --- dlls/mscoree/metahost.c | 18 ++++++++++++++++++ dlls/mscoree/mscoree_private.h | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 5e32ecb..6b53cde 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -102,6 +102,8 @@ static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); +void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); +void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); static BOOL get_mono_path(LPWSTR path); @@ -111,12 +113,18 @@ static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char static void mono_shutdown_callback_fn(MonoProfiler *prof); +static void mono_print_handler_fn(const char *string, INT is_stdout); + static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) { return mono_image_open(fname, status); } +static void CDECL set_print_handler_dummy(MonoPrintCallback callback) +{ +} + static void missing_runtime_message(void) { MESSAGE("wine: Install Mono for Windows to run .NET applications.\n"); @@ -204,11 +212,16 @@ static HRESULT load_mono(LPCWSTR mono_path) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); + LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); #undef LOAD_OPT_MONO_FUNCTION mono_profiler_install(NULL, mono_shutdown_callback_fn); + mono_trace_set_print_handler(mono_print_handler_fn); + mono_trace_set_printerr_handler(mono_print_handler_fn); + mono_set_dirs(mono_lib_path_a, mono_etc_path_a); mono_config_parse(NULL); @@ -244,6 +257,11 @@ static void mono_shutdown_callback_fn(MonoProfiler *prof) is_mono_shutdown = TRUE; } +static void mono_print_handler_fn(const char *string, INT is_stdout) +{ + wine_dbg_printf("%s", string); +} + static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost **result) { HRESULT hr = S_OK; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0fbbff6..9a7678d 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -132,6 +132,8 @@ typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char * typedef void (*MonoProfileFunc)(MonoProfiler *prof); +typedef void (*MonoPrintCallback) (const char *string, INT is_stdout); + extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; @@ -156,6 +158,8 @@ extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; +extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; +extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; /* loaded runtime interfaces */ extern void expect_no_runtimes(void) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi/tests: Avoid test failures when running as an unprivileged user.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: fca92ae67cb1339fed9785a0e915bfdec8becb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca92ae67cb1339fed9785a0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:35:32 2015 +0200 msi/tests: Avoid test failures when running as an unprivileged user. --- dlls/msi/tests/install.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1aefa9f..86ad561 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3159,6 +3159,11 @@ static void test_samesequence(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3167,6 +3172,8 @@ static void test_samesequence(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); } @@ -3181,6 +3188,12 @@ static void test_uiLevelFlags(void) MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3189,6 +3202,8 @@ static void test_uiLevelFlags(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); }

1 0

Dmitry Timoshkov : oleaut32/tests: Add parameter checking to the typelib varargs marshalling test.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: f05930f0ce3785369031ba823989d80eb0715151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05930f0ce3785369031ba823… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 7 12:30:19 2015 +0800 oleaut32/tests: Add parameter checking to the typelib varargs marshalling test. --- dlls/oleaut32/tests/tmarshal.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 1893534..2d6e5f2 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -842,7 +842,35 @@ static HRESULT WINAPI Widget_neg_restrict(IWidget* iface, INT *i) static HRESULT WINAPI Widget_VarArg_Run( IWidget *iface, BSTR name, SAFEARRAY *params, VARIANT *result) { + static const WCHAR catW[] = { 'C','a','t',0 }; + static const WCHAR supermanW[] = { 'S','u','p','e','r','m','a','n',0 }; + LONG bound; + VARIANT *var; + BSTR bstr; + HRESULT hr; + trace("VarArg_Run(%p,%p,%p)\n", name, params, result); + + ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + + hr = SafeArrayGetLBound(params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetLBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayGetUBound(params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayAccessData(params, (void **)&var); + ok(hr == S_OK, "SafeArrayAccessData failed with %x\n", hr); + + ok(V_VT(&var[0]) == VT_BSTR, "expected VT_BSTR, got %d\n", V_VT(&var[0])); + bstr = V_BSTR(&var[0]); + ok(!lstrcmpW(bstr, supermanW), "got %s\n", wine_dbgstr_w(bstr)); + + hr = SafeArrayUnaccessData(params); + ok(hr == S_OK, "SafeArrayUnaccessData error %#x\n", hr); + return S_OK; } @@ -1516,7 +1544,7 @@ static void test_typelibmarshal(void) V_BSTR(&vararg[1]) = SysAllocString(szCat); VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BSTR; - V_BSTR(&vararg[0]) = SysAllocString(NULL); + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); dispparams.cNamedArgs = 0; dispparams.cArgs = 2; dispparams.rgdispidNamedArgs = NULL;

1 0