May 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : appwiz.cpl: Make list selection always visible, enable full row selection mode.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: a100d6a7a588967bdb9427a2a0a71a83996fe41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a100d6a7a588967bdb9427a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 15:19:34 2017 +0300 appwiz.cpl: Make list selection always visible, enable full row selection mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 +++ dlls/appwiz.cpl/appwiz.rc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 8119d07..3807555 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -831,6 +831,9 @@ static INT_PTR CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l switch(msg) { case WM_INITDIALOG: + SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_SETEXTENDEDLISTVIEWSTYLE, + LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); + hImageList = ResetApplicationList(TRUE, hWnd, hImageList); if (!hImageList) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 9709ca9..049e1d8 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -62,7 +62,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Modify/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 54, 275, 34 - CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Support Information", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 34, 198, 90, 14 CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 128, 198, 90, 14 CONTROL "&Remove", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 222, 198, 90, 14

1 0

Paul Gofman : d3dx9: Use versioned parameter updates instead of 'dirty' flags.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: a1795848442022885ce1be127644d5eb1b95b914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1795848442022885ce1be127… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 16 19:49:17 2017 +0300 d3dx9: Use versioned parameter updates instead of 'dirty' flags. 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/d3dx9_private.h | 37 +++++++++++++++++----- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++++++-------------------- dlls/d3dx9_36/preshader.c | 29 +++++++++++------ 3 files changed, 86 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1795848442022885ce1b…

1 0

Paul Gofman : d3dx9: Match native out of bounds array selector index handling.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 454a2c5c214ed8444464337559c591f86a2a8a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454a2c5c214ed844446433755… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 18 19:23:17 2017 +0200 d3dx9: Match native out of bounds array selector index handling. 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/d3dx9_private.h | 4 +++- dlls/d3dx9_36/effect.c | 23 +++++++++++++++-------- dlls/d3dx9_36/preshader.c | 16 +++++++++------- dlls/d3dx9_36/tests/effect.c | 25 +++++++++---------------- 4 files changed, 36 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=454a2c5c214ed84444643…

1 0

Paul Gofman : d3dx9: Factor out regstore_set_modified_reg() function.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: b5784f926caa9d29235afcf994d5e0e408a7dd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5784f926caa9d29235afcf99… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 16 19:49:19 2017 +0300 d3dx9: Factor out regstore_set_modified_reg() function. 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 | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 880c66b..6eddf6e 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -265,21 +265,13 @@ static void regstore_free_tables(struct d3dx_regstore *rs) } } -static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, - unsigned int start_offset, unsigned int count) +static void regstore_set_modified_reg(struct d3dx_regstore *rs, unsigned int table, + unsigned int start, unsigned int end) { - unsigned int block_idx, start, end, start_block, end_block; + unsigned int block_idx, start_block, end_block; - if (!count) - return; - - memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, - data, count * table_info[table].component_size); - - start = get_reg_offset(table, start_offset); start_block = start / PRES_BITMASK_BLOCK_SIZE; start -= start_block * PRES_BITMASK_BLOCK_SIZE; - end = get_reg_offset(table, start_offset + count - 1); end_block = end / PRES_BITMASK_BLOCK_SIZE; end = (end_block + 1) * PRES_BITMASK_BLOCK_SIZE - 1 - end; @@ -298,6 +290,27 @@ static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, vo } } +static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, + unsigned int start_offset, unsigned int count) +{ + if (!count) + return; + + regstore_set_modified_reg(rs, table, get_reg_offset(table, start_offset), + get_reg_offset(table, start_offset + count - 1)); +} + +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, + unsigned int start_offset, unsigned int count) +{ + if (!count) + return; + + memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, + data, count * table_info[table].component_size); + regstore_set_modified(rs, table, start_offset, count); +} + static unsigned int regstore_is_val_set_reg(struct d3dx_regstore *rs, unsigned int table, unsigned int reg_idx) { return rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] &

1 0

