January 2013 - Wine-commits

Michael Stefaniuc : crypt32: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: ab270d433f3e2d43045449ae2fb4fb6ca4b17113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab270d433f3e2d43045449ae2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:18:24 2013 +0100 crypt32: Use assignment instead of memcpy to copy a struct. --- dlls/crypt32/decode.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a4934a7..e5f8baf 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -692,8 +692,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, CryptMemAlloc( cItems * sizeof(struct AsnArrayItemSize)); if (itemSizes) - memcpy(itemSizes, &itemSize, - sizeof(itemSize)); + *itemSizes = itemSize; } if (itemSizes) {

1 0

Michael Stefaniuc : itss: Use assignment instead of memcpy to copy a struct .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 0538e9995d91cf98ea3f8b71187b6b57cb328e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0538e9995d91cf98ea3f8b711… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:30:53 2013 +0100 itss: Use assignment instead of memcpy to copy a struct. --- dlls/itss/chm_lib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index ada9be1..c9bbcdf 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -835,7 +835,7 @@ struct chmFile *chm_dup(struct chmFile *oldHandle) struct chmFile *newHandle=NULL; newHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(struct chmFile)); - memcpy(newHandle, oldHandle, sizeof(struct chmFile)); + *newHandle = *oldHandle; /* duplicate fd handle */ DuplicateHandle(GetCurrentProcess(), oldHandle->fd,

1 0

Erich Hoover : advapi32: Fix intermittent 64-bit test failure.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: cb45236032404c69597f3a87d6ea586fbbd74a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb45236032404c69597f3a87d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 18 11:00:58 2013 -0700 advapi32: Fix intermittent 64-bit test failure. --- dlls/advapi32/tests/security.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0e0730f..e4adab1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3119,7 +3119,6 @@ static void test_GetNamedSecurityInfoA(void) bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); - HeapFree(GetProcessHeap(), 0, user); ok(bret, "Failed to add Current User to ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); @@ -3134,6 +3133,7 @@ static void test_GetNamedSecurityInfoA(void) if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("SetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); return; } @@ -3144,6 +3144,7 @@ static void test_GetNamedSecurityInfoA(void) if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); return; } @@ -3175,6 +3176,7 @@ static void test_GetNamedSecurityInfoA(void) "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } LocalFree(pSD); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); }

1 0

