July 2021 - Wine-devel - list.winehq.org

[PATCH 1/5] gdi32: Introduce NtGdiDeleteObjectApp.
by Jacek Caban 07 Jul '21

07 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/objects.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] wined3d: Print a message when forcing CS serialization.
by Zebediah Figura 07 Jul '21

07 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 00cf2f2f1d7..ce0417c9f71 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3310,6 +3310,9 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, cs->c.device = device; cs->serialize_commands = TRACE_ON(d3d_sync) || wined3d_settings.cs_multithreaded & WINED3D_CSMT_SERIALIZE; + if (cs->serialize_commands) + ERR_(d3d_sync)("Forcing serialization of all command streams.\n"); + state_init(&cs->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT, cs->c.state->feature_level); cs->data_size = WINED3D_INITIAL_CS_SIZE; -- 2.30.2

8 14

[PATCH vkd3d v2 1/5] vkd3d-shader: Allocate the $Params buffer in hlsl_ctx_init().
by Zebediah Figura 07 Jul '21

07 Jul '21

For clarity. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: no change libs/vkd3d-shader/hlsl.c | 3 +++ libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 7 ------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0b8c660c..bc593f82 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1664,6 +1664,9 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->globals_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, hlsl_strdup(ctx, "$Globals"), NULL, ctx->location))) return false; + if (!(ctx->params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, + hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) + return false; ctx->cur_buffer = ctx->globals_buffer; return true; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b62e7818..e0045acf 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -456,7 +456,7 @@ struct hlsl_ctx struct list extern_vars; struct list buffers; - struct hlsl_buffer *cur_buffer, *globals_buffer; + struct hlsl_buffer *cur_buffer, *globals_buffer, *params_buffer; struct list types; struct rb_tree functions; const struct hlsl_ir_function_decl *cur_function; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6336ddfc..9afa590a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1150,13 +1150,6 @@ static void allocate_buffers(struct hlsl_ctx *ctx) hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) return; - /* The $Globals and $Params buffers should be allocated first, before all - * explicit buffers. */ - list_remove(&params_buffer->entry); - list_add_head(&ctx->buffers, &params_buffer->entry); - list_remove(&ctx->globals_buffer->entry); - list_add_head(&ctx->buffers, &ctx->globals_buffer->entry); - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform) -- 2.32.0

3 8

[PATCH 5/5] uxtheme: Support scroll bar state tracking in non-client areas.
by Zhiyi Zhang 07 Jul '21

