August 2014 - Wine-Commits - list.winehq.org

Austin English : hid: Add HidD_GetProductString stub.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: bb25986702bf5a1749742094a8755d780f33cd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb25986702bf5a1749742094a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 31 11:59:16 2014 -0700 hid: Add HidD_GetProductString stub. --- dlls/hid/hid.spec | 2 +- dlls/hid/main.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index af6140a..f58953a 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -11,7 +11,7 @@ @ stub HidD_GetNumInputBuffers @ stub HidD_GetPhysicalDescriptor @ stub HidD_GetPreparsedData -@ stub HidD_GetProductString +@ stdcall HidD_GetProductString(long ptr long) @ stub HidD_GetSerialNumberString @ stub HidD_Hello @ stub HidD_SetConfiguration diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 2493075..927b563 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -73,3 +73,9 @@ BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); return FALSE; } + +BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) +{ + FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); + return FALSE; +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 229fc14..bb49f0b 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -30,6 +30,7 @@ typedef LONG NTSTATUS; BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); +BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); #endif /* __WINE_HIDSDI_H */

1 0

David Hedberg : shell32: Implement SHCreateShellItemFromIDLists.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: a79be28e8c96b491ca4c431b4a51ba6cf581da87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79be28e8c96b491ca4c431b4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:24 2014 +0200 shell32: Implement SHCreateShellItemFromIDLists. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 45 ++++++++++ dlls/shell32/tests/shlfolder.c | 181 +++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 1 + include/shtypes.idl | 1 + 5 files changed, 229 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a79be28e8c96b491ca4c4…

1 0

David Hedberg : shell32: Always initialize shellitem to NULL in SHCreateShellItem.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 815b532b6498e54acb30bc918af2301fe1bc5c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815b532b6498e54acb30bc918… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:23 2014 +0200 shell32: Always initialize shellitem to NULL in SHCreateShellItem. --- dlls/shell32/shellitem.c | 3 ++- dlls/shell32/tests/shlfolder.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 8236975..06b0783 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -555,6 +555,8 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, TRACE("(%p,%p,%p,%p)\n", pidlParent, psfParent, pidl, ppsi); + *ppsi = NULL; + if (!pidl) { return E_INVALIDARG; @@ -604,7 +606,6 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, } else { - *ppsi = NULL; ILFree(new_pidl); } return ret; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 4e20251..acb3517 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2236,8 +2236,10 @@ static void test_SHCreateShellItem(void) pidl_abstestfile = pILCombine(pidl_cwd, pidl_testfile); + shellitem = (void*)0xdeadbeef; ret = pSHCreateShellItem(NULL, NULL, NULL, &shellitem); ok(ret == E_INVALIDARG, "SHCreateShellItem returned %x\n", ret); + ok(shellitem == 0, "Got %p\n", shellitem); if (0) /* crashes on Windows XP */ {

1 0

David Hedberg : shell32/tests: Tests for IShellItemGetAttributes.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 955b487b20b4436e8aade43d3bd5c8d27e25db6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=955b487b20b4436e8aade43d3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:20 2014 +0200 shell32/tests: Tests for IShellItemGetAttributes. --- dlls/shell32/tests/shlfolder.c | 54 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e58a863..d3b965b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3711,10 +3711,15 @@ static void test_ShellItemBindToHandler(void) static void test_ShellItemGetAttributes(void) { - IShellItem *psi; - LPITEMIDLIST pidl_desktop; + IShellItem *psi, *psi_folder1, *psi_file1; + IShellFolder *pdesktopsf; + LPITEMIDLIST pidl_desktop, pidl; SFGAOF sfgao; HRESULT hr; + WCHAR curdirW[MAX_PATH]; + WCHAR buf[MAX_PATH]; + static const WCHAR testdir1W[] = {'t','e','s','t','d','i','r',0}; + static const WCHAR testfile1W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; if(!pSHCreateShellItem) { @@ -3749,6 +3754,51 @@ static void test_ShellItemGetAttributes(void) ok(sfgao == SFGAO_FOLDER || broken(sfgao == 0) /* <Vista */, "Got 0x%08x\n", sfgao); IShellItem_Release(psi); + + CreateFilesFolders(); + + SHGetDesktopFolder(&pdesktopsf); + + GetCurrentDirectoryW(MAX_PATH, curdirW); + myPathAddBackslashW(curdirW); + + lstrcpyW(buf, curdirW); + lstrcatW(buf, testdir1W); + hr = IShellFolder_ParseDisplayName(pdesktopsf, NULL, NULL, buf, NULL, &pidl, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_folder1); + ok(hr == S_OK, "Got 0x%08x\n", sfgao); + pILFree(pidl); + + lstrcpyW(buf, curdirW); + lstrcatW(buf, testfile1W); + hr = IShellFolder_ParseDisplayName(pdesktopsf, NULL, NULL, buf, NULL, &pidl, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItem(NULL, NULL, pidl, &psi_file1); + ok(hr == S_OK, "Got 0x%08x\n", sfgao); + pILFree(pidl); + + IShellFolder_Release(pdesktopsf); + + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi_folder1, 0, &sfgao); + ok(hr == S_OK, "Got 0x%08x\n", hr); + todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi_folder1, SFGAO_FOLDER, &sfgao); + ok(hr == S_OK, "Got 0x%08x\n", hr); + todo_wine ok(sfgao == SFGAO_FOLDER, "Got 0x%08x\n", sfgao); + + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi_file1, SFGAO_FOLDER, &sfgao); + todo_wine ok(hr == S_FALSE, "Got 0x%08x\n", hr); + todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + + IShellItem_Release(psi_folder1); + IShellItem_Release(psi_file1); + + Cleanup(); } static void test_SHParseDisplayName(void)

