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

Dmitry Timoshkov : taskschd: Implement task management using RPC APIs.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 5c5d17e8f33a2561f5e8e85b4e3d2ca88e213a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5d17e8f33a2561f5e8e85b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:23 2014 +0900 taskschd: Implement task management using RPC APIs. --- dlls/taskschd/folder.c | 30 +++++++++++++++++++---- dlls/taskschd/regtask.c | 49 ++++++++++++++++++++++++++++++++++---- dlls/taskschd/taskschd_private.h | 5 ++-- dlls/taskschd/tests/scheduler.c | 33 +++++++++---------------- 4 files changed, 84 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c5d17e8f33a2561f5e8e…

1 0

Akihiro Sagawa : user32/tests: Add some tests for edit control context menu messages.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 1ba63827f26109ee4592ad39ac248178d516fe15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba63827f26109ee4592ad39a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 8 01:43:48 2014 +0900 user32/tests: Add some tests for edit control context menu messages. --- dlls/user32/tests/edit.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index c41bbb0..219fb1d 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2243,9 +2243,49 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR return p_edit_proc(hWnd, msg, wParam, lParam); } +struct context_menu_messages +{ + unsigned int wm_command, em_setsel; +}; + +static struct context_menu_messages menu_messages; + +static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_ENTERIDLE: + if (wParam == MSGF_MENU) { + HWND hwndMenu = (HWND)lParam; + MENUBARINFO mbi = { sizeof(MENUBARINFO) }; + if (pGetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { + MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; + if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) { + if (mii.fState & MFS_HILITE) { + PostMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hwnd, WM_KEYUP, VK_RETURN, 0x1c0001); + } + else { + PostMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0x500001); + PostMessageA(hwnd, WM_KEYUP, VK_DOWN, 0x500001); + } + } + } + } + break; + case WM_COMMAND: + menu_messages.wm_command++; + break; + case EM_SETSEL: + menu_messages.em_setsel++; + break; + } + return CallWindowProcA(p_edit_proc, hwnd, msg, wParam, lParam); +} + static void test_contextmenu(void) { HWND hwndMain, hwndEdit; + MSG msg; hwndMain = CreateWindowA(szEditTest4Class, "ET4", WS_OVERLAPPEDWINDOW|WS_VISIBLE, 0, 0, 200, 200, NULL, NULL, hinst, NULL); @@ -2270,6 +2310,25 @@ static void test_contextmenu(void) } DestroyWindow (hwndEdit); + + hwndEdit = CreateWindowA("EDIT", "Test Text", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + hwndMain, NULL, hinst, NULL); + memset(&menu_messages, 0, sizeof(menu_messages)); + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, + (ULONG_PTR)child_edit_menu_proc); + + SetFocus(hwndEdit); + SendMessageA(hwndEdit, WM_SETTEXT, 0, (LPARAM)"foo"); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(-1, -1)); + while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + todo_wine ok(menu_messages.wm_command == 0, + "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); + todo_wine ok(menu_messages.em_setsel == 1, + "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel); + + DestroyWindow (hwndEdit); DestroyWindow (hwndMain); }

1 0

