August 2017 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Avoid writing queue-> head in the CS thread.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 183ca56e11e4be33c67e205a7eaf95a0190a1e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183ca56e11e4be33c67e205a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 27 23:22:41 2017 +0200 wined3d: Avoid writing queue->head in the CS thread. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8961dfe..4a405d0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2615,8 +2615,8 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) InterlockedExchange(&queue->tail, tail); } - cs->queue[WINED3D_CS_QUEUE_MAP].tail = cs->queue[WINED3D_CS_QUEUE_MAP].head = 0; - cs->queue[WINED3D_CS_QUEUE_DEFAULT].tail = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head = 0; + cs->queue[WINED3D_CS_QUEUE_MAP].tail = cs->queue[WINED3D_CS_QUEUE_MAP].head; + cs->queue[WINED3D_CS_QUEUE_DEFAULT].tail = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head; TRACE("Stopped.\n"); FreeLibraryAndExitThread(cs->wined3d_module, 0); }

1 0

Stefan Dösinger : wined3d: Do not call queue_is_empty in wined3d_cs_mt_finish.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 55eee0b9f155c1f70ff92549e22ef7984ac6b534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55eee0b9f155c1f70ff92549e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 27 23:22:42 2017 +0200 wined3d: Do not call queue_is_empty in wined3d_cs_mt_finish. Without an explicit volatile, aarch64 gcc will copy queue->tail into a register outside the loop and then continuously compare two registers against each other. The *(volatile LONG *)& forces gcc to re-read the memory every iteration. Therefore, queue_is_empty as it is written will only work from the CS thread. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 13 +++++++------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4a405d0..bef4795 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2413,8 +2413,9 @@ static const struct wined3d_cs_ops wined3d_cs_st_ops = wined3d_cs_st_push_constants, }; -static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs_queue *queue) +static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) { + wined3d_from_cs(cs); return *(volatile LONG *)&queue->head == queue->tail; } @@ -2513,7 +2514,7 @@ static void wined3d_cs_mt_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id if (cs->thread_id == GetCurrentThreadId()) return wined3d_cs_st_finish(cs, queue_id); - while (!wined3d_cs_queue_is_empty(&cs->queue[queue_id])) + while (cs->queue[queue_id].head != *(volatile LONG *)&cs->queue[queue_id].tail) wined3d_pause(); } @@ -2551,8 +2552,8 @@ static void wined3d_cs_wait_event(struct wined3d_cs *cs) * Likewise, we can race with the main thread when resetting * "waiting_for_event", in which case we would need to call * WaitForSingleObject() because the main thread called SetEvent(). */ - if (!(wined3d_cs_queue_is_empty(&cs->queue[WINED3D_CS_QUEUE_DEFAULT]) - && wined3d_cs_queue_is_empty(&cs->queue[WINED3D_CS_QUEUE_MAP])) + if (!(wined3d_cs_queue_is_empty(cs, &cs->queue[WINED3D_CS_QUEUE_DEFAULT]) + && wined3d_cs_queue_is_empty(cs, &cs->queue[WINED3D_CS_QUEUE_MAP])) && InterlockedCompareExchange(&cs->waiting_for_event, FALSE, TRUE)) return; @@ -2582,10 +2583,10 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) } queue = &cs->queue[WINED3D_CS_QUEUE_MAP]; - if (wined3d_cs_queue_is_empty(queue)) + if (wined3d_cs_queue_is_empty(cs, queue)) { queue = &cs->queue[WINED3D_CS_QUEUE_DEFAULT]; - if (wined3d_cs_queue_is_empty(queue)) + if (wined3d_cs_queue_is_empty(cs, queue)) { if (++spin_count >= WINED3D_CS_SPIN_COUNT && list_empty(&cs->query_poll_list)) wined3d_cs_wait_event(cs); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74043d0..1a196a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4277,7 +4277,7 @@ static inline struct wined3d_surface *context_get_rt_surface(const struct wined3 return texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; } -static inline void wined3d_from_cs(struct wined3d_cs *cs) +static inline void wined3d_from_cs(const struct wined3d_cs *cs) { if (cs->thread) assert(cs->thread_id == GetCurrentThreadId());

1 0

Nikolay Sivov : dwrite: Fix proportional spacing method.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 0ea60ffecd7b2848f55c365328a982131cb75ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea60ffecd7b2848f55c36532… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 28 14:18:04 2017 +0300 dwrite: Fix proportional spacing method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 68 ++++++++++++++++++---------------------------- dlls/dwrite/tests/layout.c | 27 ++++++++++++++++++ 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index c04738a..9109107 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1358,6 +1358,27 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const return S_OK; } +static void layout_apply_line_spacing(struct dwrite_textlayout *layout, UINT32 line) +{ + switch (layout->format.spacing.method) + { + case DWRITE_LINE_SPACING_METHOD_DEFAULT: + layout->linemetrics[line].height = layout->lines[line].height; + layout->linemetrics[line].baseline = layout->lines[line].baseline; + break; + case DWRITE_LINE_SPACING_METHOD_UNIFORM: + layout->linemetrics[line].height = layout->format.spacing.height; + layout->linemetrics[line].baseline = layout->format.spacing.baseline; + break; + case DWRITE_LINE_SPACING_METHOD_PROPORTIONAL: + layout->linemetrics[line].height = layout->lines[line].height * layout->format.spacing.height; + layout->linemetrics[line].baseline = layout->lines[line].baseline * layout->format.spacing.baseline; + break; + default: + ERR("Unknown spacing method %u\n", layout->format.spacing.method); + } +} + static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_LINE_METRICS1 *metrics) { UINT32 i = layout->metrics.lineCount; @@ -1391,28 +1412,12 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ } layout->linemetrics[i] = *metrics; - - switch (layout->format.spacing.method) - { - case DWRITE_LINE_SPACING_METHOD_UNIFORM: - if (layout->format.spacing.method == DWRITE_LINE_SPACING_METHOD_UNIFORM) { - layout->linemetrics[i].height = layout->format.spacing.height; - layout->linemetrics[i].baseline = layout->format.spacing.baseline; - } - break; - case DWRITE_LINE_SPACING_METHOD_PROPORTIONAL: - if (layout->format.spacing.method == DWRITE_LINE_SPACING_METHOD_UNIFORM) { - layout->linemetrics[i].height = layout->format.spacing.height * metrics->height; - layout->linemetrics[i].baseline = layout->format.spacing.baseline * metrics->baseline; - } - break; - default: - /* using content values */; - } - layout->lines[i].height = metrics->height; layout->lines[i].baseline = metrics->baseline; + if (layout->format.spacing.method != DWRITE_LINE_SPACING_METHOD_DEFAULT) + layout_apply_line_spacing(layout, i); + layout->metrics.lineCount++; return S_OK; } @@ -3967,29 +3972,8 @@ static HRESULT WINAPI dwritetextlayout3_SetLineSpacing(IDWriteTextLayout3 *iface if (!(This->recompute & RECOMPUTE_LINES)) { UINT32 line; - switch (This->format.spacing.method) - { - case DWRITE_LINE_SPACING_METHOD_DEFAULT: - for (line = 0; line < This->metrics.lineCount; line++) { - This->linemetrics[line].height = This->lines[line].height; - This->linemetrics[line].baseline = This->lines[line].baseline; - } - break; - case DWRITE_LINE_SPACING_METHOD_UNIFORM: - for (line = 0; line < This->metrics.lineCount; line++) { - This->linemetrics[line].height = This->format.spacing.height; - This->linemetrics[line].baseline = This->format.spacing.baseline; - } - break; - case DWRITE_LINE_SPACING_METHOD_PROPORTIONAL: - for (line = 0; line < This->metrics.lineCount; line++) { - This->linemetrics[line].height = This->format.spacing.height * This->lines[line].height; - This->linemetrics[line].baseline = This->format.spacing.baseline * This->lines[line].baseline; - } - break; - default: - ; - } + for (line = 0; line < This->metrics.lineCount; line++) + layout_apply_line_spacing(This, line); layout_set_line_positions(This); } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8ca50f0..ba32977 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3774,6 +3774,33 @@ static void test_GetLineMetrics(void) IDWriteTextLayout_Release(layout); + /* Switch to proportional */ + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_PROPORTIONAL, 2.0f, 4.0f); + if (hr == S_OK) { + hr = IDWriteFactory_CreateTextLayout(factory, str4W, 1, format, 100.0f, 300.0f, &layout); + ok(hr == S_OK, "Failed to create layout, hr %#x.\n", hr); + + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); + ok(hr == S_OK, "Failed to get line metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected line count %u\n", count); + + /* Back to default mode. */ + hr = IDWriteTextLayout_SetLineSpacing(layout, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0f, 0.0f); + ok(hr == S_OK, "Failed to set spacing method, hr %#x.\n", hr); + + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics + 1, 1, &count); + ok(hr == S_OK, "Failed to get line metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected line count %u\n", count); + + /* Proportional spacing applies multipliers to default, content based spacing. */ + ok(metrics[0].height == 2.0f * metrics[1].height, "Unexpected line height %f.\n", metrics[0].height); + ok(metrics[0].baseline == 4.0f * metrics[1].baseline, "Unexpected line baseline %f.\n", metrics[0].baseline); + + IDWriteTextLayout_Release(layout); + } + else + win_skip("Proportional spacing is not supported.\n"); + IDWriteTextFormat_Release(format); IDWriteFontFace_Release(fontface); IDWriteFactory_Release(factory);

