February 2009 - Wine-commits

Henri Verbeet : wined3d: Merge vertexbuffer.c with buffer.c.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 392cfefbebd9cf632af487852f6fe38b9240a90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=392cfefbebd9cf632af487852… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 09:16:04 2009 +0100 wined3d: Merge vertexbuffer.c with buffer.c. This just moves to code to the same file, but we want to merge the implementations as well at some point. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/buffer.c | 947 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/vertexbuffer.c | 820 ------------------------------------- 3 files changed, 947 insertions(+), 821 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=392cfefbebd9cf632af48…

1 0

Henri Verbeet : d3d10core: Keep a reference to the wined3d device in the d3d10 device.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 0048a0373b93616b934f5a0395bf3616ab961aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0048a0373b93616b934f5a039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 09:16:01 2009 +0100 d3d10core: Keep a reference to the wined3d device in the d3d10 device. --- dlls/d3d10core/d3d10core_private.h | 2 ++ dlls/d3d10core/device.c | 23 ++++++++++++++++------- dlls/d3d8/device.c | 6 ++++++ dlls/d3d9/device.c | 6 ++++++ dlls/ddraw/ddraw.c | 6 ++++++ dlls/wined3d/directx.c | 3 +++ include/wine/wined3d.idl | 4 ++++ 7 files changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index c48a72c..263c22d 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -52,6 +52,8 @@ struct d3d10_device const struct IWineD3DDeviceParentVtbl *device_parent_vtbl; IUnknown *outer_unknown; LONG refcount; + + IWineD3DDevice *wined3d_device; }; /* ID3D10Texture2D */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7eaa659..46e57b2 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -75,6 +75,8 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); + if (This->wined3d_device) IWineD3DDevice_Release(This->wined3d_device); + return refcount; } @@ -590,6 +592,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *iface, const D3D10_TEXTURE2D_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Texture2D **texture) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_texture2d *object; HRESULT hr; @@ -608,7 +611,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac if (desc->MipLevels == 1 && desc->ArraySize == 1) { - IWineD3DDevice *wined3d_device; IWineDXGIDevice *wine_device; hr = ID3D10Device_QueryInterface(iface, &IID_IWineDXGIDevice, (void **)&wine_device); @@ -621,24 +623,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, (IUnknown *)object, (void **)&object->dxgi_surface); + IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) { ERR("Failed to create DXGI surface, returning %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); - IWineDXGIDevice_Release(wine_device); return hr; } - wined3d_device = IWineDXGIDevice_get_wined3d_device(wine_device); - IWineDXGIDevice_Release(wine_device); - FIXME("Implement DXGI<->wined3d usage conversion\n"); - hr = IWineD3DDevice_CreateSurface(wined3d_device, desc->Width, desc->Height, + hr = IWineD3DDevice_CreateSurface(This->wined3d_device, desc->Width, desc->Height, wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0, &object->wined3d_surface, WINED3DRTYPE_SURFACE, desc->Usage, WINED3DPOOL_DEFAULT, desc->SampleDesc.Count, desc->SampleDesc.Quality, NULL, SURFACE_OPENGL, (IUnknown *)object); - IWineD3DDevice_Release(wined3d_device); if (FAILED(hr)) { ERR("CreateSurface failed, returning %#x\n", hr); @@ -1144,6 +1142,16 @@ static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface /* IWineD3DDeviceParent methods */ +static void STDMETHODCALLTYPE device_parent_WineD3DDeviceCreated(IWineD3DDeviceParent *iface, IWineD3DDevice *device) +{ + struct d3d10_device *This = device_from_device_parent(iface); + + TRACE("iface %p, device %p\n", iface, device); + + IWineD3DDevice_AddRef(device); + This->wined3d_device = device; +} + static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParent *iface, IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface) @@ -1287,6 +1295,7 @@ const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl = device_parent_AddRef, device_parent_Release, /* IWineD3DDeviceParent methods */ + device_parent_WineD3DDeviceCreated, device_parent_CreateSurface, device_parent_CreateRenderTarget, device_parent_CreateDepthStencilSurface, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 908a1a8..643cdbc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2394,6 +2394,11 @@ static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface /* IWineD3DDeviceParent methods */ +static void STDMETHODCALLTYPE device_parent_WineD3DDeviceCreated(IWineD3DDeviceParent *iface, IWineD3DDevice *device) +{ + TRACE("iface %p, device %p\n", iface, device); +} + static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParent *iface, IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface) @@ -2591,6 +2596,7 @@ const IWineD3DDeviceParentVtbl d3d8_wined3d_device_parent_vtbl = device_parent_AddRef, device_parent_Release, /* IWineD3DDeviceParent methods */ + device_parent_WineD3DDeviceCreated, device_parent_CreateSurface, device_parent_CreateRenderTarget, device_parent_CreateDepthStencilSurface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c273d70..d551ff6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1929,6 +1929,11 @@ static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface /* IWineD3DDeviceParent methods */ +static void STDMETHODCALLTYPE device_parent_WineD3DDeviceCreated(IWineD3DDeviceParent *iface, IWineD3DDevice *device) +{ + TRACE("iface %p, device %p\n", iface, device); +} + static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParent *iface, IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface) @@ -2130,6 +2135,7 @@ const IWineD3DDeviceParentVtbl d3d9_wined3d_device_parent_vtbl = device_parent_AddRef, device_parent_Release, /* IWineD3DDeviceParent methods */ + device_parent_WineD3DDeviceCreated, device_parent_CreateSurface, device_parent_CreateRenderTarget, device_parent_CreateDepthStencilSurface, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a4d2705..3e5b1fa 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3409,6 +3409,11 @@ static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface /* IWineD3DDeviceParent methods */ +static void STDMETHODCALLTYPE device_parent_WineD3DDeviceCreated(IWineD3DDeviceParent *iface, IWineD3DDevice *device) +{ + TRACE("iface %p, device %p\n", iface, device); +} + static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParent *iface, IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface) @@ -3624,6 +3629,7 @@ const IWineD3DDeviceParentVtbl ddraw_wined3d_device_parent_vtbl = device_parent_AddRef, device_parent_Release, /* IWineD3DDeviceParent methods */ + device_parent_WineD3DDeviceCreated, device_parent_CreateSurface, device_parent_CreateRenderTarget, device_parent_CreateDepthStencilSurface, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f6af28c..66eec6b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3722,6 +3722,9 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, for(i = 0; i < PATCHMAP_SIZE; i++) { list_init(&object->patches[i]); } + + IWineD3DDeviceParent_WineD3DDeviceCreated(device_parent, *ppReturnedDeviceInterface); + return WINED3D_OK; } #undef GLINFO_LOCATION diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 05e55a7..d53aa24 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2188,6 +2188,10 @@ interface IWineD3DDevice; ] interface IWineD3DDeviceParent : IUnknown { + void WineD3DDeviceCreated( + [in] IWineD3DDevice *device + ); + HRESULT CreateSurface( [in] IUnknown *superior, [in] UINT width,

1 0

Henri Verbeet : d3dx8: Don' t use uninitialized memory in the D3DXQuaternionSlerp() test.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 4fe8415070a68995d0da3f1e4bb47f8c6043dc55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe8415070a68995d0da3f1e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 09:16:00 2009 +0100 d3dx8: Don't use uninitialized memory in the D3DXQuaternionSlerp() test. --- dlls/d3dx8/tests/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index ec05fad..12236bc 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -594,7 +594,7 @@ static void D3X8QuaternionTest(void) t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; smallq.x = 0.1f; smallq.y = 0.2f; smallq.z= 0.3f; smallq.w = 0.4f; - smallr.x = 0.5f; smallr.y = 0.6f; smallr.z= 0.7f; smallq.w = 0.8f; + smallr.x = 0.5f; smallr.y = 0.6f; smallr.z= 0.7f; smallr.w = 0.8f; scale = 0.3f; scale2 = 0.78f; @@ -875,7 +875,7 @@ static void D3X8QuaternionTest(void) expectedquat.x = 334.0f; expectedquat.y = -31.9f; expectedquat.z = 6.1f; expectedquat.w = 6.7f; D3DXQuaternionSlerp(&gotquat,&q,&t,scale); expect_vec4(expectedquat,gotquat); - expectedquat.x = 0.267071f; expectedquat.y = 0.384114f; expectedquat.z = 0.501157f; expectedquat.w = 0.636291f; + expectedquat.x = 0.239485f; expectedquat.y = 0.346580f; expectedquat.z = 0.453676f; expectedquat.w = 0.560772f; D3DXQuaternionSlerp(&gotquat,&smallq,&smallr,scale); expect_vec4(expectedquat,gotquat);

1 0

Adam Stoelting : winemp3.acm: Changed pointer cast from DWORD to DWORD_PTR.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: f88e16987e6f8eae70a0a684ed026dcec8b9fada URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88e16987e6f8eae70a0a684e… Author: Adam Stoelting <astoelting(a)ucla.edu> Date: Sat Feb 21 19:19:09 2009 -0800 winemp3.acm: Changed pointer cast from DWORD to DWORD_PTR. --- dlls/winemp3.acm/mpegl3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 23ba586..6d476e4 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -419,7 +419,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)); if (aad == 0) return MMSYSERR_NOMEM; - adsi->dwDriver = (DWORD)aad; + adsi->dwDriver = (DWORD_PTR)aad; if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)