1 0

Henri Verbeet : wined3d: Make the "desc" parameter to wined3d_buffer_create() const.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 9020ef9675c6d206b4874296892b340442ecbc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9020ef9675c6d206b48742968… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 4 12:17:25 2014 +0200 wined3d: Make the "desc" parameter to wined3d_buffer_create() const. --- dlls/wined3d/buffer.c | 4 ++-- include/wine/wined3d.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4d3e32a..9af0adb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1212,8 +1212,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return WINED3D_OK; } -HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, struct wined3d_buffer_desc *desc, const void *data, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) +HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, + const void *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { struct wined3d_buffer *object; HRESULT hr; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 642f48f..2aacecb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2055,7 +2055,7 @@ HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void * HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); -HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, struct wined3d_buffer_desc *desc, +HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const void *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); HRESULT __cdecl wined3d_buffer_create_ib(struct wined3d_device *device, UINT length, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops,

1 0

David Hedberg : shell32: Implement IShellItemArray::GetAttributes.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 27b45807a72e55f0ca8068a042595e7f715ac1fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b45807a72e55f0ca8068a04… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:25 2014 +0200 shell32: Implement IShellItemArray::GetAttributes. --- dlls/shell32/shellitem.c | 41 +++++++++++++++++- dlls/shell32/tests/shlfolder.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 707a4c2..772023a 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -881,9 +881,46 @@ static HRESULT WINAPI IShellItemArray_fnGetAttributes(IShellItemArray *iface, SFGAOF *psfgaoAttribs) { IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); - FIXME("Stub: %p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); + HRESULT hr = S_OK; + SFGAOF attr; + UINT i; + TRACE("%p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); - return E_NOTIMPL; + if(AttribFlags & ~(SIATTRIBFLAGS_AND|SIATTRIBFLAGS_OR)) + FIXME("%08x contains unsupported attribution flags", AttribFlags); + + for(i = 0; i < This->item_count; i++) + { + hr = IShellItem_GetAttributes(This->array[i], sfgaoMask, &attr); + if(FAILED(hr)) + break; + + if(i == 0) + { + *psfgaoAttribs = attr; + continue; + } + + switch(AttribFlags & SIATTRIBFLAGS_MASK) + { + case SIATTRIBFLAGS_AND: + *psfgaoAttribs &= attr; + break; + case SIATTRIBFLAGS_OR: + *psfgaoAttribs |= attr; + break; + } + } + + if(SUCCEEDED(hr)) + { + if(*psfgaoAttribs == sfgaoMask) + return S_OK; + + return S_FALSE; + } + + return hr; } static HRESULT WINAPI IShellItemArray_fnGetCount(IShellItemArray *iface, diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 38d265a..6ea6813 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3984,6 +3984,103 @@ static void test_ShellItemGetAttributes(void) Cleanup(); } +static void test_ShellItemArrayGetAttributes(void) +{ + IShellItemArray *psia_files, *psia_folders1, *psia_folders2, *psia_all; + IShellFolder *pdesktopsf; + LPCITEMIDLIST pidl_array[5]; + SFGAOF attr; + HRESULT hr; + WCHAR curdirW[MAX_PATH]; + WCHAR buf[MAX_PATH]; + UINT i; + static const WCHAR testdir1W[] = {'t','e','s','t','d','i','r',0}; + static const WCHAR testdir2W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','2',0}; + static const WCHAR testdir3W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','3',0}; + static const WCHAR testfile1W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; + static const WCHAR testfile2W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','2','.','t','x','t',0}; + static const WCHAR *testfilesW[5] = { testdir1W, testdir2W, testdir3W, testfile1W, testfile2W }; + + if(!pSHCreateShellItemArrayFromShellItem) + { + win_skip("No SHCreateShellItemArrayFromShellItem, skipping test.."); + return; + } + + CreateFilesFolders(); + CreateDirectoryA(".\\testdir\\testdir3", NULL); + + SHGetDesktopFolder(&pdesktopsf); + + GetCurrentDirectoryW(MAX_PATH, curdirW); + myPathAddBackslashW(curdirW); + + for(i = 0; i < 5; i++) + { + lstrcpyW(buf, curdirW); + lstrcatW(buf, testfilesW[i]); + hr = IShellFolder_ParseDisplayName(pdesktopsf, NULL, NULL, buf, NULL, (LPITEMIDLIST*)&pidl_array[i], NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + } + IShellFolder_Release(pdesktopsf); + + hr = pSHCreateShellItemArrayFromIDLists(2, pidl_array, &psia_folders1); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItemArrayFromIDLists(2, &pidl_array[1], &psia_folders2); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItemArrayFromIDLists(2, &pidl_array[3], &psia_files); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pSHCreateShellItemArrayFromIDLists(4, &pidl_array[1], &psia_all); /* All except the first */ + ok(hr == S_OK, "got 0x%08x\n", hr); + + for(i = 0; i < 5; i++) + pILFree((LPITEMIDLIST)pidl_array[i]); + + /* [testfolder/, testfolder/testfolder2] seems to break in Vista */ + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders1, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_OK || broken(hr == E_UNEXPECTED) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER || broken(attr == 0) /* Vista */, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders1, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_OK || broken(hr == E_UNEXPECTED) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER || broken(attr == 0) /* Vista */, "Got 0x%08x\n", attr); + + /* [testfolder/testfolder2, testfolder/testfolder3] works */ + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders2, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_files, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_FALSE || broken(hr == S_OK) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == 0, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_all, SIATTRIBFLAGS_AND, SFGAO_FOLDER, &attr); + ok(hr == S_FALSE || broken(hr == S_OK) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == 0, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_folders2, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_files, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_FALSE || broken(hr == S_OK) /* Vista */, "Got 0x%08x\n", hr); + ok(attr == 0, "Got 0x%08x\n", attr); + attr = 0xdeadbeef; + hr = IShellItemArray_GetAttributes(psia_all, SIATTRIBFLAGS_OR, SFGAO_FOLDER, &attr); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(attr == SFGAO_FOLDER, "Got 0x%08x\n", attr); + + IShellItemArray_Release(psia_folders1); + IShellItemArray_Release(psia_folders2); + IShellItemArray_Release(psia_files); + IShellItemArray_Release(psia_all); + + RemoveDirectoryA(".\\testdir\\testdir3"); + Cleanup(); +} + static void test_SHParseDisplayName(void) { LPITEMIDLIST pidl1, pidl2; @@ -5006,6 +5103,7 @@ START_TEST(shlfolder) test_SHChangeNotify(TRUE); test_ShellItemBindToHandler(); test_ShellItemGetAttributes(); + test_ShellItemArrayGetAttributes(); test_SHCreateDefaultContextMenu(); test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx();