Paul Gofman : d3dx9: Avoid redundant constant tables updates.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 5e87656ec3b054fec0d3ae19db4af7c8ac2e67f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e87656ec3b054fec0d3ae19d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 18 19:23:19 2017 +0200 d3dx9: Avoid redundant constant tables updates. 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 | 72 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 6eddf6e..49eeb22 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -352,13 +352,8 @@ static void regstore_set_double(struct d3dx_regstore *rs, unsigned int table, un 1u << (reg_idx % PRES_BITMASK_BLOCK_SIZE); } -static void regstore_reset_table(struct d3dx_regstore *rs, unsigned int table) +static void regstore_reset_modified(struct d3dx_regstore *rs, unsigned int table) { - unsigned int size; - - size = rs->table_sizes[table] * table_info[table].reg_component_count * table_info[table].component_size; - - memset(rs->tables[table], 0, size); memset(rs->table_value_set[table], 0, sizeof(*rs->table_value_set[table]) * ((rs->table_sizes[table] + PRES_BITMASK_BLOCK_SIZE - 1) / PRES_BITMASK_BLOCK_SIZE)); @@ -950,7 +945,7 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) } static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, - BOOL update_all, ULONG64 new_update_version) + ULONG64 new_update_version) { unsigned int const_idx; @@ -965,7 +960,7 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const BOOL transpose; unsigned int count; - if (!(update_all || is_param_dirty(param, const_tab->update_version))) + if (!is_param_dirty(param, const_tab->update_version)) continue; transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) @@ -1305,6 +1300,23 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) return D3D_OK; } +static void set_preshader_modified(struct d3dx_preshader *pres) +{ + unsigned int i; + + for (i = 0; i < pres->ins_count; ++i) + { + const struct d3dx_pres_ins *ins = &pres->ins[i]; + const struct d3dx_pres_reg *reg = &ins->output.reg; + + if (reg->table == PRES_REGTAB_TEMP) + continue; + + regstore_set_modified(&pres->regs, reg->table, reg->offset, + pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); + } +} + static BOOL is_const_tab_input_dirty(struct d3dx_const_tab *ctab, ULONG64 update_version) { unsigned int i; @@ -1337,7 +1349,7 @@ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, const struct d3dx if (is_const_tab_input_dirty(&peval->pres.inputs, ULONG64_MAX)) { - set_constants(&peval->pres.regs, &peval->pres.inputs, FALSE, + set_constants(&peval->pres.regs, &peval->pres.inputs, next_update_version(peval->version_counter)); if (FAILED(hr = execute_preshader(&peval->pres))) @@ -1424,7 +1436,7 @@ static HRESULT set_shader_constants_device(ID3DXEffectStateManager *manager, str } start += count; } - regstore_reset_table(rs, table); + regstore_reset_modified(rs, table); return result; } @@ -1438,22 +1450,50 @@ HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, s struct d3dx_regstore *rs = &pres->regs; unsigned int i; ULONG64 new_update_version = next_update_version(peval->version_counter); + BOOL update_device = update_all; TRACE("device %p, peval %p, param_type %u.\n", device, peval, peval->param_type); - if (update_all || is_const_tab_input_dirty(&pres->inputs, ULONG64_MAX)) + if (is_const_tab_input_dirty(&pres->inputs, ULONG64_MAX)) { - set_constants(rs, &pres->inputs, update_all, new_update_version); + set_constants(rs, &pres->inputs, new_update_version); if (FAILED(hr = execute_preshader(pres))) return hr; + update_device = TRUE; } - set_constants(rs, &peval->shader_inputs, update_all, new_update_version); + if (is_const_tab_input_dirty(&peval->shader_inputs, ULONG64_MAX)) + { + set_constants(rs, &peval->shader_inputs, new_update_version); + update_device = TRUE; + } result = D3D_OK; - for (i = 0; i < ARRAY_SIZE(set_tables); ++i) + + if (update_device) { - if (FAILED(hr = set_shader_constants_device(manager, device, rs, peval->param_type, set_tables[i]))) - result = hr; + if (update_all) + { + for (i = 0; i < peval->shader_inputs.input_count; ++i) + { + unsigned int table; + + if (!peval->shader_inputs.inputs[i].RegisterCount) + continue; + table = peval->shader_inputs.regset2table[peval->shader_inputs.inputs[i].RegisterSet]; + if (table < PRES_REGTAB_COUNT) + regstore_set_modified_reg(rs, table, + peval->shader_inputs.inputs[i].RegisterIndex, + peval->shader_inputs.inputs[i].RegisterIndex + + peval->shader_inputs.inputs[i].RegisterCount - 1); + } + set_preshader_modified(pres); + } + + for (i = 0; i < ARRAY_SIZE(set_tables); ++i) + { + if (FAILED(hr = set_shader_constants_device(manager, device, rs, peval->param_type, set_tables[i]))) + result = hr; + } } return result; }

1 0