1 0

Andrew Nguyen : include: Fix mismatched extern declaration in aclui.h.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 0453b03e86fb28f3f87f1a51c69946157f924168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0453b03e86fb28f3f87f1a51c… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Feb 23 03:18:37 2009 -0600 include: Fix mismatched extern declaration in aclui.h. --- include/aclui.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/aclui.h b/include/aclui.h index d61e05c..68c6b2a 100644 --- a/include/aclui.h +++ b/include/aclui.h @@ -23,6 +23,10 @@ #include <commctrl.h> #include <accctrl.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + typedef struct _SI_OBJECT_INFO { DWORD dwFlags;

1 0

Aurimas Fischer : user32: Add Lithuanian translation.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: f322cc3d1f2617e373ceedae6b75175f1aeb3d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f322cc3d1f2617e373ceedae6… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Feb 21 23:45:23 2009 +0200 user32: Add Lithuanian translation. --- dlls/user32/resources/user32.rc | 1 + dlls/user32/resources/user32_Lt.rc | 86 ++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/user32/resources/user32.rc b/dlls/user32/resources/user32.rc index 67f7a13..6d33b21 100644 --- a/dlls/user32/resources/user32.rc +++ b/dlls/user32/resources/user32.rc @@ -57,6 +57,7 @@ #include "resources/user32_Hu.rc" #include "resources/user32_It.rc" #include "resources/user32_Ko.rc" +#include "resources/user32_Lt.rc" #include "resources/user32_Nl.rc" #include "resources/user32_No.rc" #include "resources/user32_Pl.rc" diff --git a/dlls/user32/resources/user32_Lt.rc b/dlls/user32/resources/user32_Lt.rc new file mode 100644 index 0000000..a4e60b9 --- /dev/null +++ b/dlls/user32/resources/user32_Lt.rc @@ -0,0 +1,86 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "A&tkurti", 61728 + MENUITEM "Pe&rkelti", 61456 + MENUITEM "D&ydis", 61440 + MENUITEM "Su&skleisti", 61472 + MENUITEM "Pa&didinti", 61488 + MENUITEM SEPARATOR + MENUITEM "&Užverti\tAlt-F4", 61536 + MENUITEM SEPARATOR + MENUITEM "&Apie Wine...", 61761 +} + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "" + BEGIN + MENUITEM "&Atšaukti", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Iškirpti", WM_CUT + MENUITEM "&Kopijuoti", WM_COPY + MENUITEM "Į&dėti", WM_PASTE + MENUITEM "Iš&valyti", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "&Pažymėti viską", EM_SETSEL + END +} + +MSGBOX DIALOG 100, 80, 216, 168 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE + LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX + PUSHBUTTON "&Gerai", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Atsisakyti", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Nut&raukti", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Pakartoti", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "N&epaisyti", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Taip", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ne", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Mėginti vėl", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Tę&sti", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Žinynas", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Išrinkti langą" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "Gerai", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Atsisakyti", IDCANCEL, 120, 100, 35, 14 +END + + +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "Klaida" + IDS_MDI_MOREWINDOWS "&Daugiau langų..." +} + +#pragma code_page(default)