1 0

David Hedberg : shell32: Mask out attributes we didn' t ask for in ShellItem::GetAttributes.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 678434539ef7fd0009127ca5069bdef764c49d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=678434539ef7fd0009127ca50… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:21 2014 +0200 shell32: Mask out attributes we didn't ask for in ShellItem::GetAttributes. --- dlls/shell32/shellitem.c | 1 + dlls/shell32/tests/shlfolder.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index f58c566..21bf8a5 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -269,6 +269,7 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa child_pidl = ILFindLastID(This->pidl); *psfgaoAttribs = sfgaoMask; ret = IShellFolder_GetAttributesOf(parent_folder, 1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs); + *psfgaoAttribs &= sfgaoMask; IShellFolder_Release(parent_folder); } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index d3b965b..fa7219c 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3783,17 +3783,17 @@ static void test_ShellItemGetAttributes(void) sfgao = 0xdeadbeef; hr = IShellItem_GetAttributes(psi_folder1, 0, &sfgao); ok(hr == S_OK, "Got 0x%08x\n", hr); - todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + ok(sfgao == 0, "Got 0x%08x\n", sfgao); sfgao = 0xdeadbeef; hr = IShellItem_GetAttributes(psi_folder1, SFGAO_FOLDER, &sfgao); ok(hr == S_OK, "Got 0x%08x\n", hr); - todo_wine ok(sfgao == SFGAO_FOLDER, "Got 0x%08x\n", sfgao); + ok(sfgao == SFGAO_FOLDER, "Got 0x%08x\n", sfgao); sfgao = 0xdeadbeef; hr = IShellItem_GetAttributes(psi_file1, SFGAO_FOLDER, &sfgao); todo_wine ok(hr == S_FALSE, "Got 0x%08x\n", hr); - todo_wine ok(sfgao == 0, "Got 0x%08x\n", sfgao); + ok(sfgao == 0, "Got 0x%08x\n", sfgao); IShellItem_Release(psi_folder1); IShellItem_Release(psi_file1);

