January 2015 - Wine-Commits

Francois Gouget : jscript: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: 861f02b5d14fd44b55036d1af0788159db828b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=861f02b5d14fd44b55036d1af… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:26:02 2015 +0100 jscript: Add a trailing '\n' to an ok() call. --- dlls/jscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1adc25d..c0a62b8 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1954,7 +1954,7 @@ static void test_default_value(void) hres = parse_script_expr("new Date()", &v); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); - ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d", V_VT(&v)); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); disp = V_DISPATCH(&v); V_VT(&v) = VT_EMPTY;

1 0

Henri Verbeet : wined3d: Specify the initial texture contents with wined3d_texture_create() in wined3d_device_create_cursor_texture().
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: 30aa55282e140c6551e7eb4048524f8535baf0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30aa55282e140c6551e7eb404… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 5 13:24:59 2015 +0100 wined3d: Specify the initial texture contents with wined3d_texture_create() in wined3d_device_create_cursor_texture(). --- dlls/wined3d/device.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d26d3f9..1d293bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3987,13 +3987,11 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, struct wined3d_surface *cursor_image) { + struct wined3d_sub_resource_data data; struct wined3d_resource_desc desc; struct wined3d_map_desc map_desc; struct wined3d_texture *texture; - struct wined3d_surface *surface; - BYTE *src_data, *dst_data; - unsigned int src_pitch; - unsigned int i; + HRESULT hr; if (FAILED(wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_READONLY))) { @@ -4001,8 +3999,9 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined return NULL; } - src_pitch = map_desc.row_pitch; - src_data = map_desc.data; + data.data = map_desc.data; + data.row_pitch = map_desc.row_pitch; + data.slice_pitch = map_desc.slice_pitch; desc.resource_type = WINED3D_RTYPE_TEXTURE; desc.format = WINED3DFMT_B8G8R8A8_UNORM; @@ -4015,31 +4014,15 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.depth = 1; desc.size = 0; - if (FAILED(wined3d_texture_create(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, - NULL, NULL, &wined3d_null_parent_ops, &texture))) + hr = wined3d_texture_create(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, + &data, NULL, &wined3d_null_parent_ops, &texture); + wined3d_surface_unmap(cursor_image); + if (FAILED(hr)) { ERR("Failed to create cursor texture.\n"); - wined3d_surface_unmap(cursor_image); return NULL; } - surface = surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); - if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, WINED3D_MAP_DISCARD))) - { - ERR("Failed to map destination surface.\n"); - wined3d_texture_decref(texture); - wined3d_surface_unmap(cursor_image); - return NULL; - } - - dst_data = map_desc.data; - - for (i = 0; i < desc.height; ++i) - memcpy(&dst_data[map_desc.row_pitch * i], &src_data[src_pitch * i], desc.width * 4); - - wined3d_surface_unmap(surface); - wined3d_surface_unmap(cursor_image); - return texture; }

1 0

Mark Harmstone : dsound: NOP on SetSpeakerConfig.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: a48c7fe408bdf5b28fcdcaa2709718c2a02d1e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48c7fe408bdf5b28fcdcaa27… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Dec 31 18:53:06 2014 +0000 dsound: NOP on SetSpeakerConfig. --- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/tests/dsound.c | 6 +++--- dlls/dsound/tests/dsound8.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 986168b..66c9d91 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -386,8 +386,8 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D return DSERR_UNINITIALIZED; } - This->device->speaker_config = config; - WARN("not fully functional\n"); + /* NOP on Vista and above */ + return DS_OK; } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index e5a9110..f93e137 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -158,10 +158,10 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, if (rc==DS_OK) { rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config); ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); - if (rc==DS_OK && speaker_config!=new_speaker_config) + if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x, got 0x%08x\n", - speaker_config,new_speaker_config); + "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + speaker_config,ref_speaker_config,new_speaker_config); IDirectSound_SetSpeakerConfig(dso,ref_speaker_config); } diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 64b9f62..ad16ea7 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -171,10 +171,10 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, if (rc==DS_OK) { rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config); ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); - if (rc==DS_OK && speaker_config!=new_speaker_config) + if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound8_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x, got 0x%08x\n", - speaker_config,new_speaker_config); + "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + speaker_config,ref_speaker_config,new_speaker_config); IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config); }

1 0

