April 2018 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Simplify context_update_stream_sources().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 8a1a67c43150dd0202f99b016e1e407caeec508d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1a67c43150dd0202f99b01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 16:08:15 2018 +0430 wined3d: Simplify context_update_stream_sources(). Note that this slightly changes behaviour, in that no loads or unloads happen anymore when "use_immediate_mode_draw" is set. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d2bcedc..9ba6253 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5479,32 +5479,22 @@ static void context_load_numbered_arrays(struct wined3d_context *context, void context_update_stream_sources(struct wined3d_context *context, const struct wined3d_state *state) { - BOOL load_numbered = context->d3d_info->ffp_generic_attributes - || (use_vs(state) && !context->use_immediate_mode_draw); - BOOL load_named = !context->d3d_info->ffp_generic_attributes - && !use_vs(state) && !context->use_immediate_mode_draw; - if (context->numbered_array_mask && !load_numbered) - { - context_unload_numbered_arrays(context); - context->numbered_array_mask = 0; - } - else - { - context_unload_vertex_data(context); - } + if (context->use_immediate_mode_draw) + return; - if (load_numbered) + context_unload_vertex_data(context); + if (context->d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); context_load_numbered_arrays(context, &context->stream_info, state); + return; } - else if (load_named) - { - TRACE("Loading vertex data.\n"); - context_load_vertex_data(context, &context->stream_info, state); - context->namedArraysLoaded = TRUE; - } + + TRACE("Loading named arrays.\n"); + context_unload_numbered_arrays(context); + context_load_vertex_data(context, &context->stream_info, state); + context->namedArraysLoaded = TRUE; } static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture,

1 0

