December 2012 - Wine-Commits

Henri Verbeet : d3d10core: Only create unique sampler state objects.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: a9e241e4fe6c1abc34ccb43d422c44ad129bdcb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e241e4fe6c1abc34ccb43d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:31 2012 +0100 d3d10core: Only create unique sampler state objects. --- dlls/d3d10core/d3d10core_main.c | 8 ++++- dlls/d3d10core/d3d10core_private.h | 10 ++++- dlls/d3d10core/device.c | 67 ++++++++++++++++++++++++++++++++---- dlls/d3d10core/state.c | 22 ++++++++--- 4 files changed, 91 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index e977afa..78826f6 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -69,6 +69,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba void *device_object, REFIID riid, void **device_layer) { struct d3d10_device *object; + HRESULT hr; TRACE("id %#x, layer_base %p, unknown0 %#x, device_object %p, riid %s, device_layer %p\n", id, layer_base, unknown0, device_object, debugstr_guid(riid), device_layer); @@ -81,7 +82,12 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba } object = *layer_base; - d3d10_device_init(object, device_object); + if (FAILED(hr = d3d10_device_init(object, device_object))) + { + WARN("Failed to initialize device, hr %#x.\n", hr); + *device_layer = NULL; + return hr; + } *device_layer = &object->IUnknown_inner; TRACE("Created d3d10 device at %p\n", object); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4d643a0..b32825e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -35,6 +35,7 @@ #endif #include "wine/wined3d.h" #include "wine/winedxgi.h" +#include "wine/rbtree.h" #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ @@ -247,11 +248,14 @@ struct d3d10_sampler_state ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; + struct d3d10_device *device; struct wined3d_sampler *wined3d_sampler; D3D10_SAMPLER_DESC desc; + struct wine_rb_entry entry; }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device, + const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D10Query */ @@ -275,6 +279,8 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct wine_rb_tree sampler_states; + struct d3d10_blend_state *blend_state; float blend_factor[4]; UINT sample_mask; @@ -283,7 +289,7 @@ struct d3d10_device struct d3d10_rasterizer_state *rasterizer_state; }; -void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; +HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ enum dxgi_device_layer_id diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9070d85..29f1648 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -72,15 +72,16 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) { - struct d3d10_device *This = impl_from_IUnknown(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_device *device = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", device, refcount); if (!refcount) { - if (This->wined3d_device) - wined3d_device_decref(This->wined3d_device); + if (device->wined3d_device) + wined3d_device_decref(device->wined3d_device); + wine_rb_destroy(&device->sampler_states, NULL, NULL); } return refcount; @@ -1471,7 +1472,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *iface, const D3D10_SAMPLER_DESC *desc, ID3D10SamplerState **sampler_state) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_sampler_state *object; + struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); @@ -1479,6 +1482,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i if (!desc) return E_INVALIDARG; + if ((entry = wine_rb_get(&device->sampler_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_sampler_state, entry); + + TRACE("Returning existing sampler state %p.\n", object); + *sampler_state = &object->ID3D10SamplerState_iface; + ID3D10SamplerState_AddRef(*sampler_state); + + return S_OK; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1486,7 +1500,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_sampler_state_init(object, desc))) + if (FAILED(hr = d3d10_sampler_state_init(object, device, desc))) { WARN("Failed to initialize sampler state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -1908,7 +1922,38 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = device_parent_create_swapchain, }; -void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) +static void *d3d10_rb_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *d3d10_rb_realloc(void *ptr, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + +static void d3d10_rb_free(void *ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +static int d3d10_sampler_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const D3D10_SAMPLER_DESC *ka = key; + const D3D10_SAMPLER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_sampler_state, entry)->desc; + + return memcmp(ka, kb, sizeof(*ka)); +} + +static const struct wine_rb_functions d3d10_sampler_state_rb_ops = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_sampler_state_compare, +}; + +HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; @@ -1917,4 +1962,12 @@ void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) device->refcount = 1; /* COM aggregation always takes place */ device->outer_unk = outer_unknown; + + if (wine_rb_init(&device->sampler_states, &d3d10_sampler_state_rb_ops) == -1) + { + WARN("Failed to initialize sampler state rbtree.\n"); + return E_FAIL; + } + + return S_OK; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index c086066..387d561 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -438,15 +438,16 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_AddRef(ID3D10SamplerState *if static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *iface) { - struct d3d10_sampler_state *This = impl_from_ID3D10SamplerState(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_sampler_decref(This->wined3d_sampler); - HeapFree(GetProcessHeap(), 0, This); + wined3d_sampler_decref(state->wined3d_sampler); + wine_rb_remove(&state->device->sampler_states, &state->desc); + HeapFree(GetProcessHeap(), 0, state); } return refcount; @@ -512,12 +513,14 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device, + const D3D10_SAMPLER_DESC *desc) { HRESULT hr; state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; + state->device = device; state->desc = *desc; if (FAILED(hr = wined3d_sampler_create(state, &state->wined3d_sampler))) @@ -526,6 +529,13 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_ return hr; } + if (wine_rb_put(&device->sampler_states, desc, &state->entry) == -1) + { + ERR("Failed to insert sampler state entry.\n"); + wined3d_sampler_decref(state->wined3d_sampler); + return E_FAIL; + } + return S_OK; }