Paul Gofman : d3dx9: Loop through input parameters in is_const_tab_input_dirty().
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 53bf72e266532f2f0533a0dfd7e90a25d7b6d901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bf72e266532f2f0533a0dfd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 18 19:23:20 2017 +0200 d3dx9: Loop through input parameters in is_const_tab_input_dirty(). 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 49eeb22..8d1d1b4 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1323,9 +1323,10 @@ static BOOL is_const_tab_input_dirty(struct d3dx_const_tab *ctab, ULONG64 update if (update_version == ULONG64_MAX) update_version = ctab->update_version; - for (i = 0; i < ctab->const_set_count; ++i) + for (i = 0; i < ctab->input_count; ++i) { - if (is_param_dirty(ctab->const_set[i].param, update_version)) + if (ctab->inputs_param[i] + && is_param_dirty(ctab->inputs_param[i], update_version)) return TRUE; } return FALSE;

1 0

Alexandre Julliard : gdi32: Return more meaningful data in the null driver GetDeviceCaps implementation.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 0c005a329ebaaa90f8f732a83bd94e5e99c8c13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c005a329ebaaa90f8f732a83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 12:54:45 2017 +0200 gdi32: Return more meaningful data in the null driver GetDeviceCaps implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 85 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 18e109e..fe7812c 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -298,23 +298,76 @@ static BOOL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffe static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { - switch (cap) /* return meaningful values for some entries */ + static int screen_dpi; + int bpp; + + switch (cap) { - case HORZRES: return 640; - case VERTRES: return 480; - case BITSPIXEL: return 1; - case PLANES: return 1; - case NUMCOLORS: return 2; - case ASPECTX: return 36; - case ASPECTY: return 36; - case ASPECTXY: return 51; - case LOGPIXELSX: return 72; - case LOGPIXELSY: return 72; - case SIZEPALETTE: return 2; - case TEXTCAPS: return (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | - TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER | - TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE); - default: return 0; + case DRIVERVERSION: return 0x4000; + case TECHNOLOGY: return DT_RASDISPLAY; + case HORZSIZE: return MulDiv( GetDeviceCaps( dev->hdc, HORZRES ), 254, + GetDeviceCaps( dev->hdc, LOGPIXELSX ) * 10 ); + case VERTSIZE: return MulDiv( GetDeviceCaps( dev->hdc, VERTRES ), 254, + GetDeviceCaps( dev->hdc, LOGPIXELSY ) * 10 ); + case HORZRES: return 640; + case VERTRES: return 480; + case BITSPIXEL: return 32; + case PLANES: return 1; + case NUMBRUSHES: return -1; + case NUMPENS: return -1; + case NUMMARKERS: return 0; + case NUMFONTS: return 0; + case PDEVICESIZE: return 0; + case CURVECAPS: return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | + CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); + case LINECAPS: return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | + LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); + case POLYGONALCAPS: return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | + PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); + case TEXTCAPS: return (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | + TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER | + TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE); + case CLIPCAPS: return CP_RECTANGLE; + case RASTERCAPS: return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DI_BITMAP | RC_DIBTODEV | + RC_BIGFONT | RC_STRETCHBLT | RC_FLOODFILL | RC_STRETCHDIB | RC_DEVBITS | + (GetDeviceCaps( dev->hdc, SIZEPALETTE ) ? RC_PALETTE : 0)); + case ASPECTX: return 36; + case ASPECTY: return 36; + case ASPECTXY: return (int)(hypot( GetDeviceCaps( dev->hdc, ASPECTX ), + GetDeviceCaps( dev->hdc, ASPECTY )) + 0.5); + case CAPS1: return 0; + case SIZEPALETTE: return 0; + case NUMRESERVED: return 20; + case PHYSICALWIDTH: return 0; + case PHYSICALHEIGHT: return 0; + case PHYSICALOFFSETX: return 0; + case PHYSICALOFFSETY: return 0; + case SCALINGFACTORX: return 0; + case SCALINGFACTORY: return 0; + case VREFRESH: return 0; + case DESKTOPVERTRES: return GetDeviceCaps( dev->hdc, VERTRES ); + case DESKTOPHORZRES: return GetDeviceCaps( dev->hdc, HORZRES ); + case BLTALIGNMENT: return 0; + case SHADEBLENDCAPS: return 0; + case COLORMGMTCAPS: return 0; + case LOGPIXELSX: + case LOGPIXELSY: + if (!screen_dpi && !(screen_dpi = get_dpi())) screen_dpi = 96; + return screen_dpi; + case NUMCOLORS: + bpp = GetDeviceCaps( dev->hdc, BITSPIXEL ); + return (bpp > 8) ? -1 : (1 << bpp); + case COLORRES: + /* The observed correspondence between BITSPIXEL and COLORRES is: + * BITSPIXEL: 8 -> COLORRES: 18 + * BITSPIXEL: 16 -> COLORRES: 16 + * BITSPIXEL: 24 -> COLORRES: 24 + * BITSPIXEL: 32 -> COLORRES: 24 */ + bpp = GetDeviceCaps( dev->hdc, BITSPIXEL ); + return (bpp <= 8) ? 18 : min( 24, bpp ); + default: + FIXME("(%p): unsupported capability %d, will return 0\n", dev->hdc, cap ); + return 0; } }

