July 2010 - Wine-commits - list.winehq.org

Stefan Dösinger : d3d9: Remove the shader version varying tests.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: a554d1e2968de4eb21f1d20a7c40ff7fdb0bb7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a554d1e2968de4eb21f1d20a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 6 13:00:17 2010 +0200 d3d9: Remove the shader version varying tests. My Windows 7 installation rejects mixing ps_3_0 with anything other than vs_3_0 and vice versa, making testing how those versions pass varyings moot. Since I have never seen an app mixing 3.0 and non-3.0 shaders I see no reason to keep the tests. --- dlls/d3d9/tests/visual.c | 393 ---------------------------------------------- 1 files changed, 0 insertions(+), 393 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a554d1e2968de4eb21f1d…

1 0

Marko Nikolic : libwine: Removed sign comparison warning.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 0ffb137d4a2d1ae5f291a03971ade5ba49ed0d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffb137d4a2d1ae5f291a0397… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Jul 24 17:21:21 2010 +0200 libwine: Removed sign comparison warning. --- libs/wine/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 6bb87b0..93dc7e0 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -141,7 +141,7 @@ static char *get_runtime_libdir(void) static char *get_runtime_bindir( const char *argv0 ) { char *p, *bindir, *cwd; - size_t len, size; + int len, size; #ifdef linux for (size = 256; ; size *= 2)

1 0

Henri Verbeet : wined3d: Add a missing return statement to surface_prepare_texture().
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 6874743e78c718ffe318646ece04d79f2dfc161a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6874743e78c718ffe318646ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:34 2010 +0200 wined3d: Add a missing return statement to surface_prepare_texture(). Calling surface_prepare_texture_internal() twice on the same surface is harmless, but unnecessary. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 662cdb8..561e9c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1569,6 +1569,8 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ } IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); + + return; } surface_prepare_texture_internal(surface, gl_info, srgb);

1 0

Henri Verbeet : wined3d: Cleanup Get/SetRenderState traces a bit.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 3e37b27d37f23c676c73d0e900cf26e42080376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e37b27d37f23c676c73d0e90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:35 2010 +0200 wined3d: Cleanup Get/SetRenderState traces a bit. --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d59a5e7..be473d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3018,7 +3018,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; DWORD oldValue = This->stateBlock->renderState[State]; - TRACE("(%p)->state = %s(%d), value = %d\n", This, debug_d3drenderstate(State), State, Value); + TRACE("iface %p, state %s (%#x), value %#x.\n", iface, debug_d3drenderstate(State), State, Value); This->updateStateBlock->changed.renderState[State >> 5] |= 1 << (State & 0x1f); This->updateStateBlock->renderState[State] = Value; @@ -3041,7 +3041,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderState(IWineD3DDevice *iface, WINED3DRENDERSTATETYPE State, DWORD *pValue) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) for State %d = %d\n", This, State, This->stateBlock->renderState[State]); + + TRACE("iface %p, state %s (%#x), value %p.\n", iface, debug_d3drenderstate(State), State, pValue); + *pValue = This->stateBlock->renderState[State]; return WINED3D_OK; }

1 0

Hans Leidekker : msi/tests: Skip a test if the current user has insufficient rights.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 9686c95749ed604d13fac1504b30c953897e1ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9686c95749ed604d13fac1504… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:12 2010 +0200 msi/tests: Skip a test if the current user has insufficient rights. --- dlls/msi/tests/msi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 06f85b5..dc023f4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -297,6 +297,13 @@ static void test_null(void) } r = RegSetValueA(hkey, NULL, REG_SZ, "test", strlen("test")); + if (r == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + HeapFree(GetProcessHeap(), 0, lpData); + RegCloseKey(hkey); + return; + } ok( r == ERROR_SUCCESS, "wrong error %d\n", r); r = MsiGetProductInfoA("", "", NULL, NULL);

1 0

Hans Leidekker : include: Add the TOKEN_ELEVATION_TYPE enumeration.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: deb1c552d6d9f998c77fc599ddc5ccde5eb85df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb1c552d6d9f998c77fc599d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:37 2010 +0200 include: Add the TOKEN_ELEVATION_TYPE enumeration. --- include/winnt.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e29444a..0bcb31b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3800,6 +3800,12 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _TOKEN_ELEVATION_TYPE { + TokenElevationTypeDefault = 1, + TokenElevationTypeFull, + TokenElevationTypeLimited +} TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; + /* * TOKEN_INFORMATION_CLASS */

