wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Fabian Maurer : dinput: Use proper size for combobox controls.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 49fdde1cddef0888e3cb112a9556afe169237231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49fdde1cddef0888e3cb112a9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:46 2017 +0200 dinput: 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/dinput/dinput.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput.rc b/dlls/dinput/dinput.rc index 56d111c..54eae6c 100644 --- a/dlls/dinput/dinput.rc +++ b/dlls/dinput/dinput.rc @@ -45,8 +45,8 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK", IDOK, 10, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 65, 236, 50, 14 PUSHBUTTON "Reset", IDC_RESET, 210, 236, 50, 14 - COMBOBOX IDC_PLAYERCOMBO, 10, 50, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS - COMBOBOX IDC_CONTROLLERCOMBO, 10, 20, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_PLAYERCOMBO, 10, 50, 90, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_CONTROLLERCOMBO, 10, 20, 90, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS LTEXT "Player", IDC_PLAYERTEXT, 10, 40, 90, 8, SS_LEFT LTEXT "Device", IDC_DEVICETEXT, 10, 10, 90, 8, SS_LEFT LTEXT "Actions", IDC_ACTIONTEXT, 10, 70, 90, 8, SS_LEFT

1 0

Fabian Maurer : cryptui: Use proper size for combobox controls.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 8dcc4ed2ddf6ff9d9bcd1e614c3735b44da701ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcc4ed2ddf6ff9d9bcd1e614… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:45 2017 +0200 cryptui: 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/cryptui/cryptui.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index 930c09a..a3a63f8 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -197,7 +197,7 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Show:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -337,7 +337,7 @@ CAPTION "Certificates" FONT 8, "MS Shell Dlg" BEGIN LTEXT "I&ntended purpose:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Import...", IDC_MGR_IMPORT, 7,172,65,14

1 0

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

31 Aug '17

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

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

31 Aug '17

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 1df6b56233814df8bcea4fd2c27bd36e6270b52c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df6b56233814df8bcea4fd2c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Aug 31 18:02:35 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/fi.po b/po/fi.po index a2a8ea9..0e7ac93 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11962,17 +11962,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -11988,7 +11977,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, QUERY\n" +" ADD, DELETE, IMPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -12117,25 +12106,19 @@ msgstr "(arvoa ei asetettu)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT tiedosto.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Tiedostoa '%1' ei löydy.\n" +msgstr "reg: Tiedostoa '%1' ei löydy.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "reg: Rekisteriavainta '%1' ei voida avata.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Tuntematon merkintä [\\%1!c!]\n" +msgstr "reg: Tuntematon merkintä [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry"

1 0

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

31 Aug '17

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 31 Aug '17

31 Aug '17

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 31 Aug '17

31 Aug '17

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

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

31 Aug '17

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 31 Aug '17

31 Aug '17

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

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