1 0

Alexandre Julliard : winex11: Fall back to the null driver for common device capabilities.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: bb6a65e0ca884809fc6077604bdc1d6f1e348197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6a65e0ca884809fc6077604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 13:35:02 2017 +0200 winex11: Fall back to the null driver for common device capabilities. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 139 +----------------------------------------------- 1 file changed, 2 insertions(+), 137 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 3929b55..e1eb3f8 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -33,62 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); Display *gdi_display; /* display to use for all GDI functions */ -/* a few dynamic device caps */ -static int log_pixels_x; /* pixels per logical inch in x direction */ -static int log_pixels_y; /* pixels per logical inch in y direction */ static int palette_size; static Pixmap stock_bitmap_pixmap; /* phys bitmap for the default stock bitmap */ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; -static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; -static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - static const struct gdi_dc_funcs x11drv_funcs; static const struct gdi_dc_funcs *xrender_funcs; -/****************************************************************************** - * get_reg_dword - * - * Read a DWORD value from the registry - */ -static BOOL get_reg_dword(HKEY base, const WCHAR *key_name, const WCHAR *value_name, DWORD *value) -{ - HKEY key; - DWORD type, data, size = sizeof(data); - BOOL ret = FALSE; - - if (RegOpenKeyW(base, key_name, &key) == ERROR_SUCCESS) - { - if (RegQueryValueExW(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS && - type == REG_DWORD) - { - *value = data; - ret = TRUE; - } - RegCloseKey(key); - } - return ret; -} - -/****************************************************************************** - * get_dpi - * - * get the dpi from the registry - */ -static DWORD get_dpi(void) -{ - DWORD dpi; - - if (get_reg_dword(HKEY_CURRENT_USER, dpi_key_name, dpi_value_name, &dpi)) - return dpi; - if (get_reg_dword(HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name, &dpi)) - return dpi; - return 0; -} - /********************************************************************** * device_init * @@ -106,11 +59,6 @@ static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) stock_bitmap_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); - /* Initialize device caps */ - log_pixels_x = log_pixels_y = get_dpi(); - if (!log_pixels_x) - log_pixels_x = log_pixels_y = USER_DEFAULT_SCREEN_DPI; - return TRUE; } @@ -214,20 +162,6 @@ static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case DRIVERVERSION: - return 0x300; - case TECHNOLOGY: - return DT_RASDISPLAY; - case HORZSIZE: - { - RECT primary_rect = get_primary_monitor_rect(); - return MulDiv( primary_rect.right - primary_rect.left, 254, log_pixels_x * 10 ); - } - case VERTSIZE: - { - RECT primary_rect = get_primary_monitor_rect(); - return MulDiv( primary_rect.bottom - primary_rect.top, 254, log_pixels_y * 10 ); - } case HORZRES: { RECT primary_rect = get_primary_monitor_rect(); @@ -250,80 +184,11 @@ static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } case BITSPIXEL: return screen_bpp; - case PLANES: - return 1; - case NUMBRUSHES: - return -1; - case NUMPENS: - return -1; - case NUMMARKERS: - return 0; - case NUMFONTS: - return 0; - case NUMCOLORS: - /* MSDN: Number of entries in the device's color table, if the device has - * a color depth of no more than 8 bits per pixel.For devices with greater - * color depths, -1 is returned. */ - return (default_visual.depth > 8) ? -1 : (1 << default_visual.depth); - case PDEVICESIZE: - return sizeof(X11DRV_PDEVICE); - case CURVECAPS: - return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | - CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); - case LINECAPS: - return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | - LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); - case POLYGONALCAPS: - return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | - PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); - case TEXTCAPS: - return (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | - TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER | - TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE); - case CLIPCAPS: - return CP_REGION; - case COLORRES: - /* The observed correspondence between BITSPIXEL and COLORRES is: - * BITSPIXEL: 8 -> COLORRES: 18 - * BITSPIXEL: 16 -> COLORRES: 16 - * BITSPIXEL: 24 -> COLORRES: 24 - * BITSPIXEL: 32 -> COLORRES: 24 */ - return (screen_bpp <= 8) ? 18 : min( 24, screen_bpp ); - case RASTERCAPS: - return (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | - RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | - (palette_size ? RC_PALETTE : 0)); - case SHADEBLENDCAPS: - return (SB_GRAD_RECT | SB_GRAD_TRI | SB_CONST_ALPHA | SB_PIXEL_ALPHA); - case ASPECTX: - case ASPECTY: - return 36; - case ASPECTXY: - return 51; - case LOGPIXELSX: - return log_pixels_x; - case LOGPIXELSY: - return log_pixels_y; - case CAPS1: - FIXME("(%p): CAPS1 is unimplemented, will return 0\n", dev->hdc ); - /* please see wingdi.h for the possible bit-flag values that need - to be returned. */ - return 0; case SIZEPALETTE: return palette_size; - case NUMRESERVED: - case PHYSICALWIDTH: - case PHYSICALHEIGHT: - case PHYSICALOFFSETX: - case PHYSICALOFFSETY: - case SCALINGFACTORX: - case SCALINGFACTORY: - case VREFRESH: - case BLTALIGNMENT: - return 0; default: - FIXME("(%p): unsupported capability %d, will return 0\n", dev->hdc, cap ); - return 0; + dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); + return dev->funcs->pGetDeviceCaps( dev, cap ); } }