1 0

Andrey Gusev : api-ms-win-eventing-legacy-l1-1-0: Add dll.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: c539a9f9109a3cbefbf737809b8e8f3a3a385e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c539a9f9109a3cbefbf737809… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 28 13:54:00 2017 +0300 api-ms-win-eventing-legacy-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-eventing-legacy-l1-1-0/Makefile.in | 1 + .../api-ms-win-eventing-legacy-l1-1-0.spec | 14 ++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 19 insertions(+) diff --git a/configure b/configure index 302087e..f54c685 100755 --- a/configure +++ b/configure @@ -1024,6 +1024,7 @@ enable_api_ms_win_dx_d3dkmt_l1_1_0 enable_api_ms_win_eventing_classicprovider_l1_1_0 enable_api_ms_win_eventing_consumer_l1_1_0 enable_api_ms_win_eventing_controller_l1_1_0 +enable_api_ms_win_eventing_legacy_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 @@ -18098,6 +18099,7 @@ wine_fn_config_dll api-ms-win-dx-d3dkmt-l1-1-0 enable_api_ms_win_dx_d3dkmt_l1_1_ wine_fn_config_dll api-ms-win-eventing-classicprovider-l1-1-0 enable_api_ms_win_eventing_classicprovider_l1_1_0 wine_fn_config_dll api-ms-win-eventing-consumer-l1-1-0 enable_api_ms_win_eventing_consumer_l1_1_0 wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_eventing_controller_l1_1_0 +wine_fn_config_dll api-ms-win-eventing-legacy-l1-1-0 enable_api_ms_win_eventing_legacy_l1_1_0 wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 diff --git a/configure.ac b/configure.ac index 9aeaf34..bf73b65 100644 --- a/configure.ac +++ b/configure.ac @@ -2879,6 +2879,7 @@ WINE_CONFIG_DLL(api-ms-win-dx-d3dkmt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-consumer-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-eventing-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) diff --git a/dlls/api-ms-win-eventing-legacy-l1-1-0/Makefile.in b/dlls/api-ms-win-eventing-legacy-l1-1-0/Makefile.in new file mode 100644 index 0000000..9d59ce0 --- /dev/null +++ b/dlls/api-ms-win-eventing-legacy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-eventing-legacy-l1-1-0.dll diff --git a/dlls/api-ms-win-eventing-legacy-l1-1-0/api-ms-win-eventing-legacy-l1-1-0.spec b/dlls/api-ms-win-eventing-legacy-l1-1-0/api-ms-win-eventing-legacy-l1-1-0.spec new file mode 100644 index 0000000..8e1aa7f --- /dev/null +++ b/dlls/api-ms-win-eventing-legacy-l1-1-0/api-ms-win-eventing-legacy-l1-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall ControlTraceA(int64 str ptr long) advapi32.ControlTraceA +@ stdcall EnableTrace(long long long ptr int64) advapi32.EnableTrace +@ stdcall EnableTraceEx(ptr ptr int64 long long int64 int64 long ptr) advapi32.EnableTraceEx +@ stdcall EnumerateTraceGuids(ptr long ptr) advapi32.EnumerateTraceGuids +@ stdcall FlushTraceA(int64 str ptr) advapi32.FlushTraceA +@ stdcall FlushTraceW(int64 wstr ptr) advapi32.FlushTraceW +@ stdcall -ret64 OpenTraceA(ptr) advapi32.OpenTraceA +@ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA +@ stub QueryTraceA +@ stdcall QueryTraceW(int64 wstr ptr) advapi32.QueryTraceW +@ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA +@ stdcall StopTraceA(int64 str ptr) advapi32.StopTraceA +@ stub UpdateTraceA +@ stub UpdateTraceW diff --git a/tools/make_specfiles b/tools/make_specfiles index 58207ad..b506f73 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -119,6 +119,7 @@ my @dll_groups = "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0", "api-ms-win-eventing-controller-l1-1-0", + "api-ms-win-eventing-legacy-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-eventlog-legacy-l1-1-0", "api-ms-win-security-audit-l1-1-1",

