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

Stefan Dösinger : wined3d: Remove the buffer fvf.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: f0efa9741353b9a7871eab17508404ffafb5fb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0efa9741353b9a7871eab175… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 14:16:59 2009 +0200 wined3d: Remove the buffer fvf. --- dlls/d3d8/device.c | 7 +++++-- dlls/d3d9/device.c | 3 ++- dlls/d3d9/vertexbuffer.c | 4 +++- dlls/ddraw/vertexbuffer.c | 3 ++- dlls/wined3d/buffer.c | 5 ++++- dlls/wined3d/device.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 3 --- include/wine/wined3d.idl | 4 ++-- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 352018f..057d895 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -737,7 +737,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 object->lpVtbl = &Direct3DVertexBuffer8_Vtbl; object->ref = 1; EnterCriticalSection(&d3d8_cs); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, + 0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, + (IUnknown *)object); LeaveCriticalSection(&d3d8_cs); object->fvf = FVF; @@ -1662,10 +1664,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVI static HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 iface, UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,IDirect3DVertexBuffer8* pDestBuffer,DWORD Flags) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; + IDirect3DVertexBuffer8Impl *dest = (IDirect3DVertexBuffer8Impl *) pDestBuffer; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, ((IDirect3DVertexBuffer8Impl *)pDestBuffer)->wineD3DVertexBuffer, NULL, Flags); + hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, NULL, Flags, dest->fvf); LeaveCriticalSection(&d3d8_cs); return hr; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d335fc..bfbfe97 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1449,10 +1449,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DVertexDeclaration9Impl *Decl = (IDirect3DVertexDeclaration9Impl *) pVertexDecl; HRESULT hr; + IDirect3DVertexBuffer9Impl *dest = (IDirect3DVertexBuffer9Impl *) pDestBuffer; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, ((IDirect3DVertexBuffer9Impl *)pDestBuffer)->wineD3DVertexBuffer, Decl ? Decl->wineD3DVertexDeclaration : NULL, Flags); + hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, Decl ? Decl->wineD3DVertexDeclaration : NULL, Flags, dest->fvf); LeaveCriticalSection(&d3d9_cs); return hr; } diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d13ebef..71a9ca7 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -247,7 +247,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->fvf = FVF; EnterCriticalSection(&d3d9_cs); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), pSharedHandle, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, + 0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), + pSharedHandle, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); if (hrc != D3D_OK) { diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index de94791..df7528b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -384,7 +384,8 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, Count, This->wineD3DVertexBuffer, NULL /* Output vdecl */, - Flags); + Flags, + This->fvf); /* Restore the states if needed */ if(doClip != oldClip) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1945474..0c53c23 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -317,11 +317,15 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) * processing, FLOAT4 POSITIONT with fixed function, and FLOAT16 if * GL_NV_half_float is not supported. * + * Note for d3d8 and d3d9: * The vertex buffer FVF doesn't help with finding them, we have to use * the decoded vertex declaration and pick the things that concern the * current buffer. A problem with this is that this can change between * draws, so we have to validate the information and reprocess the buffer * if it changes, and avoid false positives for performance reasons. + * WineD3D doesn't even know the vertex buffer any more, it is managed + * by the client libraries and passed to SetStreamSource and ProcessVertices + * as needed. * * We have to distinguish between vertex shaders and fixed function to * pick the way we access the strided vertex information. @@ -938,7 +942,6 @@ static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBU desc->Usage = This->resource.usage; desc->Pool = This->resource.pool; desc->Size = This->resource.size; - desc->FVF = This->fvf; return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0fcf59..fc968db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -552,8 +552,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("(%p) : Size=%d, Usage=0x%08x, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); *ppVertexBuffer = (IWineD3DBuffer *)object; - object->fvf = FVF; - /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2). * @@ -4506,11 +4504,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, - const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags) + const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags, + DWORD DestFVF) { char *dest_ptr, *dest_conv = NULL, *dest_conv_addr = NULL; unsigned int i; - DWORD DestFVF = dest->fvf; WINED3DVIEWPORT vp; WINED3DMATRIX mat, proj_mat, view_mat, world_mat; BOOL doClip; @@ -4866,7 +4864,8 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn #undef copy_and_next static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, UINT SrcStartIndex, UINT DestIndex, - UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags) + UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags, + DWORD DestFVF) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_stream_info stream_info; @@ -4912,7 +4911,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, } return process_vertices_strided(This, DestIndex, VertexCount, &stream_info, - (struct wined3d_buffer *)pDestBuffer, Flags); + (struct wined3d_buffer *)pDestBuffer, Flags, DestFVF); } /***** diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59944a4..4076912 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,9 +2095,6 @@ struct wined3d_buffer UINT dirty_end; LONG lock_count; - /* legacy vertex buffers */ - DWORD fvf; - /* conversion stuff */ UINT conversion_count; UINT draw_count; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b33b8ca..f6e5ef5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1869,7 +1869,6 @@ typedef struct _WINED3DBUFFER_DESC DWORD Usage; WINED3DPOOL Pool; UINT Size; - DWORD FVF; } WINED3DBUFFER_DESC; typedef struct glDescriptor @@ -3349,7 +3348,8 @@ interface IWineD3DDevice : IWineD3DBase [in] UINT vertex_count, [in] IWineD3DBuffer *dest_buffer, [in] IWineD3DVertexDeclaration *declaration, - [in] DWORD flags + [in] DWORD flags, + [in] DWORD DestFVF ); HRESULT BeginStateBlock( );

1 0

Christian Costa : mciqtz32: Implement MCI_STATUS.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 5ab983e979e0b63c1bd3d8455d46ed4b97069024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab983e979e0b63c1bd3d8455… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Apr 8 23:22:50 2009 +0200 mciqtz32: Implement MCI_STATUS. --- dlls/mciqtz32/mciqtz.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 874b876..0cd973b 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -336,6 +336,84 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa return 0; } +/*************************************************************************** + * MCIQTZ_mciStatus [internal] + */ +static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (!(dwFlags & MCI_STATUS_ITEM)) { + WARN("No status item specified\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + switch (lpParms->dwItem) { + case MCI_STATUS_LENGTH: + FIXME("MCI_STATUS_LENGTH not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_POSITION: + { + HRESULT hr; + REFTIME curpos; + IMediaPosition* pmpos; + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); + if (FAILED(hr)) { + FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + hr = IMediaPosition_get_CurrentPosition(pmpos, &curpos); + if (FAILED(hr)) { + FIXME("Cannot get position (hr = %x)\n", hr); + IMediaPosition_Release(pmpos); + return MCIERR_INTERNAL; + } + + IMediaPosition_Release(pmpos); + lpParms->dwReturn = curpos / 10000; + + break; + } + case MCI_STATUS_NUMBER_OF_TRACKS: + FIXME("MCI_STATUS_NUMBER_OF_TRACKS not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MODE: + FIXME("MCI_STATUS_MODE not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MEDIA_PRESENT: + FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_TIME_FORMAT: + FIXME("MCI_STATUS_TIME_FORMAT not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_READY: + FIXME("MCI_STATUS_READY not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_CURRENT_TRACK: + FIXME("MCI_STATUS_CURRENT_TRACK not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + default: + FIXME("Unknown command %08X\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + + return 0; +} + /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -371,12 +449,12 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); + case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_RECORD: case MCI_STOP: case MCI_SET: case MCI_PAUSE: case MCI_RESUME: - case MCI_STATUS: case MCI_GETDEVCAPS: case MCI_INFO: case MCI_PUT:

1 0

Stefan Dösinger : d3d9: Store the FVF in the d3d9 vertex buffer.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 77e6dcca02080c065fa1d68d2cf6077b882e0cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e6dcca02080c065fa1d68d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 10:48:42 2009 +0200 d3d9: Store the FVF in the d3d9 vertex buffer. --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/vertexbuffer.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8436b1d..9338f97 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -329,6 +329,8 @@ typedef struct IDirect3DVertexBuffer9Impl /* Parent reference */ LPDIRECT3DDEVICE9EX parentDevice; + + DWORD fvf; } IDirect3DVertexBuffer9Impl; /* --------------------- */ diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 63cac92..d13ebef 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -197,8 +197,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 pDesc->Usage = desc.Usage; pDesc->Pool = desc.Pool; pDesc->Size = desc.Size; - pDesc->FVF = desc.FVF; pDesc->Type = D3DRTYPE_VERTEXBUFFER; + pDesc->FVF = This->fvf; } @@ -245,6 +245,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface object->lpVtbl = &Direct3DVertexBuffer9_Vtbl; object->ref = 1; + object->fvf = FVF; EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), pSharedHandle, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs);