Akihiro Sagawa : user32/tests: Don' t forget to destroy the parent window after the tests.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 081538643019f711a110711354844bbc548aed3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=081538643019f711a11071135… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 8 01:43:45 2014 +0900 user32/tests: Don't forget to destroy the parent window after the tests. --- dlls/user32/tests/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d5fd3b2..c41bbb0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1299,6 +1299,7 @@ static void test_edit_control_5(void) len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); DestroyWindow(hWnd); + DestroyWindow(parentWnd); } /* Test WM_GETTEXT processing

1 0

Dmitry Timoshkov : taskschd: Remove registry based task folder management.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 7e5bd67fc4348125181716cbb5b82a1e6d9bef54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5bd67fc4348125181716cbb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 13:14:41 2014 +0900 taskschd: Remove registry based task folder management. --- dlls/taskschd/folder.c | 86 +----------------------------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6bb0c38..14f1430 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); -static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; - typedef struct { ITaskFolder ITaskFolder_iface; @@ -136,76 +134,6 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return S_OK; } -static HRESULT reg_create_folder(const WCHAR *path, HKEY *hfolder) -{ - HKEY hroot; - DWORD ret, disposition; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegCreateKeyExW(hroot, path, 0, NULL, 0, KEY_ALL_ACCESS, NULL, hfolder, &disposition); - if (ret == ERROR_FILE_NOT_FOUND) - ret = ERROR_PATH_NOT_FOUND; - - if (ret == ERROR_SUCCESS && disposition == REG_OPENED_EXISTING_KEY) - { - RegCloseKey(*hfolder); - ret = ERROR_ALREADY_EXISTS; - } - - RegCloseKey(hroot); - - return HRESULT_FROM_WIN32(ret); -} - -static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) -{ - HKEY hroot; - DWORD ret; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegOpenKeyExW(hroot, path, 0, KEY_ALL_ACCESS, hfolder); - if (ret == ERROR_FILE_NOT_FOUND) - ret = ERROR_PATH_NOT_FOUND; - - RegCloseKey(hroot); - - return HRESULT_FROM_WIN32(ret); -} - -static HRESULT reg_delete_folder(const WCHAR *path, const WCHAR *name) -{ - HKEY hroot, hfolder; - DWORD ret; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegOpenKeyExW(hroot, path, 0, DELETE, &hfolder); - - RegCloseKey(hroot); - - while (*name == '\\') name++; - if (ret == ERROR_SUCCESS) - { - ret = RegDeleteKeyW(hfolder, name); - RegCloseKey(hfolder); - } - - return HRESULT_FROM_WIN32(ret); -} - -static inline void reg_close_folder(HKEY hfolder) -{ - RegCloseKey(hfolder); -} - static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) { TaskFolder *folder = impl_from_ITaskFolder(iface); @@ -328,9 +256,7 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON hr = SchRpcDelete(folder_path, 0); heap_free(folder_path); - if (hr != S_OK) return hr; - - return reg_delete_folder(folder->path, name); + return hr; } static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR name, IRegisteredTask **task) @@ -452,7 +378,6 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** TaskFolder *folder; WCHAR *folder_path; HRESULT hr; - HKEY hfolder; if (path) { @@ -494,15 +419,6 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** return hr; } - hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); - if (hr) - { - heap_free(folder_path); - return hr; - } - - reg_close_folder(hfolder); - folder = heap_alloc(sizeof(*folder)); if (!folder) {

1 0

Stefan Dösinger : ddraw/tests: Add mipmap locking tests.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 3ff1c92dd146dd4fbfb8d97bdfef13fa3aa359ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff1c92dd146dd4fbfb8d97bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 4 11:51:05 2014 +0200 ddraw/tests: Add mipmap locking tests. --- dlls/ddraw/tests/ddraw1.c | 62 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 62 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 62 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 253 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ff1c92dd146dd4fbfb8d…

1 0

Dmitry Timoshkov : taskschd: Make ITaskFolder::CreateFolder, ITaskFolder:: GetFolder and ITaskFolder::DeleteFolder use the RPC API.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 39e972b573180ed5f831097bdbc3ce8292cf8506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e972b573180ed5f831097bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 13:14:19 2014 +0900 taskschd: Make ITaskFolder::CreateFolder, ITaskFolder::GetFolder and ITaskFolder::DeleteFolder use the RPC API. --- dlls/taskschd/folder.c | 97 ++++++++++++++++++++++++++++++--------- dlls/taskschd/tests/scheduler.c | 1 - 2 files changed, 75 insertions(+), 23 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 7caad77..6bb0c38 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -25,6 +25,7 @@ #include "winreg.h" #include "objbase.h" #include "taskschd.h" +#include "schrpc.h" #include "taskschd_private.h" #include "wine/unicode.h" @@ -273,9 +274,47 @@ static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR path, VAR return hr; } +static WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) +{ + static const WCHAR bslash[] = { '\\', 0 }; + WCHAR *folder_path; + int len = 0; + + if (path) len = strlenW(path); + + if (parent) len += strlenW(parent); + + /* +1 if parent is not '\' terminated */ + folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); + if (!folder_path) return NULL; + + folder_path[0] = 0; + + if (parent) + strcpyW(folder_path, parent); + + if (path && *path) + { + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + + while (*path == '\\') path++; + strcatW(folder_path, path); + } + + len = strlenW(folder_path); + if (!len) + strcatW(folder_path, bslash); + + return folder_path; +} + static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) { TaskFolder *folder = impl_from_ITaskFolder(iface); + WCHAR *folder_path; + HRESULT hr; TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); @@ -284,6 +323,13 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON if (flags) FIXME("unsupported flags %x\n", flags); + folder_path = get_full_path(folder->path, name); + if (!folder_path) return E_OUTOFMEMORY; + + hr = SchRpcDelete(folder_path, 0); + heap_free(folder_path); + if (hr != S_OK) return hr; + return reg_delete_folder(folder->path, name); } @@ -403,43 +449,50 @@ static const ITaskFolderVtbl TaskFolder_vtbl = HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) { - static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; WCHAR *folder_path; - int len = 0; HRESULT hr; HKEY hfolder; if (path) { - len = strlenW(path); + int len = strlenW(path); if (len && path[len - 1] == '\\') return ERROR_INVALID_NAME; } - if (parent) len += strlenW(parent); - - /* +1 if parent is not '\' terminated */ - folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); + folder_path = get_full_path(parent, path); if (!folder_path) return E_OUTOFMEMORY; - folder_path[0] = 0; - - if (parent) - strcpyW(folder_path, parent); - - if (path && *path) + if (create) { - len = strlenW(folder_path); - if (!len || folder_path[len - 1] != '\\') - strcatW(folder_path, bslash); - - while (*path == '\\') path++; - strcatW(folder_path, path); + hr = SchRpcCreateFolder(folder_path, NULL, 0); + } + else + { + DWORD start_index, count, i; + TASK_NAMES names; + + start_index = 0; + names = NULL; + hr = SchRpcEnumFolders(folder_path, 0, &start_index, 0, &count, &names); + if (hr == S_OK) + { + for (i = 0; i < count; i++) + MIDL_user_free(names[i]); + MIDL_user_free(names); + } + else + { + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + } } - len = strlenW(folder_path); - if (!len) - strcatW(folder_path, bslash); + if (FAILED(hr)) + { + heap_free(folder_path); + return hr; + } hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 0f89021..7f0669b 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -341,7 +341,6 @@ todo_wine ITaskFolder_Release(subfolder); hr = ITaskFolder_DeleteFolder(folder, Wine, 0); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0);

