April 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : winetest: Reject test runs with more than 10 tests skipped by user request.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: tools Branch: master Commit: 75331276b34dea6e5fdddf7e9583ba11f0f6066a URL: http://source.winehq.org/git/tools.git/?a=commit;h=75331276b34dea6e5fdddf7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 21 12:09:15 2011 +0200 winetest: Reject test runs with more than 10 tests skipped by user request. --- winetest/dissect | 5 ++++- winetest/winetest.conf | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 9dd1903..d0b830b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -33,7 +33,7 @@ use open ':utf8'; use CGI qw(:standard); charset("utf-8"); -use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxfilesize/; +use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize/; require "winetest.conf"; my $name0=$0; @@ -220,6 +220,7 @@ if ($wine_build) { $merge_base eq $testbuild or mydie "wine build '$wine_build' not a descendant of build $testbuild\n"; } +my $user_skips = 0; my %dllinfo; /^Dll info:\r?$/ or mydie "no Dll info header: $_"; $box->{data} .= "<h2>DLL version</h2>\n"; @@ -236,6 +237,7 @@ while ($_ = <IN>) { elsif ($2 eq "skipped") { print SUM "- $module - skipped - - - - -\n"; + mydie "too many dlls skipped by user request\n" if ++$user_skips > $maxuserskips; } } @@ -262,6 +264,7 @@ while (<IN>) { $testbox->{data} .= sprintf "<div class=\"test result skipped\">Skipped by user request.</div>\n"; print SUM "- $dll $unit skipped - - - $source $rev\n"; $dll = undef; + mydie "too many tests skipped by user request\n" if ++$user_skips > $maxuserskips; } } elsif (/^(.*$unit.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index b240ac0..9699503 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -11,6 +11,9 @@ $gitweb = "http://source.winehq.org/git/wine.git"; # Maximum number of reports for one version and tag $maxmult = 10; +# Maximum allowed number of explicit user skips +$maxuserskips = 10; + # Maximum size of the report file # This should be in line with programs\winetest\send.c $maxfilesize = 1.5 * 1024 * 1024;

1 0

Alexandre Julliard : winetest: Reject test runs from Win9x versions.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: tools Branch: master Commit: 0d2912edd386cef73bee0f9b5805e9a69e838252 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d2912edd386cef73bee0f9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 21 12:15:37 2011 +0200 winetest: Reject test runs from Win9x versions. --- winetest/dissect | 4 +++- winetest/winetest.conf | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d0b830b..03dcfd1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -33,7 +33,7 @@ use open ':utf8'; use CGI qw(:standard); charset("utf-8"); -use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize/; +use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize $acceptwin9x/; require "winetest.conf"; my $name0=$0; @@ -152,6 +152,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n"; +if ($plid != 2) { mydie "platform $plid not accepted\n" unless $acceptwin9x; } + $version = "unknown"; if ($plid==1 && $major==4) { if ($minor==0) { diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 9699503..3231d06 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -14,6 +14,9 @@ $maxmult = 10; # Maximum allowed number of explicit user skips $maxuserskips = 10; +# Whether to accept test results from Win9x versions +$acceptwin9x = 0; + # Maximum size of the report file # This should be in line with programs\winetest\send.c $maxfilesize = 1.5 * 1024 * 1024;

1 0