1 0

Henri Verbeet : wined3d: Move the "draw_binding" field from struct wined3d_surface to struct wined3d_resource.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 5ef8e974149176c145f6b51a806ed3ffd4d50398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef8e974149176c145f6b51a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 4 12:17:27 2014 +0200 wined3d: Move the "draw_binding" field from struct wined3d_surface to struct wined3d_resource. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/drawprim.c | 8 ++++---- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- dlls/wined3d/swapchain.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 33 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef8e974149176c145f6b…

1 0

Henri Verbeet : wined3d: Get rid of the get_drawable_size() callback in struct wined3d_surface.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: d079066f5df4b27d7a2dbe1cd71410b57241ea80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d079066f5df4b27d7a2dbe1cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 4 12:17:26 2014 +0200 wined3d: Get rid of the get_drawable_size() callback in struct wined3d_surface. --- dlls/wined3d/device.c | 19 +--------- dlls/wined3d/state.c | 4 +-- dlls/wined3d/surface.c | 79 +++++++++++++++--------------------------- dlls/wined3d/swapchain.c | 8 ----- dlls/wined3d/wined3d_private.h | 9 ++--- 5 files changed, 32 insertions(+), 87 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 962a4a6..66184b2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -326,7 +326,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (target) { render_offscreen = context->render_offscreen; - target->get_drawable_size(context, &drawable_width, &drawable_height); + surface_get_drawable_size(target, context, &drawable_width, &drawable_height); } else { @@ -4806,23 +4806,6 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) } } -void get_drawable_size_fbo(const struct wined3d_context *context, UINT *width, UINT *height) -{ - /* The drawable size of a fbo target is the opengl texture size, which is the power of two size. */ - *width = context->current_rt->pow2Width; - *height = context->current_rt->pow2Height; -} - -void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) -{ - const struct wined3d_swapchain *swapchain = context->swapchain; - /* The drawable size of a backbuffer / aux buffer offscreen target is the size of the - * current context's drawable, which is the size of the back buffer of the swapchain - * the active context belongs to. */ - *width = swapchain->desc.backbuffer_width; - *height = swapchain->desc.backbuffer_height; -} - LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c7d1a10..fc9c38d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4658,7 +4658,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine { UINT width, height; - target->get_drawable_size(context, &width, &height); + surface_get_drawable_size(target, context, &width, &height); gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), vp.width, vp.height); } @@ -4821,7 +4821,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st UINT height; UINT width; - target->get_drawable_size(context, &width, &height); + surface_get_drawable_size(target, context, &width, &height); gl_info->gl_ops.gl.p_glScissor(r->left, height - r->bottom, r->right - r->left, r->bottom - r->top); } checkGLcall("glScissor"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d384d78..ef584e0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -113,31 +113,39 @@ void surface_update_draw_binding(struct wined3d_surface *surface) surface->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } -void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapchain *swapchain) +void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, + unsigned int *width, unsigned int *height) { - TRACE("surface %p, swapchain %p.\n", surface, swapchain); - - if (swapchain) + if (surface->swapchain) { - surface->get_drawable_size = get_drawable_size_swapchain; + /* The drawable size of an onscreen drawable is the surface size. + * (Actually: The window size, but the surface is created in window + * size.) */ + *width = context->current_rt->resource.width; + *height = context->current_rt->resource.height; } - else + else if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - switch (wined3d_settings.offscreen_rendering_mode) - { - case ORM_FBO: - surface->get_drawable_size = get_drawable_size_fbo; - break; + const struct wined3d_swapchain *swapchain = context->swapchain; - case ORM_BACKBUFFER: - surface->get_drawable_size = get_drawable_size_backbuffer; - break; - - default: - ERR("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); - return; - } + /* The drawable size of a backbuffer / aux buffer offscreen target is + * the size of the current context's drawable, which is the size of + * the back buffer of the swapchain the active context belongs to. */ + *width = swapchain->desc.backbuffer_width; + *height = swapchain->desc.backbuffer_height; } + else + { + /* The drawable size of an FBO target is the OpenGL texture size, + * which is the power of two size. */ + *width = context->current_rt->pow2Width; + *height = context->current_rt->pow2Height; + } +} + +void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapchain *swapchain) +{ + TRACE("surface %p, swapchain %p.\n", surface, swapchain); surface->swapchain = swapchain; surface_update_draw_binding(surface); @@ -147,24 +155,6 @@ void surface_set_container(struct wined3d_surface *surface, struct wined3d_textu { TRACE("surface %p, container %p.\n", surface, container); - if (!surface->swapchain) - { - switch (wined3d_settings.offscreen_rendering_mode) - { - case ORM_FBO: - surface->get_drawable_size = get_drawable_size_fbo; - break; - - case ORM_BACKBUFFER: - surface->get_drawable_size = get_drawable_size_backbuffer; - break; - - default: - ERR("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); - return; - } - } - surface->container = container; surface_update_draw_binding(surface); } @@ -729,21 +719,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) surface->pow2Width, surface->pow2Height); } - switch (wined3d_settings.offscreen_rendering_mode) - { - case ORM_FBO: - surface->get_drawable_size = get_drawable_size_fbo; - break; - - case ORM_BACKBUFFER: - surface->get_drawable_size = get_drawable_size_backbuffer; - break; - - default: - ERR("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); - return WINED3DERR_INVALIDCALL; - } - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->locations = WINED3D_LOCATION_DISCARDED; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bf0bbc6..e24bd08 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1115,14 +1115,6 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai return swapchain_create_context(swapchain); } -void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) -{ - /* The drawable size of an onscreen drawable is the surface size. - * (Actually: The window size, but the surface is created in window size) */ - *width = context->current_rt->resource.width; - *height = context->current_rt->resource.height; -} - HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) { if (!swapchain->backup_dc) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e17dcd..ae9ce51 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2235,9 +2235,6 @@ struct wined3d_surface UINT pow2Width; UINT pow2Height; - /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ - void (*get_drawable_size)(const struct wined3d_context *context, UINT *width, UINT *height); - /* PBO */ GLuint pbo; GLuint rb_multisample; @@ -2282,6 +2279,8 @@ void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, + unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; @@ -2308,10 +2307,6 @@ HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct w GLenum target, GLint level, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; -void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; -void get_drawable_size_fbo(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; - void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_CopyResource().
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 6a1a18e7e2cf3fce8455ae86f0693e3e5df13004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1a18e7e2cf3fce8455ae86f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 4 12:17:24 2014 +0200 d3d10core: Implement d3d10_device_CopyResource(). --- dlls/d3d10core/d3d10core_private.h | 2 ++ dlls/d3d10core/device.c | 9 ++++- dlls/d3d10core/texture.c | 8 +++++ dlls/d3d10core/utils.c | 22 ++++++++++++ dlls/d3d10core/view.c | 20 ----------- dlls/wined3d/device.c | 71 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 8 files changed, 114 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 9241312..a697a0e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -60,6 +60,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECLSPEC_HIDDEN; +struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { @@ -86,6 +87,7 @@ struct d3d10_texture2d HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, const D3D10_TEXTURE2D_DESC *desc) DECLSPEC_HIDDEN; +struct d3d10_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN; /* ID3D10Texture3D */ struct d3d10_texture3d diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index db3f265..ac43ca6 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -514,7 +514,14 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * static void STDMETHODCALLTYPE d3d10_device_CopyResource(ID3D10Device1 *iface, ID3D10Resource *dst_resource, ID3D10Resource *src_resource) { - FIXME("iface %p, dst_resource %p, src_resource %p stub!\n", iface, dst_resource, src_resource); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst_resource, src_resource); + + wined3d_dst_resource = wined3d_resource_from_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_resource(src_resource); + wined3d_device_copy_resource(device->wined3d_device, wined3d_dst_resource, wined3d_src_resource); } static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *iface, diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 80ac899..b488f91 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -236,6 +236,14 @@ static const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = d3d10_texture2d_GetDesc, }; +struct d3d10_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_texture2d_vtbl); + return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D10Texture2D_iface); +} + static const struct wined3d_parent_ops d3d10_texture2d_wined3d_parent_ops = { d3d10_texture2d_wined3d_object_released, diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index e0c6014..d955fbb 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -367,6 +367,28 @@ DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) return wined3d_usage; } +struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + + ID3D10Resource_GetType(resource, &dimension); + + switch (dimension) + { + case D3D10_RESOURCE_DIMENSION_BUFFER: + return wined3d_buffer_get_resource(unsafe_impl_from_ID3D10Buffer( + (ID3D10Buffer *)resource)->wined3d_buffer); + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D( + (ID3D10Texture2D *)resource)->wined3d_texture); + + default: + FIXME("Unhandled resource dimension %#x.\n", dimension); + return NULL; + } +} + void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 4282f1a..e7aac3b 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -25,26 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -static struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) -{ - D3D10_RESOURCE_DIMENSION dimension; - - ID3D10Resource_GetType(resource, &dimension); - - switch(dimension) - { - case D3D10_RESOURCE_DIMENSION_BUFFER: - return wined3d_buffer_get_resource(((struct d3d10_buffer *)resource)->wined3d_buffer); - - case D3D10_RESOURCE_DIMENSION_TEXTURE2D: - return wined3d_texture_get_resource(((struct d3d10_texture2d *)resource)->wined3d_texture); - - default: - FIXME("Unhandled resource dimension %#x.\n", dimension); - return NULL; - } -} - static HRESULT set_dsdesc_from_resource(D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4aacf1d..962a4a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3664,6 +3664,77 @@ HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, return surface_color_fill(surface, rect, color); } +void CDECL wined3d_device_copy_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) +{ + struct wined3d_surface *dst_surface, *src_surface; + struct wined3d_texture *dst_texture, *src_texture; + unsigned int i, count; + HRESULT hr; + + TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); + + if (src_resource == dst_resource) + { + WARN("Source and destination are the same resource.\n"); + return; + } + + if (src_resource->type != dst_resource->type) + { + WARN("Resource types (%s / %s) don't match.\n", + debug_d3dresourcetype(dst_resource->type), + debug_d3dresourcetype(src_resource->type)); + return; + } + + if (src_resource->width != dst_resource->width + || src_resource->height != dst_resource->height + || src_resource->depth != dst_resource->depth) + { + WARN("Resource dimensions (%ux%ux%u / %ux%ux%u) don't match.\n", + dst_resource->width, dst_resource->height, dst_resource->depth, + src_resource->width, src_resource->height, src_resource->depth); + return; + } + + if (src_resource->format->id != dst_resource->format->id) + { + WARN("Resource formats (%s / %s) don't match.\n", + debug_d3dformat(dst_resource->format->id), + debug_d3dformat(src_resource->format->id)); + return; + } + + if (dst_resource->type != WINED3D_RTYPE_TEXTURE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); + return; + } + + dst_texture = wined3d_texture_from_resource(dst_resource); + src_texture = wined3d_texture_from_resource(src_resource); + + if (src_texture->layer_count != dst_texture->layer_count + || src_texture->level_count != dst_texture->level_count) + { + WARN("Subresource layouts (%ux%u / %ux%u) don't match.\n", + dst_texture->layer_count, dst_texture->level_count, + src_texture->layer_count, src_texture->level_count); + return; + } + + count = dst_texture->layer_count * dst_texture->level_count; + for (i = 0; i < count; ++i) + { + dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); + + if (FAILED(hr = wined3d_surface_blt(dst_surface, NULL, src_surface, NULL, 0, NULL, WINED3D_TEXF_POINT))) + ERR("Failed to blit, subresource %u, hr %#x.\n", i, hr); + } +} + void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a53c74b..e3baac2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -38,6 +38,7 @@ @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr) @ cdecl wined3d_device_color_fill(ptr ptr ptr ptr) +@ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6309fe8..642f48f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2080,6 +2080,8 @@ void __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *devic struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color); HRESULT __cdecl wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, const struct wined3d_color *color); +void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, struct wined3d_device **device);

1 0