October 2012 - Wine-Commits

Christian Costa : quartz: Forward IMediaControl_RenderFile to IFilterGraph2_RenderFile.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 7ea44c0007c432b3ef1f6431e0d112a736e79bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea44c0007c432b3ef1f6431e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 7 22:01:00 2012 +0200 quartz: Forward IMediaControl_RenderFile to IFilterGraph2_RenderFile. --- dlls/quartz/filtergraph.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 239cf0b..58d8588 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2091,9 +2091,9 @@ static HRESULT WINAPI MediaControl_RenderFile(IMediaControl *iface, BSTR strFile { IFilterGraphImpl *This = impl_from_IMediaControl(iface); - FIXME("(%p/%p)->(%s (%p)): stub !!!\n", This, iface, debugstr_w(strFilename), strFilename); + TRACE("(%p/%p)->(%s (%p))\n", This, iface, debugstr_w(strFilename), strFilename); - return S_OK; + return IFilterGraph2_RenderFile(&This->IFilterGraph2_iface, strFilename, NULL); } static HRESULT WINAPI MediaControl_AddSourceFilter(IMediaControl *iface, BSTR strFilename,

1 0

Jacek Caban : services: Fixed memory leak.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: cea783ddda62feeff8ea4197c7ce6c5997ce3a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea783ddda62feeff8ea4197c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 13:39:29 2012 +0200 services: Fixed memory leak. --- programs/services/rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 9031430..bf8ce80 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -456,8 +456,10 @@ DWORD __cdecl svcctl_CreateServiceW( return err; err = parse_dependencies((LPCWSTR)lpDependencies, entry); - if (err != ERROR_SUCCESS) + if (err != ERROR_SUCCESS) { + free_service_entry(entry); return err; + } entry->ref_count = 1; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType;

1 0

Erich Hoover : setupapi: Report the correct target file with SPFILENOTIFY_FILEEXTRACTED.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 2ee8cd5a6c15af5890145d9c05c31cbeca592eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee8cd5a6c15af5890145d9c0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Oct 4 12:49:14 2012 -0600 setupapi: Report the correct target file with SPFILENOTIFY_FILEEXTRACTED. --- dlls/setupapi/setupcab.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index ea1bc99..d92ca6a 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -82,6 +82,7 @@ typedef struct { PSP_FILE_CALLBACK_A msghandler; PVOID context; CHAR most_recent_cabinet_name[MAX_PATH]; + CHAR most_recent_target[MAX_PATH]; } SC_HSC_A, *PSC_HSC_A; #define SC_HSC_W_MAGIC 0x0CABFEED @@ -91,6 +92,7 @@ typedef struct { PSP_FILE_CALLBACK_W msghandler; PVOID context; WCHAR most_recent_cabinet_name[MAX_PATH]; + WCHAR most_recent_target[MAX_PATH]; } SC_HSC_W, *PSC_HSC_W; WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -337,6 +339,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p SetLastError(ERROR_PATH_NOT_FOUND); return -1; } + strcpy( phsc->most_recent_target, fici.FullTargetName ); return sc_cb_open(fici.FullTargetName, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); @@ -348,7 +351,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ fp.Source = phsc->most_recent_cabinet_name; - fp.Target = pfdin->psz1; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* the following should be a fixme -- but it occurs too many times */ @@ -477,6 +480,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p SetLastError(ERROR_PATH_NOT_FOUND); return -1; } + strcpyW( phsc->most_recent_target, fici.FullTargetName ); return sc_cb_open(charbuf, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); @@ -488,10 +492,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ fp.Source = phsc->most_recent_cabinet_name; - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, buf, MAX_PATH); - if ((len > MAX_PATH) || (len <= 1)) - buf[0] = '\0'; - fp.Target = buf; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* a valid fixme -- but occurs too many times */

1 0

Henri Verbeet : d3d10: Handle blend state in d3d10_effect_object_apply().
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: eda5c393350571d92aa7ce0638e89832d259af6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda5c393350571d92aa7ce063… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:38 2012 +0200 d3d10: Handle blend state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 20 +++++++++++++++++++- dlls/d3d10/tests/effect.c | 9 ++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index fc9cb41..9449da1 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -76,6 +76,7 @@ struct d3d10_effect_object { ID3D10RasterizerState *rs; ID3D10DepthStencilState *ds; + ID3D10BlendState *bs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4b26562..1afa0b5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1355,6 +1355,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } + case D3D10_EOT_BLEND_STATE: + { + ID3D10EffectBlendVariable *bv = variable->lpVtbl->AsBlend(variable); + if (FAILED(hr = bv->lpVtbl->GetBlendState(bv, variable_idx, &o->object.bs))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1385,7 +1393,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: case D3D10_EOT_BLEND_FACTOR: case D3D10_EOT_SAMPLE_MASK: @@ -2181,6 +2188,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); return S_OK; + case D3D10_EOT_BLEND_STATE: + ID3D10Device_OMSetBlendState(device, o->object.bs, o->pass->blend_factor, o->pass->sample_mask); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2194,6 +2205,8 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) return S_OK; case D3D10_EOT_STENCIL_REF: + case D3D10_EOT_BLEND_FACTOR: + case D3D10_EOT_SAMPLE_MASK: return S_OK; default: @@ -2293,6 +2306,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) ID3D10DepthStencilState_Release(o->object.ds); break; + case D3D10_EOT_BLEND_STATE: + if (o->object.bs) + ID3D10BlendState_Release(o->object.bs); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ce5e18e..7f5ce0a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3922,12 +3922,7 @@ static void test_effect_state_groups(ID3D10Device *device) ok(pass_desc.BlendFactor[2] == 0.7f, "Got unexpected BlendFactor[2] %.8e.\n", pass_desc.BlendFactor[2]); ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); hr = pass->lpVtbl->Apply(pass, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); - if (FAILED(hr)) - { - effect->lpVtbl->Release(effect); - return; - } + ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ID3D10BlendState_GetDesc(blend_state, &blend_desc); @@ -3958,7 +3953,7 @@ static void test_effect_state_groups(ID3D10Device *device) ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask);

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_sampler_variable_GetSampler() .
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 7cea4645c56257143fe93665a0aa26c469a354d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cea4645c56257143fe93665a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:39 2012 +0200 d3d10: Implement d3d10_effect_sampler_variable_GetSampler(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 9449da1..dbd72ba 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -117,6 +117,7 @@ struct d3d10_effect_state_object_variable ID3D10RasterizerState *rasterizer; ID3D10DepthStencilState *depth_stencil; ID3D10BlendState *blend; + ID3D10SamplerState *sampler; } object; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1afa0b5..c465c43 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1608,6 +1608,9 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) break; case D3D10_SVT_SAMPLER: + if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + &v->u.state.desc.sampler, &v->u.state.object.sampler))) + return hr; break; default: @@ -6778,9 +6781,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetRawValue(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetSampler(ID3D10EffectSamplerVariable *iface, UINT index, ID3D10SamplerState **sampler) { - FIXME("iface %p, index %u, sampler %p stub!\n", iface, index, sampler); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, sampler %p.\n", iface, index, sampler); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_SAMPLER) + { + WARN("Variable is not a sampler state.\n"); + return E_FAIL; + } + + if ((*sampler = v->u.state.object.sampler)) + ID3D10SamplerState_AddRef(*sampler); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(ID3D10EffectSamplerVariable *iface,

1 0

André Hentschel : winemaker: Always use parent project for project files.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 2c3121d5335055eb545f306a882fe61c585e5bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3121d5335055eb545f306a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 8 23:45:27 2012 +0200 winemaker: Always use parent project for project files. --- tools/winemaker | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 58d6bfe..d23418d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -562,15 +562,7 @@ sub source_scan_project_file($$$) $path.="/"; } - if (defined $opt_single_target or $is_sub_project == 0) { - # Either there is a single target and thus a single project, - # or we are a single project-file for which a project - # already exists - $project=$parent_project; - } else { - $project=[]; - project_init($project, $path, \@global_settings); - } + $project=$parent_project; my $project_settings=@$project[$P_SETTINGS]; if ($filename =~ /.dsp$/i) {

1 0

André Hentschel : winemaker: Include the target specific dll path when linking.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 9b2eb6e6ea7296cc79e3917ce831927142adc0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2eb6e6ea7296cc79e3917ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 8 23:48:27 2012 +0200 winemaker: Include the target specific dll path when linking. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index d23418d..4e32fc1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2589,7 +2589,7 @@ sub generate_project_files($) } else { print FILEO "\t\$(CC)"; } - print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_LIBRARY_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n"; + print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_LIBRARY_PATH) \$(${canon}_DLL_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n"; } print FILEO "\n\n"; }

