September 2010 - Wine-commits

Henri Verbeet : wined3d: IWineD3DBuffer_GetDesc() should never fail.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: fd7c1cbf052b428e694d9b49c7a4f60f0ea08b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7c1cbf052b428e694d9b49c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:38 2010 +0200 wined3d: IWineD3DBuffer_GetDesc() should never fail. --- dlls/d3d8/buffer.c | 38 +++++++++++++++----------------------- dlls/d3d9/buffer.c | 38 +++++++++++++++----------------------- dlls/ddraw/device.c | 7 +++---- dlls/ddraw/vertexbuffer.c | 19 +++---------------- dlls/wined3d/buffer.c | 4 +--- include/wine/wined3d.idl | 2 +- 6 files changed, 38 insertions(+), 70 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 513c655..f7dc12d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -212,25 +212,21 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D { IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->FVF = buffer->fvf; - desc->Format = D3DFMT_VERTEXDATA; - } + desc->Type = D3DRTYPE_VERTEXBUFFER; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->FVF = buffer->fvf; + desc->Format = D3DFMT_VERTEXDATA; - return hr; + return D3D_OK; } static const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = @@ -479,25 +475,21 @@ static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, D3DINDEXBUFFER_DESC *desc) { IDirect3DIndexBuffer8Impl *buffer = (IDirect3DIndexBuffer8Impl *)iface; - HRESULT hr; WINED3DBUFFER_DESC wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - } + desc->Format = d3dformat_from_wined3dformat(buffer->format); + desc->Type = D3DRTYPE_INDEXBUFFER; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; - return hr; + return D3D_OK; } static const IDirect3DIndexBuffer8Vtbl d3d8_indexbuffer_vtbl = diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index c70aae9..ac8c244 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -214,25 +214,21 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D { IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = D3DFMT_VERTEXDATA; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->FVF = buffer->fvf; - } + desc->Format = D3DFMT_VERTEXDATA; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->Type = D3DRTYPE_VERTEXBUFFER; + desc->FVF = buffer->fvf; - return hr; + return D3D_OK; } static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = @@ -482,24 +478,20 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D { IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->Type = D3DRTYPE_INDEXBUFFER; - } + desc->Format = d3dformat_from_wined3dformat(buffer->format); + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->Type = D3DRTYPE_INDEXBUFFER; - return hr; + return D3D_OK; } static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 95526bd..8e25543 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4345,10 +4345,9 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, } /* check that the buffer is large enough to hold the indices, - * reallocate if necessary. - */ - hr = IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); - if(desc.Size < IndexCount * sizeof(WORD)) + * reallocate if necessary. */ + IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); + if (desc.Size < IndexCount * sizeof(WORD)) { UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); IWineD3DBuffer *buffer; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index b40faa2..36087f2 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -232,13 +232,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, if(Size) { /* Get the size, for returning it, and for locking */ - hr = IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &Desc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::GetDesc failed with hr=%08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &Desc); *Size = Desc.Size; } @@ -425,26 +419,19 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; WINED3DBUFFER_DESC WDesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, Desc); if(!Desc) return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - hr = IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &WDesc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::GetDesc failed with hr=%08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &WDesc); + LeaveCriticalSection(&ddraw_cs); /* Now fill the Desc structure */ Desc->dwCaps = This->Caps; Desc->dwFVF = This->fvf; Desc->dwNumVertices = WDesc.Size / get_flexible_vertex_size(This->fvf); - LeaveCriticalSection(&ddraw_cs); return D3D_OK; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 166508a..e9b2172 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1413,7 +1413,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) +static void STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -1423,8 +1423,6 @@ static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBU desc->Usage = This->resource.usage; desc->Pool = This->resource.pool; desc->Size = This->resource.size; - - return WINED3D_OK; } static const struct IWineD3DBufferVtbl wined3d_buffer_vtbl = diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 80dabac..53bfeae 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2736,7 +2736,7 @@ interface IWineD3DBuffer : IWineD3DResource ); HRESULT Unmap( ); - HRESULT GetDesc( + void GetDesc( [out] WINED3DBUFFER_DESC *desc ); }

1 0