1 0

Stefan Dösinger : d3d: Remove the format from index buffers.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: cb1c9dcda9267b2826ecfaf061dd557957a0b5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1c9dcda9267b2826ecfaf06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 10:50:31 2009 +0200 d3d: Remove the format from index buffers. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 7 +++++-- dlls/d3d8/indexbuffer.c | 2 +- dlls/d3d8/vertexbuffer.c | 2 +- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 7 ++++--- dlls/d3d9/indexbuffer.c | 5 +++-- dlls/d3d9/vertexbuffer.c | 2 +- dlls/ddraw/device.c | 5 +++-- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/surface.c | 2 +- dlls/wined3d/buffer.c | 1 - dlls/wined3d/device.c | 15 +++++++-------- dlls/wined3d/stateblock.c | 13 +++++++++---- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 5 ++--- 16 files changed, 42 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1c9dcda9267b2826ecf…

1 0

Alexandre Julliard : ntdll: Remove pthread_data from the ntdll_thread_data structure. Document the offsets for 64-bit.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 2a2fe959afd1e6bc0d28b088dc6791afc10626cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2fe959afd1e6bc0d28b088d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 14:41:12 2009 +0200 ntdll: Remove pthread_data from the ntdll_thread_data structure. Document the offsets for 64-bit. --- dlls/ntdll/ntdll_misc.h | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 61622b1..b626df8 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -188,15 +188,14 @@ struct debug_info /* thread private data, stored in NtCurrentTeb()->SystemReserved2 */ struct ntdll_thread_data { - DWORD fs; /* 1d4 TEB selector */ - DWORD gs; /* 1d8 libc selector; update winebuild if you move this! */ - struct debug_info *debug_info; /* 1dc info for debugstr functions */ - int request_fd; /* 1e0 fd for sending server requests */ - int reply_fd; /* 1e4 fd for receiving server replies */ - int wait_fd[2]; /* 1e8 fd for sleeping server requests */ - void *vm86_ptr; /* 1f0 data for vm86 mode */ - void *pthread_data; /* 1f4 private data for pthread emulation */ - pthread_t pthread_id; /* 1f8 pthread thread id */ + DWORD fs; /* 1d4/300 TEB selector */ + DWORD gs; /* 1d8/304 libc selector; update winebuild if you move this! */ + struct debug_info *debug_info; /* 1dc/308 info for debugstr functions */ + int request_fd; /* 1e0/310 fd for sending server requests */ + int reply_fd; /* 1e4/314 fd for receiving server replies */ + int wait_fd[2]; /* 1e8/318 fd for sleeping server requests */ + void *vm86_ptr; /* 1f0/320 data for vm86 mode */ + pthread_t pthread_id; /* 1f4/328 pthread thread id */ }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void)