Alexandre Julliard : advapi32/tests: Fix another test failure.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 8148b99e3e32ee65c0206db2648f0dcf25a8970f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8148b99e3e32ee65c0206db26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 17:00:06 2013 +0100 advapi32/tests: Fix another test failure. --- dlls/advapi32/tests/service.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 5248e82..3d16126 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1856,9 +1856,10 @@ static void test_sequence(void) bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, NULL, 0, &n1); error = GetLastError(); ok(!bret, "Expected QueryServiceObjectSecurity to fail: result %d\n", bret); - ok(error == ERROR_INSUFFICIENT_BUFFER || broken(error == ERROR_INVALID_ADDRESS), + ok(error == ERROR_INSUFFICIENT_BUFFER || + broken(error == ERROR_INVALID_ADDRESS) || broken(error == ERROR_INVALID_PARAMETER), "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); - if (error == ERROR_INVALID_ADDRESS) n1 = 1024; + if (error != ERROR_INSUFFICIENT_BUFFER) n1 = 1024; pSD = LocalAlloc(0, n1); bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, n1, &n2); ok(bret, "Expected QueryServiceObjectSecurity to succeed: result %d\n", bret);

1 0

Austin English : include: Flesh out d3d11.idl.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 899392b316e2ffe4bde37a0578f138c97fa65bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=899392b316e2ffe4bde37a057… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 22 18:59:18 2013 -0800 include: Flesh out d3d11.idl. --- include/d3d11.idl | 1630 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1623 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=899392b316e2ffe4bde37…

1 0

Sergey Guralnik : user32: Init standard scrollbars during WM_NCCREATE.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 1cd5e69478afe031566fc265c7c1ecec318e936c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd5e69478afe031566fc265c… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 23 08:28:36 2013 +0200 user32: Init standard scrollbars during WM_NCCREATE. --- dlls/user32/defwnd.c | 14 ++++++++++++++ dlls/user32/tests/scroll.c | 13 +++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index af566bf..7a55844 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -837,6 +837,13 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextA( hwnd, cs->lpszName ); result = 1; + + if(cs->style & (WS_HSCROLL | WS_VSCROLL)) + { + SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; + SetScrollInfo( hwnd, SB_HORZ, &si, FALSE ); + SetScrollInfo( hwnd, SB_VERT, &si, FALSE ); + } } break; @@ -984,6 +991,13 @@ LRESULT WINAPI DefWindowProcW( if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextW( hwnd, cs->lpszName ); result = 1; + + if(cs->style & (WS_HSCROLL | WS_VSCROLL)) + { + SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; + SetScrollInfo( hwnd, SB_HORZ, &si, FALSE ); + SetScrollInfo( hwnd, SB_VERT, &si, FALSE ); + } } break; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 49f42bb..0f0ede2 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -241,7 +241,6 @@ static void scrollbar_test_default( DWORD style) ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else -todo_wine ok(( min == 0 && max == 100) || broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); @@ -253,7 +252,6 @@ todo_wine ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else -todo_wine ok(( min == 0 && max == 100) || broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); @@ -263,7 +261,6 @@ todo_wine if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else -todo_wine ok( ret || broken( !ret), /* Win 9x/ME */ "GetScrollInfo failed unexpectedly. Style is %08x\n", style); @@ -273,7 +270,6 @@ todo_wine if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else -todo_wine ok( ret || broken( !ret), /* Win 9x/ME */ "GetScrollInfo failed unexpectedly. Style is %08x\n", style); @@ -423,15 +419,12 @@ static LRESULT CALLBACK scroll_init_proc(HWND hwnd, UINT msg, /* WM_NCCREATE was passed to DefWindowProc */ if(cs->style & (WS_VSCROLL | WS_HSCROLL)) { - todo_wine - ok(h_ret && v_ret, "GetScrollInfo() should return NON-zero " + ok(h_ret && v_ret, "GetScrollInfo() should return NON-zero " "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); - todo_wine - ok(vert.nMin == 0 && vert.nMax == 100, + ok(vert.nMin == 0 && vert.nMax == 100, "unexpected init values(SB_VERT): min=%d max=%d\n", vert.nMin, vert.nMax); - todo_wine - ok(horz.nMin == 0 && horz.nMax == 100, + ok(horz.nMin == 0 && horz.nMax == 100, "unexpected init values(SB_HORZ): min=%d max=%d\n", horz.nMin, horz.nMax); }

1 0

Jacek Caban : ieframe/tests: Fixed a race in tests.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: b28a4507a993a92bf9a751a1394e9b8c5afd1c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28a4507a993a92bf9a751a13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 13:28:09 2013 +0100 ieframe/tests: Fixed a race in tests. --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 760618f..c1e8b49 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2792,7 +2792,6 @@ static void test_download(DWORD flags) CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) todo_wine CHECK_CALLED(GetDropTarget); - todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); if(!(flags & DWL_REFRESH)) CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); @@ -2805,6 +2804,7 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } + todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); if(flags & DWL_HTTP) CLEAR_CALLED(Exec_SETTITLE); /* FIXME: make it more strict */ CHECK_CALLED(UpdateUI);

1 0

Andrew Eikum : ieframe/tests: Don' t convert to long path name until the file exists.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: b233d2054e64e216a5b3868f301bfc934b019b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b233d2054e64e216a5b3868f3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 24 10:35:00 2013 -0600 ieframe/tests: Don't convert to long path name until the file exists. --- dlls/ieframe/tests/webbrowser.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index c1e8b49..1915876 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3529,8 +3529,6 @@ static void test_FileProtocol(void) GetTempPathA(MAX_PATH, file_path); strcat(file_path, test_file); - GetLongPathNameA(file_path, file_path, sizeof(file_path)); - strcat(file_url, file_path); webbrowser = create_webbrowser(); if(!webbrowser) @@ -3546,6 +3544,9 @@ static void test_FileProtocol(void) } CloseHandle(file); + GetLongPathNameA(file_path, file_path, sizeof(file_path)); + strcat(file_url, file_path); + test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, TRUE); test_DoVerb(webbrowser);

1 0

Andrew Talbot : gdiplus: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 32d070afb0d6bcec3a19f509066028fcdfcb043f URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d070afb0d6bcec3a19f5090… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 23 21:42:47 2013 +0000 gdiplus: Avoid signed-unsigned integer comparisons. --- dlls/gdiplus/graphics.c | 6 ++++-- dlls/gdiplus/image.c | 5 +++-- dlls/gdiplus/region.c | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e287683..659c46b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -429,7 +429,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst if (graphics->image && graphics->image->type == ImageTypeBitmap) { - int i, size; + DWORD i; + int size; RGNDATA *rgndata; RECT *rects; HRGN hrgn, visible_rgn; @@ -642,7 +643,8 @@ static int color_is_gray(ARGB color) static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type) { - UINT x, y, i; + UINT x, y; + INT i; if (attributes->colorkeys[type].enabled || attributes->colorkeys[ColorAdjustTypeDefault].enabled) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bb555a8..6aa8d32 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -370,7 +370,7 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, ColorPalett BYTE index = 0; int best_distance = 0x7fff; int distance; - int i; + UINT i; if (!palette) return 0; /* This algorithm scans entire palette, @@ -3793,7 +3793,8 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res LARGE_INTEGER seek; HRESULT hr; UINT bytesread; - int i, j, sig; + int i; + DWORD j, sig; /* seek to the start of the stream */ seek.QuadPart = 0; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f62b599..f7bad57 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -588,7 +588,7 @@ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) GpStatus stat; GpPath* path; GpRegion* local; - int i; + DWORD i; TRACE("(%p, %p)\n", hrgn, region); @@ -1467,7 +1467,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *region, UINT *count, GpMat GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects; @@ -1501,7 +1501,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *co GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *region, GpRectF *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects;

