wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Rosanne DiMesio : Add screenshot carousel to front page
by Jeremy Newman 31 Aug '17

31 Aug '17

Module: appdb Branch: master Commit: 182447af5e49e13e903734ebb82e1efdb072af05 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=182447af5e49e13e903734eb… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Aug 31 14:36:38 2017 -0500 Add screenshot carousel to front page Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 5 ++++ images/eveonline.jpg | Bin 0 -> 69858 bytes images/falloutnv.jpg | Bin 0 -> 70037 bytes images/goggalaxy.jpg | Bin 0 -> 69163 bytes images/matlab.jpg | Bin 0 -> 76130 bytes images/metatrader5.jpg | Bin 0 -> 128684 bytes images/outlook2010.jpg | Bin 0 -> 46640 bytes images/photoshopcc2015.jpg | Bin 0 -> 31937 bytes images/reason.jpg | Bin 0 -> 107342 bytes images/sims3.jpg | Bin 0 -> 66462 bytes images/skyrim_specialed.jpg | Bin 0 -> 102001 bytes images/steam.jpg | Bin 0 -> 66903 bytes images/wizard101.jpg | Bin 0 -> 117375 bytes index.php | 62 +++++++++++++++++++++++++++++++++++++------- 14 files changed, 58 insertions(+), 9 deletions(-) diff --git a/css/styles.css b/css/styles.css index dcde735..be5eef0 100644 --- a/css/styles.css +++ b/css/styles.css @@ -68,6 +68,11 @@ a.btn, a.btn:visited { overflow: auto; } +.carousel-control.left, +.carousel-control.right { + background-image: none +} + /* ===================================================================================================================== PAGE LAYOUT diff --git a/images/eveonline.jpg b/images/eveonline.jpg new file mode 100644 index 0000000..2e336a8 Binary files /dev/null and b/images/eveonline.jpg differ diff --git a/images/falloutnv.jpg b/images/falloutnv.jpg new file mode 100644 index 0000000..6ade796 Binary files /dev/null and b/images/falloutnv.jpg differ diff --git a/images/goggalaxy.jpg b/images/goggalaxy.jpg new file mode 100644 index 0000000..6291efd Binary files /dev/null and b/images/goggalaxy.jpg differ diff --git a/images/matlab.jpg b/images/matlab.jpg new file mode 100644 index 0000000..b5c41ed Binary files /dev/null and b/images/matlab.jpg differ diff --git a/images/metatrader5.jpg b/images/metatrader5.jpg new file mode 100644 index 0000000..480e157 Binary files /dev/null and b/images/metatrader5.jpg differ diff --git a/images/outlook2010.jpg b/images/outlook2010.jpg new file mode 100644 index 0000000..3ebf42a Binary files /dev/null and b/images/outlook2010.jpg differ diff --git a/images/photoshopcc2015.jpg b/images/photoshopcc2015.jpg new file mode 100644 index 0000000..bd9a50d Binary files /dev/null and b/images/photoshopcc2015.jpg differ diff --git a/images/reason.jpg b/images/reason.jpg new file mode 100644 index 0000000..8270e8f Binary files /dev/null and b/images/reason.jpg differ diff --git a/images/sims3.jpg b/images/sims3.jpg new file mode 100644 index 0000000..0872e31 Binary files /dev/null and b/images/sims3.jpg differ diff --git a/images/skyrim_specialed.jpg b/images/skyrim_specialed.jpg new file mode 100644 index 0000000..29446ac Binary files /dev/null and b/images/skyrim_specialed.jpg differ diff --git a/images/steam.jpg b/images/steam.jpg new file mode 100644 index 0000000..365c391 Binary files /dev/null and b/images/steam.jpg differ diff --git a/images/wizard101.jpg b/images/wizard101.jpg new file mode 100644 index 0000000..23d8844 Binary files /dev/null and b/images/wizard101.jpg differ diff --git a/index.php b/index.php index 71e32b4..b63b55d 100644 --- a/index.php +++ b/index.php @@ -98,12 +98,10 @@ apidb_header("Wine Application Database"); ?> -<div class="row"> - <div class="col-md-6 col-lg-8"> - <h1 class="whq-app-title">Welcome</h1> - -<p>This is the Wine Application Database (AppDB). Here you can get information on application + <div class="row"> + <div class="col-md-6"> + <p>This is the Wine Application Database (AppDB). Here you can get information on application compatibility with Wine.</p> <?php @@ -173,10 +171,56 @@ else echo "</p>\n"; ?> - -</div> - <div class="col-md-6 col-lg-4"> - <img src="images/appdb_montage.jpg" class="fill-width" alt="Wine AppDB"> + </div> + + <div id="carouselScreenshots" class="carousel slide container col-md-6" data-ride="carousel"> + <div class="carousel-inner" style="margin-bottom:10px"> + <div class="item active"> + <img src="images/steam.jpg" alt="First slide"> + </div> + <div class="item"> + <img src="images/outlook2010.jpg" alt="Second slide"> + </div> + <div class="item"> + <img src="images/eveonline.jpg" alt="Third slide"> + </div> + <div class="item"> + <img src="images/photoshopcc2015.jpg" alt="Fourth slide"> + </div> + <div class="item"> + <img src="images/falloutnv.jpg" alt="Fifth slide"> + </div> + <div class="item"> + <img src="images/reason.jpg" alt="Sixth slide"> + </div> + <div class="item"> + <img src="images/skyrim_specialed.jpg" alt="Seventh slide"> + </div> + <div class="item"> + <img src="images/goggalaxy.jpg" alt="Eighth slide"> + </div> + <div class="item"> + <img src="images/wizard101.jpg" alt="Ninth slide"> + </div> + <div class="item"> + <img src="images/matlab.jpg" alt="Tenth slide"> + </div> + <div class="item"> + <img src="images/sims3.jpg" alt="Eleventh slide"> + </div> + <div class="item"> + <img src="images/metatrader5.jpg" alt="Twelfth slide"> + </div> + </div> + <a class="left carousel-control" href="#carouselScreenshots" data-slide="prev"> + <span class="glyphicon glyphicon-chevron-left"></span> + <span class="sr-only">Previous</span> + </a> + <a class="right carousel-control" href="#carouselScreenshots" data-slide="next"> + <span class="glyphicon glyphicon-chevron-right"></span> + <span class="sr-only">Next</span> + </a> + </div> </div> </div>

1 0

Paul Gofman : d3dx9: Use bitmask instead of BOOL array for light_updated.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: e06b7693d6f0980b1db2fa3b9920c7a925ceb8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06b7693d6f0980b1db2fa3b9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 16:08:31 2017 +0300 d3dx9: Use bitmask instead of BOOL array for light_updated. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8095a0e..864f0e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -178,7 +178,7 @@ struct ID3DXEffectImpl DWORD begin_flags; D3DLIGHT9 current_light[8]; - BOOL light_updated[8]; + unsigned int light_updated; D3DMATERIAL9 current_material; BOOL material_updated; }; @@ -3067,7 +3067,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas state_table[state->operation].op); d3dx9_set_light_parameter(state_table[state->operation].op, &effect->current_light[state->index], param_value); - effect->light_updated[state->index] = TRUE; + effect->light_updated |= 1u << state->index; return D3D_OK; } case SC_MATERIAL: @@ -3112,15 +3112,19 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 ret = hr; } } - for (i = 0; i < ARRAY_SIZE(effect->current_light); ++i) + + if (effect->light_updated) { - if (effect->light_updated[i] - && FAILED(hr = SET_D3D_STATE(effect, SetLight, i, &effect->current_light[i]))) + for (i = 0; i < ARRAY_SIZE(effect->current_light); ++i) { - WARN("Error setting light, hr %#x.\n", hr); - ret = hr; + if ((effect->light_updated & (1u << i)) + && FAILED(hr = SET_D3D_STATE(effect, SetLight, i, &effect->current_light[i]))) + { + WARN("Error setting light, hr %#x.\n", hr); + ret = hr; + } } - effect->light_updated[i] = FALSE; + effect->light_updated = 0; } if (effect->material_updated

1 0

Paul Gofman : d3dx9: Dump bytecode if parameter evaluator creation failed.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: c48658dbb82371ca3c9feb69254138875a79310b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48658dbb82371ca3c9feb692… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 16:08:30 2017 +0300 d3dx9: Dump bytecode if parameter evaluator creation failed. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 4142c52..e3e91c6 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1324,6 +1324,9 @@ HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte err_out: WARN("Error creating parameter evaluator.\n"); + if (TRACE_ON(d3dx)) + dump_bytecode(byte_code, byte_code_size); + d3dx_free_param_eval(peval); *peval_out = NULL; return ret;

1 0

Paul Gofman : d3dx9: Do not support preshader instructions which output multiple registers.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 14fab72269cd08b99b38db254eb5db115a039662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14fab72269cd08b99b38db254… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 16:08:29 2017 +0300 d3dx9: Do not support preshader instructions which output multiple registers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 58b8d62..4142c52 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -521,7 +521,13 @@ static unsigned int *parse_pres_ins(unsigned int *ptr, unsigned int count, struc FIXME("Relative addressing in output register not supported.\n"); return NULL; } - + if (get_reg_offset(ins->output.reg.table, ins->output.reg.offset + + (pres_op_info[ins->op].func_all_comps ? 0 : ins->component_count - 1)) + != get_reg_offset(ins->output.reg.table, ins->output.reg.offset)) + { + FIXME("Instructions outputting multiple registers are not supported.\n"); + return NULL; + } return ptr; } @@ -629,8 +635,7 @@ static void append_pres_const_sets_for_shader_input(struct d3dx_const_tab *const continue; const_set.register_index = get_reg_offset(reg->table, reg->offset); - const_set.register_count = max(get_reg_offset(reg->table, - pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count), 1); + const_set.register_count = 1; const_set.table = reg->table; const_set.constant_class = D3DXPC_FORCE_DWORD; const_set.element_count = 1; @@ -963,18 +968,10 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab && out->const_set[i].register_index + out->const_set[i].register_count >= out->const_set[i + 1].register_index) { - if (out->const_set[i].register_index + out->const_set[i].register_count - > out->const_set[i + 1].register_index + out->const_set[i + 1].register_count) - { - WARN("Unexpected preshader register count %u, register index %u, " - "next register count %u, register index %u, i %u.\n", - out->const_set[i].register_count, out->const_set[i].register_index, - out->const_set[i + 1].register_count, out->const_set[i + 1].register_index, i); - hr = D3DERR_INVALIDCALL; - goto cleanup; - } - out->const_set[i].register_count = out->const_set[i + 1].register_index - + out->const_set[i + 1].register_count - out->const_set[i].register_index; + assert(out->const_set[i].register_index + out->const_set[i].register_count + <= out->const_set[i + 1].register_index + 1); + out->const_set[i].register_count = out->const_set[i + 1].register_index + 1 + - out->const_set[i].register_index; memmove(&out->const_set[i + 1], &out->const_set[i + 2], sizeof(out->const_set[i]) * (out->const_set_count - i - 2)); --out->const_set_count; @@ -1216,8 +1213,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u } } update_table_size(pres->regs.table_sizes, pres->ins[i].output.reg.table, - get_reg_offset(pres->ins[i].output.reg.table, - pres->ins[i].output.reg.offset + pres->ins[i].component_count - 1)); + get_reg_offset(pres->ins[i].output.reg.table, pres->ins[i].output.reg.offset)); } if (FAILED(regstore_alloc_table(&pres->regs, PRES_REGTAB_IMMED))) return E_OUTOFMEMORY;

1 0

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

31 Aug '17

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

Alexandre Julliard : user32: Consistently print the HDC value in DCE traces.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 3eb0d2868c4c283bf7e840689554024afe801efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb0d2868c4c283bf7e840689… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 31 19:13:26 2017 +0200 user32: Consistently print the HDC value in DCE traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 6cc9a7e..bf3f180 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -398,13 +398,13 @@ static void make_dc_dirty( struct dce *dce ) if (!dce->count) { /* Don't bother with visible regions of unused DCEs */ - TRACE("\tpurged %p dce [%p]\n", dce, dce->hwnd); + TRACE("purged %p hwnd %p\n", dce->hdc, dce->hwnd); release_dce( dce ); } else { /* Set dirty bits in the hDC and DCE structs */ - TRACE("\tfixed up %p dce [%p]\n", dce, dce->hwnd); + TRACE("fixed up %p hwnd %p\n", dce->hdc, dce->hwnd); SetHookFlags( dce->hdc, DCHF_INVALIDATEVISRGN ); } } @@ -437,7 +437,7 @@ void invalidate_dce( WND *win, const RECT *extra_rect ) { if (!dce->hwnd) continue; - TRACE( "%p: hwnd %p dcx %08x %s %s\n", dce, dce->hwnd, dce->flags, + TRACE( "%p: hwnd %p dcx %08x %s %s\n", dce->hdc, dce->hwnd, dce->flags, (dce->flags & DCX_CACHE) ? "Cache" : "Owned", dce->count ? "InUse" : "" ); if ((dce->hwnd == win->parent) && !(dce->flags & DCX_CLIPCHILDREN)) @@ -1052,7 +1052,7 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if (!dce->hwnd) dceEmpty = dce; else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags)) { - TRACE( "found valid %p dce [%p], flags %08x\n", dce, hwnd, dce->flags ); + TRACE( "found valid %p hwnd %p, flags %08x\n", dce->hdc, hwnd, dce->flags ); found = dce; bUpdateVisRgn = FALSE; break; @@ -1082,17 +1082,13 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) else { flags |= DCX_NORESETATTRS; - if (dce->hwnd == hwnd) - { - TRACE("\tskipping hVisRgn update\n"); - bUpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ - } - else + if (dce->hwnd != hwnd) { /* we should free dce->clip_rgn here, but Windows apparently doesn't */ dce->flags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); dce->clip_rgn = 0; } + else bUpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ } if (flags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) @@ -1118,7 +1114,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if (bUpdateVisRgn) update_visible_region( dce ); - TRACE("(%p,%p,0x%x): returning %p\n", hwnd, hrgnClip, flags, dce->hdc); + TRACE("(%p,%p,0x%x): returning %p%s\n", hwnd, hrgnClip, flags, dce->hdc, + bUpdateVisRgn ? " (updated)" : ""); return dce->hdc; }