1 0

Dmitry Timoshkov : gdiplus: Add more font transformation tests.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 8fd422499bb31eb0202e9b48904aa06158cffe9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd422499bb31eb0202e9b489… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 9 18:41:47 2012 +0900 gdiplus: Add more font transformation tests. --- dlls/gdiplus/tests/font.c | 177 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 176 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0ac9558..d710a5b 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -26,7 +26,8 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) -#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %f, got %f\n", expected, got) +#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) +#define expectf(expected, got) expectf_((expected), (got), 0.001) static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; @@ -36,6 +37,14 @@ static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w',' static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; +static void set_rect_empty(RectF *rc) +{ + rc->X = 0.0; + rc->Y = 0.0; + rc->Width = 0.0; + rc->Height = 0.0; +} + static void test_createfont(void) { GpFontFamily* fontfamily = NULL, *fontfamily2; @@ -806,17 +815,30 @@ todo_wine static void test_font_transform(void) { + static const WCHAR string[] = { 'A',0 }; GpStatus status; HDC hdc; LOGFONT lf; GpFont *font; GpGraphics *graphics; GpMatrix *matrix; + GpStringFormat *format, *typographic; + PointF pos[1] = { { 0,0 } }; + REAL height; + RectF bounds, rect; hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); + status = GdipSetPageUnit(graphics, UnitPixel); + expect(Ok, status); + + status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); + expect(Ok, status); + status = GdipStringFormatGetGenericTypographic(&typographic); + expect(Ok, status); + memset(&lf, 0, sizeof(lf)); lstrcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = -100; @@ -833,6 +855,34 @@ static void test_font_transform(void) expect(Ok, status); expect(-100, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); /* scale matrix */ status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); @@ -844,6 +894,34 @@ static void test_font_transform(void) todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); /* scale + ratate matrix */ status = GdipRotateMatrix(matrix, 45.0, MatrixOrderAppend); @@ -855,6 +933,34 @@ todo_wine todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); /* scale + ratate + shear matrix */ status = GdipShearMatrix(matrix, 4.0, 5.0, MatrixOrderAppend); @@ -866,10 +972,79 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); + + /* scale + ratate + shear + translate matrix */ + status = GdipTranslateMatrix(matrix, 10.0, 20.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(1032, lf.lfHeight); + expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); GdipDeleteMatrix(matrix); GdipDeleteFont(font); GdipDeleteGraphics(graphics); + GdipDeleteStringFormat(typographic); + GdipDeleteStringFormat(format); DeleteDC(hdc); }