1 0

Piotr Caban : msvcrt: Fixed floating point numbers printing when flags.Sign =' '.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: d958ecbc6931cc560b5b2c562a4bcd1b1b84a68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d958ecbc6931cc560b5b2c562… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:15:12 2012 +0100 msvcrt: Fixed floating point numbers printing when flags.Sign=' '. --- dlls/msvcrt/printf.h | 40 +++++++++++++++++++++++----------------- dlls/msvcrt/tests/printf.c | 20 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 0500360..d02115e 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -78,7 +78,7 @@ static inline int FUNC_NAME(pf_fill)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ct { int i, r = 0, written; - if(flags->Sign && !(flags->Format=='d' || flags->Format=='i')) + if(flags->Sign && !strchr("diaeEfgG", flags->Format)) flags->Sign = 0; if(left && flags->Sign) { @@ -228,18 +228,8 @@ static inline int FUNC_NAME(pf_handle_string)(FUNC_NAME(puts_clbk) pf_puts, void static inline void FUNC_NAME(pf_rebuild_format_string)(char *p, FUNC_NAME(pf_flags) *flags) { *p++ = '%'; - if(flags->Sign) - *p++ = flags->Sign; - if(flags->LeftAlign) - *p++ = flags->LeftAlign; if(flags->Alternate) *p++ = flags->Alternate; - if(flags->PadZero) - *p++ = flags->PadZero; - if(flags->FieldLength) { - sprintf(p, "%d", flags->FieldLength); - p += strlen(p); - } if(flags->Precision >= 0) { sprintf(p, ".%d", flags->Precision); p += strlen(p); @@ -541,8 +531,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API HeapFree(GetProcessHeap(), 0, tmp); } else if(flags.Format && strchr("aeEfgG", flags.Format)) { char float_fmt[20], buf_a[32], *tmp = buf_a, *decimal_point; - int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; + int len = flags.Precision + 10; double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; + int r; if(flags.Format=='f') { if(val>-10.0 && val<10.0) @@ -552,16 +543,20 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API /* Default precision is 6, additional space for sign, separator and nullbyte is required */ i += (flags.Precision==-1 ? 6 : flags.Precision) + 3; - if(i > max_len) - max_len = i; + if(i > len) + len = i; } - if(max_len > sizeof(buf_a)) - tmp = HeapAlloc(GetProcessHeap(), 0, max_len); + if(len > sizeof(buf_a)) + tmp = HeapAlloc(GetProcessHeap(), 0, len); if(!tmp) return -1; FUNC_NAME(pf_rebuild_format_string)(float_fmt, &flags); + if(val < 0) { + flags.Sign = '-'; + val = -val; + } sprintf(tmp, float_fmt, val); if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') @@ -571,9 +566,20 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(decimal_point) *decimal_point = *locinfo->lconv->decimal_point; - i = FUNC_NAME(pf_output_str)(pf_puts, puts_ctx, tmp, strlen(tmp), locinfo); + len = strlen(tmp); + i = FUNC_NAME(pf_fill)(pf_puts, puts_ctx, len, &flags, TRUE); + if(i < 0) + return i; + r = FUNC_NAME(pf_output_str)(pf_puts, puts_ctx, tmp, len, locinfo); + if(r < 0) + return r; + i += r; if(tmp != buf_a) HeapFree(GetProcessHeap(), 0, tmp); + r = FUNC_NAME(pf_fill)(pf_puts, puts_ctx, len, &flags, FALSE); + if(r < 0) + return r; + i += r; } else { if(invoke_invalid_param_handler) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 1507a01..7780327 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -515,6 +515,26 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"8.6000e+000"), "failed\n"); ok( r==11, "return count wrong\n"); + format = "% 2.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer," 8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + + format = "% 014.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer," 008.6000e+000"), "failed: %s\n", buffer); + ok( r==14, "return count wrong\n"); + + format = "% 2.4e"; + r = sprintf(buffer, format,-8.6); + ok(!strcmp(buffer,"-8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + + format = "%+2.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer,"+8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + format = "%2.4g"; r = sprintf(buffer, format,8.6); ok(!strcmp(buffer,"8.6"), "failed\n");

1 0

Andrew Talbot : msvcp100: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 4bb92e1897abbdd8327618d03c621c874c784efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb92e1897abbdd8327618d03… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 10 18:00:25 2012 +0000 msvcp100: Avoid signed-unsigned integer comparisons. --- dlls/msvcp100/ios.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 58b60db..16677f2 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -2074,7 +2074,7 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + size_t mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); @@ -2218,7 +2218,8 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) { char ch, buf[128], *to_next; const char *buf_next; - int c, i; + int c; + size_t i; TRACE("(%p)\n", this); @@ -2247,8 +2248,12 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) continue; } - for(i--; i>=buf_next-buf; i--) - ungetc(buf[i], this->file); + { + ptrdiff_t j; + + for(j = --i; j >= buf_next-buf; j--) + ungetc(buf[j], this->file); + } return ch; case CODECVT_noconv: return (unsigned char)buf[0]; @@ -2666,7 +2671,8 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this) wchar_t ch, *to_next; char buf[128]; const char *buf_next; - int c, i; + int c; + size_t i; TRACE("(%p)\n", this); @@ -2692,8 +2698,12 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this) if(to_next == &ch) continue; - for(i--; i>=buf_next-buf; i--) - ungetc(buf[i], this->file); + { + ptrdiff_t j; + + for(j = --i; j >= buf_next-buf; j--) + ungetc(buf[j], this->file); + } return ch; case CODECVT_noconv: if(i+1 < sizeof(wchar_t))