1 0

Dmitry Timoshkov : taskschd: Reimplement ITaskFolderCollection enumeration using SchRpcEnumFolders.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: de8ce034b8e0a0b84f6e9dd65c1d1e01564fbcee URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8ce034b8e0a0b84f6e9dd65… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 7 13:14:33 2014 +0900 taskschd: Reimplement ITaskFolderCollection enumeration using SchRpcEnumFolders. --- dlls/taskschd/folder_collection.c | 106 +++++-------------------------------- 1 file changed, 12 insertions(+), 94 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 004a977..47c9620 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "objbase.h" #include "taskschd.h" +#include "schrpc.h" #include "taskschd_private.h" #include "wine/unicode.h" @@ -31,15 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); -static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; - typedef struct { ITaskFolderCollection ITaskFolderCollection_iface; LONG ref; WCHAR *path; - LPWSTR *list; - LONG count; + TASK_NAMES list; + DWORD count; } TaskFolderCollection; static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj); @@ -55,14 +54,14 @@ static ULONG WINAPI folders_AddRef(ITaskFolderCollection *iface) return InterlockedIncrement(&folders->ref); } -static void free_list(LPWSTR *list, LONG count) +static void free_list(LPWSTR *list, DWORD count) { LONG i; for (i = 0; i < count; i++) - heap_free(list[i]); + MIDL_user_free(list[i]); - heap_free(list); + MIDL_user_free(list); } static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) @@ -216,98 +215,17 @@ static const ITaskFolderCollectionVtbl TaskFolderCollection_vtbl = folders_get__NewEnum }; -static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) -{ - HKEY hroot; - DWORD ret; - - ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); - if (ret) return HRESULT_FROM_WIN32(ret); - - while (*path == '\\') path++; - ret = RegOpenKeyExW(hroot, path, 0, KEY_ALL_ACCESS, hfolder); - if (ret == ERROR_FILE_NOT_FOUND) - ret = ERROR_PATH_NOT_FOUND; - - RegCloseKey(hroot); - - return HRESULT_FROM_WIN32(ret); -} - -static inline void reg_close_folder(HKEY hfolder) -{ - RegCloseKey(hfolder); -} - -static HRESULT create_folders_list(const WCHAR *path, LPWSTR **folders_list, LONG *folders_count) -{ - HRESULT hr; - HKEY hfolder; - WCHAR name[MAX_PATH]; - LONG ret, idx, allocated, count; - LPWSTR *list; - - *folders_list = NULL; - *folders_count = 0; - - hr = reg_open_folder(path, &hfolder); - if (hr) return hr; - - allocated = 64; - list = heap_alloc(allocated * sizeof(LPWSTR)); - if (!list) - { - reg_close_folder(hfolder); - return E_OUTOFMEMORY; - } - - idx = count = 0; - - while (!(ret = RegEnumKeyW(hfolder, idx++, name, MAX_PATH))) - { - /* FIXME: differentiate between folders and tasks */ - if (count >= allocated) - { - LPWSTR *new_list; - allocated *= 2; - new_list = heap_realloc(list, allocated * sizeof(LPWSTR)); - if (!new_list) - { - reg_close_folder(hfolder); - free_list(list, count); - return E_OUTOFMEMORY; - } - list = new_list; - } - - list[count] = heap_strdupW(name); - if (!list[count]) - { - reg_close_folder(hfolder); - free_list(list, count); - return E_OUTOFMEMORY; - } - - count++; - } - - reg_close_folder(hfolder); - - *folders_list = list; - *folders_count = count; - - return S_OK; -} - HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) { TaskFolderCollection *folders; HRESULT hr; - LPWSTR *list; - LONG count; + TASK_NAMES list; + DWORD start_index, count; - hr = create_folders_list(path, &list, &count); - if (hr) return hr; + start_index = 0; + list = NULL; + hr = SchRpcEnumFolders(path, 0, &start_index, 0, &count, &list); + if (hr != S_OK) return hr; folders = heap_alloc(sizeof(*folders)); if (!folders)

