wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless union.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: cb16c706026a79ad65032923f67e3245313a1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb16c706026a79ad65032923f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 13:06:28 2015 +0200 ddraw/tests: Fix compilation on systems that don't support nameless union. --- dlls/ddraw/tests/ddraw7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e151fb7..b8691b8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3862,7 +3862,7 @@ static void test_specular_lighting(void) ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); memset(&material, 0, sizeof(material)); - U(U2(material).specular).r = 1.0f; + U1(U2(material).specular).r = 1.0f; U2(U2(material).specular).g = 1.0f; U3(U2(material).specular).b = 1.0f; U4(U2(material).specular).a = 1.0f;

1 0

Andrew Eikum : mmdevapi: Always use 64-bit registry keys.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: b55cc5e4c5083d7833cc637f07c2d8f9813bf1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55cc5e4c5083d7833cc637f0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 1 13:11:12 2015 -0500 mmdevapi: Always use 64-bit registry keys. --- dlls/mmdevapi/devenum.c | 14 +++---- dlls/mmdevapi/tests/propstore.c | 93 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d612ec0..1952bda 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -143,12 +143,12 @@ static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *pr LONG ret; HKEY key; StringFromGUID2(guid, buffer, 39); - if ((ret = RegOpenKeyExW(flow == eRender ? key_render : key_capture, buffer, 0, KEY_READ|KEY_WRITE, &key)) != ERROR_SUCCESS) + if ((ret = RegOpenKeyExW(flow == eRender ? key_render : key_capture, buffer, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, &key)) != ERROR_SUCCESS) { WARN("Opening key %s failed with %u\n", debugstr_w(buffer), ret); return E_FAIL; } - ret = RegOpenKeyExW(key, reg_properties, 0, KEY_READ|KEY_WRITE, propkey); + ret = RegOpenKeyExW(key, reg_properties, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); RegCloseKey(key); if (ret != ERROR_SUCCESS) { @@ -345,11 +345,11 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st else root = key_capture; - if (RegCreateKeyExW(root, guidstr, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &key, NULL) == ERROR_SUCCESS) + if (RegCreateKeyExW(root, guidstr, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &key, NULL) == ERROR_SUCCESS) { HKEY keyprop; RegSetValueExW(key, reg_devicestate, 0, REG_DWORD, (const BYTE*)&state, sizeof(DWORD)); - if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &keyprop, NULL)) + if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) { PROPVARIANT pv; @@ -406,11 +406,11 @@ static HRESULT load_devices_from_reg(void) LONG ret; DWORD curflow; - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, software_mmdevapi, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &root, NULL); + ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, software_mmdevapi, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &root, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_capture, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &key_capture, NULL); + ret = RegCreateKeyExW(root, reg_capture, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_capture, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_render, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &key_render, NULL); + ret = RegCreateKeyExW(root, reg_render, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_render, NULL); RegCloseKey(root); cur = key_capture; curflow = eCapture; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index bcb5044..06fe690 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -30,6 +30,19 @@ #include "mmdeviceapi.h" #include "devpkey.h" +static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); + +static const WCHAR software_renderW[] = + { 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'M','M','D','e','v','i','c','e','s','\\', + 'A','u','d','i','o','\\', + 'R','e','n','d','e','r',0 }; +static const WCHAR propertiesW[] = {'P','r','o','p','e','r','t','i','e','s',0}; + + static void test_propertystore(IPropertyStore *store) { HRESULT hr; @@ -109,12 +122,86 @@ static void test_getat(IPropertyStore *store) ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); } +static void test_setvalue_on_wow64(IPropertyStore *store) +{ + PROPVARIANT pv; + HRESULT hr; + LONG ret; + WCHAR *guidW; + HKEY root, props, devkey; + DWORD type, regval, size; + + static const PROPERTYKEY PKEY_Bogus = { + {0x1da5d803, 0xd492, 0x4edd, {0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x00}}, 0x7f + }; + static const WCHAR bogusW[] = {'{','1','D','A','5','D','8','0','3','-','D','4','9','2','-','4','E','D','D','-','8','C','2','3','-','E','0','C','0','F','F','E','E','7','F','0','0','}',',','1','2','7',0}; + + PropVariantInit(&pv); + + pv.vt = VT_EMPTY; + hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); + ok(hr == S_OK, "Failed to get Endpoint GUID: %08x\n", hr); + + guidW = pv.u.pwszVal; + + pv.vt = VT_UI4; + pv.u.ulVal = 0xAB; + + hr = IPropertyStore_SetValue(store, &PKEY_Bogus, &pv); + ok(hr == S_OK || hr == E_ACCESSDENIED, "SetValue failed: %08x\n", hr); + if (hr != S_OK) + { + win_skip("Missing permission to write to registry\n"); + return; + } + + pv.u.ulVal = 0x00; + + hr = IPropertyStore_GetValue(store, &PKEY_Bogus, &pv); + ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(pv.u.ulVal == 0xAB, "Got wrong value: 0x%x\n", pv.u.ulVal); + + /* should find the key in 64-bit view */ + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ|KEY_WOW64_64KEY, &root); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevices Render key: %u\n", ret); + + ret = RegOpenKeyExW(root, guidW, 0, KEY_READ|KEY_WOW64_64KEY, &devkey); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %u\n", ret); + + ret = RegOpenKeyExW(devkey, propertiesW, 0, KEY_READ|KEY_WOW64_64KEY, &props); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %u\n", ret); + + /* Note: the registry key exists even without calling IPropStore::Commit */ + size = sizeof(regval); + ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); + ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); + ok(type == REG_DWORD, "Got wrong value type: %u\n", type); + ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); + + RegCloseKey(props); + RegCloseKey(devkey); + RegCloseKey(root); + + CoTaskMemFree(guidW); + + /* should NOT find the key in 32-bit view */ + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ, &root); + ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %u\n", ret); +} + START_TEST(propstore) { HRESULT hr; IMMDeviceEnumerator *mme = NULL; IMMDevice *dev = NULL; IPropertyStore *store; + BOOL is_wow64 = FALSE; + HMODULE hk32 = GetModuleHandleA("kernel32.dll"); + + pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); + + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -149,13 +236,17 @@ START_TEST(propstore) ok(hr == E_POINTER, "Wrong hr returned: %08x\n", hr); store = NULL; - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); + hr = IMMDevice_OpenPropertyStore(dev, STGM_READWRITE, &store); + if(hr == E_ACCESSDENIED) + hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); ok(hr == S_OK, "Opening valid store returned %08x\n", hr); if (store) { test_propertystore(store); test_deviceinterface(store); test_getat(store); + if (is_wow64) + test_setvalue_on_wow64(store); IPropertyStore_Release(store); } IMMDevice_Release(dev);