1 0

Jacek Caban : atl: Reimplemented AtlModuleLoadTypeLib on top of AtlLoadTypeLib.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 9e2d5cae7367a716f4b1ce08dcfe63d24f6acdd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2d5cae7367a716f4b1ce08d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 11 13:03:04 2012 +0100 atl: Reimplemented AtlModuleLoadTypeLib on top of AtlLoadTypeLib. --- dlls/atl/atl_main.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 415fbc3..8f8cd76 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -111,25 +111,12 @@ static _ATL_OBJMAP_ENTRYW_V1 *get_objmap_entry( _ATL_MODULEW *mod, unsigned int HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib) { - HRESULT hRes; - OLECHAR path[MAX_PATH+8]; /* leave some space for index */ - TRACE("(%p, %s, %p, %p)\n", pM, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); if (!pM) return E_INVALIDARG; - GetModuleFileNameW(pM->m_hInstTypeLib, path, MAX_PATH); - if (lpszIndex) - lstrcatW(path, lpszIndex); - - hRes = LoadTypeLib(path, ppTypeLib); - if (FAILED(hRes)) - return hRes; - - *pbstrPath = SysAllocString(path); - - return S_OK; + return AtlLoadTypeLib(pM->m_hInstTypeLib, lpszIndex, pbstrPath, ppTypeLib); } HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM)