1 0

Stefan Dösinger : d3d9/tests: Add a test for (sub-) resource types.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: af51c679bf52055ccbd14d78268a7fee617a535f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af51c679bf52055ccbd14d782… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 4 11:51:01 2014 +0200 d3d9/tests: Add a test for (sub-) resource types. --- dlls/d3d9/tests/device.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c936364..550c95e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7621,6 +7621,166 @@ static void test_vdecl_apply(void) DestroyWindow(window); } +static void test_resource_type(void) +{ + IDirect3DDevice9 *device; + IDirect3DSurface9 *surface; + IDirect3DTexture9 *texture; + IDirect3DCubeTexture9 *cube_texture; + IDirect3DVolume9 *volume; + IDirect3DVolumeTexture9 *volume_texture; + D3DSURFACE_DESC surface_desc; + D3DVOLUME_DESC volume_desc; + D3DRESOURCETYPE type; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_CreateTexture(device, 2, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + type = IDirect3DTexture9_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "Expected type D3DRTYPE_TEXTURE, got %u.\n", type); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + /* The following code crashes, for the sake of completeness: + * type = texture->lpVtbl->GetType((IDirect3DTexture9 *)surface); + * ok(type == D3DRTYPE_PONIES, "Expected type D3DRTYPE_PONIES, got %u.\n", type); + * + * So applications will not depend on getting the "right" resource type - whatever it + * may be - from the "wrong" vtable. */ + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 2, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture9_GetLevelDesc(texture, 2, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture); + + hr = IDirect3DDevice9_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture, NULL); + ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); + type = IDirect3DCubeTexture9_GetType(cube_texture); + ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); + + hr = IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture, + D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); + type = IDirect3DSurface9_GetType(surface); + ok(type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", type); + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + hr = IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface9_Release(surface); + IDirect3DCubeTexture9_Release(cube_texture); + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + type = IDirect3DVolumeTexture9_GetType(volume_texture); + ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 0, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */ + hr = IDirect3DVolume9_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + IDirect3DVolume9_Release(volume); + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 2, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume9 is not an IDirect3DResource9 and has no GetType method. */ + hr = IDirect3DVolume9_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 2, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + IDirect3DVolume9_Release(volume); + IDirect3DVolumeTexture9_Release(volume_texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -7709,6 +7869,7 @@ START_TEST(device) test_begin_end_state_block(); test_shader_constant_apply(); test_vdecl_apply(); + test_resource_type(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d8/tests: Add a test for (sub-) resource types.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: fffe162f40bf7fd4794eb5e9e6febc4bdb3b5114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffe162f40bf7fd4794eb5e9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 4 11:51:02 2014 +0200 d3d8/tests: Add a test for (sub-) resource types. --- dlls/d3d8/tests/device.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d683a76..37621bf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5957,6 +5957,150 @@ static void test_shader_constant_apply(void) DestroyWindow(window); } +static void test_resource_type(void) +{ + IDirect3DDevice8 *device; + IDirect3DSurface8 *surface; + IDirect3DTexture8 *texture; + IDirect3DCubeTexture8 *cube_texture; + IDirect3DVolume8 *volume; + IDirect3DVolumeTexture8 *volume_texture; + D3DSURFACE_DESC surface_desc; + D3DVOLUME_DESC volume_desc; + D3DRESOURCETYPE type; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateImageSurface(device, 4, 4, D3DFMT_X8R8G8B8, &surface); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_CreateTexture(device, 2, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + type = IDirect3DTexture8_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "Expected type D3DRTYPE_TEXTURE, got %u.\n", type); + + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture8_GetLevelDesc(texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 2, "Expected width 2, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 8, "Expected height 8, got %u.\n", surface_desc.Height); + IDirect3DSurface8_Release(surface); + + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 2, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + hr = IDirect3DTexture8_GetLevelDesc(texture, 2, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + ok(surface_desc.Width == 1, "Expected width 1, got %u.\n", surface_desc.Width); + ok(surface_desc.Height == 2, "Expected height 2, got %u.\n", surface_desc.Height); + IDirect3DSurface8_Release(surface); + IDirect3DTexture8_Release(texture); + + hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture); + ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); + type = IDirect3DCubeTexture8_GetType(cube_texture); + ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); + + hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, + D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface8_Release(surface); + IDirect3DCubeTexture8_Release(cube_texture); + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture); + type = IDirect3DVolumeTexture8_GetType(volume_texture); + ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + IDirect3DVolumeTexture8_Release(volume_texture); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6039,6 +6183,7 @@ START_TEST(device) test_pixel_format(); test_begin_end_state_block(); test_shader_constant_apply(); + test_resource_type(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Piotr Caban : ole32: Null terminate strings in STREAM_ReadString function.
by Alexandre Julliard April 7, 2014

April 7, 2014

Module: wine Branch: master Commit: 306e98425bb7b36c63a1c1d452cf28953512359e URL: http://source.winehq.org/git/wine.git/?a=commit;h=306e98425bb7b36c63a1c1d45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 7 18:55:11 2014 +0200 ole32: Null terminate strings in STREAM_ReadString function. --- dlls/ole32/storage32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index debdbbf..b859ad1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8698,7 +8698,10 @@ static HRESULT STREAM_ReadString( IStream *stm, LPWSTR *string ) len = MultiByteToWideChar( CP_ACP, 0, str, count, NULL, 0 ); wstr = CoTaskMemAlloc( (len + 1)*sizeof (WCHAR) ); if( wstr ) + { MultiByteToWideChar( CP_ACP, 0, str, count, wstr, len ); + wstr[len] = 0; + } CoTaskMemFree( str ); *string = wstr;

1 0