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

Hans Leidekker : usp10: Remove redundant code from ScriptTextOut.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 20ae9be59516b28efd1389b6b6c2314b6cf9bfcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ae9be59516b28efd1389b6b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu May 1 17:41:46 2008 +0200 usp10: Remove redundant code from ScriptTextOut. --- dlls/usp10/usp10.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e8e9bf0..5e6b147 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1407,7 +1407,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HFONT hfont; HRESULT hr = S_OK; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", @@ -1416,9 +1415,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc && psc && !*psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); fuOptions &= ETO_CLIPPED + ETO_OPAQUE; if (!psa->fNoGlyphIndex) /* Have Glyphs? */ @@ -1427,7 +1423,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) hr = S_FALSE; - unselect_cached_font(psc, hfont); return hr; }

1 0

Hans Leidekker : usp10: Fix a few failing tests and make them pass on Wine.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: c1e686429a730ce850c5877bda968eb2a5a8c51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e686429a730ce850c5877bd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu May 1 17:42:03 2008 +0200 usp10: Fix a few failing tests and make them pass on Wine. --- dlls/usp10/tests/usp10.c | 8 +++++--- dlls/usp10/usp10.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b0a0b85..252f7d9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -498,7 +498,7 @@ static void test_ScriptTextOut(HDC hdc) hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (psc == NULL, "psc should be null\n"); /* Test Rect Rgn is acceptable */ rect.top = 10; @@ -508,7 +508,7 @@ static void test_ScriptTextOut(HDC hdc) hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (psc == NULL, "psc should be null\n"); iCP = 1; hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust, @@ -953,7 +953,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) /* * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail */ - ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr); + ok(hr == E_INVALIDARG || + hr == E_FAIL, /* win2k3 */ + "ScriptStringFree should return E_INVALIDARG or E_FAIL not %08x\n", hr); } } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5e6b147..57e6611 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1413,7 +1413,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); - if (!hdc && psc && !*psc) return E_INVALIDARG; + if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; fuOptions &= ETO_CLIPPED + ETO_OPAQUE;

1 0

Rob Shearman : widl: Consolidate writing of COM and dispatch interfaces into one function to remove duplicated code .
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 033cade616dcd12a47d3f74babc7b47233559f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033cade616dcd12a47d3f74ba… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 1 12:35:31 2008 +0100 widl: Consolidate writing of COM and dispatch interfaces into one function to remove duplicated code. Split up the writing into start and end to eventually support the style MIDL uses where it writes declared types, etc. between the start and end of the interface. Make internal header functions take the file pointer to print to. Don't write interface IDs for non-object interfaces and always write handle declarations even if the interface has no methods, like MIDL does. --- tools/widl/header.c | 199 +++++++++++++++++++++++---------------------------- tools/widl/header.h | 1 - tools/widl/parser.y | 4 +- 3 files changed, 93 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=033cade616dcd12a47d3f…

1 0

Paul Vriens : winecfg: Better alignment of text and combobox.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 550aaaded571b1204bfcd04c732eec03c9ce52a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550aaaded571b1204bfcd04c7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu May 1 17:05:12 2008 +0200 winecfg: Better alignment of text and combobox. --- programs/winecfg/Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index d917c72..cdb9093 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -74,8 +74,8 @@ BEGIN EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,110,80,32 - COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,110,100,32 + COMBOBOX IDC_D3D_VSHADER_MODE,120,108,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 GROUPBOX " Screen &Resolution ",IDC_STATIC,8,151,244,93

1 0

Paul Vriens : urlmon/tests: Fix timeout for tests on win9x.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 3a3246527ae07868632e7f4c40b6a1d900532738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a3246527ae07868632e7f4c4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu May 1 15:27:16 2008 +0200 urlmon/tests: Fix timeout for tests on win9x. --- dlls/urlmon/tests/url.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5c8505c..592eefa 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -449,6 +449,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, LPWSTR additional_headers = (LPWSTR)0xdeadbeef; BYTE sec_id[100]; DWORD fetched = 256, size = 100; + DWORD tid; static const WCHAR wszMimes[] = {'*','/','*',0}; @@ -518,7 +519,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink_AddRef(pOIProtSink); protocol_sink = pOIProtSink; - CreateThread(NULL, 0, thread_proc, NULL, 0, NULL); + CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); return S_OK; }

1 0

Paul Vriens : user32/tests: Run tests again on win95.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 587f14da0b4fcb224fce58c19f488cfb1e53a965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587f14da0b4fcb224fce58c19… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu May 1 16:34:39 2008 +0200 user32/tests: Run tests again on win95. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f7df8b5..26ceb55 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4585,7 +4585,7 @@ static LRESULT CALLBACK TestExposedRegion_WndProc(HWND hwnd, UINT msg, WPARAM wP 10,10,50,50, NULL, NULL, 0, NULL); DestroyWindow(win); - waitResult = MsgWaitForMultipleObjectsEx( 0, NULL, waitTime, QS_PAINT, 0 ); + waitResult = MsgWaitForMultipleObjects( 0, NULL, FALSE, waitTime, QS_PAINT ); ValidateRect(hwnd, NULL); EndPaint(hwnd, &ps);