1 0

Michael Stefaniuc : localui: Avoid sizeof on structs with a varlength array .
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: f417dc1efbd227c6c88ab57143c2f8363d62c0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f417dc1efbd227c6c88ab5714… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 11 13:35:40 2012 +0100 localui: Avoid sizeof on structs with a varlength array. --- dlls/localui/localui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index b9e4c4e..382e2db 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -122,7 +122,7 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) shortname[len-1] = '\0'; /* get current settings */ - len = sizeof(cfg); + len = FIELD_OFFSET(COMMCONFIG, wcProviderData[1]); status = ERROR_SUCCESS; res = XcvDataW( hXcv, cmd_GetDefaultCommConfigW, (PBYTE) shortname,

1 0

Alexandre Julliard : gdi32: Fix text justification to properly handle logical coordinates.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 351e58318ab453d88efb236bc350099d2c151634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351e58318ab453d88efb236bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 16:52:43 2012 +0100 gdi32: Fix text justification to properly handle logical coordinates. --- dlls/gdi32/font.c | 13 ++++++------- dlls/gdi32/tests/dc.c | 13 +++++++++++++ dlls/gdi32/tests/font.c | 40 ++++++++++++++++++++++++---------------- 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3d75682..34520f5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1189,7 +1189,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, /* Perform device size to world size transformations. */ if (ret) { - INT extra = dc->charExtra, + INT extra = abs(INTERNAL_XWSTODS(dc, dc->charExtra)), breakExtra = dc->breakExtra, breakRem = dc->breakRem, i; @@ -1198,7 +1198,6 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, { for (i = 0; i < count; ++i) { - dxs[i] = abs(INTERNAL_XDSTOWS(dc, dxs[i])); dxs[i] += (i+1) * extra; if (count > 1 && (breakExtra || breakRem) && str[i] == tm.tmBreakChar) { @@ -1209,15 +1208,12 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, dxs[i]++; } } + dxs[i] = abs(INTERNAL_XDSTOWS(dc, dxs[i])); if (dxs[i] <= maxExt) ++nFit; } - breakRem = dc->breakRem; } - size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); - size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); - - if (!dxs && count > 1 && (breakExtra || breakRem)) + else if (count > 1 && (breakExtra || breakRem)) { for (i = 0; i < count; i++) { @@ -1232,6 +1228,9 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, } } } + size->cx += count * extra; + size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); + size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); } if (lpnFit) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 8baacc2..802d82a 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -58,6 +58,7 @@ static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; + int extra; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -86,6 +87,18 @@ static void test_dc_values(void) color = GetTextColor( hdc ); ok( color == 0, "wrong color %08x\n", color ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 0, "initial extra %d\n", extra ); + SetTextCharacterExtra( hdc, 123 ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + SetMapMode( hdc, MM_LOMETRIC ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + SetMapMode( hdc, MM_TEXT ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + DeleteDC( hdc ); } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1064ce2..8508d70 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1753,18 +1753,17 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { INT y, breakCount, - justifiedWidth = 0, /* to test GetTextExtentExPointW() */ areaWidth = clientArea->right - clientArea->left, nErrors = 0, e; - BOOL lastExtent = FALSE; PSTR pFirstChar, pLastChar; SIZE size; TEXTMETRICA tm; struct err { - char extent[100]; + char *start; + int len; int GetTextExtentExPointWWidth; - } error[10]; + } error[20]; GetTextMetricsA(hdc, &tm); y = clientArea->top; @@ -1803,18 +1802,16 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { SetTextJustification(hdc, areaWidth - size.cx, breakCount); GetTextExtentPoint32(hdc, pFirstChar, pLastChar - pFirstChar, &size); - justifiedWidth = size.cx; + if (size.cx != areaWidth && nErrors < sizeof(error)/sizeof(error[0]) - 1) + { + error[nErrors].start = pFirstChar; + error[nErrors].len = pLastChar - pFirstChar; + error[nErrors].GetTextExtentExPointWWidth = size.cx; + nErrors++; + } } - else lastExtent = TRUE; - /* catch errors and report them */ - if (!lastExtent && (justifiedWidth != areaWidth)) - { - memset(error[nErrors].extent, 0, 100); - memcpy(error[nErrors].extent, pFirstChar, pLastChar - pFirstChar); - error[nErrors].GetTextExtentExPointWWidth = justifiedWidth; - nErrors++; - } + trace( "%u %.*s\n", size.cx, (int)(pLastChar - pFirstChar), pFirstChar); y += size.cy; str = pLastChar; @@ -1825,8 +1822,8 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ ok(error[e].GetTextExtentExPointWWidth == areaWidth, - "GetTextExtentPointW() for \"%s\" should have returned a width of %d, not %d.\n", - error[e].extent, areaWidth, error[e].GetTextExtentExPointWWidth); + "GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", + error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); } } @@ -1862,6 +1859,17 @@ static void test_SetTextJustification(void) testJustification(hdc, testText, &clientArea); + SetMapMode( hdc, MM_ANISOTROPIC ); + SetWindowExtEx( hdc, 2, 2, NULL ); + GetClientRect( hwnd, &clientArea ); + DPtoLP( hdc, (POINT *)&clientArea, 2 ); + testJustification(hdc, testText, &clientArea); + + SetViewportExtEx( hdc, 3, 3, NULL ); + GetClientRect( hwnd, &clientArea ); + DPtoLP( hdc, (POINT *)&clientArea, 2 ); + testJustification(hdc, testText, &clientArea); + DeleteObject(hfont); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd);