1 0

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

31 Aug '17

Module: wine Branch: master Commit: b6cab7e20288ac469002ac3c6d982ac6fb8b4fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cab7e20288ac469002ac3c6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:50 2017 +0200 wineconsole: 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> --- programs/wineconsole/wineconsole.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc index 587e846..8df6aef 100644 --- a/programs/wineconsole/wineconsole.rc +++ b/programs/wineconsole/wineconsole.rc @@ -120,7 +120,7 @@ FONT 8, "MS Shell Dlg" AUTOCHECKBOX "&Close console", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP GROUPBOX "Edition", -1, 115, 55, 85, 42 - COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 60, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } IDD_SAVE_SETTINGS DIALOG 20, 20, 210, 60

1 0

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

31 Aug '17

Module: wine Branch: master Commit: 44a9cc05175fd4138cc6012a3e75cf0b32e07c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a9cc05175fd4138cc6012a3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:49 2017 +0200 wineps.drv: 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/wineps.drv/wineps.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/wineps.rc b/dlls/wineps.drv/wineps.rc index 216a2cf..ed4ba83 100644 --- a/dlls/wineps.drv/wineps.rc +++ b/dlls/wineps.drv/wineps.rc @@ -36,10 +36,10 @@ FONT 8, "MS Shell Dlg" CONTROL "&Landscape", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 180, 10 LTEXT "Duplex:", IDD_DUPLEX_NAME, 10, 140, 200, 8 - COMBOBOX IDD_DUPLEX, 10, 151, 200, 40, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + COMBOBOX IDD_DUPLEX, 10, 151, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP LTEXT "Print &Quality:", -1, 10, 170, 200, 8 - COMBOBOX IDD_QUALITY, 10, 181, 200, 40, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + COMBOBOX IDD_QUALITY, 10, 181, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

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