1 0

Aric Stewart : setupapi: Restore close brace before using guid string as reg key.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: a3487ad3169f5d323ffec2ded6754c3357640161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3487ad3169f5d323ffec2ded… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 1 07:58:37 2015 -0500 setupapi: Restore close brace before using guid string as reg key. --- dlls/setupapi/devinst.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 966af75..2a97eab 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2132,6 +2132,8 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, interfaceGuidStr[37] = 0; UuidFromStringW(&interfaceGuidStr[1], &interfaceGuid); + interfaceGuidStr[37] = '}'; + interfaceGuidStr[38] = 0; l = RegOpenKeyExW(interfacesKey, interfaceGuidStr, 0, KEY_READ, &interfaceKey); if (!l)

1 0

Alexandre Julliard : Wine release 1.7.42
by Alexandre Julliard 01 May '15

01 May '15

Module: website Branch: master Commit: f93903a79309bfd74bce82bb5a5d60436abc8476 URL: http://source.winehq.org/git/website.git/?a=commit;h=f93903a79309bfd74bce82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:50:20 2015 +0900 Wine release 1.7.42 --- news/en/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2015050101.xml b/news/en/2015050101.xml new file mode 100644 index 0000000..1834956 --- /dev/null +++ b/news/en/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>May 1, 2015</date> +<title>Wine 1.7.42 Released</title> +<body> + The Wine development release 1.7.42 is now available. + <a href="{$root}/announce/1.7.42">What's new</a> in this release: +<ul> + <li>Support for dynamic timezone information.</li> + <li>Initial desktop shell window support.</li> + <li>Some more Direct2D support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.42 : Alexandre Julliard : Release 1.7.42
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: refs/tags/wine-1.7.42 Tag: 758126d337e3d9b72d080ff5fc4fc8da85e85b3b URL: http://source.winehq.org/git/wine.git/?a=tag;h=758126d337e3d9b72d080ff5fc4f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:48:19 2015 +0900 Release 1.7.42