1 0

Eric Pouech : winedbg: Added ability to print properly float/double values.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: bd6b394e84ca5c12c59cf81d4bc35b9afce09224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6b394e84ca5c12c59cf81d4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 1 13:57:18 2008 +0200 winedbg: Added ability to print properly float/double values. --- programs/winedbg/memory.c | 65 +++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 34 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index d417610..50fe3df 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -466,56 +466,53 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) */ void print_basic(const struct dbg_lvalue* lvalue, int count, char format) { - LONGLONG res; - if (lvalue->type.id == dbg_itype_none) { dbg_printf("Unable to evaluate expression\n"); return; } - res = types_extract_as_longlong(lvalue); - - /* FIXME: this implies i386 byte ordering */ - switch (format) + if (format != 0) { - case 'x': - dbg_printf("0x%x", (DWORD)(ULONG64)res); - break; + LONGLONG res = types_extract_as_longlong(lvalue); + WCHAR wch; - case 'd': - dbg_print_longlong(res, TRUE); - dbg_printf("\n"); - break; + /* FIXME: this implies i386 byte ordering */ + switch (format) + { + case 'x': + dbg_printf("0x%x", (DWORD)(ULONG64)res); + return; - case 'c': - dbg_printf("%d = '%c'", (char)(res & 0xff), (char)(res & 0xff)); - break; + case 'd': + dbg_print_longlong(res, TRUE); + dbg_printf("\n"); + return; - case 'u': - { - WCHAR wch = (WCHAR)(res & 0xFFFF); + case 'c': + dbg_printf("%d = '%c'", (char)(res & 0xff), (char)(res & 0xff)); + return; + + case 'u': + wch = (WCHAR)(res & 0xFFFF); dbg_printf("%d = '", wch); dbg_outputW(&wch, 1); dbg_printf("'"); - } - break; + return; - case 'i': - case 's': - case 'w': - case 'b': - dbg_printf("Format specifier '%c' is meaningless in 'print' command\n", format); - case 0: - if (lvalue->type.id == dbg_itype_segptr) - { - dbg_print_longlong(res, TRUE); - dbg_printf("\n"); + case 'i': + case 's': + case 'w': + case 'b': + dbg_printf("Format specifier '%c' is meaningless in 'print' command\n", format); } - else - print_typed_basic(lvalue); - break; } + if (lvalue->type.id == dbg_itype_segptr) + { + dbg_print_longlong(types_extract_as_longlong(lvalue), TRUE); + dbg_printf("\n"); + } + else print_typed_basic(lvalue); } void print_bare_address(const ADDRESS64* addr)

1 0

Roderick Colenbrander : wined3d: Fix typo in pixel format trace.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 02bab6edbed6577b46ac55ed8064761d8767f91c URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bab6edbed6577b46ac55ed8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu May 1 12:32:40 2008 +0000 wined3d: Fix typo in pixel format trace. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 74d409d..8ac6473 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3949,7 +3949,7 @@ BOOL InitAdapters(void) { } } - TRACE("iPixelFormat=%d, iPixelType=%#x, RGBA=%d/%d/%d/%d, doubleBuffer=%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->iPixelType, cfgs->doubleBuffer, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); + TRACE("iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->iPixelType, cfgs->doubleBuffer, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); cfgs++; }

1 0

Roderick Colenbrander : wined3d: In window mode (!pbuffer) we want both a window drawable format and double buffering.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 96c770d9bfa7561b82ad31f6dd6b176634d65a3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c770d9bfa7561b82ad31f6d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu May 1 13:23:17 2008 +0000 wined3d: In window mode (!pbuffer) we want both a window drawable format and double buffering. --- dlls/wined3d/context.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c91153c..dcce127 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -140,8 +140,8 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) continue; - /* In all cases except when we are in pbuffer-mode we need a window drawable format with double buffering. */ - if(!pbuffer && !cfgs->windowDrawable && !cfgs->doubleBuffer) + /* In window mode (!pbuffer) we need a window drawable format and double buffering. */ + if(!pbuffer && !(cfgs->windowDrawable && cfgs->doubleBuffer)) continue; /* We like to have aux buffers in backbuffer mode */

1 0

Roderick Colenbrander : wined3d: We don' t want double buffering in pbuffer mode.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: cb0f0af131a9c86b8deda8ab2ab97437064141f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0f0af131a9c86b8deda8ab2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu May 1 13:26:02 2008 +0000 wined3d: We don't want double buffering in pbuffer mode. --- dlls/wined3d/context.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index dcce127..e5b82e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -148,8 +148,8 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF if(auxBuffers && !cfgs->auxBuffers) continue; - /* In pbuffer-mode we need a pbuffer-capable format */ - if(pbuffer && !cfgs->pbufferDrawable) + /* In pbuffer-mode we need a pbuffer-capable format but we don't want double buffering */ + if(pbuffer && (!cfgs->pbufferDrawable || cfgs->doubleBuffer)) continue; if(cfgs->redSize != redBits)

1 0