07 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 3 +++ dlls/user32/defwnd.c | 11 +++++++++++ dlls/user32/nonclient.c | 33 +++++++++++++++++++++++++++++++++ dlls/user32/scroll.c | 37 ++++++++++++++++++++++++++++++++++--- 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index bf32097f95c..c25cb1721d5 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -171,6 +171,8 @@ extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DE extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseMove( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; @@ -184,6 +186,7 @@ extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BO extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; +void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index a3d92e84aef..5eb056ebd9e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -245,6 +245,17 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCPAINT: return NC_HandleNCPaint( hwnd, (HRGN)wParam ); + case WM_NCMOUSEMOVE: + { + POINT pt; + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + return NC_HandleNCMouseMove( hwnd, pt ); + } + + case WM_NCMOUSELEAVE: + return NC_HandleNCMouseLeave( hwnd ); + case WM_NCHITTEST: { POINT pt; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 50ecb0c4e2e..02e6ad92320 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -635,6 +635,39 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) return HTNOWHERE; } +LRESULT NC_HandleNCMouseMove(HWND hwnd, POINT pt) +{ + LONG hittest; + RECT rect; + + TRACE("hwnd=%p pt=%s\n", hwnd, wine_dbgstr_point(&pt)); + + hittest = NC_HandleNCHitTest(hwnd, pt); + if (hittest != HTHSCROLL && hittest != HTVSCROLL) + return 0; + + WIN_GetRectangles(hwnd, COORDS_CLIENT, &rect, NULL); + ScreenToClient(hwnd, &pt); + pt.x -= rect.left; + pt.y -= rect.top; + SCROLL_HandleScrollEvent(hwnd, hittest == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); + return 0; +} + +LRESULT NC_HandleNCMouseLeave(HWND hwnd) +{ + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + POINT pt = {0, 0}; + + TRACE("hwnd=%p\n", hwnd); + + if (style & WS_HSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_HORZ, WM_NCMOUSELEAVE, pt); + if (style & WS_VSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_VERT, WM_NCMOUSELEAVE, pt); + + return 0; +} /****************************************************************************** * diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index c4c06476b9c..929d70cf08c 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -751,7 +751,7 @@ static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) * 'pt' is the location of the mouse event in client (for SB_CTL) or * windows coordinates. */ -static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) +void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) { /* Previous mouse position for timer events */ static POINT prevPt; @@ -773,7 +773,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ); if (!infoPtr) return; if ((g_tracking_info.hit_test == SCROLL_NOWHERE) - && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE)) + && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE + && msg != WM_NCMOUSEMOVE && msg != WM_NCMOUSELEAVE)) return; if (nBar == SB_CTL && (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX))) @@ -841,6 +842,32 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; + case WM_NCMOUSEMOVE: + hittest = SCROLL_HitTest( hwnd, nBar, pt, vertical == g_tracking_info.vertical && GetCapture() == hwnd ); + prevPt = pt; + + if (nBar == SB_CTL) + break; + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + TrackMouseEvent( &tme ); + if (((tme.dwFlags & (TME_NONCLIENT | TME_LEAVE)) != (TME_NONCLIENT | TME_LEAVE)) || tme.hwndTrack != hwnd) + { + tme.dwFlags = TME_NONCLIENT | TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent( &tme ); + } + + break; + + case WM_NCMOUSELEAVE: + if (nBar == SB_CTL) + return; + + hittest = SCROLL_NOWHERE; + break; + case WM_MOUSELEAVE: if (nBar != SB_CTL) return; @@ -870,7 +897,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ - if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE) + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE || msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; @@ -1049,6 +1076,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) if (msg.message == WM_LBUTTONUP || msg.message == WM_MOUSEMOVE || msg.message == WM_MOUSELEAVE || + msg.message == WM_NCMOUSEMOVE || + msg.message == WM_NCMOUSELEAVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { pt.x = (short)LOWORD(msg.lParam) - rect.left; @@ -1383,6 +1412,8 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA } break; case WM_LBUTTONUP: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: case WM_MOUSEMOVE: case WM_MOUSELEAVE: case WM_SYSTIMER: -- 2.30.2

2 1

[PATCH v3 1/3] wininet/tests: Test InternetCrackUrl when given a bogus length
by Tim Clem 07 Jul '21

07 Jul '21

Windows will stop processing at the first null, even when given an explicit length. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/wininet/tests/url.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index bce7dc76c59..6927ca5e6e8 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -653,6 +653,26 @@ static void InternetCrackUrl_test(void) GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); ok(GLE == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "Expected GLE to represent a failure\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); + ret = InternetCrackUrlA("http://x.org", 13 /* includes the nul */, 0, &urlComponents); + ok(ret, "InternetCrackUrlA failed with error %d\n", GetLastError()); + todo_wine + ok(urlComponents.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", urlComponents.dwHostNameLength); + + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); + ret = InternetCrackUrlA("http://\0x.org", 13, 0, &urlComponents); + todo_wine ok(ret == FALSE, "Expected InternetCrackUrlA to fail\n"); + + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); + ret = InternetCrackUrlA("http://x.org\0/x", 15, 0, &urlComponents); + ok(ret, "InternetCrackUrlA failed with error %d\n", GetLastError()); + todo_wine + ok(urlComponents.dwUrlPathLength == 0, + "Expected dwUrlPathLength of 0, got %d\n", urlComponents.dwUrlPathLength); } static void InternetCrackUrlW_test(void) @@ -664,6 +684,8 @@ static void InternetCrackUrlW_test(void) 'U','L','T', 0 }; static const WCHAR url2[] = { '.','.','/','R','i','t','z','.','x','m','l',0 }; static const WCHAR url3[] = { 'h','t','t','p',':','/','/','x','.','o','r','g',0 }; + static const WCHAR url4[] = { 'h','t','t','p',':','/','/',0,'x','.','o','r','g',0 }; + static const WCHAR url5[] = { 'h','t','t','p',':','/','/','x','.','o','r','g',0,'/','x',0 }; URL_COMPONENTSW comp; WCHAR scheme[20], host[20], user[20], pwd[20], urlpart[50], extra[50]; DWORD error; @@ -825,6 +847,41 @@ static void InternetCrackUrlW_test(void) ok(r, "InternetCrackUrlW failed unexpectedly\n"); ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + host[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = ARRAY_SIZE(host); + r = InternetCrackUrlW(url3, 13 /* includes the nul */, 0, &comp); + ok(r, "InternetCrackUrlW failed with error %d\n", GetLastError()); + todo_wine + ok(comp.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", comp.dwHostNameLength); + + host[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = ARRAY_SIZE(host); + r = InternetCrackUrlW(url4, 13, 0, &comp); + todo_wine ok(r == FALSE, "Expected InternetCrackUrlW to fail\n"); + + host[0] = 0; + urlpart[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = ARRAY_SIZE(host); + comp.lpszUrlPath = urlpart; + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); + r = InternetCrackUrlW(url5, 15, 0, &comp); + ok(r, "InternetCrackUrlW failed with error %d\n", GetLastError()); + todo_wine + ok(comp.dwUrlPathLength == 0, + "Expected dwUrlPathLength of 0, got %d\n", comp.dwUrlPathLength); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents) -- 2.32.0

2 5

[PATCH v2 3/3] wininet: the buffer is returned from InternetGetLastResponseInfo() even when the error is 0
by Damjan Jovanovic 07 Jul '21

07 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 8 ++------ dlls/wininet/tests/ftp.c | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-)

