wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

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

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

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

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

Alexandre Julliard : kernel32: Add support for LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE flag.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 8d82ab4ae7e3375e3e100f2bfaa0b6bf1466877d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d82ab4ae7e3375e3e100f2bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 14:19:47 2017 +0200 kernel32: Add support for LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 13 +++++++------ dlls/kernel32/tests/loader.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 8abf195..16356f1 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -936,7 +936,7 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) /****************************************************************** * load_library_as_datafile */ -static BOOL load_library_as_datafile( LPCWSTR name, HMODULE* hmod) +static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) { static const WCHAR dotDLL[] = {'.','d','l','l',0}; @@ -944,14 +944,16 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE* hmod) HANDLE hFile = INVALID_HANDLE_VALUE; HANDLE mapping; HMODULE module; + DWORD sharing = FILE_SHARE_READ; *hmod = 0; + if (!(flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) sharing |= FILE_SHARE_WRITE; + if (SearchPathW( NULL, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), filenameW, NULL )) { - hFile = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, 0 ); + hFile = CreateFileW( filenameW, GENERIC_READ, sharing, NULL, OPEN_EXISTING, 0, 0 ); } if (hFile == INVALID_HANDLE_VALUE) return FALSE; @@ -987,7 +989,6 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) static const DWORD unsupported_flags = load_library_search_flags | LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_AS_IMAGE_RESOURCE | - LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; @@ -998,7 +999,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); - if (flags & LOAD_LIBRARY_AS_DATAFILE) + if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) { ULONG_PTR magic; @@ -1014,7 +1015,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) /* The method in load_library_as_datafile allows searching for the * 'native' libraries only */ - if (load_library_as_datafile( libname->Buffer, &hModule )) goto done; + if (load_library_as_datafile( libname->Buffer, &hModule, flags )) goto done; flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */ /* Fallback to normal behaviour */ } diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 09c21d8..1c44257 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -523,6 +523,7 @@ static void test_Loader(void) }; int i; DWORD file_size; + HANDLE h; HMODULE hlib, hlib_as_data_file; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; @@ -706,9 +707,37 @@ static void test_Loader(void) ok(!hlib, "GetModuleHandle should fail\n"); SetLastError(0xdeadbeef); + h = CreateFileA( dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok( h != INVALID_HANDLE_VALUE, "open failed err %u\n", GetLastError() ); + CloseHandle( h ); + + SetLastError(0xdeadbeef); ret = FreeLibrary(hlib_as_data_file); ok(ret, "FreeLibrary error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryExA(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE); + if (!((ULONG_PTR)hlib_as_data_file & 1) || /* winxp */ + (!hlib_as_data_file && GetLastError() == ERROR_INVALID_PARAMETER)) /* w2k3 */ + { + win_skip( "LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE not supported\n" ); + FreeLibrary(hlib_as_data_file); + } + else + { + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + h = CreateFileA( dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + todo_wine ok( h == INVALID_HANDLE_VALUE, "open succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_SHARING_VIOLATION, "wrong error %u\n", GetLastError() ); + CloseHandle( h ); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(hlib_as_data_file); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + query_image_section( i, dll_name, &nt_header ); } else

1 0