1 0

Hugh McMaster : regedit: Null-terminate incomplete REG_EXPAND_SZ and REG_MULTI_SZ Unicode data.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: e9daef47e1f22f2e7a9cd5670e1aa92afe1a1182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9daef47e1f22f2e7a9cd5670… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 28 11:05:42 2017 +0000 regedit: Null-terminate incomplete REG_EXPAND_SZ and REG_MULTI_SZ Unicode data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 25 ++++++++++++++++++------- programs/regedit/tests/regedit.c | 22 +++++++++++----------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 162d088..6e6ea47 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -518,16 +518,27 @@ static void prepare_hex_string_data(struct parser *parser) { if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) { - BYTE *data = parser->data; - - if (data[parser->data_size - 1] != 0) + if (parser->is_unicode) { - data[parser->data_size] = 0; - parser->data_size++; - } + WCHAR *data = parser->data; + DWORD len = parser->data_size / sizeof(WCHAR); - if (!parser->is_unicode) + if (data[len - 1] != 0) + { + data[len] = 0; + parser->data_size += sizeof(WCHAR); + } + } + else { + BYTE *data = parser->data; + + if (data[parser->data_size - 1] != 0) + { + data[parser->data_size] = 0; + parser->data_size++; + } + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); parser->data_size *= sizeof(WCHAR); heap_free(data); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 5e895ab..60f93c9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -758,7 +758,7 @@ static void test_basic_import_unicode(void) lr = RegQueryValueExA(hkey, "Wine11d", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine11e */ size = sizeof(buffer); @@ -766,7 +766,7 @@ static void test_basic_import_unicode(void) lr = RegQueryValueExA(hkey, "Wine11e", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -872,7 +872,7 @@ static void test_basic_import_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,\\"); - verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, 0); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -882,7 +882,7 @@ static void test_basic_import_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17d\"=hex(7):4c,00,69,00,6e,00,65,00,\\"); - verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, 0); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -913,7 +913,7 @@ static void test_basic_import_unicode(void) lr = RegQueryValueExA(hkey, "Wine18d", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); - todo_wine ok(size == 12 || broken(size == 11) /* Win2k */, "got wrong size %u, expected 12\n", size); + ok(size == 12 || broken(size == 11) /* Win2k */, "got wrong size %u, expected 12\n", size); ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); /* Wine18e */ size = sizeof(buffer); @@ -921,7 +921,7 @@ static void test_basic_import_unicode(void) lr = RegQueryValueExA(hkey, "Wine18e", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); - todo_wine ok(size == 12 || broken(size == 11) /* Win2k */, "got wrong size %u, expected 12\n", size); + ok(size == 12 || broken(size == 11) /* Win2k */, "got wrong size %u, expected 12\n", size); ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -953,8 +953,8 @@ static void test_basic_import_unicode(void) "\"Wine20d\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,\n" "\"Wine20e\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00\n" "\"Wine20f\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00,\n\n"); - verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); - verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20c", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20d", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20e", REG_MULTI_SZ, "Line\0", 6, 0); @@ -966,8 +966,8 @@ static void test_basic_import_unicode(void) "\"Wine21b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,\n" "\"Wine21c\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" "\"Wine21d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00,\n\n"); - verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); - verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -2470,7 +2470,7 @@ static void test_comments_unicode(void) " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,;comment\n" " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n"); - verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg: Null-terminate incomplete REG_EXPAND_SZ and REG_MULTI_SZ Unicode data.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 39e0e81c21f5de6f17fc577dbe74274b08f99490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e0e81c21f5de6f17fc577db… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 28 12:50:38 2017 +0000 reg: Null-terminate incomplete REG_EXPAND_SZ and REG_MULTI_SZ Unicode data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 25 ++++++++++++++++++------- programs/reg/tests/reg.c | 22 +++++++++++----------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index a39e1db..d2b4cdc 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -410,16 +410,27 @@ static void prepare_hex_string_data(struct parser *parser) { if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) { - BYTE *data = parser->data; - - if (data[parser->data_size - 1] != 0) + if (parser->is_unicode) { - data[parser->data_size] = 0; - parser->data_size++; - } + WCHAR *data = parser->data; + DWORD len = parser->data_size / sizeof(WCHAR); - if (!parser->is_unicode) + if (data[len - 1] != 0) + { + data[len] = 0; + parser->data_size += sizeof(WCHAR); + } + } + else { + BYTE *data = parser->data; + + if (data[parser->data_size - 1] != 0) + { + data[parser->data_size] = 0; + parser->data_size++; + } + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); parser->data_size *= sizeof(WCHAR); heap_free(data); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a373805..ab65c38 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2809,7 +2809,7 @@ static void test_unicode_import(void) " 63,00,61,00,74,00,;comment\n" " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3005,7 +3005,7 @@ static void test_unicode_import(void) err = RegQueryValueExA(hkey, "Wine44i", NULL, &type, (BYTE *)&buffer, &size); ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine44j */ size = sizeof(buffer); @@ -3013,7 +3013,7 @@ static void test_unicode_import(void) err = RegQueryValueExA(hkey, "Wine44j", NULL, &type, (BYTE *)&buffer, &size); ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine44k */ verify_reg_nonexist(hkey, "Wine44k"); @@ -3649,7 +3649,7 @@ static void test_unicode_import(void) ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, "got %u, expected 0\n", err); if (err == ERROR_SUCCESS) - verify_reg(hkey, "Wine62b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine62b", REG_EXPAND_SZ, "%PATH%", 7, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3669,7 +3669,7 @@ static void test_unicode_import(void) ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, "got %u, expected 0\n", err); if (err == ERROR_SUCCESS) - verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3727,14 +3727,14 @@ static void test_unicode_import(void) err = RegQueryValueExA(hkey, "Wine64d", NULL, &type, (BYTE *)&buffer, &size); ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); - todo_wine ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); + ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); /* Wine64e */ size = sizeof(buffer); err = RegQueryValueExA(hkey, "Wine64e", NULL, &type, (BYTE *)&buffer, &size); ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); - todo_wine ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); + ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3768,8 +3768,8 @@ static void test_unicode_import(void) "\"Wine66e\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00\n" "\"Wine66f\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00,\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); - verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine66c", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine66d", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine66e", REG_MULTI_SZ, "Line\0", 6, 0); @@ -3782,8 +3782,8 @@ static void test_unicode_import(void) "\"Wine67c\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" "\"Wine67d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00,\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "Wine67a", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); - verify_reg(hkey, "Wine67b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine67a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine67b", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine67c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine67d", REG_EXPAND_SZ, "%PATH%", 7, 0);