1 0

Rico Schüller : advapi32: Use the lower 32bit of the special HKEYs on 64bit.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: cea0e758e632fcc27a057c656d271e532f7646bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea0e758e632fcc27a057c656… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jan 23 17:55:08 2013 +0100 advapi32: Use the lower 32bit of the special HKEYs on 64bit. --- dlls/advapi32/registry.c | 20 +++++++++++--------- dlls/advapi32/tests/registry.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 744908f..c01e125 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -228,9 +228,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a static HKEY create_special_root_hkey( HKEY hkey, DWORD access ) { HKEY ret = 0; - int idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + int idx = HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST); - if (hkey == HKEY_CURRENT_USER) + if (HandleToUlong(hkey) == HandleToUlong(HKEY_CURRENT_USER)) { if (RtlOpenCurrentUser( access, (HANDLE *)&hkey )) return 0; TRACE( "HKEY_CURRENT_USER -> %p\n", hkey ); @@ -267,9 +267,10 @@ static inline HKEY get_special_root_hkey( HKEY hkey ) { HKEY ret = hkey; - if ((hkey >= HKEY_SPECIAL_ROOT_FIRST) && (hkey <= HKEY_SPECIAL_ROOT_LAST)) + if ((HandleToUlong(hkey) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) + && (HandleToUlong(hkey) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) { - if (!(ret = special_root_keys[(UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST])) + if (!(ret = special_root_keys[HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)])) ret = create_special_root_hkey( hkey, MAXIMUM_ALLOWED ); } return ret; @@ -286,9 +287,10 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) TRACE("(%p %p)\n", hkey, override); - if ((hkey < HKEY_SPECIAL_ROOT_FIRST) || (hkey > HKEY_SPECIAL_ROOT_LAST)) + if ((HandleToUlong(hkey) < HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) + || (HandleToUlong(hkey) > HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) return ERROR_INVALID_PARAMETER; - idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + idx = HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST); if (override) { @@ -443,7 +445,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc UNICODE_STRING nameW; /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ - if (hkey == HKEY_CLASSES_ROOT && name && *name == '\\') name++; + if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT) && name && *name == '\\') name++; if (!retkey) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -490,7 +492,7 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM acce else { /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ - if (hkey == HKEY_CLASSES_ROOT && name && *name == '\\') name++; + if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT) && name && *name == '\\') name++; } if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -2814,7 +2816,7 @@ cleanup: LSTATUS WINAPI RegDisablePredefinedCache(void) { HKEY hkey_current_user; - int idx = (UINT_PTR)HKEY_CURRENT_USER - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + int idx = HandleToUlong(HKEY_CURRENT_USER) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST); /* prevent caching of future requests */ hkcu_cache_disabled = TRUE; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 33b5d9b..b2483a7 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -36,6 +36,7 @@ static DWORD GLE; static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1"; static const char * sTestpath2 = "%FOO%\\subdir1"; +static const DWORD ptr_size = 8 * sizeof(void*); static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); @@ -947,6 +948,39 @@ static void test_reg_open_key(void) "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); RegCloseKey(hkResult); + /* check special HKEYs on 64bit + * only the lower 4 bytes of the supplied key are used + */ + if (ptr_size == 64) + { + /* HKEY_CURRENT_USER */ + ret = RegOpenKeyA(UlongToHandle(HandleToUlong(HKEY_CURRENT_USER)), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)1 << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)0xdeadbeef << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)0xffffffff << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + /* HKEY_LOCAL_MACHINE */ + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_LOCAL_MACHINE) | (ULONG64)0xdeadbeef << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + } + /* Try using WOW64 flags when opening a key with a DACL set to verify that * the registry access check is performed correctly. Redirection isn't * being tested, so the tests don't care about whether the process is @@ -1798,8 +1832,6 @@ static void test_symlinks(void) pRtlFreeUnicodeString( &target_str ); } -static const DWORD ptr_size = 8 * sizeof(void*); - static DWORD get_key_value( HKEY root, const char *name, DWORD flags ) { HKEY key;

1 0