wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

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 : 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_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: 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

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

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

Alexandre Julliard : ntdll/tests: Add tests for open directories with NtCreateFile and strange options.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 538c8bc5e8c1e97021d38a7b95e35cef43c9aa80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538c8bc5e8c1e97021d38a7b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:19:05 2009 +0100 ntdll/tests: Add tests for open directories with NtCreateFile and strange options. --- dlls/ntdll/tests/file.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 39e71a5..dff5d9f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -50,6 +50,7 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG, ULONG * ); static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG, ULONG, PLARGE_INTEGER ); +static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); static NTSTATUS (WINAPI *pNtOpenFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); static NTSTATUS (WINAPI *pNtDeleteFile)(POBJECT_ATTRIBUTES ObjectAttributes); static NTSTATUS (WINAPI *pNtReadFile)(HANDLE hFile, HANDLE hEvent, @@ -152,6 +153,84 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ok( !reserved, "reserved is not 0: %x\n", reserved ); } +static void create_file_test(void) +{ + NTSTATUS status; + HANDLE dir; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + UINT len; + + len = GetCurrentDirectoryW( MAX_PATH, path ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + /* try various open modes and options on directories */ + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( dir ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_DIRECTORY_FILE, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN_IF, FILE_DIRECTORY_FILE, NULL, 0 ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( dir ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_SUPERSEDE, FILE_DIRECTORY_FILE, NULL, 0 ); + ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OVERWRITE, FILE_DIRECTORY_FILE, NULL, 0 ); + ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OVERWRITE_IF, FILE_DIRECTORY_FILE, NULL, 0 ); + ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN, 0, NULL, 0 ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( dir ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, 0, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN_IF, 0, NULL, 0 ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( dir ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_SUPERSEDE, 0, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OVERWRITE, 0, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OVERWRITE_IF, 0, NULL, 0 ); + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); +} + static void open_file_test(void) { NTSTATUS status; @@ -1344,6 +1423,7 @@ START_TEST(file) pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll, "RtlWow64EnableFsRedirectionEx"); pNtCreateMailslotFile = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile"); + pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); pNtDeleteFile = (void *)GetProcAddress(hntdll, "NtDeleteFile"); pNtReadFile = (void *)GetProcAddress(hntdll, "NtReadFile"); @@ -1360,6 +1440,7 @@ START_TEST(file) pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); + create_file_test(); open_file_test(); delete_file_test(); read_file_test();

1 0

Alexandre Julliard : server: Improve parameter checks when opening a directory.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 151446a2a60e4d5165873d3c183f926dd0edbd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151446a2a60e4d5165873d3c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 12:18:44 2009 +0100 server: Improve parameter checks when opening a directory. --- server/fd.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/server/fd.c b/server/fd.c index 8f35812..e26ce04 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1732,7 +1732,8 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, int root_fd = -1; int rw_mode; - if ((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) + if (((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) || + ((options & FILE_DIRECTORY_FILE) && (flags & O_TRUNC))) { set_error( STATUS_INVALID_PARAMETER ); return NULL; @@ -1785,9 +1786,13 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1) { /* if we tried to open a directory for write access, retry read-only */ - if (errno != EISDIR || - !(access & FILE_UNIX_WRITE_ACCESS) || - (fd->unix_fd = open( name, O_RDONLY | (flags & ~(O_TRUNC | O_CREAT | O_EXCL)), *mode )) == -1) + if (errno == EISDIR) + { + if ((access & FILE_UNIX_WRITE_ACCESS) || (flags & O_CREAT)) + fd->unix_fd = open( name, O_RDONLY | (flags & ~(O_TRUNC | O_CREAT | O_EXCL)), *mode ); + } + + if (fd->unix_fd == -1) { file_set_error(); goto error; @@ -1836,7 +1841,16 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, return NULL; } strcpy( closed_fd->unlink, unlink_name ); - if (flags & O_TRUNC) ftruncate( fd->unix_fd, 0 ); + if (flags & O_TRUNC) + { + if (S_ISDIR(st.st_mode)) + { + release_object( fd ); + set_error( STATUS_OBJECT_NAME_COLLISION ); + return NULL; + } + ftruncate( fd->unix_fd, 0 ); + } } else /* special file */ {

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

Łukasz Wojniłowicz : Polish translation for release 1.1.34
by Jeremy Newman 07 Dec '09

07 Dec '09

Module: website Branch: master Commit: 5b49e4906982e28677e512cd597cef175d5f47d0 URL: http://source.winehq.org/git/website.git/?a=commit;h=5b49e4906982e28677e512… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 5 10:52:28 2009 +0100 Polish translation for release 1.1.34 --- news/pl/2009120401.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2009120401.xml b/news/pl/2009120401.xml new file mode 100644 index 0000000..8bf6a18 --- /dev/null +++ b/news/pl/2009120401.xml @@ -0,0 +1,17 @@ +<news> +<date>Grudzień 4, 2009</date> +<title>Wydano Wine 1.1.34</title> +<body> + Wydanie rozwojowe Wine 1.1.34 jest już dostępne. + <a href="{$root}/announce/1.1.34">Co nowego</a> w tym wydaniu: +<ul> + <li>Wiele poprawek we wsparciu certyfikatów crypto.</li> + <li>Dużo ulepszeń MSHTML.</li> + <li>Wiele poprawek we wsparciu Left 4 Dead 2 DRM.</li> + <li>Duża liczba poprawek w uszeregowaniach OLE.</li> + <li>Wiele ulepszeń Listview.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.34.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009