1 0

Alexandre Julliard : include: Add libloaderapi.h.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: bef1390691e46f1d1558d6600c1b5e54f87f850a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef1390691e46f1d1558d6600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 15:42:40 2017 +0200 include: Add libloaderapi.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/libloaderapi.h | 36 ++++++++++++++++++++++++++++++++++++ include/winbase.h | 3 ++- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index 454ac80..fcdd8b3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -423,6 +423,7 @@ HEADER_SRCS = \ ksguid.h \ ksmedia.h \ ksuuids.h \ + libloaderapi.h \ lm.h \ lmaccess.h \ lmapibuf.h \ diff --git a/include/libloaderapi.h b/include/libloaderapi.h new file mode 100644 index 0000000..8f112a7 --- /dev/null +++ b/include/libloaderapi.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _APISETLIBLOADER_ +#define _APISETLIBLOADER_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *DLL_DIRECTORY_COOKIE, **PDLL_DIRECTORY_COOKIE; + +WINBASEAPI DLL_DIRECTORY_COOKIE WINAPI AddDllDirectory(const WCHAR *); +WINBASEAPI BOOL WINAPI RemoveDllDirectory(DLL_DIRECTORY_COOKIE); +WINBASEAPI BOOL WINAPI SetDefaultDllDirectories(DWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* _APISETLIBLOADER_ */ diff --git a/include/winbase.h b/include/winbase.h index 9d59e4d..f6a28c3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -37,6 +37,8 @@ extern "C" { #define WINADVAPI DECLSPEC_IMPORT #endif +#include <libloaderapi.h> + /* Windows Exit Procedure flag values */ #define WEP_FREE_DLL 0 #define WEP_SYSTEM_EXIT 1 @@ -2512,7 +2514,6 @@ WINBASEAPI BOOL WINAPI SetCurrentDirectoryW(LPCWSTR); WINBASEAPI BOOL WINAPI SetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,DWORD); WINBASEAPI BOOL WINAPI SetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,DWORD); #define SetDefaultCommConfig WINELIB_NAME_AW(SetDefaultCommConfig) -WINBASEAPI BOOL WINAPI SetDefaultDllDirectories(DWORD); WINBASEAPI BOOL WINAPI SetDllDirectoryA(LPCSTR); WINBASEAPI BOOL WINAPI SetDllDirectoryW(LPCWSTR); #define SetDllDirectory WINELIB_NAME_AW(SetDllDirectory)