1 0

Adam Stoelting : msadp32.acm: Changed pointer cast from DWORD to DWORD_PTR.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 23066a5e7363ccfc0967cab6de19e252d20c8204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23066a5e7363ccfc0967cab6d… Author: Adam Stoelting <astoelting(a)ucla.edu> Date: Sat Feb 21 19:00:12 2009 -0800 msadp32.acm: Changed pointer cast from DWORD to DWORD_PTR. --- dlls/msadp32.acm/msadp32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 7a66207..1c0c840 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -544,7 +544,7 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmAdpcmData)); if (aad == 0) return MMSYSERR_NOMEM; - adsi->dwDriver = (DWORD)aad; + adsi->dwDriver = (DWORD_PTR)aad; if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)

1 0

Detlef Riekenberg : fusion/tests: Fix remaining win98 failures in asmcache.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: cfb33d1894a7c77c132ebe4cebd85eb5e3c5533b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb33d1894a7c77c132ebe4ce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 21 12:17:43 2009 +0100 fusion/tests: Fix remaining win98 failures in asmcache. --- dlls/fusion/tests/asmcache.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 7f757c5..cd55afa 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1193,7 +1193,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1214,7 +1216,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1237,7 +1241,9 @@ static void test_QueryAssemblyInfo(void) { ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); @@ -1260,7 +1266,9 @@ static void test_QueryAssemblyInfo(void) { ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); @@ -1282,7 +1290,9 @@ static void test_QueryAssemblyInfo(void) "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1304,7 +1314,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1328,7 +1340,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1372,7 +1386,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1419,7 +1435,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n"); @@ -1463,7 +1481,9 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); todo_wine { - ok(info.uliAssemblySizeInKB.u.LowPart == 4, + /* win9x: 32 */ + ok((info.uliAssemblySizeInKB.u.LowPart == 4) || + broken(info.uliAssemblySizeInKB.u.LowPart == 32), "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), "Wrong assembly path returned\n");

1 0

Paul Vriens : fusion/tests: Fix a test failure on Win64.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 6f73f1bdbb7a55a6e2122d84a027717b8c95b5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f73f1bdbb7a55a6e2122d84a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 21 15:16:32 2009 +0100 fusion/tests: Fix a test failure on Win64. --- dlls/fusion/tests/asmenum.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index cbc0c40..921ddf8 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -303,6 +303,10 @@ static void test_enumerate(void) enum_gac_assemblies(&assemblies, 0, path); to_multibyte(path, buf); + lstrcatA(path, "_64"); + enum_gac_assemblies(&assemblies, 0, path); + + to_multibyte(path, buf); lstrcatA(path, "_MSIL"); enum_gac_assemblies(&assemblies, 0, path);

1 0

Vitaliy Margolen : dinput: Let each device decide which hook event to skip.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 74f2eccc9085d5f7667497f5d0d74e8053732f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f2eccc9085d5f7667497f5d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Feb 21 12:54:37 2009 -0700 dinput: Let each device decide which hook event to skip. Some programs acquire mouse in exclusive and keyboard in non-exclusive mode. --- dlls/dinput/dinput_main.c | 3 +-- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/keyboard.c | 12 +++++++----- dlls/dinput/mouse.c | 10 +++++++--- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index bdcf557..f89d5f0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -899,8 +899,7 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) if (dev->acquired && dev->event_proc) { TRACE("calling %p->%p (%lx %lx)\n", dev, dev->event_proc, wparam, lparam); - dev->event_proc( (LPDIRECTINPUTDEVICE8A)dev, wparam, lparam ); - skip |= dev->dwCoopLevel & DISCL_EXCLUSIVE; + skip |= dev->event_proc( (LPDIRECTINPUTDEVICE8A)dev, wparam, lparam ); } LeaveCriticalSection( &dinput->crit ); } diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 15783e2..24fffb8 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -60,7 +60,7 @@ extern const struct dinput_device joystick_linux_device; extern const struct dinput_device joystick_linuxinput_device; extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A); -typedef void (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); +typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 47536f7..f9c689b 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -74,16 +74,16 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) return out_code; } -static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - int dik_code; + int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; BYTE new_diks; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) - return; + return 0; TRACE("(%p) %ld,%ld\n", iface, wparam, lparam); @@ -96,15 +96,17 @@ static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM /* returns now if key event already known */ if (new_diks == This->DInputKeyState[dik_code]) - return; + return ret; This->DInputKeyState[dik_code] = new_diks; TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]); - + dik_code = id_to_offset(&This->base.data_format, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON); EnterCriticalSection(&This->base.crit); queue_event((LPDIRECTINPUTDEVICE8A)This, dik_code, new_diks, hook->time, This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); + + return ret; } const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 178b8fb..7b95be3 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -78,7 +78,7 @@ struct SysMouseImpl WARP_MOUSE warp_override; }; -static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); +static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} @@ -286,17 +286,18 @@ const struct dinput_device mouse_device = { */ /* low-level mouse hook */ -static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) +static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = (SysMouseImpl*) iface; DWORD dwCoop; - int wdata = 0, inst_id = -1; + int wdata = 0, inst_id = -1, ret; TRACE("msg %lx @ (%d %d)\n", wparam, hook->pt.x, hook->pt.y); EnterCriticalSection(&This->base.crit); dwCoop = This->base.dwCoopLevel; + ret = dwCoop & DISCL_EXCLUSIVE; switch(wparam) { case WM_MOUSEMOVE: @@ -370,6 +371,8 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x00; break; + default: + ret = 0; } @@ -381,6 +384,7 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA } LeaveCriticalSection(&This->base.crit); + return ret; } static BOOL dinput_window_check(SysMouseImpl* This) {

1 0