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

Fabian Maurer : comdlg32: Use proper size for combobox controls.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: 823c4b14b4c2a204c371e567d78dcb9e91df3e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823c4b14b4c2a204c371e567d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:44 2017 +0200 comdlg32: Use proper size for combobox controls. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 7d0fbb5..44e3d58 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -163,7 +163,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "List Files of &Type:", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Dri&ves:", stc4, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Open", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -185,7 +185,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "List Files of &Type:", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Dri&ves:", stc4, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Save As", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -488,7 +488,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS - COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | + COMBOBOX IDC_FILETYPE, 226, 256, 100, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST DEFPUSHBUTTON "&Open", IDOK, 350, 240, 32, 14, WS_GROUP | WS_CLIPSIBLINGS

1 0

Józef Kucia : msvcrt: Fix precision handling for string arguments.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: 2a2f525eb3cb220759c1079b2c9c96bc98667ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2f525eb3cb220759c1079b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 19:22:55 2017 +0200 msvcrt: Fix precision handling for string arguments. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/printf.h | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 845b267..c39beca 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1094,6 +1094,8 @@ char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); unsigned int* __cdecl __p__fmode(void); MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*); +MSVCRT_size_t __cdecl MSVCRT_strnlen(const char *,MSVCRT_size_t); +MSVCRT_size_t __cdecl MSVCRT_wcsnlen(const MSVCRT_wchar_t*,MSVCRT_size_t); MSVCRT_wchar_t*** __cdecl MSVCRT___p__wenviron(void); INT __cdecl MSVCRT_wctomb(char*,MSVCRT_wchar_t); char* __cdecl MSVCRT__strdate(char* date); diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 8bb3382..fe1e127 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -165,8 +165,13 @@ static inline int FUNC_NAME(pf_output_format_wstr)(FUNC_NAME(puts_clbk) pf_puts, { int r, ret; - if(len < 0) - len = strlenW(str); + if(len < 0) { + /* Do not search past the length specified by the precision. */ + if(flags->Precision>=0) + len = MSVCRT_wcsnlen(str, flags->Precision); + else + len = strlenW(str); + } if(flags->Precision>=0 && flags->Precision<len) len = flags->Precision; @@ -190,8 +195,13 @@ static inline int FUNC_NAME(pf_output_format_str)(FUNC_NAME(puts_clbk) pf_puts, { int r, ret; - if(len < 0) - len = strlen(str); + if(len < 0) { + /* Do not search past the length specified by the precision. */ + if(flags->Precision>=0) + len = MSVCRT_strnlen(str, flags->Precision); + else + len = strlen(str); + } if(flags->Precision>=0 && flags->Precision<len) len = flags->Precision;

1 0

Fabian Maurer : joy.cpl: Use proper size for combobox controls.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: 2842d837d4fc026ce95f2ded210f496db4f5f90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2842d837d4fc026ce95f2ded2… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:47 2017 +0200 joy.cpl: Use proper size for combobox controls. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 62811fe..bced24f 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -49,7 +49,7 @@ STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Joystick" FONT 8, "Ms Shell Dlg" { - COMBOBOX IDC_TESTSELECTCOMBO, 5, 5, 200, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_TESTSELECTCOMBO, 5, 5, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS GROUPBOX "Buttons", IDC_STATIC, 0, 110, 250, 110 GROUPBOX "", IDC_TESTGROUPXY, 15, 30, 60, 60 GROUPBOX "", IDC_TESTGROUPRXRY, 92, 30, 60, 60 @@ -62,7 +62,7 @@ STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Test Force Feedback" FONT 8, "Ms Shell Dlg" { - COMBOBOX IDC_FFSELECTCOMBO, 5, 5, 200, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_FFSELECTCOMBO, 5, 5, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS LTEXT "Available Effects", IDC_STATIC, 10, 30, 100, 10 LISTBOX IDC_FFEFFECTLIST, 10, 40, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY LTEXT "Press any button in the controller to activate the chosen effect. The effect direction can be changed with the controller axis.",

1 0

Fabian Maurer : comctl32/tests: Use proper size for combobox controls.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: fdcd2a74ebc1a9bfca478b9fbb3280d3effc4888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcd2a74ebc1a9bfca478b9fb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:43 2017 +0200 comctl32/tests: Use proper size for combobox controls. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/rsrc.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 4f7a225..93e1244 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -98,6 +98,6 @@ IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG 5, 43, 227, 215 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" { - COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 14, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 60, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Add", IDC_PS_PUSHBUTTON1, 164, 68, 40, 13 }

1 0

Józef Kucia : d3d10core/tests: Remove needless assignment.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: a48af9e8c3fa865b5b982576f46371a5b1ed08f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48af9e8c3fa865b5b982576f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:35 2017 +0200 d3d10core/tests: Remove needless assignment. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a10f40d..819d949 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8879,7 +8879,6 @@ static void test_draw_depth_only(void) check_texture_float(texture, 0.5f, 1); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); - depth.x = 0.1f; for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0

Józef Kucia : wined3d: Avoid potential NULL pointer dereference (Coverity).
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: b202586ee9a7fde70a737b7b2872301569d6bb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b202586ee9a7fde70a737b7b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:34 2017 +0200 wined3d: Avoid potential NULL pointer dereference (Coverity). Signed-off-by: Józef Kucia <jkucia(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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bef4795..6ea2fd2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1317,10 +1317,10 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con if (prev) InterlockedDecrement(&prev->resource->bind_count); - device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline)); - - if (op->initial_count != ~0u) + if (op->view && op->initial_count != ~0u) wined3d_unordered_access_view_set_counter(op->view, op->initial_count); + + device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline)); } void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined3d_pipeline pipeline,