1 0

Alexandre Julliard : oleaut32: Don't copy uninitialized data.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 8da116d0b7c1c8150b1f31210b19153cf376dd1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da116d0b7c1c8150b1f31210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 18:12:54 2017 +0200 oleaut32: Don't copy uninitialized data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tmarshal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 5fd1fdd..e0e1e08 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1079,7 +1079,7 @@ deserialize_param( DWORD x; hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); if (hres) ERR("Failed to read integer 4 byte\n"); - memcpy(arg,&x,2); + else memcpy(arg,&x,2); } if (debugout) TRACE_(olerelay)("%04x",*arg & 0xffff); return hres; @@ -1089,7 +1089,7 @@ deserialize_param( DWORD x; hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); if (hres) ERR("Failed to read integer 4 byte\n"); - memcpy(arg,&x,1); + else memcpy(arg,&x,1); } if (debugout) TRACE_(olerelay)("%02x",*arg & 0xff); return hres;

1 0

Alexandre Julliard : shell32: Avoid zeroing a buffer that will get overwritten.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: feac70c1cf8e69469f8e35122a4fe7d23e6955f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feac70c1cf8e69469f8e35122… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 18:13:09 2017 +0200 shell32: Avoid zeroing a buffer that will get overwritten. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index c725927..c391ace 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1315,9 +1315,10 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) { SHGetPathFromIDListW (pidl, wszSrcPathRoot); - ZeroMemory(wszDstPath, MAX_PATH+1); if (This->sPathTarget) lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH); + else + wszDstPath[0] = 0; PathAddBackslashW(wszSrcPathRoot); PathAddBackslashW(wszDstPath); wszSrcPathsList = build_paths_list(wszSrcPathRoot, cidl, apidl);

1 0

Alexandre Julliard : propsys: Don' t use the format string size as buffer size.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 7960ed9d428640928ff1958fdfb9e89467a8d8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7960ed9d428640928ff1958fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 18:15:12 2017 +0200 propsys: Don't use the format string size as buffer size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 90e20e3..ca3b421 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -49,22 +49,16 @@ static HRESULT PROPVAR_ConvertFILETIME(const FILETIME *ft, PROPVARIANT *ppropvar switch (vt) { case VT_LPSTR: - { - static const char format[] = "%04d/%02d/%02d:%02d:%02d:%02d.%03d"; - - ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, - sizeof(format)); + ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, 64); if (!ppropvarDest->u.pszVal) return E_OUTOFMEMORY; - snprintf( ppropvarDest->u.pszVal, sizeof(format), - format, + sprintf( ppropvarDest->u.pszVal, "%04d/%02d/%02d:%02d:%02d:%02d.%03d", time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond, time.wMilliseconds ); return S_OK; - } default: FIXME("Unhandled target type: %d\n", vt);

1 0