December 2008 - Wine-commits

Christian Costa : dmusic: Move IDirectMusicThru and IDirectMusicPortDownload to DirectMusicPort object where they belong .
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: cc53bd283ca58b82ee1eca070082ce7a3aa9fb90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc53bd283ca58b82ee1eca070… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Dec 18 21:24:58 2008 +0100 dmusic: Move IDirectMusicThru and IDirectMusicPortDownload to DirectMusicPort object where they belong. --- dlls/dmusic/Makefile.in | 4 +- dlls/dmusic/dmusic_private.h | 24 +-------- dlls/dmusic/port.c | 111 +++++++++++++++++++++++++++++++++++++++++- dlls/dmusic/portdownload.c | 111 ------------------------------------------ dlls/dmusic/thru.c | 77 ----------------------------- 5 files changed, 113 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc53bd283ca58b82ee1ec…

1 0

Vincent Povirk : winex11.drv: Do not assume window managers support _NET_WORKAREA.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 1a2216cbc7af03ffae0bd75be90d556901d98e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2216cbc7af03ffae0bd75be… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Dec 16 17:47:03 2008 -0600 winex11.drv: Do not assume window managers support _NET_WORKAREA. --- dlls/winex11.drv/xinerama.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index f3af0c3..0850026 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -111,7 +111,7 @@ static int query_screens(void) { int i, count, event_base, error_base; XineramaScreenInfo *screens; - RECT rc_work; + RECT rc_work = {0, 0, 0, 0}; if (!monitors) /* first time around */ load_xinerama();

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get_position.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 49ac9e0d1901fc6090fe782d4436001bc41d1458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ac9e0d1901fc6090fe782d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 19 17:46:58 2008 +1100 mshtml: Implement IHTMLStyle get_position. --- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 705f44a..fa4ad51 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1734,8 +1734,8 @@ static HRESULT WINAPI HTMLStyle_get_left(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_get_position(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return IHTMLStyle2_get_position(HTMLSTYLE2(This), p); } static HRESULT WINAPI HTMLStyle_put_zIndex(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7ba6e86..aa8dbb8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2299,6 +2299,10 @@ static void test_default_style(IHTMLStyle *style) test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); + hres = IHTMLStyle_get_position(style, &str); + ok(hres == S_OK, "get_position failed: %08x\n", hres); + ok(!str, "str=%s\n", dbgstr_w(str)); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_fontFamily(style, &str); ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres);

1 0

Henri Verbeet : wined3d: Consistently use .xyzw for vector components.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 02e4c3361105e0638902b4066be2bee471c870c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e4c3361105e0638902b4066… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 19 19:21:56 2008 +0100 wined3d: Consistently use .xyzw for vector components. --- dlls/wined3d/arb_program_shader.c | 118 ++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 34 ++++------- 2 files changed, 72 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02e4c3361105e0638902b…

1 0

Henri Verbeet : wined3d: Remove a useless FIXME.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 33f344882c3cb39be11a0c23dcb1a3be0e692bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f344882c3cb39be11a0c23d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 19 19:21:56 2008 +0100 wined3d: Remove a useless FIXME. --- dlls/wined3d/indexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index 0737892..2325f70 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -108,7 +108,7 @@ static DWORD WINAPI IWineD3DIndexBufferImpl_GetPriority(IWineD3DIndexBuffer *ifa } static void WINAPI IWineD3DIndexBufferImpl_PreLoad(IWineD3DIndexBuffer *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); } static void WINAPI IWineD3DIndexBufferImpl_UnLoad(IWineD3DIndexBuffer *iface) {

1 0

Henri Verbeet : wined3d: Only apply shader constants that changed.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 4a19d893e5d5955c045d5dbfe5b764d98cf951fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a19d893e5d5955c045d5dbfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 19 19:21:56 2008 +0100 wined3d: Only apply shader constants that changed. This improves performance a bit for applications that use a lot of shaders with a lot of constants. --- dlls/wined3d/glsl_shader.c | 402 ++++++++++++++++++++++++++++------------ dlls/wined3d/stateblock.c | 13 -- dlls/wined3d/utils.c | 10 + dlls/wined3d/wined3d_private.h | 9 +- 4 files changed, 293 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a19d893e5d5955c045d5…

1 0

Henri Verbeet : wined3d: Properly reset the stateblock.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 684017c0710a2745ead31ae643a4f28f43dd8bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=684017c0710a2745ead31ae64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 19 19:21:55 2008 +0100 wined3d: Properly reset the stateblock. --- dlls/wined3d/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f4554eb..36fbcba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7125,6 +7125,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->exStyle = exStyle; } + TRACE("Resetting stateblock\n"); + IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock); + IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->stateBlock); + + /* Note: No parent needed for initial internal stateblock */ + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock, NULL); + if (FAILED(hr)) ERR("Resetting the stateblock failed with error 0x%08x\n", hr); + else TRACE("Created stateblock %p\n", This->stateBlock); + This->updateStateBlock = This->stateBlock; + IWineD3DStateBlock_AddRef((IWineD3DStateBlock *)This->updateStateBlock); + hr = IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *) This->stateBlock); if(FAILED(hr)) { ERR("Resetting the stateblock failed with error 0x%08x\n", hr);

1 0

Henri Verbeet : wined3d: Set the initial viewport in InitStartupStateBlock( ).
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: ef7365a4cdf72a8cde87a00e8b2ed366ffd345a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7365a4cdf72a8cde87a00e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 19 19:21:55 2008 +0100 wined3d: Set the initial viewport in InitStartupStateBlock(). >From 8aa3fb7ceb6fb93abf71520c852403284a9f8c76 Mon Sep 17 00:00:00 2001 From: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri, 19 Dec 2008 19:21:55 +0100 Subject: wined3d: Set the initial viewport in InitStartupStateBlock(). --- dlls/wined3d/device.c | 23 ----------------------- dlls/wined3d/stateblock.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 09f4739..f4554eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2181,17 +2181,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR ENTER_GL(); - { /* Set a default viewport */ - WINED3DVIEWPORT vp; - vp.X = 0; - vp.Y = 0; - vp.Width = pPresentationParameters->BackBufferWidth; - vp.Height = pPresentationParameters->BackBufferHeight; - vp.MinZ = 0.0f; - vp.MaxZ = 1.0f; - IWineD3DDevice_SetViewport((IWineD3DDevice *)This, &vp); - } - /* Initialize the current view state */ This->view_ident = 1; This->contexts[0]->last_was_rhw = 0; @@ -7081,16 +7070,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE (pPresentationParameters->BackBufferWidth != swapchain->presentParms.BackBufferWidth || pPresentationParameters->BackBufferHeight != swapchain->presentParms.BackBufferHeight)) { - WINED3DVIEWPORT vp; UINT i; - vp.X = 0; - vp.Y = 0; - vp.Width = pPresentationParameters->BackBufferWidth; - vp.Height = pPresentationParameters->BackBufferHeight; - vp.MinZ = 0; - vp.MaxZ = 1; - if(!pPresentationParameters->Windowed) { DisplayModeChanged = TRUE; } @@ -7104,10 +7085,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE if(This->auto_depth_stencil_buffer) { updateSurfaceDesc((IWineD3DSurfaceImpl *)This->auto_depth_stencil_buffer, pPresentationParameters); } - - - /* Now set the new viewport */ - IWineD3DDevice_SetViewport(iface, &vp); } if((pPresentationParameters->Windowed && !swapchain->presentParms.Windowed) || diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b0cb027..4859262 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1244,6 +1244,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat /* check the return values, because the GetBackBuffer call isn't valid for ddraw */ hr = IWineD3DDevice_GetSwapChain(device, 0, &swapchain); if( hr == WINED3D_OK && swapchain != NULL) { + WINED3DVIEWPORT vp; + hr = IWineD3DSwapChain_GetBackBuffer(swapchain, 0, WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); if( hr == WINED3D_OK && backbuffer != NULL) { IWineD3DSurface_GetDesc(backbuffer, &desc); @@ -1258,6 +1260,16 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat ERR("This should never happen, expect rendering issues!\n"); } } + + /* Set the default viewport */ + vp.X = 0; + vp.Y = 0; + vp.Width = ((IWineD3DSwapChainImpl *)swapchain)->presentParms.BackBufferWidth; + vp.Height = ((IWineD3DSwapChainImpl *)swapchain)->presentParms.BackBufferHeight; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + IWineD3DDevice_SetViewport(device, &vp); + IWineD3DSwapChain_Release(swapchain); }