Henri Verbeet : wined3d: Get rid of redundant comparisons against NULL / 0.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: b68d257710ba6bbac33f1470df98efe7c81050e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68d257710ba6bbac33f1470d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:39 2010 +0200 wined3d: Get rid of redundant comparisons against NULL / 0. --- dlls/wined3d/arb_program_shader.c | 128 +++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 18 ++-- dlls/wined3d/basetexture.c | 6 +- dlls/wined3d/buffer.c | 8 +- dlls/wined3d/clipper.c | 11 +-- dlls/wined3d/device.c | 142 ++++++++++++++++++++---------------- dlls/wined3d/directx.c | 29 ++++--- dlls/wined3d/drawprim.c | 40 +++++----- dlls/wined3d/glsl_shader.c | 28 ++++--- dlls/wined3d/palette.c | 6 +- dlls/wined3d/query.c | 6 +- dlls/wined3d/resource.c | 15 ++-- dlls/wined3d/shader.c | 6 +- dlls/wined3d/state.c | 26 ++++--- dlls/wined3d/stateblock.c | 7 +- dlls/wined3d/surface.c | 34 ++++---- dlls/wined3d/surface_base.c | 25 ++++--- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/swapchain_base.c | 6 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_main.c | 14 ++-- dlls/wined3d/wined3d_private.h | 2 +- 23 files changed, 299 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b68d257710ba6bbac33f1…

1 0

Henri Verbeet : wined3d: Get rid of redundant comparisons against FALSE.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 0b15963b4edf7cdf53b5b5162fc48fa0c424a1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b15963b4edf7cdf53b5b5162… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:40 2010 +0200 wined3d: Get rid of redundant comparisons against FALSE. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/swapchain_gdi.c | 3 ++- dlls/wined3d/utils.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c1927b0..05ff012 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5313,7 +5313,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio bool_const = get_bool_const(ins, This, ins->src[0].reg.idx); if(ins->src[0].modifiers == WINED3DSPSM_NOT) bool_const = !bool_const; - if(!priv->muted && bool_const == FALSE) + if (!priv->muted && !bool_const) { shader_addline(buffer, "#if(FALSE){\n"); priv->muted = TRUE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c9ec815..35558ad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -81,7 +81,8 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { + if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode) + { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index 250485b..8920cae 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -65,7 +65,8 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { + if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode) + { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6cc154e..8760ce6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2880,7 +2880,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting memset(&settings->op[i], 0xff, sizeof(settings->op[i])); } - if(stateblock->renderState[WINED3DRS_FOGENABLE] == FALSE) { + if (!stateblock->renderState[WINED3DRS_FOGENABLE]) + { settings->fog = FOG_OFF; } else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { if(use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->position_transformed) {

1 0

Henri Verbeet : wined3d: Introduce a structure for stream state.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 6ce848bee49968e53626e472f7af0dd0b4b7f3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce848bee49968e53626e472f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:41 2010 +0200 wined3d: Introduce a structure for stream state. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 142 ++++++++++++++++++++++------------------ dlls/wined3d/drawprim.c | 36 +++++----- dlls/wined3d/state.c | 90 +++++++++++++++---------- dlls/wined3d/stateblock.c | 47 ++++++++----- dlls/wined3d/wined3d_private.h | 15 +++-- 6 files changed, 186 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ce848bee49968e53626e…

1 0

Hans Leidekker : include: Add knownfolders.h.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 6416430f687db227c9150134aa1a5bb567f095ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6416430f687db227c9150134a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:00:14 2010 +0200 include: Add knownfolders.h. --- include/Makefile.in | 1 + include/knownfolders.h | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6416430f687db227c9150…

1 0

Hans Leidekker : include/shlobj.h: Add known folder flags.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 4deb1844c736ebe79e50a04a429170af46f5f118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deb1844c736ebe79e50a04a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:00:44 2010 +0200 include/shlobj.h: Add known folder flags. --- include/shlobj.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index e0170ea..ad41f94 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -85,6 +85,15 @@ BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); +#define KF_FLAG_SIMPLE_IDLIST 0x00000100 +#define KF_FLAG_NOT_PARENT_RELATIVE 0x00000200 +#define KF_FLAG_DEFAULT_PATH 0x00000400 +#define KF_FLAG_INIT 0x00000800 +#define KF_FLAG_NO_ALIAS 0x00001000 +#define KF_FLAG_DONT_UNEXPAND 0x00002000 +#define KF_FLAG_DONT_VERIFY 0x00004000 +#define KF_FLAG_CREATE 0x00008000 + #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */ #define SHFMT_NOFORMAT 0xFFFFFFFDL /* Drive is not formattable */

1 0

Hans Leidekker : shell32: Implement SHGetKnownFolderPath.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 678c6776901425654c05988202ed53f7e9a68334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678c6776901425654c0598820… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:01:14 2010 +0200 shell32: Implement SHGetKnownFolderPath. --- dlls/shell32/shell32_En.rc | 18 ++ dlls/shell32/shellpath.c | 431 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/shresdef.h | 19 ++ 3 files changed, 464 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=678c6776901425654c059…

1 0

Hans Leidekker : shell32: Implement SHGetFolderPathEx.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 859a1d0d44e33b9705dc8578d78b13b270d70708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859a1d0d44e33b9705dc8578d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:01:44 2010 +0200 shell32: Implement SHGetFolderPathEx. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 26 ++++++++++++++++++++ dlls/shell32/tests/shellpath.c | 51 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 961e1af..034f640 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -356,6 +356,7 @@ @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathEx(ptr long ptr ptr long) @ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) @ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0eafdc1..ec66699 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2937,3 +2937,29 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t } return hr; } + +/************************************************************************* + * SHGetFolderPathEx [SHELL32.@] + */ +HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, LPWSTR path, DWORD len) +{ + HRESULT hr; + WCHAR *buffer; + + TRACE("%s, 0x%08x, %p, %p, %u\n", debugstr_guid(rfid), flags, token, path, len); + + if (!path || !len) return E_INVALIDARG; + + hr = SHGetKnownFolderPath( rfid, flags, token, &buffer ); + if (SUCCEEDED( hr )) + { + if (strlenW( buffer ) + 1 > len) + { + CoTaskMemFree( buffer ); + return HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER ); + } + strcpyW( path, buffer ); + CoTaskMemFree( buffer ); + } + return hr; +} diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index b874b5a..2a86eac 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -31,6 +31,7 @@ #include "shlobj.h" #include "shlwapi.h" #include "initguid.h" +#include "knownfolders.h" #include "wine/test.h" /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want @@ -93,6 +94,9 @@ static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); +static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR *); +static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); + static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; @@ -187,7 +191,9 @@ static void loadShell32(void) GET_PROC(DllGetVersion) GET_PROC(SHGetFolderPathA) + GET_PROC(SHGetFolderPathEx) GET_PROC(SHGetFolderLocation) + GET_PROC(SHGetKnownFolderPath) GET_PROC(SHGetSpecialFolderPathA) GET_PROC(SHGetSpecialFolderLocation) GET_PROC(ILFindLastID) @@ -833,6 +839,50 @@ static void test_NonExistentPath(void) else skip("RegOpenKeyExA(HKEY_CURRENT_USER, %s, ...) failed\n", userShellFolders); } +static void test_SHGetFolderPathEx(void) +{ + HRESULT hr; + WCHAR buffer[MAX_PATH], *path; + DWORD len; + + if (!pSHGetKnownFolderPath || !pSHGetFolderPathEx) + { + win_skip("SHGetKnownFolderPath or SHGetFolderPathEx not available\n"); + return; + } + +if (0) { /* crashes */ + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); +} + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "expected path != NULL\n"); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, MAX_PATH); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(!lstrcmpiW(path, buffer), "expected equal paths\n"); + len = lstrlenW(buffer); + CoTaskMemFree(path); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, 0); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + +if (0) { /* crashes */ + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, NULL, len + 1); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = pSHGetFolderPathEx(NULL, 0, NULL, buffer, MAX_PATH); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); +} + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "expected 0x8007007a, got 0x%08x\n", hr); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); +} + START_TEST(shellpath) { if (!init()) return; @@ -858,5 +908,6 @@ START_TEST(shellpath) testWinDir(); testSystemDir(); test_NonExistentPath(); + test_SHGetFolderPathEx(); } }