1 0

Nicolas Le Cam : shell32/tests: Skip FolderShortcut test on Win2k.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: fbcec1ca56e7acff180b23e81b6f1d38060ad4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcec1ca56e7acff180b23e81… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Apr 9 00:01:12 2009 +0200 shell32/tests: Skip FolderShortcut test on Win2k. Skip this test as it doesn't work on Win2k. CoCreateInstance is successful but IPersistPropertyBag_Load call fails. --- dlls/shell32/tests/shlfolder.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a45a386..5c30a7b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1196,7 +1196,13 @@ static void test_FolderShortcut(void) { win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n"); return; } - + + if (!pSHGetFolderPathAndSubDirA) + { + win_skip("FolderShortcut test doesn't work on Win2k\n"); + return; + } + /* These tests basically show, that CLSID_FolderShortcuts are initialized * via their IPersistPropertyBag interface. And that the target folder * is taken from the IPropertyBag's 'Target' property. @@ -1216,7 +1222,7 @@ static void test_FolderShortcut(void) { IPersistPropertyBag_Release(pPersistPropertyBag); return; } - + hr = IPersistPropertyBag_QueryInterface(pPersistPropertyBag, &IID_IShellFolder, (LPVOID*)&pShellFolder); IPersistPropertyBag_Release(pPersistPropertyBag);

1 0

Henri Verbeet : wined3d: Only update the swizzle and use map for streams that are actually used in device_stream_info_from_strided ().
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 877e252681b4d75abc2392704479ab78f332670d URL: http://source.winehq.org/git/wine.git/?a=commit;h=877e252681b4d75abc2392704… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:27 2009 +0200 wined3d: Only update the swizzle and use map for streams that are actually used in device_stream_info_from_strided(). This fixes a regression introduced by d7c7c768507a923902e9178f98343e22e4e22652 and exposed by ef2d70418383f03c6bf701caeb67129acc6d2453. Unfortunately having EXT_vertex_array_bgra support masks the problem, which is why the regression tests didn't catch it. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f44d75d..d0fcf59 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -352,6 +352,8 @@ void device_stream_info_from_strided(IWineD3DDeviceImpl *This, for (i = 0; i < sizeof(stream_info->elements) / sizeof(*stream_info->elements); ++i) { + if (!stream_info->elements[i].format_desc) continue; + if (!GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) && stream_info->elements[i].format_desc->format == WINED3DFMT_A8R8G8B8) { stream_info->swizzle_map |= 1 << i;