Bruno Jesus : iphlpapi: Add a stub for CreateSortedAddressPairs().
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: 6b4dcb3f35c4e406463e5139d105f20468a21e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4dcb3f35c4e406463e5139d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 3 01:29:10 2015 -0200 iphlpapi: Add a stub for CreateSortedAddressPairs(). --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 22 ++++++++++++++++++++++ include/ws2ipdef.h | 6 ++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c51b58b..fcb6d72 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -46,7 +46,7 @@ #@ stub CreatePersistentTcpPortReservation #@ stub CreatePersistentUdpPortReservation @ stdcall CreateProxyArpEntry( long long long ) -#@ stub CreateSortedAddressPairs +@ stdcall CreateSortedAddressPairs( ptr long ptr long long ptr ptr ) #@ stub CreateUnicastIpAddressEntry #@ stub DeleteAnycastIpAddressEntry @ stdcall DeleteIPAddress( long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c06b69f..f04e12a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -280,6 +280,28 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) /****************************************************************** + * CreateSortedAddressPairs (IPHLPAPI.@) + */ +DWORD WINAPI CreateSortedAddressPairs(const PSOCKADDR_IN6 source, DWORD sourcecount, + const PSOCKADDR_IN6 destination, DWORD destinationcount, + DWORD sortoptions, + PSOCKADDR_IN6_PAIR *sortedaddr, DWORD *sortedcount) +{ + FIXME("(source %p, sourcecount %d, destination %p, destcount %d, sortoptions %x," + " sortedaddr %p, sortedcount %p): stub\n", source, sourcecount, destination, + destinationcount, sortoptions, sortedaddr, sortedcount); + + if (source || sourcecount || !destination || !sortedaddr || !sortedcount || destinationcount > 500) + return ERROR_INVALID_PARAMETER; + + /* Returning not supported tells the client we don't have IPv6 support + * so applications can fallback to IPv4. + */ + return ERROR_NOT_SUPPORTED; +} + + +/****************************************************************** * DeleteIPAddress (IPHLPAPI.@) * * Delete an IP address added with AddIPAddress(). diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index ea8db3d..ca47caa 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -129,6 +129,12 @@ typedef struct WS(sockaddr_in6) ULONG sin6_scope_id; } SOCKADDR_IN6,*PSOCKADDR_IN6, *LPSOCKADDR_IN6; +typedef struct WS(sockaddr_in6_pair) +{ + PSOCKADDR_IN6 SourceAddress; + PSOCKADDR_IN6 DestinationAddress; +} SOCKADDR_IN6_PAIR, *PSOCKADDR_IN6_PAIR; + /* * Multicast group information */

1 0