Alexandre Julliard : kernel32: Implement SetDefaultDllDirectories.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: e99811aee2dff88c41d6e2875401810a85325839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99811aee2dff88c41d6e2875… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 13:29:09 2017 +0200 kernel32: Implement SetDefaultDllDirectories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 30 ++++++++++++++++---- dlls/kernel32/path.c | 10 ------- dlls/kernel32/tests/module.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 97d815c..8abf195 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -48,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); #define NE_FFLAGS_LIBMODULE 0x8000 static WCHAR *dll_directory; /* extra path for SetDllDirectoryW */ +static DWORD default_search_flags; /* default flags set by SetDefaultDllDirectories */ static CRITICAL_SECTION dlldir_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -58,6 +59,10 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION dlldir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); /**************************************************************************** * GetDllDirectoryA (KERNEL32.@) @@ -148,6 +153,21 @@ BOOL WINAPI SetDllDirectoryW( LPCWSTR dir ) } +/************************************************************************* + * SetDefaultDllDirectories (KERNEL32.@) + */ +BOOL WINAPI SetDefaultDllDirectories( DWORD flags ) +{ + if (!flags || (flags & ~load_library_search_flags)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + default_search_flags = flags; + return TRUE; +} + + /**************************************************************************** * DisableThreadLibraryCalls (KERNEL32.@) * @@ -964,16 +984,14 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) NTSTATUS nts; HMODULE hModule; WCHAR *load_path; - static const DWORD unsupported_flags = + static const DWORD unsupported_flags = load_library_search_flags | LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | - LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | - LOAD_LIBRARY_SEARCH_APPLICATION_DIR | - LOAD_LIBRARY_SEARCH_USER_DIRS | - LOAD_LIBRARY_SEARCH_SYSTEM32 | - LOAD_LIBRARY_SEARCH_DEFAULT_DIRS; + LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; + + if (!(flags & load_library_search_flags)) flags |= default_search_flags; if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c746693..ec7c53b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -2081,13 +2081,3 @@ BOOL WINAPI SetSearchPathMode(DWORD flags) SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } - -/************************************************************************* - * SetDefaultDllDirectories (KERNEL32.@) - */ -BOOL WINAPI SetDefaultDllDirectories(DWORD flags) -{ - FIXME("(%x): stub\n", flags); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index bb22c24..6b178c8 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -25,6 +25,7 @@ static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); +static BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD); static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, @@ -515,6 +516,7 @@ static void init_pointers(void) MAKEFUNC(GetDllDirectoryA); MAKEFUNC(GetDllDirectoryW); MAKEFUNC(SetDllDirectoryA); + MAKEFUNC(SetDefaultDllDirectories); MAKEFUNC(GetModuleHandleExA); MAKEFUNC(GetModuleHandleExW); MAKEFUNC(K32GetModuleInformation); @@ -739,6 +741,70 @@ static void testK32GetModuleInformation(void) ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); } +static void test_SetDefaultDllDirectories(void) +{ + HMODULE mod; + BOOL ret; + + if (!pSetDefaultDllDirectories) + { + win_skip( "SetDefaultDllDirectories not available\n" ); + return; + } + + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 0 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 3 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR | 0x8000 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + /* restore some sane defaults */ + pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -768,4 +834,5 @@ START_TEST(module) testLoadLibraryEx(); testGetModuleHandleEx(); testK32GetModuleInformation(); + test_SetDefaultDllDirectories(); }

1 0

Alexandre Julliard : kernel32: Implement safe dll search mode.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: 66e302f80b2ecaac087756f1df3ae55f77f33838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e302f80b2ecaac087756f1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 12:47:34 2017 +0200 kernel32: Implement safe dll search mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index badfe1d..97d815c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -728,13 +728,11 @@ static const WCHAR *get_dll_system_path(void) if (!cached_path) { WCHAR *p, *path; - int len = 3; + int len = 1; len += 2 * GetSystemDirectoryW( NULL, 0 ); len += GetWindowsDirectoryW( NULL, 0 ); p = path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - *p++ = '.'; - *p++ = ';'; GetSystemDirectoryW( p, path + len - p); p += strlenW(p); /* if system directory ends in "32" add 16-bit version too */ @@ -751,6 +749,52 @@ static const WCHAR *get_dll_system_path(void) return cached_path; } +/*********************************************************************** + * get_dll_safe_mode + */ +static BOOL get_dll_safe_mode(void) +{ + static const WCHAR keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const WCHAR valueW[] = {'S','a','f','e','D','l','l','S','e','a','r','c','h','M','o','d','e',0}; + + static int safe_mode = -1; + + if (safe_mode == -1) + { + char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + DWORD size = sizeof(buffer); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + safe_mode = 1; + RtlInitUnicodeString( &nameW, keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + RtlInitUnicodeString( &nameW, valueW ); + if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size ) && + info->Type == REG_DWORD && info->DataLength == sizeof(DWORD)) + safe_mode = !!*(DWORD *)info->Data; + NtClose( hkey ); + } + if (!safe_mode) TRACE( "SafeDllSearchMode disabled through the registry\n" ); + } + return safe_mode; +} + /****************************************************************** * get_module_path_end * @@ -783,6 +827,7 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) const WCHAR *system_path = get_dll_system_path(); const WCHAR *mod_end = NULL; UNICODE_STRING name, value; + BOOL safe_mode; WCHAR *p, *ret; int len = 0, path_len = 0; @@ -811,7 +856,9 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) path_len = value.Length; RtlEnterCriticalSection( &dlldir_section ); + safe_mode = get_dll_safe_mode(); if (dll_directory) len += strlenW(dll_directory) + 1; + else len += 2; /* current directory */ if ((p = ret = HeapAlloc( GetProcessHeap(), 0, path_len + len * sizeof(WCHAR) ))) { if (module) @@ -826,13 +873,23 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) p += strlenW(p); *p++ = ';'; } + else if (!safe_mode) + { + *p++ = '.'; + *p++ = ';'; + } + strcpyW( p, system_path ); + p += strlenW(p); + *p++ = ';'; + if (!dll_directory && safe_mode) + { + *p++ = '.'; + *p++ = ';'; + } } RtlLeaveCriticalSection( &dlldir_section ); if (!ret) return NULL; - strcpyW( p, system_path ); - p += strlenW(p); - *p++ = ';'; value.Buffer = p; value.MaximumLength = path_len;