1 0

Nikolay Sivov : msxml3: Support elements with namespaces.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 8d055c78547cc3cb14df485b6c3bd4771c504445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d055c78547cc3cb14df485b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 08:55:40 2010 +0400 msxml3: Support elements with namespaces. --- dlls/msxml3/domdoc.c | 30 ++++++++++-- dlls/msxml3/node.c | 25 +++++----- dlls/msxml3/tests/domdoc.c | 107 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 142 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fe3aa4c..9053a7d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1468,19 +1468,19 @@ static HRESULT WINAPI domdoc_createNode( domdoc *This = impl_from_IXMLDOMDocument3( iface ); DOMNodeType node_type; xmlNodePtr xmlnode; - xmlChar *xml_name; + xmlChar *xml_name, *href; HRESULT hr; TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); if(!node) return E_INVALIDARG; - if(namespaceURI && namespaceURI[0]) - FIXME("nodes with namespaces currently not supported.\n"); - hr = get_node_type(Type, &node_type); if(FAILED(hr)) return hr; + if(namespaceURI && namespaceURI[0] && node_type != NODE_ELEMENT) + FIXME("nodes with namespaces currently not supported.\n"); + TRACE("node_type %d\n", node_type); /* exit earlier for types that need name */ @@ -1496,12 +1496,31 @@ static HRESULT WINAPI domdoc_createNode( } xml_name = xmlChar_from_wchar(name); + /* prevent empty href to be allocated */ + href = namespaceURI ? xmlChar_from_wchar(namespaceURI) : NULL; switch(node_type) { case NODE_ELEMENT: - xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL); + { + xmlChar *local, *prefix; + + local = xmlSplitQName2(xml_name, &prefix); + + xmlnode = xmlNewDocNode(get_doc(This), NULL, local ? local : xml_name, NULL); + + /* allow to create default namespace xmlns= */ + if (local || (href && *href)) + { + xmlNsPtr ns = xmlNewNs(xmlnode, href, prefix); + xmlSetNs(xmlnode, ns); + } + + xmlFree(local); + xmlFree(prefix); + break; + } case NODE_ATTRIBUTE: xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), xml_name, NULL); break; @@ -1543,6 +1562,7 @@ static HRESULT WINAPI domdoc_createNode( *node = create_node(xmlnode); heap_free(xml_name); + heap_free(href); if(*node) { diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index db894dd..e059d77 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1098,35 +1098,34 @@ static HRESULT WINAPI xmlnode_put_dataType( lstrcmpiW(dataTypeName,szBinHex) == 0 || lstrcmpiW(dataTypeName,szBinBase64) == 0) { - xmlNsPtr pNS = NULL; - xmlAttrPtr pAttr = NULL; xmlChar* str = xmlChar_from_wchar(dataTypeName); + xmlAttrPtr attr; - pAttr = xmlHasNsProp(This->node, (const xmlChar*)"dt", + if (!str) return E_OUTOFMEMORY; + + attr = xmlHasNsProp(This->node, (const xmlChar*)"dt", (const xmlChar*)"urn:schemas-microsoft-com:datatypes"); - if (pAttr) + if (attr) { - pAttr = xmlSetNsProp(This->node, pAttr->ns, (const xmlChar*)"dt", str); - + attr = xmlSetNsProp(This->node, attr->ns, (const xmlChar*)"dt", str); hr = S_OK; } else { - pNS = xmlNewNs(This->node, (const xmlChar*)"urn:schemas-microsoft-com:datatypes", (const xmlChar*)"dt"); - if(pNS) + xmlNsPtr ns = xmlNewNs(This->node, (const xmlChar*)"urn:schemas-microsoft-com:datatypes", (const xmlChar*)"dt"); + if (ns) { - pAttr = xmlNewNsProp(This->node, pNS, (const xmlChar*)"dt", str); - if(pAttr) + attr = xmlNewNsProp(This->node, ns, (const xmlChar*)"dt", str); + if (attr) { - xmlAddChild(This->node, (xmlNodePtr)pAttr); - + xmlAddChild(This->node, (xmlNodePtr)attr); hr = S_OK; } else ERR("Failed to create Attribute\n"); } else - ERR("Failed to Create Namepsace\n"); + ERR("Failed to create Namespace\n"); } heap_free( str ); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a3ab55e..f65eff7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5910,7 +5910,7 @@ static void test_get_ownerDocument(void) if (!doc) return; str = SysAllocString( szComplete4 ); - hr = IXMLDOMDocument2_loadXML( doc, str, &b ); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); ok( hr == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); @@ -5976,7 +5976,7 @@ static void test_get_ownerDocument(void) static void test_setAttributeNode(void) { - IXMLDOMDocument *doc; + IXMLDOMDocument *doc, *doc2; IXMLDOMElement *elem; IXMLDOMAttribute *attr, *attr2, *ret_attr; VARIANT_BOOL b; @@ -6019,8 +6019,109 @@ static void test_setAttributeNode(void) todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + IXMLDOMElement_Release(elem); + + /* add attribute already attached to another document */ + doc2 = create_document(&IID_IXMLDOMDocument); + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument_loadXML( doc2, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_get_documentElement(doc2, &elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMElement_setAttributeNode(elem, attr, NULL); + todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); + IXMLDOMElement_Release(elem); + + IXMLDOMDocument_Release(doc2); + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_put_dataType(void) +{ + IXMLDOMCDATASection *cdata; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("test"), &cdata); + ok( hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("number")); + ok( hr == E_FAIL, "got 0x%08x\n", hr); + hr = IXMLDOMCDATASection_put_dataType(cdata, _bstr_("string")); + ok( hr == E_FAIL, "got 0x%08x\n", hr); + IXMLDOMCDATASection_Release(cdata); + + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_createNode(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + IXMLDOMNode *node; + VARIANT v, var; + BSTR prefix, str; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + /* NODE_ELEMENT nodes */ + /* 1. specified namespace */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("ns1:test"), _bstr_("http://winehq.org"), &node); + ok( hr == S_OK, "got 0x%08x\n", hr); + prefix = NULL; + hr = IXMLDOMNode_get_prefix(node, &prefix); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok(lstrcmpW(prefix, _bstr_("ns1")) == 0, "wrong prefix\n"); + SysFreeString(prefix); + IXMLDOMNode_Release(node); + + /* 2. default namespace */ + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), _bstr_("http://winehq.org/default"), &node); + ok( hr == S_OK, "got 0x%08x\n", hr); + prefix = (void*)0xdeadbeef; + hr = IXMLDOMNode_get_prefix(node, &prefix); + todo_wine ok( hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok(prefix == 0, "expected empty prefix, got %p\n", prefix); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_BSTR; + hr = IXMLDOMElement_getAttribute(elem, _bstr_("xmlns"), &var); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok( V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + str = NULL; + hr = IXMLDOMElement_get_namespaceURI(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("http://winehq.org/default")) == 0, "expected default namespace\n"); + IXMLDOMElement_Release(elem); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -6079,6 +6180,8 @@ START_TEST(domdoc) test_removeQualifiedItem(); test_get_ownerDocument(); test_setAttributeNode(); + test_put_dataType(); + test_createNode(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Fix IXMLDOMNode::get_prefix() for empty prefix.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 154c0828bfcc8a02320c66ae39099138706142c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154c0828bfcc8a02320c66ae3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 09:00:02 2010 +0400 msxml3: Fix IXMLDOMNode::get_prefix() for empty prefix. --- dlls/msxml3/node.c | 16 ++++++------- dlls/msxml3/tests/domdoc.c | 51 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index e059d77..7e91292 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1429,8 +1429,7 @@ static HRESULT WINAPI xmlnode_get_prefix( BSTR* prefixString) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT hr = S_FALSE; - xmlNsPtr *pNSList; + xmlNsPtr *ns; TRACE("(%p)->(%p)\n", This, prefixString ); @@ -1439,16 +1438,15 @@ static HRESULT WINAPI xmlnode_get_prefix( *prefixString = NULL; - pNSList = xmlGetNsList(This->node->doc, This->node); - if(pNSList) + if ((ns = xmlGetNsList(This->node->doc, This->node))) { - *prefixString = bstr_from_xmlChar( pNSList[0]->prefix ); - - xmlFree(pNSList); - hr = S_OK; + if (ns[0]->prefix) *prefixString = bstr_from_xmlChar( ns[0]->prefix ); + xmlFree(ns); } - return hr; + TRACE("prefix %s\n", debugstr_w(*prefixString)); + + return *prefixString ? S_OK : S_FALSE; } static HRESULT WINAPI xmlnode_get_baseName( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f65eff7..176ff36 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6103,8 +6103,8 @@ static void test_createNode(void) ok( hr == S_OK, "got 0x%08x\n", hr); prefix = (void*)0xdeadbeef; hr = IXMLDOMNode_get_prefix(node, &prefix); - todo_wine ok( hr == S_FALSE, "got 0x%08x\n", hr); - todo_wine ok(prefix == 0, "expected empty prefix, got %p\n", prefix); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(prefix == 0, "expected empty prefix, got %p\n", prefix); hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); ok( hr == S_OK, "got 0x%08x\n", hr); @@ -6118,6 +6118,7 @@ static void test_createNode(void) hr = IXMLDOMElement_get_namespaceURI(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); ok( lstrcmpW(str, _bstr_("http://winehq.org/default")) == 0, "expected default namespace\n"); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMNode_Release(node); @@ -6126,6 +6127,51 @@ static void test_createNode(void) free_bstrs(); } +static void test_get_prefix(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *element; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + /* no prefix */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &element); + ok( hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_get_prefix(element, NULL); + ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_prefix(element, &str); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok( str == 0, "got %p\n", str); + + IXMLDOMElement_Release(element); + + /* with prefix */ + hr = IXMLDOMDocument_createElement(doc, _bstr_("a:elem"), &element); + ok( hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_prefix(element, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("a")) == 0, "expected prefix \"a\"\n"); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = IXMLDOMElement_get_namespaceURI(element, &str); + todo_wine ok( hr == S_FALSE, "got 0x%08x\n", hr); + todo_wine ok( str == 0, "got %p\n", str); + + IXMLDOMElement_Release(element); + + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -6182,6 +6228,7 @@ START_TEST(domdoc) test_setAttributeNode(); test_put_dataType(); test_createNode(); + test_get_prefix(); CoUninitialize(); }

1 0