1 0

Hans Leidekker : msi/tests: Skip tests if UAC is enabled and the process is not running elevated.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 33b6ad7f73ea511939a0f4ddf79f125f0dec3ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b6ad7f73ea511939a0f4ddf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:57 2010 +0200 msi/tests: Skip tests if UAC is enabled and the process is not running elevated. --- dlls/msi/tests/install.c | 362 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/package.c | 35 +++++ dlls/msi/tests/patch.c | 40 +++++ 3 files changed, 437 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33b6ad7f73ea511939a0f…

1 0

Alexandre Julliard : gdi.exe: Disable the remaining 16-bit visible region functions, they can't work.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: b644c8538ab81be7e057f8bd2c36d4f15cdee403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b644c8538ab81be7e057f8bd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:26:38 2010 +0200 gdi.exe: Disable the remaining 16-bit visible region functions, they can't work. --- dlls/gdi.exe16/gdi.c | 38 ++++++-------------------------------- 1 files changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 85dfef8..4eff2bc 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -1776,7 +1776,8 @@ BOOL16 WINAPI PtVisible16( HDC16 hdc, INT16 x, INT16 y ) */ INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn ) { - return SelectVisRgn( HDC_32(hdc), HRGN_32(hrgn) ); + FIXME( "%04x %04x no longer supported\n", hdc, hrgn ); + return ERROR; } @@ -3703,21 +3704,8 @@ INT16 WINAPI IntersectVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right */ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) { - struct saved_visrgn *saved; - HDC hdc = HDC_32( hdc16 ); - - TRACE("%p\n", hdc ); - - if (!(saved = HeapAlloc( GetProcessHeap(), 0, sizeof(*saved) ))) return 0; - if (!(saved->hrgn = CreateRectRgn( 0, 0, 0, 0 ))) - { - HeapFree( GetProcessHeap(), 0, saved ); - return 0; - } - saved->hdc = hdc; - GetRandomRgn( hdc, saved->hrgn, SYSRGN ); - list_add_head( &saved_regions, &saved->entry ); - return HRGN_16(saved->hrgn); + FIXME( "%04x no longer supported\n", hdc16 ); + return 0; } @@ -3726,22 +3714,8 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) */ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) { - struct saved_visrgn *saved; - HDC hdc = HDC_32( hdc16 ); - INT16 ret = ERROR; - - TRACE("%p\n", hdc ); - - LIST_FOR_EACH_ENTRY( saved, &saved_regions, struct saved_visrgn, entry ) - { - if (saved->hdc != hdc) continue; - ret = SelectVisRgn( hdc, saved->hrgn ); - list_remove( &saved->entry ); - DeleteObject( saved->hrgn ); - HeapFree( GetProcessHeap(), 0, saved ); - break; - } - return ret; + FIXME( "%04x no longer supported\n", hdc16 ); + return ERROR; }

1 0

Henri Verbeet : wined3d: Merge strect_rect_fbo() and surface_load_srgb_fbo( ).
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 0bf68b846adde16fe19d4b7814d866ba1e4d012a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf68b846adde16fe19d4b781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:33 2010 +0200 wined3d: Merge strect_rect_fbo() and surface_load_srgb_fbo(). --- dlls/wined3d/device.c | 132 --------------------------- dlls/wined3d/surface.c | 196 +++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 4 - 3 files changed, 155 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf68b846adde16fe19d4…

1 0