Matteo Bruni : wined3d: Allow context_draw_shaded_quad() to function without immediate mode draws.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: f7926c079318662052df863cb204eb165436b1c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7926c079318662052df863c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 19 16:08:16 2018 +0430 wined3d: Allow context_draw_shaded_quad() to function without immediate mode draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/wined3d/glsl_shader.c | 3 --- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9ba6253..d5378e2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1447,6 +1447,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) } } + if (context->blit_vbo) + GL_EXTCALL(glDeleteBuffers(1, &context->blit_vbo)); + checkGLcall("context cleanup"); } @@ -5564,15 +5567,41 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te quad[3].texcoord = info.texcoords[3]; /* Draw a quad. */ - gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - - for (i = 0; i < ARRAY_SIZE(quad); ++i) + if (gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { - GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); - GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + if (!context->blit_vbo) + GL_EXTCALL(glGenBuffers(1, &context->blit_vbo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context->blit_vbo)); + + context_unload_vertex_data(context); + context_unload_numbered_arrays(context); + + GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); + GL_EXTCALL(glVertexAttribPointer(0, 2, GL_FLOAT, FALSE, sizeof(*quad), NULL)); + GL_EXTCALL(glVertexAttribPointer(1, 3, GL_FLOAT, FALSE, sizeof(*quad), + (void *)FIELD_OFFSET(struct blit_vertex, texcoord))); + + GL_EXTCALL(glEnableVertexAttribArray(0)); + GL_EXTCALL(glEnableVertexAttribArray(1)); + + gl_info->gl_ops.gl.p_glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, 0)); + GL_EXTCALL(glDisableVertexAttribArray(1)); + GL_EXTCALL(glDisableVertexAttribArray(0)); } + else + { + gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glEnd(); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); + GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + } + + gl_info->gl_ops.gl.p_glEnd(); + } checkGLcall("draw"); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 799b2ff..dfd8e61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12628,9 +12628,6 @@ void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct win if (!gl_info->supported[ARB_VERTEX_SHADER] || !gl_info->supported[ARB_FRAGMENT_SHADER]) return; - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return; - if (!(blitter = heap_alloc(sizeof(*blitter)))) { ERR("Failed to allocate blitter.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d539413..8cdc3ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1983,6 +1983,8 @@ struct wined3d_context struct wined3d_fence *buffer_fences[MAX_ATTRIBS]; unsigned int buffer_fence_count; + GLuint blit_vbo; + DWORD tex_unit_map[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS];

1 0

Nikolay Sivov : d3d9/tests: Add a basic test for default value and limits of max frame latency parameter.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: c39b87fff86eed6bdf3eb4a4c45d43c56946b3d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c39b87fff86eed6bdf3eb4a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 14:30:54 2018 +0300 d3d9/tests: Add a basic test for default value and limits of max frame latency parameter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 77e09c3..7c36e6e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4043,6 +4043,55 @@ static void test_device_caps(void) DestroyWindow(window); } +static void test_frame_latency(void) +{ + IDirect3DDevice9Ex *device; + ULONG refcount; + UINT latency; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 1); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 1, "Unexpected max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 0); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 30); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 31); +todo_wine + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4093,4 +4142,5 @@ START_TEST(d3d9ex) test_backbuffer_resize(); test_format_unknown(); test_device_caps(); + test_frame_latency(); }

1 0

Hugh McMaster : regedit: Use the correct window class name.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 6bca0abb68016df0fe31a1568cc6f8f744caeb92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bca0abb68016df0fe31a156… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 19 13:21:24 2018 +0000 regedit: Use the correct window class name. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 460a951..19d720d 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -62,7 +62,7 @@ const WCHAR strClipboardFormat[] = {'T','O','D','O',':',' ','S','E','T',' ','C', #define MAX_LOADSTRING 100 WCHAR szTitle[MAX_LOADSTRING]; -const WCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; +const WCHAR szFrameClass[] = {'R','e','g','E','d','i','t','_','R','e','g','E','d','i','t',0}; const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)

1 0

Hugh McMaster : regedit/tests: Add tests for values with embedded null characters.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 7cd90766bb38417e84f85055c5bb8e31de24a2bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cd90766bb38417e84f85055… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 19 13:21:25 2018 +0000 regedit/tests: Add tests for values with embedded null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 74 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 3bab7e1..41712a1 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1638,6 +1638,22 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine32a"); verify_reg_nonexist(hkey, "Wine32b"); + /* Test with embedded null characters */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=\"\\0\n" + "\"Wine33b\"=\"\\0\\0\n" + "\"Wine33c\"=\"Value1\\0\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine33e\"=\"Value3\\0Value4\n" + "\"Wine33f\"=\"\\0Value4\n\n"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -2134,6 +2150,22 @@ static void test_invalid_import_unicode(void) verify_reg_nonexist(hkey, "Wine32a"); verify_reg_nonexist(hkey, "Wine32b"); + /* Test with embedded null characters */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=\"\\0\n" + "\"Wine33b\"=\"\\0\\0\n" + "\"Wine33c\"=\"Value1\\0\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine33e\"=\"Value3\\0Value4\n" + "\"Wine33f\"=\"\\0Value4\n\n"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -3483,6 +3515,18 @@ static void test_export(void) "\"Wine3b\"=hex:12,34,56,78\r\n" "\"Wine3c\"=dword:10203040\r\n\r\n"; + const char *embedded_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine4a\"=dword:00000005\r\n" + "\"Wine4b\"=\"\"\r\n" + "\"Wine4c\"=\"Value\"\r\n" + "\"Wine4d\"=\"\"\r\n" + "\"Wine4e\"=dword:00000100\r\n" + "\"Wine4f\"=\"\"\r\n" + "\"Wine4g\"=\"Value2\"\r\n" + "\"Wine4h\"=\"abc\"\r\n\r\n"; + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -3600,6 +3644,7 @@ static void test_export(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); + /* Test registry export with embedded null characters */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" @@ -3617,6 +3662,35 @@ static void test_export(void) ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); + + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine4a\"=dword:00000005\n" + "\"Wine4b\"=hex(1):00,00,00,00,00,00,00,00\n" + "\"Wine4c\"=\"Value\"\n" + "\"Wine4d\"=hex(1):00,00,61,00,62,00,63,00\n" + "\"Wine4e\"=dword:00000100\n" + "\"Wine4f\"=hex(1):00,00,56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine4g\"=\"Value2\"\n" + "\"Wine4h\"=hex(1):61,00,62,00,63,00,00,00, \\\n" + " 64,00,65,00,66,00,00,00\n\n"); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + dword = 0x5; + verify_reg(hkey, "Wine4a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4b", REG_SZ, "\0\0\0\0\0\0\0", 4, 0); + verify_reg(hkey, "Wine4c", REG_SZ, "Value", 6, 0); + verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, TODO_REG_SIZE); + dword = 0x100; + verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4f", REG_SZ, "\0Value", 7, 0); + verify_reg(hkey, "Wine4g", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Wine4h", REG_SZ, "abc\0def", 8, 0); + RegCloseKey(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(regedit)

1 0

Hugh McMaster : reg/tests: Add tests for values with embedded null characters.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 448344c5e443b35c06bc0cc4f2e8ee9b7968008f URL: https://source.winehq.org/git/wine.git/?a=commit;h=448344c5e443b35c06bc0cc4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 19 13:21:27 2018 +0000 reg/tests: Add tests for values with embedded null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b64defb..5004414 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2355,6 +2355,23 @@ static void test_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); + /* Test with embedded null characters */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine69a\"=\"\\0\n" + "\"Wine69b\"=\"\\0\\0\n" + "\"Wine69c\"=\"Value1\\0\n" + "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine69e\"=\"Value3\\0Value4\n" + "\"Wine69f\"=\"\\0Value4\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine69a"); + verify_reg_nonexist(hkey, "Wine69b"); + verify_reg_nonexist(hkey, "Wine69c"); + verify_reg_nonexist(hkey, "Wine69d"); + verify_reg_nonexist(hkey, "Wine69e"); + verify_reg_nonexist(hkey, "Wine69f"); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3863,6 +3880,23 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); + /* Test with embedded null characters */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine69a\"=\"\\0\n" + "\"Wine69b\"=\"\\0\\0\n" + "\"Wine69c\"=\"Value1\\0\n" + "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" + "\"Wine69e\"=\"Value3\\0Value4\n" + "\"Wine69f\"=\"\\0Value4\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine69a"); + verify_reg_nonexist(hkey, "Wine69b"); + verify_reg_nonexist(hkey, "Wine69c"); + verify_reg_nonexist(hkey, "Wine69d"); + verify_reg_nonexist(hkey, "Wine69e"); + verify_reg_nonexist(hkey, "Wine69f"); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -4328,9 +4362,9 @@ error: static void test_export(void) { LONG err; - DWORD r, dword; + DWORD r, dword, type, size; HKEY hkey, subkey; - BYTE hex[4]; + BYTE hex[4], buffer[8]; const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -4406,6 +4440,18 @@ static void test_export(void) "\"Wine3b\"=hex:12,34,56,78\r\n" "\"Wine3c\"=dword:10203040\r\n\r\n"; + const char *embedded_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine4a\"=dword:00000005\r\n" + "\"Wine4b\"=\"\"\r\n" + "\"Wine4c\"=\"Value\"\r\n" + "\"Wine4d\"=\"\"\r\n" + "\"Wine4e\"=dword:00000100\r\n" + "\"Wine4f\"=\"\"\r\n" + "\"Wine4g\"=\"Value2\"\r\n" + "\"Wine4h\"=\"abc\"\r\n\r\n"; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4598,6 +4644,44 @@ static void test_export(void) ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with embedded null characters */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine4a\"=dword:00000005\n" + "\"Wine4b\"=hex(1):00,00,00,00,00,00,00,00\n" + "\"Wine4c\"=\"Value\"\n" + "\"Wine4d\"=hex(1):00,00,61,00,62,00,63,00\n" + "\"Wine4e\"=dword:00000100\n" + "\"Wine4f\"=hex(1):00,00,56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine4g\"=\"Value2\"\n" + "\"Wine4h\"=hex(1):61,00,62,00,63,00,00,00, \\\n" + " 64,00,65,00,66,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + dword = 0x5; + verify_reg(hkey, "Wine4a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4b", REG_SZ, "\0\0\0\0\0\0\0", 4, 0); + verify_reg(hkey, "Wine4c", REG_SZ, "Value", 6, 0); + /* Wine4d */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine4d", NULL, &type, (BYTE *)&buffer, &size); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_SZ, "got wrong type %u, expected %u\n", type, REG_SZ); + todo_wine ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); + ok(memcmp(buffer, "\0abc", size) == 0, "got wrong data\n"); + dword = 0x100; + verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4f", REG_SZ, "\0Value", 7, 0); + verify_reg(hkey, "Wine4g", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Wine4h", REG_SZ, "abc\0def", 8, 0); + RegCloseKey(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(reg)

1 0

Francois Gouget : dmime: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: d5784736aa4e5c27113e81f61c49b66b4f42f518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5784736aa4e5c27113e81f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:27:03 2018 +0200 dmime: Add a trailing '\n' to a FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index cbc2b3c..77c94f1 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -924,7 +924,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea return hr; break; case FOURCC_RIFF: - FIXME("Loading of embedded RIFF form %s", debugstr_fourcc(chunk.type)); + FIXME("Loading of embedded RIFF form %s\n", debugstr_fourcc(chunk.type)); break; } }