1 0

Alexandre Julliard : Release 1.7.42.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: e7a405ad9e377baf691042b877e88ef37cc617d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a405ad9e377baf691042b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:48:19 2015 +0900 Release 1.7.42. --- ANNOUNCE | 579 +++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 318 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7a405ad9e377baf69104…

1 0

Nikolay Sivov : ole32/tests: Fix a test failure on Win8.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: bb37d7507415cb88551c4eb3fa1f9366093ebb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb37d7507415cb88551c4eb3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 12:13:09 2015 +0300 ole32/tests: Fix a test failure on Win8. --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 38d82a8..220052d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1554,7 +1554,7 @@ static void test_registered_object_thread_affinity(void) ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); GetExitCodeThread(thread, &exitcode); hr = exitcode; - ok(hr == RPC_E_WRONG_THREAD, "CoRevokeClassObject called from different " + ok(hr == RPC_E_WRONG_THREAD || broken(hr == S_OK) /* win8 */, "CoRevokeClassObject called from different " "thread to where registered should return RPC_E_WRONG_THREAD instead of 0x%08x\n", hr); thread = CreateThread(NULL, 0, register_class_object_thread, NULL, 0, &tid);

1 0

Nikolay Sivov : setupapi/tests: Trace error codes when SetupOpenLog fails.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 21b9c5f023e0a6db7911ae0162964c37c32f5c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b9c5f023e0a6db7911ae016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:59:24 2015 +0300 setupapi/tests: Trace error codes when SetupOpenLog fails. --- dlls/setupapi/tests/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 7423738..d5cfa01 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -787,8 +787,9 @@ static void test_SetupLogError(void) ok(!ret, "SetupLogError succeeded\n"); ok(error == ERROR_FILE_INVALID, "got wrong error: %d\n", error); + SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); - ok(ret, "SetupOpenLog failed\n"); + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupLogErrorA("Test with wrong log severity\r\n", LogSevMaximum); @@ -803,8 +804,9 @@ static void test_SetupLogError(void) ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER /* Win Vista+ */), "SetupLogError failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); - ok(ret, "SetupOpenLog failed\n"); + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetupCloseLog(); }

1 0

Nikolay Sivov : ole32/tests: Fix test failures on some VMs with limited user permissions.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 3d33d8a9c4c63ff06dc4decf89249dcf4d9b3509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d33d8a9c4c63ff06dc4decf8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:52:43 2015 +0300 ole32/tests: Fix test failures on some VMs with limited user permissions. --- dlls/ole32/tests/compobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4be9c8b..38d82a8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1964,7 +1964,12 @@ static void test_TreatAsClass(void) ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); - ok(lr == ERROR_SUCCESS, "Couldn't create class key\n"); + if (lr) { + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", + GetLastError()); + RegCloseKey(clsidkey); + return; + } hr = pCoTreatAsClass(&deadbeef, &deadbeef); ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr);

1 0

Nikolay Sivov : dwrite: Improve run tracing format.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 4fa8d3a444aee257733fb119d9e1c805562afd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa8d3a444aee257733fb119d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:35:13 2015 +0300 dwrite: Improve run tracing format. --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5935918..68e582e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -249,7 +249,7 @@ static inline struct dwrite_typography *impl_from_IDWriteTypography(IDWriteTypog static inline const char *debugstr_run(const struct regular_layout_run *run) { - return wine_dbg_sprintf("[%u,%u]", run->descr.textPosition, run->descr.textPosition + + return wine_dbg_sprintf("[%u,%u)", run->descr.textPosition, run->descr.textPosition + run->descr.stringLength); }

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 May 2015