David Hedberg : shell32: Implement SHCreateShellItemArrayFromShellItem.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: bf1b56be101d17fed35d0ca342c3e9a45923484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1b56be101d17fed35d0ca34… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Jul 26 11:54:04 2010 +0200 shell32: Implement SHCreateShellItemArrayFromShellItem. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 30 +++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 57 ++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 1 + 4 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 426e841..41cfde3 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -335,6 +335,7 @@ @ stub SHCreateProcessAsUserW @ stdcall SHCreateShellItem(ptr ptr ptr ptr) @ stdcall SHCreateShellItemArray(ptr ptr long ptr ptr) +@ stdcall SHCreateShellItemArrayFromShellItem(ptr ptr ptr) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) @ stub SHExtractIconsW diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 8dd6239..68cd32e 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -827,3 +827,33 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, *ppsiItemArray = NULL; return ret; } + +HRESULT WINAPI SHCreateShellItemArrayFromShellItem(IShellItem *psi, REFIID riid, void **ppv) +{ + IShellItemArrayImpl *This; + IShellItem **array; + HRESULT ret; + + TRACE("%p, %s, %p\n", psi, shdebugstr_guid(riid), ppv); + + array = HeapAlloc(GetProcessHeap(), 0, sizeof(IShellItem*)); + if(!array) + return E_OUTOFMEMORY; + + ret = IShellItemArray_Constructor(NULL, riid, (void**)&This); + if(SUCCEEDED(ret)) + { + array[0] = psi; + IShellItem_AddRef(psi); + This->array = array; + This->item_count = 1; + *ppv = This; + } + else + { + HeapFree(GetProcessHeap(), 0, array); + *ppv = NULL; + } + + return ret; +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 491327e..b8c5da6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -59,6 +59,7 @@ static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static HRESULT (WINAPI *pSHCreateShellItemArray)(LPCITEMIDLIST,IShellFolder*,UINT,LPCITEMIDLIST*,IShellItemArray**); +static HRESULT (WINAPI *pSHCreateShellItemArrayFromShellItem)(IShellItem*, REFIID, void **); static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); @@ -81,6 +82,7 @@ static void init_function_pointers(void) MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateShellItem); MAKEFUNC(SHCreateShellItemArray); + MAKEFUNC(SHCreateShellItemArrayFromShellItem); MAKEFUNC(SHGetFolderPathA); MAKEFUNC(SHGetFolderPathAndSubDirA); MAKEFUNC(SHGetPathFromIDListW); @@ -3056,6 +3058,61 @@ static void test_SHCreateShellItemArray(void) } } + /* SHCreateShellItemArrayFromShellItem */ + if(pSHCreateShellItemArrayFromShellItem) + { + IShellItem *psi; + + if(0) + { + /* Crashes under Windows 7 */ + hr = pSHCreateShellItemArrayFromShellItem(NULL, &IID_IShellItemArray, NULL); + hr = pSHCreateShellItemArrayFromShellItem(NULL, &IID_IShellItemArray, (void**)&psia); + hr = pSHCreateShellItemArrayFromShellItem(psi, &IID_IShellItemArray, NULL); + } + + hr = pSHCreateItemFromIDList(pidl_testdir, &IID_IShellItem, (void**)&psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = pSHCreateShellItemArrayFromShellItem(psi, &IID_IShellItemArray, (void**)&psia); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + IShellItem *psi2; + UINT count; + hr = IShellItemArray_GetCount(psia, &count); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(count == 1, "Got count %d\n", count); + hr = IShellItemArray_GetItemAt(psia, 0, &psi2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + todo_wine + ok(psi != psi2, "ShellItems are of the same instance.\n"); + if(SUCCEEDED(hr)) + { + LPITEMIDLIST pidl1, pidl2; + hr = pSHGetIDListFromObject((IUnknown*)psi, &pidl1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(pidl1 != NULL, "pidl1 was null.\n"); + hr = pSHGetIDListFromObject((IUnknown*)psi2, &pidl2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(pidl2 != NULL, "pidl2 was null.\n"); + ok(ILIsEqual(pidl1, pidl2), "pidls not equal.\n"); + pILFree(pidl1); + pILFree(pidl2); + IShellItem_Release(psi2); + } + hr = IShellItemArray_GetItemAt(psia, 1, &psi2); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + IShellItemArray_Release(psia); + } + IShellItem_Release(psi); + } + } + else + skip("No SHCreateShellItemArrayFromShellItem.\n"); + + IShellFolder_Release(psf); pILFree(pidl_testdir); Cleanup(); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index d982cc1..f4defe0 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -518,6 +518,7 @@ cpp_quote("HRESULT WINAPI SHGetItemFromDataObject(IDataObject *pdtobj, DATAOBJ_G cpp_quote("HRESULT WINAPI SHGetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl);") cpp_quote("HRESULT WINAPI SHGetItemFromObject(IUnknown *punk, REFIID riid, void **ppv);") cpp_quote("HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, IShellFolder* psf, UINT cidl, PCUITEMID_CHILD_ARRAY ppidl, IShellItemArray **ppsiItemArray);") +cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromShellItem(IShellItem *psi, REFIID riid, void **ppv);") /***************************************************************************** * IShellItemFilter interface

1 0