1 0

Henri Verbeet : wined3d: Get rid of a redundant strcat in shader_glsl_get_register_name().
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 3a0eb81cea5301103da362e2594ca828fc8bc6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0eb81cea5301103da362e25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:29 2009 +0200 wined3d: Get rid of a redundant strcat in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 85 +++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a0eb81cea5301103da36…

1 0

Nicolas Le Cam : shell32/tests: Skip interactive part of SetNameOf test on Win2k.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: eb57396fc62b1c4fc56c187273c534ca82abc1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb57396fc62b1c4fc56c18727… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 7 19:15:35 2009 +0200 shell32/tests: Skip interactive part of SetNameOf test on Win2k. Passing an absolute path to SetNameOf on Win2k display an error message box about invalid characters in filename, forcing interaction during test. --- dlls/shell32/tests/shlfolder.c | 63 +++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 08ea9cc..cbbad01 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -473,7 +473,7 @@ static void test_GetDisplayName(void) IShellFolder_Release(psfFile); } - if(!pSHBindToParent) + if (!pSHBindToParent) { win_skip("SHBindToParent is missing\n"); DeleteFileA(szTestFile); @@ -482,37 +482,42 @@ static void test_GetDisplayName(void) } /* Some tests for IShellFolder::SetNameOf */ - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); - ok(SUCCEEDED(hr), "SHBindToParent failed! hr = %08x\n", hr); - if (SUCCEEDED(hr)) { - /* It's ok to use this fixed path. Call will fail anyway. */ - WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; - LPITEMIDLIST pidlNew; - - /* The pidl returned through the last parameter of SetNameOf is a simple one. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); - ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); - if(hr == S_OK) - { - ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, - "pidl returned from SetNameOf should be simple!\n"); - - /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf - * is implemented on top of SHFileOperation in WinXP. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, - SHGDN_FORPARSING, NULL); - ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); - - /* Rename the file back to its original name. SetNameOf ignores the fact, that the - * SHGDN flags specify an absolute path. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + if (pSHGetFolderPathAndSubDirA) + { + hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + ok(SUCCEEDED(hr), "SHBindToParent failed! hr = %08x\n", hr); + if (SUCCEEDED(hr)) { + /* It's ok to use this fixed path. Call will fail anyway. */ + WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; + LPITEMIDLIST pidlNew; + + /* The pidl returned through the last parameter of SetNameOf is a simple one. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); + if (hr == S_OK) + { + ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); + + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, + SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); + + /* Rename the file back to its original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); + + pILFree(pidlNew); + } - pILFree(pidlNew); + IShellFolder_Release(psfPersonal); } - - IShellFolder_Release(psfPersonal); } + else + win_skip("Avoid needs of interaction on Win2k\n"); /* Deleting the file and the directory */ DeleteFileA(szTestFile);

1 0

Nicolas Le Cam : shell32/tests: Fix PropertyBag test on Win2k.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 1d3edf6377cf346eed758bdfe1c6a81f5dadde5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3edf6377cf346eed758bdfe… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 7 19:16:46 2009 +0200 shell32/tests: Fix PropertyBag test on Win2k. --- dlls/shell32/tests/shlfolder.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cbbad01..a45a386 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1106,7 +1106,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC 'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 }; if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { - ok(V_VT(pVar) == VT_I4, "Wrong variant type for 'TargetSpecialFolder' property!\n"); + ok(V_VT(pVar) == VT_I4 || + broken(V_VT(pVar) == VT_BSTR), /* Win2k */ + "Wrong variant type for 'TargetSpecialFolder' property!\n"); return E_INVALIDARG; } @@ -1120,7 +1122,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC WCHAR wszPath[MAX_PATH]; BOOL result; - ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'Target' property!\n"); + ok(V_VT(pVar) == VT_BSTR || + broken(V_VT(pVar) == VT_EMPTY), /* Win2k */ + "Wrong variant type for 'Target' property!\n"); if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG; result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE);

1 0