1 0

Fabian Maurer : user32/combo: Set listbox popup height correctly and add tests.
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: f7f7b89e2e9117811c91269643868c6d063db5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f7b89e2e9117811c9126964… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 17 18:24:57 2017 +0200 user32/combo: Set listbox popup height correctly and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 8 ---- dlls/user32/tests/combo.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 8 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index a2e8b3c..f35e0d9 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1033,14 +1033,6 @@ static void CBDropDown( LPHEADCOMBO lphc ) if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight = nHeight + COMBO_YBORDERSIZE(); - - if (nDroppedHeight < nHeight) - { - if (nItems < 5) - nDroppedHeight = (nItems+1)*nIHeight; - else if (nDroppedHeight < 6*nIHeight) - nDroppedHeight = 6*nIHeight; - } } r.left = rect.left; diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index f52efae..03fc412 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -29,6 +29,8 @@ #define COMBO_ID 1995 +#define COMBO_YBORDERSIZE() 2 + static HWND hMainWnd; #define expect_eq(expr, value, type, fmt); { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } @@ -700,6 +702,110 @@ static void test_listbox_styles(DWORD cb_style) DestroyWindow(combo); } +static void test_listbox_size(DWORD style) +{ + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + UINT x, y; + BOOL ret; + int i, test; + const char wine_test[] = "Wine Test"; + + static const struct list_size_info + { + int num_items; + int height_combo; + BOOL todo; + } info_height[] = { + {2, 24}, + {2, 41, TRUE}, + {2, 42}, + {2, 50}, + {2, 60}, + {2, 80}, + {2, 89}, + {2, 90}, + {2, 100}, + + {10, 24}, + {10, 41, TRUE}, + {10, 42}, + {10, 50}, + {10, 60}, + {10, 80}, + {10, 89, TRUE}, + {10, 90}, + {10, 100}, + }; + + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_count_list; + int expected_height_list; + int list_height_nonclient; + int list_height_calculated; + RECT rect_list_client, rect_list_complete; + + hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + ret = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(ret, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + + GetClientRect(hList, &rect_list_client); + GetWindowRect(hList, &rect_list_complete); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo + - (cbInfo.rcItem.bottom + COMBO_YBORDERSIZE()) + - list_height_nonclient + - 1; + + expected_count_list = list_height_calculated / height_item; + if(expected_count_list < 0) + expected_count_list = 0; + expected_count_list = min(expected_count_list, info_test->num_items); + expected_height_list = expected_count_list * height_item; + + todo_wine_if(info_test->todo) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -719,6 +825,7 @@ START_TEST(combo) test_listbox_styles(CBS_SIMPLE); test_listbox_styles(CBS_DROPDOWN); test_listbox_styles(CBS_DROPDOWNLIST); + test_listbox_size(CBS_DROPDOWN); DestroyWindow(hMainWnd); }

1 0