1 0

Vitaliy Margolen : dinput: Remove DIEnumDevicesCallbackAtoW.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 6e07c7bc14b7e4d3864bfb4a1fdf5568c60f5d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e07c7bc14b7e4d3864bfb4a1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 19 11:06:49 2008 -0700 dinput: Remove DIEnumDevicesCallbackAtoW. It's no longer used. --- dlls/dinput/device.c | 34 ---------------------------------- dlls/dinput/device_private.h | 11 ----------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index aaf5577..ebc87eb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -532,40 +532,6 @@ int find_property(const DataFormat *df, LPCDIPROPHEADER ph) return -1; } - -BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA lpddi, LPVOID lpvRef) { - DIDEVICEOBJECTINSTANCEW ddtmp; - device_enumobjects_AtoWcb_data* data; - - data = (device_enumobjects_AtoWcb_data*) lpvRef; - - memset(&ddtmp, 0, sizeof(ddtmp)); - - ddtmp.dwSize = sizeof(DIDEVICEINSTANCEW); - ddtmp.guidType = lpddi->guidType; - ddtmp.dwOfs = lpddi->dwOfs; - ddtmp.dwType = lpddi->dwType; - ddtmp.dwFlags = lpddi->dwFlags; - MultiByteToWideChar(CP_ACP, 0, lpddi->tszName, -1, ddtmp.tszName, MAX_PATH); - - if (lpddi->dwSize == sizeof(DIDEVICEINSTANCEA)) { - /** - * if dwSize < sizeof(DIDEVICEINSTANCEA of DInput version >= 5) - * force feedback and other newer data aren't available - */ - ddtmp.dwFFMaxForce = lpddi->dwFFMaxForce; - ddtmp.dwFFForceResolution = lpddi->dwFFForceResolution; - ddtmp.wCollectionNumber = lpddi->wCollectionNumber; - ddtmp.wDesignatorIndex = lpddi->wDesignatorIndex; - ddtmp.wUsagePage = lpddi->wUsagePage; - ddtmp.wUsage = lpddi->wUsage; - ddtmp.dwDimension = lpddi->dwDimension; - ddtmp.wExponent = lpddi->wExponent; - ddtmp.wReserved = lpddi->wReserved; - } - return data->lpCallBack(&ddtmp, data->lpvRef); -} - /****************************************************************************** * queue_event - add new event to the ring queue */ diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index dd06a4b..3463382 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -104,17 +104,6 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; -/** - * Callback Data used by specific callback - * for EnumObject on 'W' interfaces - */ -typedef struct { - LPDIENUMDEVICEOBJECTSCALLBACKW lpCallBack; - LPVOID lpvRef; -} device_enumobjects_AtoWcb_data; - -extern BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA, LPVOID); - extern const GUID DInput_Wine_Keyboard_GUID; extern const GUID DInput_Wine_Mouse_GUID;

1 0

Simon C. Ion : winemaker: Correctly process directories containing regexp metacharacters.
by Alexandre Julliard 20 Dec '08

20 Dec '08

Module: wine Branch: master Commit: 7b5cbdb261477461c2527d344dfbb47f7094530a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5cbdb261477461c2527d344… Author: Simon C. Ion <ion.simon.c(a)gmail.com> Date: Fri Dec 19 18:23:45 2008 -0600 winemaker: Correctly process directories containing regexp metacharacters. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index b70e08d..918cd2a 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1103,7 +1103,7 @@ sub search_from($$) my $directory=get_directory_contents $dirname; my $found; foreach my $dentry (@$directory) { - if ($dentry =~ /^$component$/i or + if ($dentry =~ /^\Q$component\E$/i or (defined $renamed and $dentry =~ /^$renamed$/i) ) { $dirname.="$dentry/";

1 0