André Hentschel : configure: Fix check for cms.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: 4110c93e419ded0572cc1a2bb8b1940a1b370ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4110c93e419ded0572cc1a2bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 2 00:34:47 2015 +0100 configure: Fix check for cms. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b4e041d..79d6632 100755 --- a/configure +++ b/configure @@ -11854,7 +11854,7 @@ $as_echo "#define HAVE_RESOLV 1" >>confdefs.h esac fi -if test "x$with_lcms2" != "xno" +if test "x$with_cms" != "xno" then if ${LCMS2_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : diff --git a/configure.ac b/configure.ac index 94b83ab..b67a7e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1455,7 +1455,7 @@ then fi dnl **** Check for LittleCMS *** -if test "x$with_lcms2" != "xno" +if test "x$with_cms" != "xno" then WINE_PACKAGE_FLAGS(LCMS2,[lcms2],[-llcms2],,, [AC_CHECK_HEADERS([lcms2.h])

1 0

Stefan Leichter : ntoskrnl.exe: Emulate instruction mov eax,cr4.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: e729dba55d33adbb7403a03042f7637dfcddb980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e729dba55d33adbb7403a0304… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jan 2 12:44:47 2015 +0100 ntoskrnl.exe: Emulate instruction mov eax,cr4. --- dlls/ntoskrnl.exe/instr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index fe35686..e170044 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -319,9 +319,14 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE("mov eax,cr0 at 0x%08x, EAX=0x%08x\n", context->Eip,context->Eax ); context->Eip += prefixlen+3; return ExceptionContinueExecution; + case 0xe0: + TRACE("mov eax,cr4 at 0x%08x, EAX=0x%08x\n", context->Eip,context->Eax ); + context->Eip += prefixlen+3; + return ExceptionContinueExecution; default: break; /*fallthrough to bad instruction handling */ } + ERR("Unsupported EAX -> CR register, eip+2 is %02x\n", instr[2]); break; /*fallthrough to bad instruction handling */ case 0x20: /* mov crX, eax */ switch (instr[2])

1 0

Mark Harmstone : dsound: Get speaker config from mmdevice props.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: 52345858d0a75c160e4bc2edcf32138e4a1fa492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52345858d0a75c160e4bc2edc… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Dec 31 20:49:21 2014 +0000 dsound: Get speaker config from mmdevice props. Use PKEY_AudioEndpoint_PhysicalSpeakers to set the speaker config in dsound. --- dlls/dsound/primary.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 36c00da..ea4559c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -146,6 +146,49 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } +static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) +{ + IPropertyStore *store; + HRESULT hr; + PROPVARIANT pv; + ULONG phys_speakers; + + const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + + hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); + if (FAILED(hr)) { + WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); + return def; + } + + hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); + + if (FAILED(hr)) { + WARN("IPropertyStore_GetValue failed: %08x\n", hr); + IPropertyStore_Release(store); + return def; + } + + if (pv.vt != VT_UI4) { + WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt); + PropVariantClear(&pv); + IPropertyStore_Release(store); + return def; + } + + phys_speakers = pv.u.ulVal; + + PropVariantClear(&pv); + IPropertyStore_Release(store); + + if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) + return DSSPEAKER_MONO; + + return def; +} + HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { UINT prebuf_frames; @@ -181,6 +224,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice); + hres = DSOUND_WaveFormat(device, device->client, forcewave, &wfx); if (FAILED(hres)) { IAudioClient_Release(device->client);

1 0

Francois Gouget : shell32: Fix the IDS_PERSONAL hardcoded default.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: d7fc48463b1ce7b8b587c2f27ff7fe16f0525302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fc48463b1ce7b8b587c2f27… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 5 19:27:07 2015 +0100 shell32: Fix the IDS_PERSONAL hardcoded default. The corresponding folder is called 'My Documents' but on Linux it's usually called 'Documents' so that's much more appropriate fallback than 'Personal'. --- dlls/shell32/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e67babe..83df879 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2573,7 +2573,7 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { /* Fall back to hard coded defaults. */ switch (LOWORD(pwszSubPath)) { case IDS_PERSONAL: - lstrcpyW(wszSubPath, PersonalW); + lstrcpyW(wszSubPath, DocumentsW); break; case IDS_MYMUSIC: lstrcpyW(wszSubPath, My_MusicW);

1 0

Francois Gouget : shell32: Fix a trailing '\n' in a FIXME() call.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: aa096fb456a79d12711c24faf2aab3f379fa168a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa096fb456a79d12711c24faf… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:26:24 2015 +0100 shell32: Fix a trailing '\n' in a FIXME() call. --- dlls/shell32/assoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 39e210d..f3c8e65 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -1041,7 +1041,7 @@ HRESULT WINAPI SHAssocEnumHandlers(const WCHAR *extra, ASSOC_FILTER filter, IEnu { struct enumassochandlers *enumassoc; - FIXME("(%s %d %p\n): stub", debugstr_w(extra), filter, enumhandlers); + FIXME("(%s %d %p): stub\n", debugstr_w(extra), filter, enumhandlers); *enumhandlers = NULL;

1 0

Hans Leidekker : advapi32: Return an error from RegSetValueExW if passed a NULL data pointer and non-zero size.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: ff0ee8f8a8faf35d148f00e4de2671feee051be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0ee8f8a8faf35d148f00e4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 5 13:18:50 2015 +0100 advapi32: Return an error from RegSetValueExW if passed a NULL data pointer and non-zero size. --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 8e33ab3..620dd6a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1201,7 +1201,7 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, /* no need for version check, not implemented on win9x anyway */ - if (data && ((ULONG_PTR)data >> 16) == 0) return ERROR_NOACCESS; + if ((data && ((ULONG_PTR)data >> 16) == 0) || (!data && count)) return ERROR_NOACCESS; if (count && is_string(type)) { diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index bcf3d7d..3acda0e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -436,6 +436,21 @@ static void test_set_value(void) ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + if (pRegGetValueA) /* avoid a crash on Windows 2000 */ + { + ret = RegSetValueExW(hkey_main, NULL, 0, REG_SZ, NULL, 4); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_SZ, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_DWORD, NULL, 4); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_DWORD, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + } + /* RegSetKeyValue */ if (!pRegSetKeyValueW) win_skip("RegSetKeyValue() is not supported.\n"); @@ -464,6 +479,12 @@ static void test_set_value(void) ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 0); ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 4); + ok(ret == ERROR_NOACCESS, "got %d\n", ret); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_DWORD, NULL, 4); + ok(ret == ERROR_NOACCESS, "got %d\n", ret); + RegCloseKey(subkey); } }

1 0