Nikolay Sivov : comctl32/monthcal: Make sure set focus date is valid before using it (Valgrind).
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: d505c2dce7ac01368ceed6b42f8ee6adb6fa5395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d505c2dce7ac01368ceed6b42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 28 00:07:52 2017 +0300 comctl32/monthcal: Make sure set focus date is valid before using it (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 97e0c8c..b94345c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -641,11 +641,16 @@ static inline void MONTHCAL_GetDayRectI(const MONTHCAL_INFO *infoPtr, RECT *r, * * NOTE: when calendar index is unknown pass -1 */ -static inline void MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date, - RECT *r, INT calIdx) +static BOOL MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date, RECT *r, INT calIdx) { INT col, row; + if (!MONTHCAL_ValidateDate(date)) + { + SetRectEmpty(r); + return FALSE; + } + if (calIdx == -1) { INT cmp = MONTHCAL_CompareMonths(date, &infoPtr->calendars[0].month); @@ -668,6 +673,8 @@ static inline void MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTE MONTHCAL_GetDayPos(infoPtr, date, &col, &row, calIdx); MONTHCAL_GetDayRectI(infoPtr, r, col, row, calIdx); + + return TRUE; } static LRESULT @@ -739,20 +746,19 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) if(MONTHCAL_IsDateEqual(&infoPtr->focusedSel, st)) return FALSE; /* invalidate old focused day */ - MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1); - InvalidateRect(infoPtr->hwndSelf, &r, FALSE); + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1)) + InvalidateRect(infoPtr->hwndSelf, &r, FALSE); infoPtr->focusedSel = *st; } - MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1); + /* On set invalidates new day, on reset clears previous focused day. */ + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1)) + InvalidateRect(infoPtr->hwndSelf, &r, FALSE); if(!st && MONTHCAL_ValidateDate(&infoPtr->focusedSel)) infoPtr->focusedSel = st_null; - /* on set invalidates new day, on reset clears previous focused day */ - InvalidateRect(infoPtr->hwndSelf, &r, FALSE); - return TRUE; } @@ -1746,17 +1752,11 @@ MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) return FALSE; /* Invalidate old and new today day rectangle, and today label. */ - if (MONTHCAL_ValidateDate(&infoPtr->todaysDate)) - { - MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &rect, -1); + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &rect, -1)) InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); - } - if (MONTHCAL_ValidateDate(today)) - { - MONTHCAL_GetDayRect(infoPtr, today, &rect, -1); + if (MONTHCAL_GetDayRect(infoPtr, today, &rect, -1)) InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); - } infoPtr->todaysDate = *today;

1 0

Nikolay Sivov : comctl32/monthcal: Make sure set today date is valid before using it (Valgrind).
by Alexandre Julliard 28 Aug '17

28 Aug '17

Module: wine Branch: master Commit: a56f49cdd5a3ec14d9c0c5e755f7e3edc4f0835b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56f49cdd5a3ec14d9c0c5e75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 28 00:07:51 2017 +0300 comctl32/monthcal: Make sure set today date is valid before using it (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e913e71..97e0c8c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -257,10 +257,12 @@ static inline BOOL MONTHCAL_IsDateEqual(const SYSTEMTIME *first, const SYSTEMTIM /* make sure that date fields are valid */ static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) { - if(time->wMonth < 1 || time->wMonth > 12 ) return FALSE; - if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) return FALSE; + if (time->wMonth < 1 || time->wMonth > 12 ) + return FALSE; + if (time->wDay == 0 || time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) + return FALSE; - return TRUE; + return TRUE; } /* Copies timestamp part only. @@ -1738,21 +1740,28 @@ MONTHCAL_GetToday(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *today) static BOOL MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) { - RECT new_r, old_r; + RECT rect; + + if (MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) + return FALSE; - if(MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) return FALSE; + /* Invalidate old and new today day rectangle, and today label. */ + if (MONTHCAL_ValidateDate(&infoPtr->todaysDate)) + { + MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &rect, -1); + InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); + } - MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &old_r, -1); - MONTHCAL_GetDayRect(infoPtr, today, &new_r, -1); + if (MONTHCAL_ValidateDate(today)) + { + MONTHCAL_GetDayRect(infoPtr, today, &rect, -1); + InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); + } - infoPtr->todaysDate = *today; + infoPtr->todaysDate = *today; - /* only two days need redrawing */ - InvalidateRect(infoPtr->hwndSelf, &old_r, FALSE); - InvalidateRect(infoPtr->hwndSelf, &new_r, FALSE); - /* and today label */ - InvalidateRect(infoPtr->hwndSelf, &infoPtr->todayrect, FALSE); - return TRUE; + InvalidateRect(infoPtr->hwndSelf, &infoPtr->todayrect, FALSE); + return TRUE; } /* MCM_SETTODAT handler */

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2017