1 0

Hans Leidekker : msi: Don' t set the Preselected property for a full reinstall.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: c66b78a81000f48d9dda76ef2b30a75f39a16bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66b78a81000f48d9dda76ef2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 11 14:04:16 2012 +0100 msi: Don't set the Preselected property for a full reinstall. --- dlls/msi/action.c | 3 ++- dlls/msi/msipriv.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 076d1b3..babf0f0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1784,7 +1784,7 @@ static BOOL process_overrides( MSIPACKAGE *package, int level ) ret |= process_state_property( package, level, szReinstall, INSTALLSTATE_UNKNOWN ); ret |= process_state_property( package, level, szAdvertise, INSTALLSTATE_ADVERTISED ); - if (ret) + if (ret && !package->full_reinstall) msi_set_property( package->db, szPreselected, szOne, -1 ); return ret; @@ -7785,6 +7785,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, { TRACE("setting REINSTALL property to ALL\n"); msi_set_property( package->db, szReinstall, szAll, -1 ); + package->full_reinstall = 1; } /* properties may have been added by a transform */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4110ec6..c7a42cb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -414,6 +414,7 @@ typedef struct tagMSIPACKAGE unsigned char need_reboot_at_end : 1; unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; + unsigned char full_reinstall : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW

1 0

Hans Leidekker : advapi32: Add support for filtering credentials on MacOS in CredEnumerateW.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: ffa6dbe0b11110af5d02761867f41dc134cee060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa6dbe0b11110af5d0276186… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 7 17:09:25 2012 +0100 advapi32: Add support for filtering credentials on MacOS in CredEnumerateW. --- dlls/advapi32/cred.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index b735821..e17dfb6 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -716,7 +716,7 @@ static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type) return key_name; } -static BOOL credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) +static BOOL registry_credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) { LPWSTR target_name; DWORD ret; @@ -777,7 +777,7 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter, ret = RegOpenKeyExW(hkeyMgr, target_name, 0, KEY_QUERY_VALUE, &hkeyCred); if (ret != ERROR_SUCCESS) continue; - if (!credential_matches_filter(hkeyCred, filter)) + if (!registry_credential_matches_filter(hkeyCred, filter)) { RegCloseKey(hkeyCred); continue; @@ -801,6 +801,30 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter, } #ifdef __APPLE__ +static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCHAR *filter) +{ + int len; + WCHAR *target_name; + const WCHAR *p; + BOOL ret; + + if (!filter) return TRUE; + + len = MultiByteToWideChar(CP_UTF8, 0, data, data_len, NULL, 0); + if (!(target_name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, data, data_len, target_name, len); + target_name[len] = 0; + + TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); + + p = strchrW(filter, '*'); + ret = CompareStringW(GetThreadLocale(), 0, filter, + (p && !p[1] ? p - filter : -1), target_name, + (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; + HeapFree(GetProcessHeap(), 0, target_name); + return ret; +} + static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials, char *buffer, DWORD *len, DWORD *count) { @@ -821,6 +845,8 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials SecKeychainAttributeInfo info; SecKeychainAttributeList *attr_list; UInt32 info_tags[] = { kSecServerItemAttr }; + BOOL match; + info.count = sizeof(info_tags)/sizeof(info_tags[0]); info.tag = info_tags; info.format = NULL; @@ -837,10 +863,15 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials } else *len += sizeof(CREDENTIALW); - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) continue; + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) + { + SecKeychainItemFreeAttributesAndData(attr_list, NULL); + continue; + } TRACE("server item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); - /* FIXME: filter based on attr_list->attr[0].data */ + match = mac_credential_matches_filter(attr_list->attr[0].data, attr_list->attr[0].length, filter); SecKeychainItemFreeAttributesAndData(attr_list, NULL); + if (!match) continue; ret = mac_read_credential_from_item(item, FALSE, buffer ? credentials[*count] : NULL, buffer ? buffer + sizeof(CREDENTIALW) : NULL,

1 0

Alexandre Julliard : winex11: Send WM_ENTERSIZEMOVE when starting to poll for a window move/resize.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 91ebca2bf10e3ef5edcb65868a8f3ce96d514e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ebca2bf10e3ef5edcb65868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 13:57:35 2012 +0100 winex11: Send WM_ENTERSIZEMOVE when starting to poll for a window move/resize. --- dlls/winex11.drv/mouse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 47a453c..8870665 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1350,6 +1350,8 @@ void move_resize_window( HWND hwnd, int dir ) /* (some apps don't like it if we return before the size/move is done) */ if (!button) return; + SendMessageW( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); + for (;;) { MSG msg;

1 0

Amine Khaldi : include: Define LIST_ENTRY using the standard offsetof.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 9b4e92a6f153ed4139c8e8c54b6bb0213a66bfc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4e92a6f153ed4139c8e8c54… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:16:46 2012 +0100 include: Define LIST_ENTRY using the standard offsetof. --- include/wine/list.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index 9712603..b4d681f 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -21,6 +21,8 @@ #ifndef __WINE_SERVER_LIST_H #define __WINE_SERVER_LIST_H +#include <stddef.h> + struct list { struct list *next; @@ -227,6 +229,6 @@ static inline void list_move_head( struct list *dst, struct list *src ) /* get pointer to object containing list element */ #undef LIST_ENTRY #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (size_t)(&((type *)0)->field))) + ((type *)((char *)(elem) - offsetof(type, field))) #endif /* __WINE_SERVER_LIST_H */

1 0