31 Aug '17

Module: wine Branch: master Commit: 08a8ce1657d295210358953aa69df82fd81862d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a8ce1657d295210358953aa… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:48 2017 +0200 serialui: 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/serialui/serialui.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/serialui/serialui.rc b/dlls/serialui/serialui.rc index 8147903..5840204 100644 --- a/dlls/serialui/serialui.rc +++ b/dlls/serialui/serialui.rc @@ -28,15 +28,15 @@ CAPTION "Settings for %s" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Baud Rate", -1,5,20,70,18 - COMBOBOX IDC_BAUD, 80, 20, 70, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_BAUD, 80, 20, 70, 60, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Parity", -1,5,40,70,18 - COMBOBOX IDC_PARITY, 80, 40, 70, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PARITY, 80, 40, 70, 60, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Flow Control", -1,5,60,70,18 - COMBOBOX IDC_FLOW, 80, 60, 70, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FLOW, 80, 60, 70, 60, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Data Bits", -1,5,80,70,18 - COMBOBOX IDC_DATA, 80, 80, 70, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DATA, 80, 80, 70, 60, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Stop Bits", -1,5,100,70,18 - COMBOBOX IDC_STOP, 80, 100, 70, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STOP, 80, 100, 70, 60, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK,30,138,50,14 PUSHBUTTON "Cancel", IDCANCEL,85,138,50,14 /* these two buttons are for testing Get/SetDefaultCommConfig */

1 0

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

31 Aug '17

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

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