1 0

Józef Kucia : d3d11: Simplify d3d10_query_GetData().
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: c4aac1c005730ef080488c3b50edb371da1af2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4aac1c005730ef080488c3b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:38 2017 +0200 d3d11: Simplify d3d10_query_GetData(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index ef8e63c..d37cbde 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -334,11 +334,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d && data_size == sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS)) { data_size = sizeof(D3D11_QUERY_DATA_PIPELINE_STATISTICS); - if (data) - { - d3d10_data_pointer = data; - data = &d3d11_data; - } + d3d10_data_pointer = data; + data = &d3d11_data; } wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags);

1 0

Józef Kucia : d3d11/tests: Add 10_1 to default feature levels list.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: 68c3df90cc50c130f666ff30a2433d17ac3c2d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c3df90cc50c130f666ff30a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:37 2017 +0200 d3d11/tests: Add 10_1 to default feature levels list. Avoids skipping some tests when the highest supported feature level is 10_1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 60ae0e0..e94366a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -997,6 +997,7 @@ static ID3D11Device *create_device(const struct device_desc *desc) static const D3D_FEATURE_LEVEL default_feature_level[] = { D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0, }; const D3D_FEATURE_LEVEL *feature_level; @@ -6638,7 +6639,7 @@ static void test_texture(void) ID3D11Texture2D_Release(texture); ID3D11PixelShader_Release(ps); - if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_10_1) + if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_11_0) { win_skip("SRV tests are broken on WARP.\n"); ID3D11Buffer_Release(cb); @@ -14269,7 +14270,7 @@ static void test_face_culling(void) ID3D11RasterizerState_Release(state); } - broken_warp = is_warp_device(device) && ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_10_1; + broken_warp = is_warp_device(device) && ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_11_0; /* Test SV_IsFrontFace. */ ID3D11PixelShader_Release(test_context.ps);

1 0

Józef Kucia : d3d11/tests: Remove needless assignment.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: b4a40ac555417b417f33a03d25319b704fd2cf9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a40ac555417b417f33a03d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:36 2017 +0200 d3d11/tests: Remove needless assignment. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3cf49cc..60ae0e0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11302,7 +11302,6 @@ static void test_draw_depth_only(void) check_texture_float(texture, 0.5f, 1); ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); - depth.x = 0.1f; for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0

Alexandre Julliard : kernel32: Silence buffer overflow gcc warnings.
by Alexandre Julliard Aug. 31, 2017

Aug. 31, 2017

Module: wine Branch: master Commit: 741fe13d445d73293d54066ad4a9a9d9cbecb96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=741fe13d445d73293d54066ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 31 10:48:39 2017 +0200 kernel32: Silence buffer overflow gcc warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/oldconfig.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 6c80dc6..219ecc5 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -290,7 +290,8 @@ static void create_hardware_branch(void) { if (strncmp(dent->d_name, "hd", 2) == 0) { - sprintf(cStr, procname_ide_media, dent->d_name); + if (snprintf(cStr, sizeof(cStr), procname_ide_media, dent->d_name) >= sizeof(cStr)) + continue; procfile = fopen(cStr, "r"); if (!procfile) { @@ -306,7 +307,8 @@ static void create_hardware_branch(void) if (nType == DRIVE_UNKNOWN) continue; } - sprintf(cStr, procname_ide_model, dent->d_name); + if (snprintf(cStr, sizeof(cStr), procname_ide_model, dent->d_name) >= sizeof(cStr)) + continue; procfile = fopen(cStr, "r"); if (!procfile) { @@ -322,7 +324,8 @@ static void create_hardware_branch(void) cDevModel[strlen(cDevModel) - 1] = 0; } - sprintf(cUnixDeviceName, "/dev/%s", dent->d_name); + if (snprintf(cUnixDeviceName, sizeof(cUnixDeviceName), "/dev/%s", dent->d_name) >= sizeof(cUnixDeviceName)) + continue; scsi_addr.PortNumber = (dent->d_name[2] - 'a') / 2; scsi_addr.PathId = 0; scsi_addr.TargetId = (dent->d_name[2] - 'a') % 2;

1 0