May 2018 - Wine-Devel - list.winehq.org

[PATCH v2 1/4] comctl32/taskdialog: Move TASKDIALOGCONFIG pointer in struct taskdialog_info.
by Zhiyi Zhang May 18, 2018

May 18, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ef90efcc8d..6471eac203 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -84,8 +84,7 @@ struct taskdialog_template_desc struct taskdialog_info { HWND hwnd; - PFTASKDIALOGCALLBACK callback; - LONG_PTR callback_data; + const TASKDIALOGCONFIG *taskconfig; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -520,8 +519,10 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) { - return dialog_info->callback ? dialog_info->callback(dialog_info->hwnd, notification, wparam, lparam, - dialog_info->callback_data) : S_OK; + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + return taskconfig->pfCallback + ? taskconfig->pfCallback(dialog_info->hwnd, notification, wparam, lparam, taskconfig->lpCallbackData) + : S_OK; } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD command_id) @@ -590,8 +591,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto if (!taskconfig || taskconfig->cbSize != sizeof(TASKDIALOGCONFIG)) return E_INVALIDARG; - dialog_info.callback = taskconfig->pfCallback; - dialog_info.callback_data = taskconfig->lpCallbackData; + dialog_info.taskconfig = taskconfig; template = create_taskdialog_template(taskconfig); ret = (short)DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent, -- 2.17.0

2 1

[PATCH] winevulkan: Trace unsupported instance extensions.
by Józef Kucia May 18, 2018

May 18, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ef9f09530246..53d7a119ab0c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -730,9 +730,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) num_properties++; + else + TRACE("Instance extension '%s' is not supported.\n", host_properties[i].extensionName); } - /* We only have to count. */ if (!properties) { TRACE("Returning %u extensions\n", num_properties); -- 2.16.1

1 0

[PATCH v2 4/4] comctl32/taskdialog: Add support for timer.
by Zhiyi Zhang May 18, 2018

May 18, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 25 ++++++++++++++++++++++- dlls/comctl32/tests/taskdialog.c | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ba19ed51a6..f458e32002 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -48,10 +48,13 @@ static const UINT DIALOG_MIN_WIDTH = 240; static const UINT DIALOG_SPACING = 5; static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; +static const UINT DIALOG_TIMER_MS = 200; static const UINT ID_MAIN_INSTRUCTION = 0xf000; static const UINT ID_CONTENT = 0xf001; +static const UINT ID_TIMER = 1; + struct taskdialog_control { struct list entry; @@ -85,6 +88,7 @@ struct taskdialog_info { HWND hwnd; const TASKDIALOGCONFIG *taskconfig; + DWORD last_timer_tick; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -533,6 +537,19 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD EndDialog(dialog_info->hwnd, command_id); } +static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + + dialog_info->hwnd = hwnd; + + if (taskconfig->dwFlags & TDF_CALLBACK_TIMER) + { + SetTimer(hwnd, ID_TIMER, DIALOG_TIMER_MS, NULL); + dialog_info->last_timer_tick = GetTickCount(); + } +} + static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; @@ -550,8 +567,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; - dialog_info->hwnd = hwnd; SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + taskdialog_init(dialog_info, hwnd); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); break; @@ -568,9 +585,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_HELP: taskdialog_notify(dialog_info, TDN_HELP, 0, 0); break; + case WM_TIMER: + if (ID_TIMER == wParam + && taskdialog_notify(dialog_info, TDN_TIMER, GetTickCount() - dialog_info->last_timer_tick, 0) == S_FALSE) + dialog_info->last_timer_tick = GetTickCount(); + break; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); + if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); break; default: return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index ad455554b2..94fb25abb3 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -323,6 +323,39 @@ static void test_help(void) run_test(&info, IDOK, msg_got_tdn_help, "send f1"); } +static HRESULT CALLBACK taskdialog_callback_proc_timer(HWND hwnd, UINT notification, WPARAM wParam, LPARAM lParam, + LONG_PTR ref_data) +{ + int elapsed_ms; + int delta; + static int last_elapsed_ms = 0; + static int fired_count = 0; + if (notification == TDN_TIMER) + { + fired_count++; + elapsed_ms = (int)wParam; + delta = elapsed_ms - last_elapsed_ms; + ok(delta > 0, "Expect timer delta positive\n"); + last_elapsed_ms = elapsed_ms; + } + + if (fired_count == 2) SendMessageW(hwnd, TDM_CLICK_BUTTON, IDOK, 0); + + return S_OK; +} + +static void test_timer(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc_timer; + info.dwFlags = TDF_CALLBACK_TIMER; + info.dwCommonButtons = TDCBF_OK_BUTTON; + + pTaskDialogIndirect(&info, NULL, NULL, NULL); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -360,6 +393,7 @@ START_TEST(taskdialog) test_callback(); test_buttons(); test_help(); + test_timer(); unload_v6_module(ctx_cookie, hCtx); } -- 2.17.0