1 0

Roderick Colenbrander : ntdll: Read correct sysfs entry for core information.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: e502dce411439284db6f043e37bc0f4e51e50f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e502dce411439284db6f043e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 18 22:30:27 2018 -0700 ntdll: Read correct sysfs entry for core information. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8995c36..c3f5df3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1497,7 +1497,7 @@ static inline BOOL logical_proc_info_add_group(SYSTEM_LOGICAL_PROCESSOR_INFORMAT static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) { - static const char core_info[] = "/sys/devices/system/cpu/cpu%u/%s"; + static const char core_info[] = "/sys/devices/system/cpu/cpu%u/topology/%s"; static const char cache_info[] = "/sys/devices/system/cpu/cpu%u/cache/index%u/%s"; static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap";

1 0

Alexandre Julliard : user32: Add partial stub for GetDpiForMonitorInternal ().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 8b7ed3630729e77766cc524d27540eac72f3b02a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7ed3630729e77766cc524d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 10:46:43 2018 +0200 user32: Add partial stub for GetDpiForMonitorInternal(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec | 2 +- .../ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec | 2 +- dlls/shcore/main.c | 12 ++------ dlls/user32/sysparams.c | 32 ++++++++++++++++------ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec index ca1fe1c..336d8ce 100644 --- a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stub GetDpiForMonitorInternal +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) user32.GetDpiForMonitorInternal @ stdcall GetProcessDpiAwarenessInternal(long ptr) user32.GetProcessDpiAwarenessInternal @ stdcall SetProcessDpiAwarenessInternal(long) user32.SetProcessDpiAwarenessInternal diff --git a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec index 67c40ab..cd546c2 100644 --- a/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec +++ b/dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0/ext-ms-win-rtcore-ntuser-dpi-l1-2-0.spec @@ -1 +1 @@ -@ stub GetDpiForMonitorInternal +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) user32.GetDpiForMonitorInternal diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 17d4b68..07918bc 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -58,14 +58,6 @@ HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value) HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x, UINT *y) { - HDC hDC; - - FIXME("(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y); - - hDC = GetDC(0); - if (x) *x = GetDeviceCaps(hDC, LOGPIXELSX); - if (y) *y = GetDeviceCaps(hDC, LOGPIXELSY); - ReleaseDC(0, hDC); - - return S_OK; + if (GetDpiForMonitorInternal( monitor, type, x, y )) return S_OK; + return HRESULT_FROM_WIN32( GetLastError() ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 425acae..8c5dd0a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -630,11 +630,17 @@ static UINT get_system_dpi(void) static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - DWORD dpi; + static UINT system_dpi; + UINT dpi; - if ((dpi = get_reg_dword( HKEY_CURRENT_USER, dpi_key_name, dpi_value_name ))) return dpi; - if ((dpi = get_reg_dword( HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name ))) return dpi; - return USER_DEFAULT_SCREEN_DPI; + if (!system_dpi) + { + if (!(dpi = get_reg_dword( HKEY_CURRENT_USER, dpi_key_name, dpi_value_name )) && + !(dpi = get_reg_dword( HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name ))) + dpi = USER_DEFAULT_SCREEN_DPI; + system_dpi = dpi; + } + return system_dpi; } HDC get_display_dc(void) @@ -3284,12 +3290,22 @@ BOOL WINAPI IsProcessDPIAware(void) */ UINT WINAPI GetDpiForSystem(void) { - static int display_dpi; - if (!IsProcessDPIAware()) return USER_DEFAULT_SCREEN_DPI; + return get_system_dpi(); +} + +/*********************************************************************** + * GetDpiForMonitorInternal (USER32.@) + */ +BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT *y ) +{ + UINT dpi = get_system_dpi(); - if (!display_dpi) display_dpi = get_system_dpi(); - return display_dpi; + WARN( "(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y ); + + if (x) *x = dpi; + if (y) *y = dpi; + return TRUE; } /*********************************************************************** diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d9058b..8556502 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -296,6 +296,7 @@ @ stdcall GetDlgItemTextA(long long ptr long) @ stdcall GetDlgItemTextW(long long ptr long) @ stdcall GetDoubleClickTime() +@ stdcall GetDpiForMonitorInternal(long long ptr ptr) @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) @ stdcall GetFocus() diff --git a/include/winuser.h b/include/winuser.h index 86cdbf6..c2055e9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3678,6 +3678,7 @@ WINUSERAPI UINT WINAPI GetDlgItemTextA(HWND,INT,LPSTR,INT); WINUSERAPI UINT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT); #define GetDlgItemText WINELIB_NAME_AW(GetDlgItemText) WINUSERAPI UINT WINAPI GetDoubleClickTime(void); +WINUSERAPI BOOL WINAPI GetDpiForMonitorInternal(HMONITOR,UINT,UINT*,UINT*); WINUSERAPI UINT WINAPI GetDpiForWindow(HWND); WINUSERAPI UINT WINAPI GetDpiForSystem(void); WINUSERAPI HWND WINAPI GetFocus(void);

1 0

Alexandre Julliard : user32: Implement GetDpiForWindow().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: fb563978d815f74786bf25baa0bf4c4362595dd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb563978d815f74786bf25ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 10:47:18 2018 +0200 user32: Implement GetDpiForWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8c5dd0a..715bf59 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3313,8 +3313,21 @@ BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT */ UINT WINAPI GetDpiForWindow( HWND hwnd ) { - FIXME( "stub: %p\n", hwnd ); - return GetDpiForSystem(); + UINT dpi; + + switch (GetAwarenessFromDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd ))) + { + case DPI_AWARENESS_UNAWARE: + return USER_DEFAULT_SCREEN_DPI; + case DPI_AWARENESS_SYSTEM_AWARE: + return get_system_dpi(); + case DPI_AWARENESS_PER_MONITOR_AWARE: + GetDpiForMonitorInternal( MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ), + 0 /* MDT_EFFECTIVE_DPI */, &dpi, NULL ); + return dpi; + default: + return 0; + } } /**********************************************************************

1 0