Dmitry Timoshkov : winex11.drv: Make sure that all relevant keyboard traces are printed in the same debug channel .
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: f339b6c0f166a2117f78010e79fe622138db07dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f339b6c0f166a2117f78010e7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 20 18:57:38 2011 +0900 winex11.drv: Make sure that all relevant keyboard traces are printed in the same debug channel. --- dlls/winex11.drv/keyboard.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 4185025..42ca462 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1144,7 +1144,7 @@ static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD f { INPUT input; - TRACE_(key)( "vkey=%04x scan=%04x flags=%04x\n", vkey, scan, flags ); + TRACE_(key)( "hwnd %p vkey=%04x scan=%04x flags=%04x\n", hwnd, vkey, scan, flags ); input.type = INPUT_KEYBOARD; input.u.ki.wVk = vkey; @@ -1295,13 +1295,13 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) if (xic && event->type == KeyPress) { ascii_chars = XmbLookupString(xic, event, buf, sizeof(buf), &keysym, &status); - TRACE("XmbLookupString needs %i byte(s)\n", ascii_chars); + TRACE_(key)("XmbLookupString needs %i byte(s)\n", ascii_chars); if (status == XBufferOverflow) { Str = HeapAlloc(GetProcessHeap(), 0, ascii_chars); if (Str == NULL) { - ERR("Failed to allocate memory!\n"); + ERR_(key)("Failed to allocate memory!\n"); wine_tsx11_unlock(); return; } @@ -2402,16 +2402,16 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (scanCode & 0x8000) { - TRACE("Key UP, doing nothing\n" ); + TRACE_(key)("Key UP, doing nothing\n" ); return 0; } if (!match_x11_keyboard_layout(hkl)) - FIXME("keyboard layout %p is not supported\n", hkl); + FIXME_(key)("keyboard layout %p is not supported\n", hkl); if ((lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80)) { - TRACE("Ctrl+Alt+[key] won't generate a character\n"); + TRACE_(key)("Ctrl+Alt+[key] won't generate a character\n"); return 0; } @@ -2432,27 +2432,27 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (lpKeyState[VK_SHIFT] & 0x80) { - TRACE("ShiftMask = %04x\n", ShiftMask); + TRACE_(key)("ShiftMask = %04x\n", ShiftMask); e.state |= ShiftMask; } if (lpKeyState[VK_CAPITAL] & 0x01) { - TRACE("LockMask = %04x\n", LockMask); + TRACE_(key)("LockMask = %04x\n", LockMask); e.state |= LockMask; } if (lpKeyState[VK_CONTROL] & 0x80) { - TRACE("ControlMask = %04x\n", ControlMask); + TRACE_(key)("ControlMask = %04x\n", ControlMask); e.state |= ControlMask; } if (lpKeyState[VK_NUMLOCK] & 0x01) { - TRACE("NumLockMask = %04x\n", NumLockMask); + TRACE_(key)("NumLockMask = %04x\n", NumLockMask); e.state |= NumLockMask; } /* Restore saved AltGr state */ - TRACE("AltGrMask = %04x\n", AltGrMask); + TRACE_(key)("AltGrMask = %04x\n", AltGrMask); e.state |= AltGrMask; TRACE_(key)("(%04X, %04X) : faked state = 0x%04x\n", @@ -2485,11 +2485,11 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (!e.keycode && virtKey != VK_NONAME) { - WARN("Unknown virtual key %X !!!\n", virtKey); + WARN_(key)("Unknown virtual key %X !!!\n", virtKey); wine_tsx11_unlock(); return 0; } - else TRACE("Found keycode %u\n",e.keycode); + else TRACE_(key)("Found keycode %u\n",e.keycode); TRACE_(key)("type %d, window %lx, state 0x%04x, keycode %u\n", e.type, e.window, e.state, e.keycode); @@ -2500,13 +2500,13 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (xic) { ret = XmbLookupString(xic, &e, buf, sizeof(buf), &keysym, &status); - TRACE("XmbLookupString needs %d byte(s)\n", ret); + TRACE_(key)("XmbLookupString needs %d byte(s)\n", ret); if (status == XBufferOverflow) { lpChar = HeapAlloc(GetProcessHeap(), 0, ret); if (lpChar == NULL) { - ERR("Failed to allocate memory!\n"); + ERR_(key)("Failed to allocate memory!\n"); wine_tsx11_unlock(); return 0; } @@ -2586,9 +2586,9 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState ksname = "No Name"; if ((keysym >> 8) != 0xff) { - WARN("no char for keysym %04lx (%s) :\n", + WARN_(key)("no char for keysym %04lx (%s) :\n", keysym, ksname); - WARN("virtKey=%X, scanCode=%X, keycode=%u, state=%X\n", + WARN_(key)("virtKey=%X, scanCode=%X, keycode=%u, state=%X\n", virtKey, scanCode, e.keycode, e.state); } }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetPass().
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 2e2b3c775b820a9906a47e27e3ad4d795a3fe300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2b3c775b820a9906a47e27e… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 20 07:58:32 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetPass(). --- dlls/d3dx9_36/effect.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 837e80d..287e468 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -668,8 +668,19 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3DXHANDLE technique, UINT index) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_technique *tech = is_valid_technique(This, technique); - FIXME("iface %p, technique %p, index %u stub\n", This, technique, index); + TRACE("iface %p, technique %p, index %u\n", This, technique, index); + + if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); + + if (tech && index < tech->pass_count) + { + TRACE("Returning pass %p\n", tech->pass_handles[index]); + return tech->pass_handles[index]; + } + + WARN("Invalid argument specified.\n"); return NULL; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetPassByName().
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 0a23fc7b294e2dd30482f9a36196d31ebc47fc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a23fc7b294e2dd30482f9a36… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 20 07:58:34 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetPassByName(). --- dlls/d3dx9_36/effect.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 287e468..081da31 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -688,8 +688,29 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3D static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPassByName(ID3DXBaseEffect *iface, D3DXHANDLE technique, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_technique *tech = is_valid_technique(This, technique); + + TRACE("iface %p, technique %p, name %s\n", This, technique, debugstr_a(name)); + + if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); + + if (tech && name) + { + unsigned int i; + + for (i = 0; i < tech->pass_count; ++i) + { + struct d3dx_pass *pass = get_pass_struct(tech->pass_handles[i]); - FIXME("iface %p, technique %p, name %s stub\n", This, technique, debugstr_a(name)); + if (!strcmp(pass->name, name)) + { + TRACE("Returning pass %p\n", tech->pass_handles[i]); + return tech->pass_handles[i]; + } + } + } + + WARN("Invalid argument specified.\n"); return NULL; }

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DVolume9 iface.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: aab2d427e3bb24d71dc575fa5f4f057ee34b7ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab2d427e3bb24d71dc575fa5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 11:04:23 2011 +0200 d3d9: COM cleanup for the IDirect3DVolume9 iface. --- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/volume.c | 66 +++++++++++++++++++++++++++++---------------- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ecf6113..8a19606 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -188,8 +188,8 @@ HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT typedef struct IDirect3DVolume9Impl { /* IUnknown fields */ - const IDirect3DVolume9Vtbl *lpVtbl; - LONG ref; + IDirect3DVolume9 IDirect3DVolume9_iface; + LONG ref; struct wined3d_volume *wined3d_volume; IUnknown *container; IUnknown *forwardReference; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e109e33..57f8bc3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3148,7 +3148,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent *volume = object->wined3d_volume; wined3d_volume_incref(*volume); - IDirect3DVolume9_Release((IDirect3DVolume9 *)object); + IDirect3DVolume9_Release(&object->IDirect3DVolume9_iface); object->container = container_parent; object->forwardReference = container_parent; diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index cd76f06..34336d6 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -24,9 +24,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -/* IDirect3DVolume9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(LPDIRECT3DVOLUME9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static inline IDirect3DVolume9Impl *impl_from_IDirect3DVolume9(IDirect3DVolume9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVolume9Impl, IDirect3DVolume9_iface); +} + +static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(IDirect3DVolume9 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -42,8 +48,9 @@ static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(LPDIRECT3DVOLUME9 ifac return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static ULONG WINAPI IDirect3DVolume9Impl_AddRef(IDirect3DVolume9 *iface) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); TRACE("iface %p.\n", iface); @@ -68,8 +75,9 @@ static ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { } } -static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static ULONG WINAPI IDirect3DVolume9Impl_Release(IDirect3DVolume9 *iface) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); TRACE("iface %p.\n", iface); @@ -93,10 +101,10 @@ static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { } } -/* IDirect3DVolume9 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, + IDirect3DDevice9 **device) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); IDirect3DResource9 *resource; HRESULT hr; @@ -114,8 +122,10 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, ID return hr; } -static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(IDirect3DVolume9 *iface, REFGUID refguid, + const void *pData, DWORD SizeOfData, DWORD Flags) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", @@ -128,8 +138,10 @@ static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(IDirect3DVolume9 *iface, REFGUID refguid, + void *pData, DWORD *pSizeOfData) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", @@ -142,8 +154,9 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(LPDIRECT3DVOLUME9 ifac return hr; } -static HRESULT WINAPI IDirect3DVolume9Impl_FreePrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static HRESULT WINAPI IDirect3DVolume9Impl_FreePrivateData(IDirect3DVolume9 *iface, REFGUID refguid) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); @@ -155,8 +168,10 @@ static HRESULT WINAPI IDirect3DVolume9Impl_FreePrivateData(LPDIRECT3DVOLUME9 ifa return hr; } -static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, REFIID riid, void** ppContainer) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(IDirect3DVolume9 *iface, REFIID riid, + void **ppContainer) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); HRESULT res; TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer); @@ -172,7 +187,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DESC *desc) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -194,8 +209,10 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(IDirect3DVolume9 *iface, D3DV return D3D_OK; } -static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(IDirect3DVolume9 *iface, + D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); HRESULT hr; TRACE("iface %p, locked_box %p, box %p, flags %#x.\n", @@ -209,8 +226,9 @@ static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DL return hr; } -static HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) { - IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; +static HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(IDirect3DVolume9 *iface) +{ + IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -254,7 +272,7 @@ HRESULT volume_init(IDirect3DVolume9Impl *volume, IDirect3DDevice9Impl *device, { HRESULT hr; - volume->lpVtbl = &Direct3DVolume9_Vtbl; + volume->IDirect3DVolume9_iface.lpVtbl = &Direct3DVolume9_Vtbl; volume->ref = 1; hr = IWineD3DDevice_CreateVolume(device->WineD3DDevice, width, height, depth, usage & WINED3DUSAGE_MASK,

1 0

Huw Davies : gdi32: Add a directional bias for the case when the Bresenham error term is zero.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: a9675b35093aa3226814c37dd8b2c36270056293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9675b35093aa3226814c37dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 20 12:52:06 2011 +0100 gdi32: Add a directional bias for the case when the Bresenham error term is zero. --- dlls/gdi32/dibdrv/objects.c | 83 +++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/tests/dib.c | 21 +++++++++++ 2 files changed, 102 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index c8fb7fe..a2411c3 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -106,7 +106,31 @@ static inline BOOL pt_in_rect( const RECT *rect, const POINT *pt ) (pt->y >= rect->top) && (pt->y < rect->bottom)); } -static void WINAPI solid_pen_line_callback(INT x, INT y, LPARAM lparam) +/********************************************************************** + * get_octant_number + * + * Return the octant number starting clockwise from the +ve x-axis. + */ +static inline int get_octant_number(int dx, int dy) +{ + if(dy > 0) + if(dx > 0) + return ( dx > dy) ? 1 : 2; + else + return (-dx > dy) ? 4 : 3; + else + if(dx < 0) + return (-dx > -dy) ? 5 : 6; + else + return ( dx > -dy) ? 8 : 7; +} + +static inline DWORD get_octant_mask(int dx, int dy) +{ + return 1 << (get_octant_number(dx, dy) - 1); +} + +static void solid_pen_line_callback(INT x, INT y, LPARAM lparam) { dibdrv_physdev *pdev = (dibdrv_physdev *)lparam; RECT rect; @@ -119,6 +143,61 @@ static void WINAPI solid_pen_line_callback(INT x, INT y, LPARAM lparam) return; } +static void bres_line_with_bias(INT x1, INT y1, INT x2, INT y2, void (* callback)(INT,INT,LPARAM), LPARAM lParam) +{ + INT xadd = 1, yadd = 1; + INT err, erradd; + INT cnt; + INT dx = x2 - x1; + INT dy = y2 - y1; + DWORD octant = get_octant_mask(dx, dy); + INT bias = 0; + + /* Octants 3, 5, 6 and 8 take a bias */ + if(octant & 0xb4) bias = 1; + + if (dx < 0) + { + dx = -dx; + xadd = -1; + } + if (dy < 0) + { + dy = -dy; + yadd = -1; + } + if (dx > dy) /* line is "more horizontal" */ + { + err = 2*dy - dx; erradd = 2*dy - 2*dx; + for(cnt = 0; cnt < dx; cnt++) + { + callback(x1, y1, lParam); + if (err + bias > 0) + { + y1 += yadd; + err += erradd; + } + else err += 2*dy; + x1 += xadd; + } + } + else /* line is "more vertical" */ + { + err = 2*dx - dy; erradd = 2*dx - 2*dy; + for(cnt = 0; cnt < dy; cnt++) + { + callback(x1, y1, lParam); + if (err + bias > 0) + { + x1 += xadd; + err += erradd; + } + else err += 2*dx; + y1 += yadd; + } + } +} + static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { const WINEREGION *clip = get_wine_region(pdev->clip); @@ -188,7 +267,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) if(clip->numRects == 1 && pt_in_rect(&clip->extents, start) && pt_in_rect(&clip->extents, end)) /* FIXME: Optimize by moving Bresenham algorithm to the primitive functions, or at least cache adjacent points in the callback */ - LineDDA(start->x, start->y, end->x, end->y, solid_pen_line_callback, (LPARAM)pdev); + bres_line_with_bias(start->x, start->y, end->x, end->y, solid_pen_line_callback, (LPARAM)pdev); else if(clip->numRects >= 1) ret = FALSE; } diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 784d8d5..3046799 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -78,6 +78,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", "2426172d9e8fec27d9228088f382ef3c93717da9", "9e8f27ca952cdba01dbf25d07c34e86a7820c012", + "664fac17803859a4015c6ae29e5538e314d5c827", "17b2c177bdce5e94433574a928bda5c94a8cdfa5", "fe6cc678fb13a3ead67839481bf22348adc69f52", "d51bd330cec510cdccf5394328bd8e5411901e9e", @@ -150,6 +151,18 @@ static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const HeapFree(GetProcessHeap(), 0, hash); } +static const RECT bias_check[] = +{ + {100, 100, 200, 150}, + {100, 100, 150, 200}, + {100, 100, 50, 200}, + {100, 100, 0, 150}, + {100, 100, 0, 50}, + {100, 100, 50, 0}, + {100, 100, 150, 0}, + {100, 100, 200, 50} +}; + static const RECT hline_clips[] = { {120, 120, 140, 120}, /* unclipped */ @@ -251,6 +264,14 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "diagonal solid lines"); memset(bits, 0xcc, dib_size); + for(i = 0; i < sizeof(bias_check) / sizeof(bias_check[0]); i++) + { + MoveToEx(hdc, bias_check[i].left, bias_check[i].top, NULL); + LineTo(hdc, bias_check[i].right, bias_check[i].bottom); + } + compare_hash(bmi, bits, sha1, "more diagonal solid lines"); + memset(bits, 0xcc, dib_size); + /* solid brush PatBlt */ solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); orig_brush = SelectObject(hdc, solid_brush);

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DVolumeTexture9 iface .
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: a3e77bfe594c0f87de3130fb7c237064070f24a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e77bfe594c0f87de3130fb7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 11:08:42 2011 +0200 d3d9: COM cleanup for the IDirect3DVolumeTexture9 iface. --- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/volumetexture.c | 114 +++++++++++++++++++++++++++----------------- 3 files changed, 73 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3e77bfe594c0f87de313…

1 0

Andrew Nguyen : msvcrt: Avoid the use of SetFilePointerEx in _lseeki64.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 6329d0d47da7391baa545669f9028ff2ac4bc4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6329d0d47da7391baa545669f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 20 01:17:48 2011 -0500 msvcrt: Avoid the use of SetFilePointerEx in _lseeki64. --- dlls/msvcrt/file.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b8077d2..c1a7785 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -863,7 +863,7 @@ void msvcrt_free_io(void) __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) { HANDLE hand = msvcrt_fdtoh(fd); - LARGE_INTEGER ofs, ret; + LARGE_INTEGER ofs; TRACE(":fd (%d) handle (%p)\n",fd,hand); if (hand == INVALID_HANDLE_VALUE) @@ -881,13 +881,16 @@ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) (whence==SEEK_CUR)?"SEEK_CUR": (whence==SEEK_END)?"SEEK_END":"UNKNOWN"); + /* The MoleBox protection scheme expects msvcrt to use SetFilePointer only, + * so a LARGE_INTEGER offset cannot be passed directly via SetFilePointerEx. */ ofs.QuadPart = offset; - if (SetFilePointerEx(hand, ofs, &ret, whence)) + if ((ofs.LowPart = SetFilePointer(hand, ofs.LowPart, &ofs.HighPart, whence)) != INVALID_SET_FILE_POINTER || + GetLastError() == ERROR_SUCCESS) { MSVCRT_fdesc[fd].wxflag &= ~(WX_ATEOF|WX_READEOF); /* FIXME: What if we seek _to_ EOF - is EOF set? */ - return ret.QuadPart; + return ofs.QuadPart; } TRACE(":error-last error (%d)\n",GetLastError()); msvcrt_set_errno(GetLastError());

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetPassDesc().
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: f284dc77f2f9e760af34600f225f4b6c086cf17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f284dc77f2f9e760af34600f2… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 20 07:58:29 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetPassDesc(). --- dlls/d3dx9_36/effect.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ce2ed82..837e80d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -171,6 +171,26 @@ struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DX return NULL; } +struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) +{ + unsigned int i, k; + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *technique = get_technique_struct(base->technique_handles[i]); + + for (k = 0; k < technique->pass_count; ++k) + { + if (technique->pass_handles[k] == pass) + { + return get_pass_struct(pass); + } + } + } + + return NULL; +} + struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) { unsigned int i, count; @@ -513,10 +533,24 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetTechniqueDesc(ID3DXBaseEffect *ifac static HRESULT WINAPI ID3DXBaseEffectImpl_GetPassDesc(ID3DXBaseEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_pass *p = is_valid_pass(This, pass); - FIXME("iface %p, pass %p, desc %p stub\n", This, pass, desc); + TRACE("iface %p, pass %p, desc %p\n", This, pass, desc); - return E_NOTIMPL; + if (!desc || !p) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = p->name; + desc->Annotations = p->annotation_count; + + FIXME("Pixel shader and vertex shader are not supported, yet.\n"); + desc->pVertexShaderFunction = NULL; + desc->pVertexShaderFunction = NULL; + + return D3D_OK; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetFunctionDesc(ID3DXBaseEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc)

1 0