2 1

[PATCH] kerberos: Silence a FIXME for the GSS_S_FAILURE case.
by Dmitry Timoshkov May 18, 2018

May 18, 2018

In order to understand the source of GSS_S_FAILURE one needs to know GSS minor status code which could be translated only to text by GSS-API gss_display_status(), and knowing the text wouldn't change the returned error code anyway. A curious one (a developer) would need to generate a +kerberos log. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index d40ec04dd5..0ff6ae2738 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -710,6 +710,7 @@ static NTSTATUS status_gss_to_sspi( OM_uint32 status ) case GSS_S_OLD_TOKEN: return SEC_E_INVALID_TOKEN; case GSS_S_UNSEQ_TOKEN: return SEC_E_OUT_OF_SEQUENCE; case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; + case GSS_S_FAILURE: return SEC_E_INTERNAL_ERROR; default: FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status ); -- 2.16.3

2 1

[PATCH 1/5] msi/tests: Test deferral of CreateFolders and RemoveFolders.
by Zebediah Figura May 18, 2018

May 18, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 ++++++++ dlls/msi/tests/custom.c | 87 ++++++++++++++++++++++++++++++++++++++++------ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 9c991d6..248439a 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version -custom_IMPORTS = uuid msi ole32 +custom_IMPORTS = uuid msi ole32 shell32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 849975d..ae1b47b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -596,7 +596,11 @@ static const char cf_install_exec_seq_dat[] = "FileCost\t\t900\n" "RemoveFiles\t\t3500\n" "CreateFolders\t\t3700\n" + "cf_immediate\tNOT REMOVE\t3701\n" + "cf_deferred\tNOT REMOVE\t3702\n" "RemoveFolders\t\t3800\n" + "rf_immediate\tREMOVE\t3801\n" + "rf_deferred\tREMOVE\t3802\n" "InstallFiles\t\t4000\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" @@ -609,6 +613,15 @@ static const char cf_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "LaunchConditions\t\t100\n"; +static const char cf_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "cf_immediate\t1\tcustom.dll\tcf_absent\n" + "cf_deferred\t1025\tcustom.dll\tcf_present\n" + "rf_immediate\t1\tcustom.dll\tcf_present\n" + "rf_deferred\t1025\tcustom.dll\tcf_absent\n"; + static const char sr_selfreg_dat[] = "File_\tCost\n" "s72\tI2\n" @@ -1771,6 +1784,7 @@ static const msi_table cf_tables[] = ADD_TABLE(cf_file), ADD_TABLE(cf_create_folders), ADD_TABLE(cf_install_exec_seq), + ADD_TABLE(cf_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index ff1be9b..aeee98e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,10 +24,13 @@ #include <windef.h> #include <winbase.h> #define COBJMACROS +#include <shlobj.h> #include <msxml.h> #include <msi.h> #include <msiquery.h> +static int todo_level, todo_do_loop; + static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; @@ -47,8 +50,30 @@ static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condi MsiProcessMessage(hinst, INSTALLMESSAGE_USER, record); MsiCloseHandle(record); } -#define ok(hinst, condition, ...) ok_(hinst, 0, __FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_wine_ok(hinst, condition, ...) ok_(hinst, 1, __FILE__, __LINE__, condition, __VA_ARGS__) + +static void winetest_start_todo( int is_todo ) +{ + todo_level = (todo_level << 1) | (is_todo != 0); + todo_do_loop=1; +} + +static int winetest_loop_todo(void) +{ + int do_loop=todo_do_loop; + todo_do_loop=0; + return do_loop; +} + +static void winetest_end_todo(void) +{ + todo_level >>= 1; +} + +#define ok(hinst, condition, ...) ok_(hinst, todo_level, __FILE__, __LINE__, condition, __VA_ARGS__) +#define todo_wine_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_wine_if(1) static const char *dbgstr_w(WCHAR *str) { @@ -886,7 +911,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, NULL, MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - todo_wine_ok(hinst, !cost, "got %d\n", cost); + todo_wine + ok(hinst, !cost, "got %d\n", cost); r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, NULL); ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); @@ -894,7 +920,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, cost == 8, "got %d\n", cost); + todo_wine + ok(hinst, cost == 8, "got %d\n", cost); sz = cost = temp = 0xdead; r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, NULL, &sz, &cost, &temp); @@ -946,7 +973,8 @@ static void test_costs(MSIHANDLE hinst) r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine + ok(hinst, sz == 4, "got size %u\n", sz); ok(hinst, cost == 8, "got cost %d\n", cost); ok(hinst, !temp, "got temp %d\n", temp); @@ -954,15 +982,19 @@ static void test_costs(MSIHANDLE hinst) strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 2; strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 3; strcpy(buffer,"x"); @@ -1021,7 +1053,8 @@ UINT WINAPI main_test(MSIHANDLE hinst) /* Test MsiGetDatabaseState() */ res = MsiGetDatabaseState(hinst); - todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); + todo_wine + ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); test_props(hinst); test_db(hinst); @@ -1101,7 +1134,8 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) len = sizeof(prop); r = MsiGetPropertyA(hinst, "TESTPATH", prop, &len); ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); - todo_wine_ok(hinst, !prop[0], "got %s\n", prop); + todo_wine + ok(hinst, !prop[0], "got %s\n", prop); /* Test modes */ ok(hinst, MsiGetMode(hinst, MSIRUNMODE_SCHEDULED), "should be scheduled\n"); @@ -1113,3 +1147,34 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) return ERROR_SUCCESS; } + +static BOOL pf_exists(const char *file) +{ + char path[MAX_PATH]; + + if (FAILED(SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILESX86, NULL, 0, path))) + SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILES, NULL, 0, path); + strcat(path, "\\"); + strcat(path, file); + return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; +} + +UINT WINAPI cf_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\first"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\second"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\third"), "folder absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI cf_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\first"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\second"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\third"), "folder present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 51bb60e..cac0f85 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -3,3 +3,5 @@ @ stdcall da_immediate(long) @ stdcall da_deferred(long) @ stdcall nested(long) +@ stdcall cf_present(long) +@ stdcall cf_absent(long) -- 2.7.4

3 14

[PATCH v3] d3d11: Implement depth clip.
by Zebediah Figura May 17, 2018

May 17, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 3 --- dlls/d3d11/state.c | 1 + dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 8 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4b39c1b..50521bd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16894,12 +16894,10 @@ static void test_depth_clip(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D10DepthStencilView_Release(dsv); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248..863f71f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -948,9 +948,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); - /* GL_DEPTH_CLAMP */ - if (!desc->DepthClipEnable) - FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f880a23..d4c3bef 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1068,6 +1068,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.front_ccw = desc->FrontCounterClockwise; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2a8ec0a..894c744 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27396,12 +27396,10 @@ static void test_depth_clip(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D11DepthStencilView_Release(dsv); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32c2552..a4e4a0c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, + {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, @@ -3879,6 +3880,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + {ARB_DEPTH_CLAMP, MAKEDWORD_VERSION(3, 2)}, {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 * core geometry shaders so it's not really correct to expose the diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34e08e9..be34cb0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4329,6 +4329,24 @@ static void frontface(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + + if (gl_info->supported[ARB_DEPTH_CLAMP]) + { + if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } + } + else if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + WARN("Depth clip not supported by this GL implementation.\n"); + } } static void frontface_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4340,6 +4358,24 @@ static void frontface_cc(struct wined3d_context *context, const struct wined3d_s gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + + if (gl_info->supported[ARB_DEPTH_CLAMP]) + { + if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } + } + else if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + WARN("Depth clip not supported by this GL implementation.\n"); + } } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3140526..525c298 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, + ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5..7681aa2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1986,6 +1986,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + BOOL depth_clip; }; struct wined3d_sampler_desc -- 2.7.4

1 0

[PATCH 2/2] ntdll: Return success for TokenIntegrityLevel in NtSetInformationToken.
by Alistair Leslie-Hughes May 17, 2018

May 17, 2018

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/nt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4ff9880..dc0ce04 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -638,6 +638,10 @@ NTSTATUS WINAPI NtSetInformationToken( FIXME("TokenSessionId stub!\n"); ret = STATUS_SUCCESS; break; + case TokenIntegrityLevel: + FIXME("TokenIntegrityLevel stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break; -- 1.9.1

1 0

[PATCH 1/2] ntdll: Return success for TokenSessionId in NtSetInformationToken.
by Alistair Leslie-Hughes May 17, 2018

May 17, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/nt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3f5df3..4ff9880 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -624,6 +624,20 @@ NTSTATUS WINAPI NtSetInformationToken( } SERVER_END_REQ; break; + case TokenSessionId: + if (TokenInformationLength < sizeof(DWORD)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + if (!TokenInformation) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + FIXME("TokenSessionId stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break; -- 1.9.1

1 0

[PATCH v2] d3d11: Implement depth clip.
by Zebediah Figura May 17, 2018

May 17, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 3 --- dlls/d3d11/state.c | 1 + dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 11 +++++++++++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4b39c1b..50521bd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16894,12 +16894,10 @@ static void test_depth_clip(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D10DepthStencilView_Release(dsv); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248..863f71f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -948,9 +948,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); - /* GL_DEPTH_CLAMP */ - if (!desc->DepthClipEnable) - FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f880a23..d4c3bef 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1068,6 +1068,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.front_ccw = desc->FrontCounterClockwise; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2a8ec0a..894c744 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27396,12 +27396,10 @@ static void test_depth_clip(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D11DepthStencilView_Release(dsv); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32c2552..a4e4a0c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, + {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, @@ -3879,6 +3880,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + {ARB_DEPTH_CLAMP, MAKEDWORD_VERSION(3, 2)}, {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 * core geometry shaders so it's not really correct to expose the diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34e08e9..875d49a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4329,6 +4329,17 @@ static void frontface(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + + if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } } static void frontface_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3140526..525c298 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, + ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5..7681aa2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1986,6 +1986,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + BOOL depth_clip; }; struct wined3d_sampler_desc -- 2.7.4

1 0

[PATCH 2/2] winecfg: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 17, 2018

May 17, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/appdefaults.c | 18 +++++++-------- programs/winecfg/audio.c | 37 ++++++++++++++---------------- programs/winecfg/drive.c | 2 +- programs/winecfg/drivedetect.c | 3 +-- programs/winecfg/driveui.c | 12 ++++------ programs/winecfg/libraries.c | 4 ++-- programs/winecfg/theme.c | 51 +++++++++++++++++------------------------- programs/winecfg/winecfg.c | 10 ++++----- 8 files changed, 58 insertions(+), 79 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 61d515c707..e098c2b31a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -174,8 +174,7 @@ init_comboboxes (HWND dialog) if (current_app) { WCHAR str[256]; - LoadStringW (GetModuleHandleW(NULL), IDS_USE_GLOBAL_SETTINGS, str, - sizeof(str)/sizeof(str[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_USE_GLOBAL_SETTINGS, str, ARRAY_SIZE(str)); SendDlgItemMessageW (dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM)str); } @@ -216,21 +215,20 @@ static void init_appsheet(HWND dialog) /* we use the lparam field of the item so we can alter the presentation later and not change code * for instance, to use the tile view or to display the EXEs embedded 'display name' */ - LoadStringW (GetModuleHandleW(NULL), IDS_DEFAULT_SETTINGS, appname, - sizeof(appname)/sizeof(appname[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_DEFAULT_SETTINGS, appname, ARRAY_SIZE(appname)); add_listview_item(listview, appname, NULL); /* because this list is only populated once, it's safe to bypass the settings list here */ if (RegOpenKeyA(config_key, "AppDefaults", &key) == ERROR_SUCCESS) { i = 0; - size = sizeof(appname)/sizeof(appname[0]); + size = ARRAY_SIZE(appname); while (RegEnumKeyExW (key, i, appname, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { add_listview_item(listview, appname, strdupW(appname)); i++; - size = sizeof(appname)/sizeof(appname[0]); + size = ARRAY_SIZE(appname); } RegCloseKey(key); @@ -331,19 +329,19 @@ static void on_add_app_click(HWND dialog) 0, 0, NULL, 0, NULL }; LoadStringW (GetModuleHandleW(NULL), IDS_SELECT_EXECUTABLE, selectExecutableStr, - sizeof(selectExecutableStr)/sizeof(selectExecutableStr[0])); + ARRAY_SIZE(selectExecutableStr)); LoadStringW (GetModuleHandleW(NULL), IDS_EXECUTABLE_FILTER, programsFilter, - sizeof(programsFilter)/sizeof(programsFilter[0])); + ARRAY_SIZE(programsFilter)); snprintfW( filter, MAX_PATH, filterW, programsFilter, 0, 0 ); ofn.lpstrTitle = selectExecutableStr; ofn.lpstrFilter = filter; ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; - ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); + ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); ofn.lpstrFile = file; ofn.lpstrFile[0] = '\0'; - ofn.nMaxFile = sizeof(file)/sizeof(file[0]); + ofn.nMaxFile = ARRAY_SIZE(file); if (GetOpenFileNameW (&ofn)) { diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 4b22f3d50d..1e5f69de24 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -232,12 +232,11 @@ static void initAudioDlg (HWND hDlg) WINE_TRACE("\n"); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER, - format_str, sizeof(format_str) / sizeof(*format_str)); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER_NONE, - disabled_str, sizeof(disabled_str) / sizeof(*disabled_str)); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SYSDEFAULT, - sysdefault_str, sizeof(sysdefault_str) / sizeof(*sysdefault_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER, format_str, ARRAY_SIZE(format_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER_NONE, disabled_str, + ARRAY_SIZE(disabled_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SYSDEFAULT, sysdefault_str, + ARRAY_SIZE(sysdefault_str)); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); @@ -250,8 +249,7 @@ static void initAudioDlg (HWND hDlg) PropVariantInit(&pv); if(get_driver_name(devenum, &pv) && pv.u.pwszVal[0] != '\0'){ have_driver = TRUE; - wnsprintfW(display_str, sizeof(display_str) / sizeof(*display_str), - format_str, pv.u.pwszVal); + wnsprintfW(display_str, ARRAY_SIZE(display_str), format_str, pv.u.pwszVal); lstrcatW(g_drv_keyW, pv.u.pwszVal); } PropVariantClear(&pv); @@ -275,8 +273,8 @@ static void initAudioDlg (HWND hDlg) i = 0; while (speaker_configs[i].text_id != 0) { - LoadStringW(GetModuleHandleW(NULL), speaker_configs[i].text_id, - speaker_str, sizeof(speaker_str) / sizeof(*speaker_str)); + LoadStringW(GetModuleHandleW(NULL), speaker_configs[i].text_id, speaker_str, + ARRAY_SIZE(speaker_str)); SendDlgItemMessageW(hDlg, IDC_SPEAKERCONFIG_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)speaker_str); @@ -287,14 +285,14 @@ static void initAudioDlg (HWND hDlg) GetClientRect(GetDlgItem(hDlg, IDC_LIST_AUDIO_DEVICES), &rect); width = (rect.right - rect.left) * 3 / 5; - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DEVICE, colW, sizeof(colW)/sizeof(*colW)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DEVICE, colW, ARRAY_SIZE(colW)); lvcol.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; lvcol.pszText = colW; lvcol.cchTextMax = lstrlenW(colW); lvcol.cx = width; SendDlgItemMessageW(hDlg, IDC_LIST_AUDIO_DEVICES, LVM_INSERTCOLUMNW, 0, (LPARAM)&lvcol); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SPEAKER_CONFIG, colW, sizeof(colW)/sizeof(*colW)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SPEAKER_CONFIG, colW, ARRAY_SIZE(colW)); lvcol.pszText = colW; lvcol.cchTextMax = lstrlenW(colW); lvcol.cx = rect.right - rect.left - width; @@ -343,7 +341,7 @@ static void initAudioDlg (HWND hDlg) SendDlgItemMessageW(hDlg, IDC_LIST_AUDIO_DEVICES, LVM_INSERTITEMW, 0, (LPARAM)&lvitem); LoadStringW(GetModuleHandleW(NULL), speaker_configs[render_devs[i].speaker_config].text_id, - speaker_str, sizeof(speaker_str) / sizeof(*speaker_str)); + speaker_str, ARRAY_SIZE(speaker_str)); lvitem.mask = LVIF_TEXT; lvitem.iItem = i; @@ -378,8 +376,7 @@ static void initAudioDlg (HWND hDlg) HeapFree(GetProcessHeap(), 0, reg_in_dev); HeapFree(GetProcessHeap(), 0, reg_vin_dev); }else - wnsprintfW(display_str, sizeof(display_str) / sizeof(*display_str), - format_str, disabled_str); + wnsprintfW(display_str, ARRAY_SIZE(display_str), format_str, disabled_str); SetDlgItemTextW(hDlg, IDC_AUDIO_DRIVER, display_str); } @@ -405,10 +402,10 @@ static void test_sound(void) if(!PlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_ASYNC)){ WCHAR error_str[256], title_str[256]; - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED, - error_str, sizeof(error_str) / sizeof(*error_str)); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED_TITLE, - title_str, sizeof(title_str) / sizeof(*title_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED, error_str, + ARRAY_SIZE(error_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED_TITLE, title_str, + ARRAY_SIZE(title_str)); MessageBoxW(NULL, error_str, title_str, MB_OK | MB_ICONERROR); } @@ -527,7 +524,7 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) render_devs[dev].speaker_config = idx; LoadStringW(GetModuleHandleW(NULL), speaker_configs[idx].text_id, - speaker_str, sizeof(speaker_str) / sizeof(*speaker_str)); + speaker_str, ARRAY_SIZE(speaker_str)); lvitem.mask = LVIF_TEXT; lvitem.iItem = dev; diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index b5ef69d423..ecd0d9aff4 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -284,7 +284,7 @@ BOOL load_drives(void) if (data->mount_point_offset) unixpath = (char *)data + data->mount_point_offset; if (data->device_offset) device = (char *)data + data->device_offset; - if (!GetVolumeInformationW( root, volname, sizeof(volname)/sizeof(WCHAR), + if (!GetVolumeInformationW( root, volname, ARRAY_SIZE(volname), &serial, NULL, NULL, NULL, 0 )) { volname[0] = 0; diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 253c6296a9..d56512354f 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -291,8 +291,7 @@ static void ensure_drive_c_is_mapped(void) if (stat(drive_c_dir, &buf) == 0) { WCHAR label[64]; - LoadStringW (GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, - sizeof(label)/sizeof(label[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, ARRAY_SIZE(label)); add_drive('C', "../drive_c", NULL, label, 0, DRIVE_FIXED); } else diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 98e057bd79..c25e71df52 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -340,8 +340,7 @@ static void on_add_click(HWND dialog) if (new == 'C') { WCHAR label[64]; - LoadStringW (GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, - sizeof(label)/sizeof(label[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, ARRAY_SIZE(label)); add_drive(new, "../drive_c", NULL, label, 0, DRIVE_FIXED); } else add_drive(new, "/", NULL, NULL, 0, DRIVE_UNKNOWN); @@ -444,8 +443,7 @@ static void update_controls(HWND dialog) for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++) { WCHAR driveDesc[64]; - LoadStringW (GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, - sizeof(driveDesc)/sizeof(driveDesc[0])); + LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc)); SendDlgItemMessageW (dialog, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)driveDesc); if (type_pairs[i].sCode == type) @@ -633,8 +631,7 @@ static void init_listview_columns(HWND dialog) GetClientRect(GetDlgItem(dialog, IDC_LIST_DRIVES), &viewRect); width = (viewRect.right - viewRect.left) / 6 - 5; - LoadStringW (GetModuleHandleW(NULL), IDS_COL_DRIVELETTER, column, - sizeof(column)/sizeof(column[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_COL_DRIVELETTER, column, ARRAY_SIZE(column)); listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW (listColumn.pszText); @@ -642,8 +639,7 @@ static void init_listview_columns(HWND dialog) SendDlgItemMessageW (dialog, IDC_LIST_DRIVES, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); - LoadStringW (GetModuleHandleW(NULL), IDS_COL_DRIVEMAPPING, column, - sizeof(column)/sizeof(column[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_COL_DRIVEMAPPING, column, ARRAY_SIZE(column)); listColumn.cx = viewRect.right - viewRect.left - width; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW (listColumn.pszText); diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index d414c75a2f..22e9435e32 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -208,7 +208,7 @@ static inline BOOL is_builtin_only( const char *name ) !strcmp( ext, ".tlb" )) return TRUE; } - return bsearch( &name, builtin_only, sizeof(builtin_only)/sizeof(builtin_only[0]), + return bsearch( &name, builtin_only, ARRAY_SIZE(builtin_only), sizeof(builtin_only[0]), compare_dll ) != NULL; } @@ -414,7 +414,7 @@ static void on_add_combo_change(HWND dialog) WCHAR buffer[1024]; int sel, len; - SendDlgItemMessageW(dialog, IDC_DLLCOMBO, WM_GETTEXT, sizeof(buffer)/sizeof(WCHAR), (LPARAM) buffer); + SendDlgItemMessageW(dialog, IDC_DLLCOMBO, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); /* if lib was chosen from combobox, we receive an empty buffer, check manually */ sel=SendDlgItemMessageW(dialog, IDC_DLLCOMBO, CB_GETCURSEL, 0, 0); len=SendDlgItemMessageW(dialog, IDC_DLLCOMBO, CB_GETLBTEXTLEN, sel, 0); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1d915bcaad..f98dcc3ae7 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -299,8 +299,7 @@ static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) WCHAR currentSize[MAX_PATH]; ThemeFile* theme = NULL; - LoadStringW (GetModuleHandleW(NULL), IDS_NOTHEME, textNoTheme, - sizeof(textNoTheme) / sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), IDS_NOTHEME, textNoTheme, ARRAY_SIZE(textNoTheme)); SendMessageW (comboTheme, CB_RESETCONTENT, 0, 0); SendMessageW (comboTheme, CB_ADDSTRING, 0, (LPARAM)textNoTheme); @@ -311,11 +310,9 @@ static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) SendMessageW (comboTheme, CB_ADDSTRING, 0, (LPARAM)item->fancyName); } - - if (IsThemeActive () && SUCCEEDED (GetCurrentThemeName (currentTheme, - sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentColor) / sizeof(WCHAR), - currentSize, sizeof(currentSize) / sizeof(WCHAR)))) + + if (IsThemeActive() && SUCCEEDED(GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), + currentColor, ARRAY_SIZE(currentColor), currentSize, ARRAY_SIZE(currentSize)))) { /* Determine the index of the currently active theme. */ BOOL found = FALSE; @@ -371,11 +368,9 @@ static BOOL update_color_and_size (int themeIndex, HWND comboColor, ThemeFile* theme = DSA_GetItemPtr (themeFiles, themeIndex - 1); fill_color_size_combos (theme, comboColor, comboSize); - - if ((SUCCEEDED (GetCurrentThemeName (currentTheme, - sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentColor) / sizeof(WCHAR), - currentSize, sizeof(currentSize) / sizeof(WCHAR)))) + + if ((SUCCEEDED(GetCurrentThemeName (currentTheme, ARRAY_SIZE(currentTheme), + currentColor, ARRAY_SIZE(currentColor), currentSize, ARRAY_SIZE(currentSize)))) && (lstrcmpiW (currentTheme, theme->themeFileName) == 0)) { select_color_and_size (theme, currentColor, comboColor, @@ -560,7 +555,7 @@ static void set_color_from_theme(WCHAR *keyName, COLORREF color) keyNameA = HeapAlloc(GetProcessHeap(), 0, keyNameSize); WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, keyNameSize, NULL, NULL); - for (i=0; i<sizeof(metrics)/sizeof(metrics[0]); i++) + for (i=0; i < ARRAY_SIZE(metrics); i++) { if (lstrcmpiA(metrics[i].color_reg, keyNameA)==0) { @@ -620,19 +615,16 @@ static void on_theme_install(HWND dialog) static const WCHAR filterMask[] = {0,'*','.','m','s','s','t','y','l','e','s',';', '*','.','t','h','e','m','e',0,0}; static const WCHAR themeExt[] = {'.','T','h','e','m','e',0}; - const int filterMaskLen = sizeof(filterMask)/sizeof(filterMask[0]); + const int filterMaskLen = ARRAY_SIZE(filterMask); OPENFILENAMEW ofn; WCHAR filetitle[MAX_PATH]; WCHAR file[MAX_PATH]; WCHAR filter[100]; WCHAR title[100]; - LoadStringW (GetModuleHandleW(NULL), IDS_THEMEFILE, - filter, sizeof (filter) / sizeof (filter[0]) - filterMaskLen); - memcpy (filter + lstrlenW (filter), filterMask, - filterMaskLen * sizeof (WCHAR)); - LoadStringW (GetModuleHandleW(NULL), IDS_THEMEFILE_SELECT, - title, sizeof (title) / sizeof (title[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_THEMEFILE, filter, ARRAY_SIZE(filter) - filterMaskLen); + memcpy(filter + lstrlenW (filter), filterMask, filterMaskLen * sizeof (WCHAR)); + LoadStringW(GetModuleHandleW(NULL), IDS_THEMEFILE_SELECT, title, ARRAY_SIZE(title)); ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hwndOwner = dialog; @@ -646,7 +638,7 @@ static void on_theme_install(HWND dialog) ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]); ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; - ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); + ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); ofn.lpstrInitialDir = NULL; ofn.lpstrTitle = title; ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -746,8 +738,8 @@ static void init_shell_folder_listview_headers(HWND dialog) { WCHAR szLinksTo[64] = {'L','i','n','k','s',' ','t','o',0}; int width; - LoadStringW(GetModuleHandleW(NULL), IDS_SHELL_FOLDER, szShellFolder, sizeof(szShellFolder)/sizeof(WCHAR)); - LoadStringW(GetModuleHandleW(NULL), IDS_LINKS_TO, szLinksTo, sizeof(szLinksTo)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), IDS_SHELL_FOLDER, szShellFolder, ARRAY_SIZE(szShellFolder)); + LoadStringW(GetModuleHandleW(NULL), IDS_LINKS_TO, szLinksTo, ARRAY_SIZE(szLinksTo)); GetClientRect(GetDlgItem(dialog, IDC_LIST_SFPATHS), &viewRect); width = (viewRect.right - viewRect.left) / 3; @@ -965,7 +957,7 @@ static void refresh_sysparams(HWND hDlg) { int i; - for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + for (i = 0; i < ARRAY_SIZE(metrics); i++) { if (metrics[i].sm_idx != -1) metrics[i].size = GetSystemMetrics(metrics[i].sm_idx); @@ -983,10 +975,9 @@ static void read_sysparams(HWND hDlg) NONCLIENTMETRICSW nonclient_metrics; int i, idx; - for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + for (i = 0; i < ARRAY_SIZE(metrics); i++) { - LoadStringW(GetModuleHandleW(NULL), i + IDC_SYSPARAMS_BUTTON, buffer, - sizeof(buffer) / sizeof(buffer[0])); + LoadStringW(GetModuleHandleW(NULL), i + IDC_SYSPARAMS_BUTTON, buffer, ARRAY_SIZE(buffer)); idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)buffer); if (idx != CB_ERR) SendMessageW(list, CB_SETITEMDATA, idx, i); @@ -1013,8 +1004,8 @@ static void apply_sysparams(void) { NONCLIENTMETRICSW ncm; int i, cnt = 0; - int colors_idx[sizeof(metrics) / sizeof(metrics[0])]; - COLORREF colors[sizeof(metrics) / sizeof(metrics[0])]; + int colors_idx[ARRAY_SIZE(metrics)]; + COLORREF colors[ARRAY_SIZE(metrics)]; HDC hdc; int dpi; @@ -1049,7 +1040,7 @@ static void apply_sysparams(void) SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); - for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + for (i = 0; i < ARRAY_SIZE(metrics); i++) if (metrics[i].color_idx != -1) { colors_idx[cnt] = metrics[i].color_idx; diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index ba317c7755..be04ba2a77 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -62,14 +62,12 @@ void set_window_title(HWND dialog) if (current_app) { WCHAR apptitle[256]; - LoadStringW (GetModuleHandleW(NULL), IDS_WINECFG_TITLE_APP, apptitle, - sizeof(apptitle)/sizeof(apptitle[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_WINECFG_TITLE_APP, apptitle, ARRAY_SIZE(apptitle)); wsprintfW (newtitle, apptitle, current_app); } else { - LoadStringW (GetModuleHandleW(NULL), IDS_WINECFG_TITLE, newtitle, - sizeof(newtitle)/sizeof(newtitle[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_WINECFG_TITLE, newtitle, ARRAY_SIZE(newtitle)); } WINE_TRACE("setting title to %s\n", wine_dbgstr_w (newtitle)); @@ -83,7 +81,7 @@ WCHAR* load_string (UINT id) int len; WCHAR* newStr; - LoadStringW (GetModuleHandleW(NULL), id, buf, sizeof(buf)/sizeof(buf[0])); + LoadStringW(GetModuleHandleW(NULL), id, buf, ARRAY_SIZE(buf)); len = lstrlenW (buf); newStr = HeapAlloc (GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR)); @@ -477,7 +475,7 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) while (TRUE) { WCHAR name[1024]; - DWORD namesize = sizeof(name)/sizeof(name[0]); + DWORD namesize = ARRAY_SIZE(name); BOOL removed = FALSE; /* find out the needed size, allocate a buffer, read the value */ -- 2.14.3

1 0