1 0

Alexandre Julliard : user32: Add support for setting the window surface visible region.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: cc7bf355c50b17b2e04f754c80464289df2a9ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7bf355c50b17b2e04f754c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 15:21:21 2012 +0200 user32: Add support for setting the window surface visible region. --- dlls/user32/win.c | 6 +++++ dlls/user32/winpos.c | 55 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/bitblt.c | 23 ++++++++++++++++++ include/wine/gdi_driver.h | 1 + 4 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7da4972..66eaf09 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -539,6 +539,11 @@ static RECT *dummy_surface_get_bounds( struct window_surface *window_surface ) return &dummy_bounds; } +static void dummy_surface_set_region( struct window_surface *window_surface, HRGN region ) +{ + /* nothing to do */ +} + static void dummy_surface_flush( struct window_surface *window_surface ) { /* nothing to do */ @@ -555,6 +560,7 @@ static const struct window_surface_funcs dummy_surface_funcs = dummy_surface_unlock, dummy_surface_get_bitmap_info, dummy_surface_get_bounds, + dummy_surface_set_region, dummy_surface_flush, dummy_surface_destroy }; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 7a0d8f9..a04bf2c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1941,6 +1941,57 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) /*********************************************************************** + * update_surface_region + */ +static void update_surface_region( HWND hwnd ) +{ + NTSTATUS status; + HRGN region = 0; + RGNDATA *data; + size_t size = 256; + WND *win = WIN_GetPtr( hwnd ); + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; + if (!win->surface) goto done; + + do + { + if (!(data = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( RGNDATA, Buffer[size] )))) goto done; + + SERVER_START_REQ( get_surface_region ) + { + req->window = wine_server_user_handle( hwnd ); + wine_server_set_reply( req, data->Buffer, size ); + if (!(status = wine_server_call( req ))) + { + size_t reply_size = wine_server_reply_size( reply ); + if (reply_size) + { + data->rdh.dwSize = sizeof(data->rdh); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = reply_size / sizeof(RECT); + data->rdh.nRgnSize = reply_size; + region = ExtCreateRegion( NULL, size, data ); + OffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top ); + } + } + else size = reply->total_size; + } + SERVER_END_REQ; + HeapFree( GetProcessHeap(), 0, data ); + } while (status == STATUS_BUFFER_OVERFLOW); + + if (status) goto done; + + win->surface->funcs->set_region( win->surface, region ); + if (region) DeleteObject( region ); + +done: + WIN_ReleasePtr( win ); +} + + +/*********************************************************************** * set_window_pos * * Backend implementation of SetWindowPos. @@ -1949,7 +2000,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) { WND *win; - HWND parent = GetAncestor( hwnd, GA_PARENT ); + HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret; int old_width; RECT visible_rect, old_visible_rect, old_window_rect; @@ -2005,6 +2056,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->visible_rect = visible_rect; old_surface = win->surface; win->surface = new_surface; + surface_win = wine_server_ptr_handle( reply->surface_win ); if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) { RECT client; @@ -2022,6 +2074,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { + if (surface_win) update_surface_region( surface_win ); if (old_surface != new_surface || ((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e1812cd..c3cf056 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1848,6 +1848,28 @@ static RECT *x11drv_surface_get_bounds( struct window_surface *window_surface ) } /*********************************************************************** + * x11drv_surface_set_region + */ +static void x11drv_surface_set_region( struct window_surface *window_surface, HRGN region ) +{ + RGNDATA *data; + struct x11drv_window_surface *surface = get_x11_surface( window_surface ); + + TRACE( "updating surface %p with %p\n", surface, region ); + + if (!region) + { + XSetClipMask( gdi_display, surface->gc, None ); + } + else if ((data = X11DRV_GetRegionData( region, 0 ))) + { + XSetClipRectangles( gdi_display, surface->gc, 0, 0, + (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); + HeapFree( GetProcessHeap(), 0, data ); + } +} + +/*********************************************************************** * x11drv_surface_flush */ static void x11drv_surface_flush( struct window_surface *window_surface ) @@ -1945,6 +1967,7 @@ static const struct window_surface_funcs x11drv_surface_funcs = x11drv_surface_unlock, x11drv_surface_get_bitmap_info, x11drv_surface_get_bounds, + x11drv_surface_set_region, x11drv_surface_flush, x11drv_surface_destroy }; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index c58803d..e942ed9 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -233,6 +233,7 @@ struct window_surface_funcs void (*unlock)( struct window_surface *surface ); void* (*get_info)( struct window_surface *surface, BITMAPINFO *info ); RECT* (*get_bounds)( struct window_surface *surface ); + void (*set_region)( struct window_surface *surface, HRGN region ); void (*flush)( struct window_surface *surface ); void (*destroy)( struct window_surface *surface ); };