1 0

Akihiro Sagawa : msi: Avoid using isspace()/isdigit() for WCHARs.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: f6ced24999ffb287bacb8300d0e7c55d89568a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ced24999ffb287bacb8300d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 18 10:16:14 2017 +0200 msi: Avoid using isspace()/isdigit() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tokenize.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 441a54a..1656fd8 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -187,6 +187,21 @@ static const char isIdChar[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* Fx */ }; +/* +** WCHAR safe version of isdigit() +*/ +static inline int isDigit(WCHAR c) +{ + return c >= '0' && c <= '9'; +} + +/* +** WCHAR safe version of isspace(), except '\r' +*/ +static inline int isSpace(WCHAR c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\f'; +} /* ** Return the length of the token that begins at z[0]. Return @@ -199,7 +214,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){ *skip = 0; switch( *z ){ case ' ': case '\t': case '\n': case '\f': - for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} + for(i=1; isSpace(z[i]); i++){} *tokenType = TK_SPACE; return i; case '-': @@ -265,7 +280,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){ return i; } case '.': - if( !isdigit(z[1]) ){ + if( !isDigit(z[1]) ){ *tokenType = TK_DOT; return 1; } @@ -273,7 +288,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': *tokenType = TK_INTEGER; - for(i=1; isdigit(z[i]); i++){} + for(i=1; isDigit(z[i]); i++){} return i; case '[': for(i=1; z[i] && z[i-1]!=']'; i++){}

1 0

Huw Davies : ole32: Add a helper to copy FORMATETC structures.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 11db49190bb531796ac3e8e86c2f67b5f60d39dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=11db49190bb531796ac3e8e86… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 18 11:07:02 2017 +0100 ole32: Add a helper to copy FORMATETC structures. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 12 ++++++++++++ dlls/ole32/oleobj.c | 16 ++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6488287..8bab819 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -334,4 +334,16 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) +{ + *dst = *src; + if (src->ptd) + { + dst->ptd = CoTaskMemAlloc( src->ptd->tdSize ); + if (!dst->ptd) return E_OUTOFMEMORY; + memcpy( dst->ptd, src->ptd, src->ptd->tdSize ); + } + return S_OK; +} + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index edbef55..17ab8d0 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -56,14 +56,14 @@ static void release_statdata(STATDATA *data) static HRESULT copy_statdata(STATDATA *dst, const STATDATA *src) { - *dst = *src; - if(src->formatetc.ptd) - { - dst->formatetc.ptd = CoTaskMemAlloc(src->formatetc.ptd->tdSize); - if(!dst->formatetc.ptd) return E_OUTOFMEMORY; - memcpy(dst->formatetc.ptd, src->formatetc.ptd, src->formatetc.ptd->tdSize); - } - if(dst->pAdvSink) IAdviseSink_AddRef(dst->pAdvSink); + HRESULT hr; + + hr = copy_formatetc( &dst->formatetc, &src->formatetc ); + if (FAILED(hr)) return hr; + dst->advf = src->advf; + dst->pAdvSink = src->pAdvSink; + if (dst->pAdvSink) IAdviseSink_AddRef( dst->pAdvSink ); + dst->dwConnection = src->dwConnection; return S_OK; }

1 0