December 2009 - Wine-commits

Gerald Pfeifer : ntdll: Guard debugging code by #ifdef instead of plain #if .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 43d07203358f182e9339a89b9f0b352b78255627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d07203358f182e9339a89b9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Dec 7 16:07:29 2009 +0100 ntdll: Guard debugging code by #ifdef instead of plain #if. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f568eee..9731069 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -230,7 +230,7 @@ static void VIRTUAL_DumpView( FILE_VIEW *view ) /*********************************************************************** * VIRTUAL_Dump */ -#if WINE_VM_DEBUG +#ifdef WINE_VM_DEBUG static void VIRTUAL_Dump(void) { sigset_t sigset;

1 0

Aric Stewart : mpr: Initialize handle to NULL on ERROR_NO_NETWORK case in WNetOpenEnum.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 3b93ff71c7c410d3fb80f473a68c898ec3cffbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b93ff71c7c410d3fb80f473a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 7 12:59:52 2009 -0600 mpr: Initialize handle to NULL on ERROR_NO_NETWORK case in WNetOpenEnum. --- dlls/mpr/wnet.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index cffa340..66d165f 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -637,7 +637,10 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage, if (!lphEnum) ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) + { + lphEnum = NULL; ret = WN_NO_NETWORK; + } else { if (lpNet) @@ -726,7 +729,10 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, if (!lphEnum) ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) + { + lphEnum = NULL; ret = WN_NO_NETWORK; + } else { switch (dwScope)

1 0

Henri Verbeet : wined3d: Pass the correct vertex count in DrawIndexedPrimitiveStrided().
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 8a833a2d75552283d41082512a403c9d834ad64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a833a2d75552283d41082512… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 20:19:59 2009 +0100 wined3d: Pass the correct vertex count in DrawIndexedPrimitiveStrided(). This fixes a regression introduced by 2b2fc827ce1f340554cc8d01f6b183d4a5c02114. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eb5ad5b..b286b69 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4997,7 +4997,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided(IWineD3DDev This->stateBlock->streamIsUP = TRUE; This->stateBlock->baseVertexIndex = 0; This->up_strided = DrawPrimStrideData; - drawPrimitive(iface, 0 /* numindices */, 0 /* start_idx */, idxSize, pIndexData); + drawPrimitive(iface, vertex_count, 0 /* start_idx */, idxSize, pIndexData); This->up_strided = NULL; return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Rename the wined3d_adapter "num" field to "ordinal ".
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: aed85222b5cfbc248d3a321dda95f02e936b1273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed85222b5cfbc248d3a321dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 20:20:00 2009 +0100 wined3d: Rename the wined3d_adapter "num" field to "ordinal". This makes it consistent with dxgi_adapter. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/swapchain_base.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b286b69..bf81ea9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1110,7 +1110,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, } /* Get info on the current display setup */ - IWineD3D_GetAdapterDisplayMode(This->wineD3D, This->adapter->num, &Mode); + IWineD3D_GetAdapterDisplayMode(This->wineD3D, This->adapter->ordinal, &Mode); object->orig_width = Mode.Width; object->orig_height = Mode.Height; object->orig_fmt = Mode.Format; @@ -6615,10 +6615,10 @@ static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRE if(!pp->BackBufferWidth) return TRUE; if(!pp->BackBufferHeight) return TRUE; - count = IWineD3D_GetAdapterModeCount(This->wineD3D, This->adapter->num, WINED3DFMT_UNKNOWN); + count = IWineD3D_GetAdapterModeCount(This->wineD3D, This->adapter->ordinal, WINED3DFMT_UNKNOWN); for(i = 0; i < count; i++) { memset(&m, 0, sizeof(m)); - hr = IWineD3D_EnumAdapterModes(This->wineD3D, This->adapter->num, WINED3DFMT_UNKNOWN, i, &m); + hr = IWineD3D_EnumAdapterModes(This->wineD3D, This->adapter->ordinal, WINED3DFMT_UNKNOWN, i, &m); if(FAILED(hr)) { ERR("EnumAdapterModes failed\n"); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60db4a4..405ae97 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4676,7 +4676,7 @@ BOOL InitAdapters(IWineD3DImpl *This) HDC hdc; TRACE("Initializing default adapter\n"); - adapter->num = 0; + adapter->ordinal = 0; adapter->monitorPoint.x = -1; adapter->monitorPoint.y = -1; @@ -4884,7 +4884,7 @@ BOOL InitAdapters(IWineD3DImpl *This) nogl_adapter: /* Initialize an adapter for ddraw-only memory counting */ memset(This->adapters, 0, sizeof(This->adapters)); - This->adapters[0].num = 0; + This->adapters[0].ordinal = 0; This->adapters[0].opengl = FALSE; This->adapters[0].monitorPoint.x = -1; This->adapters[0].monitorPoint.y = -1; diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index 31b9d07..132e0bc 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -139,7 +139,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface HRESULT hr; TRACE("(%p)->(%p): Calling GetAdapterDisplayMode\n", This, pMode); - hr = IWineD3D_GetAdapterDisplayMode(This->wineD3DDevice->wineD3D, This->wineD3DDevice->adapter->num, pMode); + hr = IWineD3D_GetAdapterDisplayMode(This->wineD3DDevice->wineD3D, This->wineD3DDevice->adapter->ordinal, pMode); TRACE("(%p) : returning w(%d) h(%d) rr(%d) fmt(%u,%s)\n", This, pMode->Width, pMode->Height, pMode->RefreshRate, pMode->Format, debug_d3dformat(pMode->Format)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3173d12..37244f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1324,7 +1324,7 @@ struct wined3d_driver_info /* The adapter structure */ struct wined3d_adapter { - UINT num; + UINT ordinal; BOOL opengl; POINT monitorPoint; struct wined3d_gl_info gl_info;

1 0

Henri Verbeet : wined3d: Remove the redundant "adapterNo" field from the device.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: a02f93defb7f0326767b7c47fa33ba1850d2ccd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02f93defb7f0326767b7c47f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 20:20:01 2009 +0100 wined3d: Remove the redundant "adapterNo" field from the device. --- dlls/wined3d/device.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bf81ea9..c8f6ea1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4419,7 +4419,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetBackBuffer(IWineD3DDevice *iface, UI static HRESULT WINAPI IWineD3DDeviceImpl_GetDeviceCaps(IWineD3DDevice *iface, WINED3DCAPS* pCaps) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WARN("(%p) : stub, calling idirect3d for now\n", This); - return IWineD3D_GetDeviceCaps(This->wineD3D, This->adapterNo, This->devType, pCaps); + return IWineD3D_GetDeviceCaps(This->wineD3D, This->adapter->ordinal, This->devType, pCaps); } static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { @@ -7332,7 +7332,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->createParms.hFocusWindow = focus_window; device->createParms.BehaviorFlags = flags; - device->adapterNo = adapter_idx; device->devType = device_type; for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 37244f7..c2bedd6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1513,7 +1513,6 @@ struct IWineD3DDeviceImpl /* Internal use fields */ WINED3DDEVICE_CREATION_PARAMETERS createParms; - UINT adapterNo; WINED3DDEVTYPE devType; IWineD3DSwapChain **swapchains;

1 0

Henri Verbeet : wined3d: Rename the "wineD3D" device field to "wined3d".
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 54f3dec8e614d26f6790bf8934548a2e543e622c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f3dec8e614d26f6790bf893… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 20:20:02 2009 +0100 wined3d: Rename the "wineD3D" device field to "wined3d". --- dlls/wined3d/device.c | 24 ++++++++++++------------ dlls/wined3d/resource.c | 3 ++- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain_base.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c8f6ea1..51c2fa7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -425,8 +425,8 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { if (This->hardwareCursor) DestroyCursor(This->hardwareCursor); This->haveHardwareCursor = FALSE; - IWineD3D_Release(This->wineD3D); - This->wineD3D = NULL; + IWineD3D_Release(This->wined3d); + This->wined3d = NULL; HeapFree(GetProcessHeap(), 0, This); TRACE("Freed device %p\n", This); This = NULL; @@ -1110,7 +1110,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, } /* Get info on the current display setup */ - IWineD3D_GetAdapterDisplayMode(This->wineD3D, This->adapter->ordinal, &Mode); + IWineD3D_GetAdapterDisplayMode(This->wined3d, This->adapter->ordinal, &Mode); object->orig_width = Mode.Width; object->orig_height = Mode.Height; object->orig_fmt = Mode.Format; @@ -2251,8 +2251,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U static HRESULT WINAPI IWineD3DDeviceImpl_GetDirect3D(IWineD3DDevice *iface, IWineD3D **ppD3D) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *ppD3D= This->wineD3D; - TRACE("(%p) : wineD3D returning %p\n", This, *ppD3D); + *ppD3D = This->wined3d; + TRACE("Returning %p.\n", *ppD3D); IWineD3D_AddRef(*ppD3D); return WINED3D_OK; } @@ -4419,7 +4419,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetBackBuffer(IWineD3DDevice *iface, UI static HRESULT WINAPI IWineD3DDeviceImpl_GetDeviceCaps(IWineD3DDevice *iface, WINED3DCAPS* pCaps) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WARN("(%p) : stub, calling idirect3d for now\n", This); - return IWineD3D_GetDeviceCaps(This->wineD3D, This->adapter->ordinal, This->devType, pCaps); + return IWineD3D_GetDeviceCaps(This->wined3d, This->adapter->ordinal, This->devType, pCaps); } static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { @@ -6615,10 +6615,10 @@ static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRE if(!pp->BackBufferWidth) return TRUE; if(!pp->BackBufferHeight) return TRUE; - count = IWineD3D_GetAdapterModeCount(This->wineD3D, This->adapter->ordinal, WINED3DFMT_UNKNOWN); + count = IWineD3D_GetAdapterModeCount(This->wined3d, This->adapter->ordinal, WINED3DFMT_UNKNOWN); for(i = 0; i < count; i++) { memset(&m, 0, sizeof(m)); - hr = IWineD3D_EnumAdapterModes(This->wineD3D, This->adapter->ordinal, WINED3DFMT_UNKNOWN, i, &m); + hr = IWineD3D_EnumAdapterModes(This->wined3d, This->adapter->ordinal, WINED3DFMT_UNKNOWN, i, &m); if(FAILED(hr)) { ERR("EnumAdapterModes failed\n"); } @@ -7303,8 +7303,8 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->lpVtbl = &IWineD3DDevice_Vtbl; device->ref = 1; - device->wineD3D = (IWineD3D *)wined3d; - IWineD3D_AddRef(device->wineD3D); + device->wined3d = (IWineD3D *)wined3d; + IWineD3D_AddRef(device->wined3d); device->adapter = wined3d->adapter_count ? adapter : NULL; device->parent = parent; device->device_parent = device_parent; @@ -7319,7 +7319,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, if (FAILED(hr)) { ERR("Failed to get the adapter's display mode, hr %#x.\n", hr); - IWineD3D_Release(device->wineD3D); + IWineD3D_Release(device->wined3d); return hr; } device->ddraw_width = mode.Width; @@ -7356,7 +7356,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, if (FAILED(hr)) { ERR("Failed to compile state table, hr %#x.\n", hr); - IWineD3D_Release(device->wineD3D); + IWineD3D_Release(device->wined3d); return hr; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 17f336d..ea61c59 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -188,7 +188,8 @@ HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID refguid, void if (data->flags & WINED3DSPD_IUNKNOWN) { *(LPUNKNOWN *)pData = data->ptr.object; - if(((IWineD3DImpl *) This->resource.wineD3DDevice->wineD3D)->dxVersion != 7) { + if (((IWineD3DImpl *)This->resource.wineD3DDevice->wined3d)->dxVersion != 7) + { /* D3D8 and D3D9 addref the private data, DDraw does not. This can't be handled in * ddraw because it doesn't know if the pointer returned is an IUnknown * or just a * Blob diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 41fca71..b3cae54 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -730,7 +730,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) if (This->changed.vertexDecl && This->vertexDecl != targetStateBlock->vertexDecl && (This->blockType != WINED3DSBT_RECORDED - || ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion != 9)) + || ((IWineD3DImpl *)This->wineD3DDevice->wined3d)->dxVersion != 9)) { TRACE("Updating vertex declaration from %p to %p.\n", This->vertexDecl, targetStateBlock->vertexDecl); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bd283af..ed4e9aa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2002,7 +2002,7 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] if (!pal) { - UINT dxVersion = ((IWineD3DImpl *)device->wineD3D)->dxVersion; + UINT dxVersion = ((IWineD3DImpl *)device->wined3d)->dxVersion; /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ if (dxVersion <= 7) diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index 132e0bc..6490d78 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -139,7 +139,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface HRESULT hr; TRACE("(%p)->(%p): Calling GetAdapterDisplayMode\n", This, pMode); - hr = IWineD3D_GetAdapterDisplayMode(This->wineD3DDevice->wineD3D, This->wineD3DDevice->adapter->ordinal, pMode); + hr = IWineD3D_GetAdapterDisplayMode(This->wineD3DDevice->wined3d, This->wineD3DDevice->adapter->ordinal, pMode); TRACE("(%p) : returning w(%d) h(%d) rr(%d) fmt(%u,%s)\n", This, pMode->Width, pMode->Height, pMode->RefreshRate, pMode->Format, debug_d3dformat(pMode->Format)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2bedd6..34f9f33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1459,7 +1459,7 @@ struct IWineD3DDeviceImpl /* WineD3D Information */ IUnknown *parent; IWineD3DDeviceParent *device_parent; - IWineD3D *wineD3D; + IWineD3D *wined3d; struct wined3d_adapter *adapter; /* Window styles to restore when switching fullscreen mode */

1 0

Henri Verbeet : dxgi: The "unknown0" parameter to DXGID3D10CreateDevice() is a pointer.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: efbd38ae84085142b7f7f8f93fa091897d3b674f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbd38ae84085142b7f7f8f93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 20:20:03 2009 +0100 dxgi: The "unknown0" parameter to DXGID3D10CreateDevice() is a pointer. Fixes stack corruption in the 64-bit tests. Thanks to Paul Vriens for debugging this. --- dlls/d3d10/d3d10_main.c | 2 +- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10core/d3d10core.spec | 2 +- dlls/d3d10core/d3d10core_main.c | 4 ++-- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/tests/device.c | 6 +++--- dlls/dxgi/dxgi.spec | 2 +- dlls/dxgi/dxgi_main.c | 4 ++-- dlls/dxgi/tests/device.c | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 10bf533..65ce1e0 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -124,7 +124,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } } - hr = D3D10CoreCreateDevice(factory, adapter, flags, 0, device); + hr = D3D10CoreCreateDevice(factory, adapter, flags, NULL, device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f077115..5bf59b1 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -179,6 +179,6 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, DWORD unknown0, ID3D10Device **device); + UINT flags, void *unknown0, ID3D10Device **device); #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10core/d3d10core.spec b/dlls/d3d10core/d3d10core.spec index 9bf25b5..6569888 100644 --- a/dlls/d3d10core/d3d10core.spec +++ b/dlls/d3d10core/d3d10core.spec @@ -1,2 +1,2 @@ -@ stdcall D3D10CoreCreateDevice(ptr ptr long long ptr) +@ stdcall D3D10CoreCreateDevice(ptr ptr long ptr ptr) @ stdcall D3D10CoreRegisterLayers() diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 4151dd0..9d0c5d7 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -102,13 +102,13 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void) } HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, DWORD unknown0, ID3D10Device **device) + UINT flags, void *unknown0, ID3D10Device **device) { IUnknown *dxgi_device; HMODULE d3d10core; HRESULT hr; - TRACE("factory %p, adapter %p, flags %#x, unknown0 %#x, device %p\n", + TRACE("factory %p, adapter %p, flags %#x, unknown0 %p, device %p.\n", factory, adapter, flags, unknown0, device); d3d10core = GetModuleHandleA("d3d10core.dll"); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 35d5ed3..cc3029f 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -257,7 +257,7 @@ struct dxgi_device_layer }; HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, DWORD unknown0, void **device); + UINT flags, void *unknown0, void **device); HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count); #endif /* __WINE_D3D10CORE_PRIVATE_H */ diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fb166ec..122a154 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -22,7 +22,7 @@ #include "wine/test.h" HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, DWORD unknown0, ID3D10Device **device); + UINT flags, void *unknown0, ID3D10Device **device); static ID3D10Device *create_device(void) { @@ -38,7 +38,7 @@ static ID3D10Device *create_device(void) ok(SUCCEEDED(hr), "EnumAdapters failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; - hr = D3D10CoreCreateDevice(factory, adapter, 0, 0, &device); + hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); if (FAILED(hr)) { HMODULE d3d10ref; @@ -59,7 +59,7 @@ static ID3D10Device *create_device(void) ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; - hr = D3D10CoreCreateDevice(factory, adapter, 0, 0, &device); + hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; } diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index d7f8aba..853d8e2 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -1,3 +1,3 @@ @ stdcall CreateDXGIFactory(ptr ptr) -@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long long ptr) +@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 489f986..312b3b7 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -224,7 +224,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) } HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, DWORD unknown0, void **device) + UINT flags, void *unknown0, void **device) { struct layer_get_size_args get_size_args; struct dxgi_device *dxgi_device; @@ -233,7 +233,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I DWORD count; HRESULT hr; - TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, unknown0 %#x, device %p\n", + TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, unknown0 %p, device %p.\n", d3d10core, factory, adapter, flags, unknown0, device); hr = register_d3d10core_layers(d3d10core); diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 2391c1b..d4ca50b 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -22,7 +22,7 @@ #include "wine/test.h" HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, - IDXGIAdapter *adapter, UINT flags, DWORD arg5, void **device); + IDXGIAdapter *adapter, UINT flags, void *unknown0, void **device); static IDXGIDevice *create_device(HMODULE d3d10core) { @@ -39,7 +39,7 @@ static IDXGIDevice *create_device(HMODULE d3d10core) ok(SUCCEEDED(hr), "EnumAdapters failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, 0, (void **)&device); + hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); if (FAILED(hr)) { HMODULE d3d10ref; @@ -60,7 +60,7 @@ static IDXGIDevice *create_device(HMODULE d3d10core) ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, 0, (void **)&device); + hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; }

1 0

Vincent Povirk : ole32: Change the base IStorage filename to a pointer type .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 9300a92ccccf794208882bf12c5b1e0a3f9a0cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9300a92ccccf794208882bf12… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 7 14:53:36 2009 -0600 ole32: Change the base IStorage filename to a pointer type. The maximum size of the name returned by Stat() on a top-level storage has nothing to do with DIRENTRY_NAME_BUFFER_LEN. Windows can return longer names and probably has a limit of MAX_PATH. Also, Stat always returns an absolute pathname, so we don't need a special case in StgOpenStorage. --- dlls/ole32/storage32.c | 17 +++++----- dlls/ole32/storage32.h | 2 +- dlls/ole32/tests/storage32.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3263221..2015eaf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2242,6 +2242,7 @@ static HRESULT StorageImpl_Construct( HRESULT hr = S_OK; DirEntry currentEntry; DirRef currentEntryRef; + WCHAR fullpath[MAX_PATH]; if ( FAILED( validateSTGM(openFlags) )) return STG_E_INVALIDFLAG; @@ -2272,15 +2273,19 @@ static HRESULT StorageImpl_Construct( This->hFile = hFile; if(pwcsName) { + if (!GetFullPathNameW(pwcsName, MAX_PATH, fullpath, NULL)) + { + lstrcpynW(fullpath, pwcsName, MAX_PATH); + } This->pwcsName = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(pwcsName)+1)*sizeof(WCHAR)); + (lstrlenW(fullpath)+1)*sizeof(WCHAR)); if (!This->pwcsName) { hr = STG_E_INSUFFICIENTMEMORY; goto end; } - strcpyW(This->pwcsName, pwcsName); - lstrcpynW(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN); + strcpyW(This->pwcsName, fullpath); + This->base.filename = This->pwcsName; } /* @@ -5857,7 +5862,6 @@ HRESULT WINAPI StgOpenStorage( HANDLE hFile = 0; DWORD shareMode; DWORD accessMode; - WCHAR fullname[MAX_PATH]; TRACE("(%s, %p, %x, %p, %d, %p)\n", debugstr_w(pwcsName), pstgPriority, grfMode, @@ -6011,11 +6015,6 @@ HRESULT WINAPI StgOpenStorage( goto end; } - /* prepare the file name string given in lieu of the root property name */ - GetFullPathNameW(pwcsName, MAX_PATH, fullname, NULL); - memcpy(newStorage->base.filename, fullname, DIRENTRY_NAME_BUFFER_LEN); - newStorage->base.filename[DIRENTRY_NAME_BUFFER_LEN-1] = '\0'; - /* * Get an "out" pointer for the caller. */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index a087e0d..fdac6a5 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -239,7 +239,7 @@ struct StorageBaseImpl DWORD stateBits; /* If set, this overrides the root storage name returned by IStorage_Stat */ - WCHAR filename[DIRENTRY_NAME_BUFFER_LEN]; + LPCWSTR filename; BOOL create; /* Was the storage created or opened. The behaviour of STGM_SIMPLE depends on this */ diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 6e222c7..b5ecf22 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2466,6 +2466,76 @@ static void test_rename(void) ok( r == TRUE, "deleted file\n"); } +static void test_toplevel_stat(void) +{ + IStorage *stg = NULL; + HRESULT r; + STATSTG stat; + WCHAR prev_dir[MAX_PATH]; + WCHAR temp[MAX_PATH]; + WCHAR full_path[MAX_PATH]; + LPWSTR rel_path; + + DeleteFileA(filenameA); + + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + + IStorage_Release( stg ); + + r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); + + r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + + IStorage_Release( stg ); + + DeleteFileA(filenameA); + + /* Stat always returns the full path, even for files opened with a relative path. */ + GetCurrentDirectoryW(MAX_PATH, prev_dir); + + GetTempPathW(MAX_PATH, temp); + + SetCurrentDirectoryW(temp); + + GetFullPathNameW(filename, MAX_PATH, full_path, &rel_path); + + r = StgCreateDocfile( rel_path, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + + IStorage_Release( stg ); + + r = StgOpenStorage( rel_path, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); + + r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); + ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); + CoTaskMemFree(stat.pwcsName); + + IStorage_Release( stg ); + + SetCurrentDirectoryW(prev_dir); + + DeleteFileA(filenameA); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2503,4 +2573,5 @@ START_TEST(storage32) test_copyto_iidexclusions_storage(); test_copyto_iidexclusions_stream(); test_rename(); + test_toplevel_stat(); }

1 0

Alexandre Julliard : ntdll: Get rid of a line break in a trace.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 019e40493898873a8e0f2ebbc883d0858633acc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019e40493898873a8e0f2ebbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 7 21:25:20 2009 +0100 ntdll: Get rid of a line break in a trace. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1af4116..00c54c2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -105,7 +105,7 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT ANSI_STRING unix_name; int created = FALSE; - TRACE("handle=%p access=%08x name=%s objattr=%08x root=%p sec=%p io=%p alloc_size=%p\n" + TRACE("handle=%p access=%08x name=%s objattr=%08x root=%p sec=%p io=%p alloc_size=%p " "attr=%08x sharing=%08x disp=%d options=%08x ea=%p.0x%08x\n", handle, access, debugstr_us(attr->ObjectName), attr->Attributes, attr->RootDirectory, attr->SecurityDescriptor, io, alloc_size,

1 0

Scott Ritchie : Update Ubuntu install instructions
by Jeremy Newman 07 Dec '09

07 Dec '09

Module: website Branch: master Commit: 8238f8dbacba18546e645d1359dbd9e50d5ae71a URL: http://source.winehq.org/git/website.git/?a=commit;h=8238f8dbacba18546e645d… Author: Scott Ritchie <scott(a)open-vote.org> Date: Sun Dec 6 14:25:57 2009 -0800 Update Ubuntu install instructions Update ubuntu install instructions >From 303aa1f6aedd1ac1812cf121c743c0e9068d62d2 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)scott-laptop.(none)> Date: Sun, 6 Dec 2009 14:21:58 -0800 Subject: Update Ubuntu install instructions --- images/distro/ubuntu-ppa.png | Bin 0 -> 58532 bytes templates/en/download/deb.template | 16 ++++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/images/distro/ubuntu-ppa.png b/images/distro/ubuntu-ppa.png new file mode 100644 index 0000000..d839cfc Binary files /dev/null and b/images/distro/ubuntu-ppa.png differ diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index 6f44d0a..b843618 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -3,7 +3,7 @@ <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Wine for Ubuntu and Ubuntu derivatives -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> +<a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> <p>Ubuntu and other Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of @@ -27,7 +27,7 @@ beta packages.</i></p> <b>System->Administration->Software Sources</b>. Then select the <b>Third Party Software</b> tab and click <b>Add</b>.</p> -<img src="{$root}/images/distro/ubuntu-softwaresources1.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Third Party Software" border="0"> <p>Then, <b>copy and paste one of the lines below</b> depending on which version you are running.</p> @@ -41,7 +41,7 @@ version you are running.</p> <p><b>For Ubuntu Hardy (8.04):</b><br> <i>deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron"</i></p> -<h2>Trusting the WineHQ APT Repository:</h2> +<h2>Trusting the WineHQ APT Repository (9.04 and earlier):</h2> <p>After adding the repository, you also need to add the key for the repository to your system's list of trusted keys. Ubuntu 9.10 users may skip this step.</p> @@ -82,10 +82,14 @@ the packages are available at <p>It is also possible to add the Wine repositories and install via the command line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu -derivatives.</p> +derivatives. You will need to run these in a terminal window.</p> -<p>First, open a terminal window (Applications->Accessories->Terminal). Then -add the repository's key to your system's list of trusted APT keys by copy +<h3>For 9.10 (Karmic):</h3> + +<p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> + +<h3>For 9.04 and earlier:</h3> +<p>Add the repository's key to your system's list of trusted APT keys by copy and pasting the following into your terminal:</p> <p><i>wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add -</i></p>

1 0