1 0

Alexandre Julliard : server: Add a heuristic to avoid computing surface regions when no pixel format has been set .
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: d0c9d223713044aee3e5515f199920b7c7ec6fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c9d223713044aee3e5515f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 15:17:57 2012 +0200 server: Add a heuristic to avoid computing surface regions when no pixel format has been set. --- server/window.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 9943452..2b4bc50 100644 --- a/server/window.c +++ b/server/window.c @@ -102,6 +102,7 @@ struct window #define PAINT_ERASE 0x0020 /* needs WM_ERASEBKGND */ #define PAINT_NONCLIENT 0x0040 /* needs WM_NCPAINT */ #define PAINT_DELAYED_ERASE 0x0080 /* still needs erase after WM_ERASEBKGND */ +#define PAINT_PIXEL_FORMAT_CHILD 0x0100 /* at least one child has a custom pixel format */ /* growable array of user handles */ struct user_handle_array @@ -165,6 +166,14 @@ static inline struct window *get_last_child( struct window *win ) return ptr ? LIST_ENTRY( ptr, struct window, entry ) : NULL; } +/* set the PAINT_PIXEL_FORMAT_CHILD flag on all the parents */ +/* note: we never reset the flag, it's just a heuristic */ +static inline void update_pixel_format_flags( struct window *win ) +{ + for (win = win->parent; win && win->parent; win = win->parent) + win->paint_flags |= PAINT_PIXEL_FORMAT_CHILD; +} + /* link a window at the right place in the siblings list */ static void link_window( struct window *win, struct window *previous ) { @@ -244,6 +253,8 @@ static int set_parent_window( struct window *win, struct window *parent ) /* top-level, attach the two threads */ if (parent->thread && parent->thread != win->thread && !is_desktop_window(parent)) attach_thread_input( win->thread, parent->thread ); + + if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); } else /* move it to parent unlinked list */ { @@ -1038,6 +1049,7 @@ static struct region *clip_pixel_format_children( struct window *parent, struct offset_region( clip, offset_x, offset_y ); if (!intersect_region( clip, clip, parent_clip )) break; if (!union_region( region, region, clip )) break; + if (!(ptr->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD))) continue; /* subtract the client rect if it uses a custom pixel format */ set_region_rect( clip, &ptr->client_rect ); @@ -2238,6 +2250,7 @@ DECL_HANDLER(set_window_pos) } win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); + if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); if (get_req_data_size() >= 3 * sizeof(rectangle_t)) { @@ -2256,7 +2269,10 @@ DECL_HANDLER(set_window_pos) reply->new_ex_style = win->ex_style; top = get_top_clipping_window( win ); - if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE)) reply->surface_win = top->handle; + if (is_visible( top ) && + (top->paint_flags & PAINT_HAS_SURFACE) && + (top->paint_flags & PAINT_PIXEL_FORMAT_CHILD)) + reply->surface_win = top->handle; }

1 0