2 1

[PATCH v2 2/3] wininet: return the required buffer size from InternetGetLastResponseInfo() when it's too small
by Damjan Jovanovic 07 Jul '21

07 Jul '21

Try 2 calculates the wide char string length instead of the ASCII length. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 18 ++++++++++++++++-- dlls/wininet/tests/ftp.c | 28 +++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-)

2 1

[PATCH v2 1/3] wininet: InternetGetLastResponseInfoW() returns wide chars, not ASCII
by Damjan Jovanovic 07 Jul '21

07 Jul '21

Try 2 reuses MultiByteToWideChar() to find the string length. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

2 1

[PATCH] reg/tests: Test use of registry views when importing keys and values
by Hugh McMaster 07 Jul '21

07 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/export.c | 3 +- programs/reg/tests/import.c | 272 ++++++++++++++++++++++++++++++++-- programs/reg/tests/reg_test.h | 3 + 3 files changed, 267 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index e32f750079e..af00262212b 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -50,8 +50,7 @@ BOOL compare_export_(const char *file, unsigned line, const char *filename, todo_wine_if (todo & TODO_REG_COMPARE) lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); - ret = DeleteFileA(filename); - lok(ret, "DeleteFile failed: %u\n", GetLastError()); + ret = delete_file(filename); exit: HeapFree(GetProcessHeap(), 0, fbuf); diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 598319628dc..edae8277eb3 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -41,14 +41,23 @@ BOOL is_elevated_process(void) return TRUE; } -static BOOL write_file(const void *str, DWORD size) +BOOL delete_file_(const char *file, unsigned line, const char *fname) +{ + BOOL ret; + + ret = DeleteFileA(fname); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + + return ret; +} + +static BOOL write_file(const char *fname, const void *str, DWORD size) { HANDLE file; BOOL ret; DWORD written; - file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); + file = CreateFileA(fname, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); if (file == INVALID_HANDLE_VALUE) return FALSE; @@ -60,7 +69,7 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc) +static BOOL write_reg_file(const char *fname, const char *contents, BOOL unicode) { int lenA; BOOL ret; @@ -70,23 +79,30 @@ BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unic if (unicode) { int len = MultiByteToWideChar(CP_UTF8, 0, contents, lenA, NULL, 0); - int size = len * sizeof(WCHAR); + DWORD size = len * sizeof(WCHAR); WCHAR *wstr = HeapAlloc(GetProcessHeap(), 0, size); if (!wstr) return FALSE; MultiByteToWideChar(CP_UTF8, 0, contents, lenA, wstr, len); - ret = write_file(wstr, size); + ret = write_file(fname, wstr, size); HeapFree(GetProcessHeap(), 0, wstr); } else - ret = write_file(contents, lenA); + ret = write_file(fname, contents, lenA); + return ret; +} + +BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc) +{ + BOOL ret; + + ret = write_reg_file("test.reg", contents, unicode); if (!ret) return FALSE; run_reg_exe("reg import test.reg", rc); - ret = DeleteFileA("test.reg"); - lok(ret, "DeleteFile failed: %u\n", GetLastError()); + delete_file("test.reg"); return ret; } @@ -3598,6 +3614,232 @@ static void test_import_win31(void) delete_key(HKEY_CLASSES_ROOT, KEY_BASE, 0); } +static BOOL write_test_files(void) +{ + const char *test1, *test2; + BOOL ret; + + test1 = "REGEDIT4\n\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "]\n" + "\"Wine1\"=dword:00000123\n\n" + "\"Wine2\"=\"Test Value\"\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "#comment\n" + "@=\"Test\"\n" + ";comment\n\n" + "\"Wine4\"=hex(2):25,50,41,54,48,25,00\n\n"; + + test2 = "\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey]\n" + "\"Empty string\"=\"\"\n" + "\"\"=\"Default registry value\"\n\n"; + + ret = write_reg_file("reg4.reg", test1, FALSE); + ret = write_reg_file("reg5.reg", test2, TRUE); + + return ret; +} + +static void test_registry_view_win32(void) +{ + DWORD r, dword = 0x123; + BOOL is_wow64, is_win32; + HKEY hkey, subkey; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + if (!write_test_files()) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try adding to the 32-bit registry view (32-bit Windows) */ + run_reg_exe("reg import reg4.reg /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import reg5.reg /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + + open_key(hkey, "subkey", KEY_WOW64_32KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try adding to the 64-bit registry view, which doesn't exist on 32-bit Windows */ + run_reg_exe("reg import reg4.reg /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import reg5.reg /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + + open_key(hkey, "subkey", KEY_WOW64_64KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + delete_file("reg4.reg"); + delete_file("reg5.reg"); +} + +static void test_registry_view_win64(void) +{ + DWORD r, dword = 0x123; + BOOL is_wow64, is_win64; + HKEY hkey, subkey; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + if (!write_test_files()) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try adding to the 32-bit registry view (64-bit Windows) */ + run_reg_exe("reg import reg4.reg /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import reg5.reg /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + todo_wine verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + + todo_wine open_key(hkey, "subkey", KEY_WOW64_32KEY, &subkey); + todo_wine verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + todo_wine close_key(subkey); + todo_wine close_key(hkey); + + todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try adding to the 64-bit registry view (64-bit Windows) */ + run_reg_exe("reg import reg4.reg /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import reg5.reg /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + + open_key(hkey, "subkey", KEY_WOW64_64KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); + + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + delete_file("reg4.reg"); + delete_file("reg5.reg"); +} + +static void test_registry_view_wow64(void) +{ + DWORD r, dword = 0x123; + BOOL is_wow64; + HKEY hkey, subkey; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + if (!write_test_files()) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try adding to the 32-bit registry view (WOW64) */ + run_reg_exe("reg import reg4.reg /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import reg5.reg /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + + open_key(hkey, "subkey", KEY_WOW64_32KEY, &subkey); + verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + close_key(subkey); + close_key(hkey); + + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try adding to the 64-bit registry view (WOW64) */ + run_reg_exe("reg import reg4.reg /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import reg5.reg /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + todo_wine verify_reg(hkey, "Wine4", REG_EXPAND_SZ, "%PATH%", 7, 0); + + todo_wine open_key(hkey, "subkey", KEY_WOW64_64KEY, &subkey); + todo_wine verify_reg(subkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(subkey, NULL, REG_SZ, "Default registry value", 23, 0); + todo_wine close_key(subkey); + todo_wine close_key(hkey); + + todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + delete_file("reg4.reg"); + delete_file("reg5.reg"); +} + START_TEST(import) { DWORD r; @@ -3613,4 +3855,16 @@ START_TEST(import) test_import_with_whitespace(); test_unicode_import_with_whitespace(); test_import_win31(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); } diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 3f64e552a19..45d480cda49 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -93,6 +93,9 @@ extern const char *escaped_null_test; /* import.c */ BOOL is_elevated_process(void); +#define delete_file(f) delete_file_(__FILE__,__LINE__,f) +BOOL delete_file_(const char *file, unsigned line, const char *fname); + #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) #define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r) BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc); -- 2.32.0

1 0

[PATCH website v3] winehq: Announcement for OSPP Summer 2021
by Zhenbo Li 07 Jul '21

07 Jul '21

1 1