Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 01/01: [NTOS:IO] Move IopRemovePlugPlayEvent around and add the ResponseData parameter (not used yet)

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a05051f5546ad2a118daf… commit a05051f5546ad2a118daf4e9de484b10b472f152 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 29 14:26:16 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 29 14:26:16 2020 +0100 [NTOS:IO] Move IopRemovePlugPlayEvent around and add the ResponseData parameter (not used yet) --- ntoskrnl/io/pnpmgr/plugplay.c | 54 +++++++++++++++++++++++-----------------… [View More]--- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 7782c3ee135..c1d5baa816a 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -91,30 +91,6 @@ IopQueueTargetDeviceEvent(const GUID *Guid, } -/* - * Remove the current PnP event from the tail of the event queue - * and signal IopPnpNotifyEvent if there is yet another event in the queue. - */ -static NTSTATUS -IopRemovePlugPlayEvent(VOID) -{ - /* Remove a pnp event entry from the tail of the queue */ - if (!IsListEmpty(&IopPnpEventQueueHead)) - { - ExFreePool(CONTAINING_RECORD(RemoveTailList(&IopPnpEventQueueHead), PNP_EVENT_ENTRY, ListEntry)); - } - - /* Signal the next pnp event in the queue */ - if (!IsListEmpty(&IopPnpEventQueueHead)) - { - KeSetEvent(&IopPnpNotifyEvent, - 0, - FALSE); - } - - return STATUS_SUCCESS; -} - static PDEVICE_OBJECT IopTraverseDeviceNode(PDEVICE_NODE Node, PUNICODE_STRING DeviceInstance) { @@ -245,6 +221,34 @@ IopPnpEnumerateDevice(PPLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA DeviceData) return Status; } + +/* + * Remove the current PnP event from the tail of the event queue + * and signal IopPnpNotifyEvent if there is yet another event in the queue. + */ +static +NTSTATUS +IopRemovePlugPlayEvent( + _In_ PPLUGPLAY_CONTROL_USER_RESPONSE_DATA ResponseData) +{ + /* Remove a pnp event entry from the tail of the queue */ + if (!IsListEmpty(&IopPnpEventQueueHead)) + { + ExFreePool(CONTAINING_RECORD(RemoveTailList(&IopPnpEventQueueHead), PNP_EVENT_ENTRY, ListEntry)); + } + + /* Signal the next pnp event in the queue */ + if (!IsListEmpty(&IopPnpEventQueueHead)) + { + KeSetEvent(&IopPnpNotifyEvent, + 0, + FALSE); + } + + return STATUS_SUCCESS; +} + + static NTSTATUS IopGetInterfaceDeviceList(PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA DeviceList) { @@ -1348,7 +1352,7 @@ NtPlugPlayControl(IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, case PlugPlayControlUserResponse: if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_USER_RESPONSE_DATA)) return STATUS_INVALID_PARAMETER; - return IopRemovePlugPlayEvent(); + return IopRemovePlugPlayEvent((PPLUGPLAY_CONTROL_USER_RESPONSE_DATA)Buffer); // case PlugPlayControlGenerateLegacyDevice: [View Less]

5 years, 2 months

[reactos] 01/01: [SHELL32_APITEST] Add DoPropTest to SHChangeNotify testcase

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=302356bf5779e439bf029… commit 302356bf5779e439bf0292f97d0099b0e9c336f0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 29 16:02:48 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Feb 29 16:02:48 2020 +0900 [SHELL32_APITEST] Add DoPropTest to SHChangeNotify testcase CORE-13950 --- modules/rostests/apitests/shell32/SHChangeNotify.… [View More]

5 years, 2 months

[reactos] 01/01: [SHELL32_APITEST] Support multi-process of SHChangeNotify testcase (#2399)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f766e94d4087b136f8a1… commit 7f766e94d4087b136f8a142863a395cafd235868 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 29 08:13:52 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 29 08:13:52 2020 +0900 [SHELL32_APITEST] Support multi-process of SHChangeNotify testcase (#2399) The shell32!SHChangeNotify function must be tested on multiple processes. … [View More]CORE-13950 --- modules/rostests/apitests/shell32/CMakeLists.txt | 6 + .../rostests/apitests/shell32/SHChangeNotify.cpp | 304 ++++----------------- modules/rostests/apitests/shell32/shell-notify.cpp | 256 +++++++++++++++++ 3 files changed, 317 insertions(+), 249 deletions(-) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index aab3e8bcfb8..1ef8819746c 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -46,3 +46,9 @@ set_module_type(shell32_apitest win32cui) add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) add_pch(shell32_apitest shelltest.h SOURCE) add_rostests_file(TARGET shell32_apitest) + +# shell-notify.exe +add_executable(shell-notify shell-notify.cpp) +set_module_type(shell-notify win32gui UNICODE) +add_importlibs(shell-notify msvcrt kernel32 user32 shell32 shlwapi ole32) +add_rostests_file(TARGET shell-notify SUBDIR testdata) diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index c4257b993ec..372696d24ec 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -10,8 +10,8 @@ #include <stdio.h> #define WM_SHELL_NOTIFY (WM_USER + 100) - -#define ID_TEST 1000 +#define WM_GET_NOTIFY_FLAGS (WM_USER + 101) +#define WM_CLEAR_FLAGS (WM_USER + 102) static WCHAR s_dir1[MAX_PATH]; // "%TEMP%\\WatchDir1" static WCHAR s_dir2[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir2" @@ -20,12 +20,7 @@ static WCHAR s_file1[MAX_PATH]; // "%TEMP%\\WatchDir1\\File1.txt" static WCHAR s_file2[MAX_PATH]; // "%TEMP%\\WatchDir1\\File2.txt" static HWND s_hwnd = NULL; -static WCHAR s_szName[] = L"SHChangeNotify testcase"; -static LPITEMIDLIST s_pidl = NULL; -static UINT s_uRegID = 0; -static SHChangeNotifyEntry s_entry; - -static CHAR s_path1[MAX_PATH], s_path2[MAX_PATH]; +static const WCHAR s_szName[] = L"SHChangeNotify testcase"; typedef enum TYPE { @@ -40,21 +35,6 @@ typedef enum TYPE TYPE_FREESPACE } TYPE; -static BYTE s_counters[TYPE_FREESPACE + 1]; - -static LPCSTR -DoGetPattern(void) -{ - size_t i; - static char buf[TYPE_FREESPACE + 1 + 1]; - for (i = 0; i < TYPE_FREESPACE + 1; ++i) - { - buf[i] = (char)('0' + s_counters[i]); - } - buf[i] = 0; - return buf; -} - typedef void (*ACTION)(void); typedef struct TEST_ENTRY @@ -134,13 +114,10 @@ static const TEST_ENTRY s_TestEntries[] = { {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "000010000", DoAction2}, {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "000100000", DoAction1}, {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "000000010", NULL}, - {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, NULL, "000000010", NULL}, {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, s_dir3, "000000010", DoAction3}, - {__LINE__, SHCNE_RENAMEFOLDER, s_dir2, NULL, "000000010", NULL}, {__LINE__, SHCNE_CREATE, s_file1, NULL, "010000000", NULL}, {__LINE__, SHCNE_CREATE, s_file1, s_file2, "010000000", NULL}, {__LINE__, SHCNE_CREATE, s_file1, NULL, "010000000", DoAction4}, - {__LINE__, SHCNE_RENAMEITEM, s_file1, NULL, "100000000", NULL}, {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "100000000", NULL}, {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "100000000", DoAction5}, {__LINE__, SHCNE_RENAMEITEM, s_file1, s_file2, "100000000", NULL}, @@ -175,11 +152,21 @@ static const TEST_ENTRY s_TestEntries[] = { {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "000010000", NULL}, {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "000010000", DoAction8}, }; -static const size_t s_nTestEntries = _countof(s_TestEntries); -static size_t s_iTest = 0; + +LPCSTR PatternFromFlags(DWORD flags) +{ + static char s_buf[TYPE_FREESPACE + 1 + 1]; + DWORD i; + for (i = 0; i <= TYPE_FREESPACE; ++i) + { + s_buf[i] = (char)('0' + !!(flags & (1 << i))); + } + s_buf[i] = 0; + return s_buf; +} static void -DoTestEntry1(const TEST_ENTRY *entry) +DoTestEntry(const TEST_ENTRY *entry) { if (entry->action) { @@ -187,16 +174,13 @@ DoTestEntry1(const TEST_ENTRY *entry) } SHChangeNotify(entry->event, SHCNF_PATHW | SHCNF_FLUSH, entry->item1, entry->item2); - SendMessageW(s_hwnd, WM_COMMAND, ID_TEST + s_iTest, 0); - ZeroMemory(&s_counters, sizeof(s_counters)); -} + DWORD flags = SendMessageW(s_hwnd, WM_GET_NOTIFY_FLAGS, 0, 0); + LPCSTR pattern = PatternFromFlags(flags); -static void -DoTestEntry2(const TEST_ENTRY *entry) -{ - LPCSTR pattern = DoGetPattern(); ok(lstrcmpA(pattern, entry->pattern) == 0, "Line %d: pattern mismatch '%s'\n", entry->line, pattern); + + SendMessageW(s_hwnd, WM_CLEAR_FLAGS, 0, 0); } static BOOL @@ -223,252 +207,74 @@ DoInit(HWND hwnd) lstrcpyW(s_file2, s_dir1); PathAppendW(s_file2, L"File2.txt"); - s_pidl = ILCreateFromPathW(s_dir1); - - s_entry.pidl = s_pidl; - s_entry.fRecursive = TRUE; - LONG fEvents = SHCNE_ALLEVENTS; - s_uRegID = SHChangeNotifyRegister(hwnd, SHCNRF_ShellLevel, fEvents, WM_SHELL_NOTIFY, - 1, &s_entry); - return s_uRegID != 0; -} - -static DWORD WINAPI ThreadFunc(LPVOID) -{ - for (size_t i = 0; i < s_nTestEntries; ++i) - { - s_iTest = i; - DoTestEntry1(&s_TestEntries[i]); - } - - SendMessageW(s_hwnd, WM_COMMAND, IDOK, 0); - return 0; -} - -static BOOL -OnCreate(HWND hwnd) -{ - s_hwnd = hwnd; - - BOOL bOK = DoInit(hwnd); - if (!bOK) - { - skip("SHChangeNotifyRegister failed\n"); - return FALSE; - } - - DWORD tid; - HANDLE hThread = CreateThread(NULL, 0, ThreadFunc, NULL, 0, &tid); - if (hThread == NULL) - { - skip("CreateThread failed\n"); - return FALSE; - } - CloseHandle(hThread); - return TRUE; } static void -OnCommand(HWND hwnd, UINT id) -{ - switch (id) - { - case IDOK: - case IDCANCEL: - DestroyWindow(hwnd); - break; - default: - if (ID_TEST <= id && id < ID_TEST + 1000) - { - DoTestEntry2(&s_TestEntries[s_iTest]); - } - break; - } -} - -static void -OnDestroy(HWND hwnd) +DoEnd(HWND hwnd) { - SHChangeNotifyDeregister(s_uRegID); - CoTaskMemFree(s_pidl); DeleteFileW(s_file1); DeleteFileW(s_file2); RemoveDirectoryW(s_dir3); RemoveDirectoryW(s_dir2); RemoveDirectoryW(s_dir1); - PostQuitMessage(0); - s_hwnd = NULL; + + SendMessageW(s_hwnd, WM_COMMAND, IDOK, 0); } -static void -DoShellNotify(HWND hwnd, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2, LONG lEvent) +START_TEST(SHChangeNotify) { - if (pidl1) - SHGetPathFromIDListA(pidl1, s_path1); - else - s_path1[0] = 0; - - if (pidl2) - SHGetPathFromIDListA(pidl2, s_path2); - else - s_path2[0] = 0; + WCHAR szPath[MAX_PATH]; + GetModuleFileNameW(NULL, szPath, _countof(szPath)); + PathRemoveFileSpecW(szPath); + PathAppendW(szPath, L"shell-notify.exe"); - switch (lEvent) + if (!PathFileExistsW(szPath)) { - case SHCNE_RENAMEITEM: - trace("SHCNE_RENAMEITEM('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_RENAMEITEM] = 1; - break; - case SHCNE_CREATE: - trace("SHCNE_CREATE('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_CREATE] = 1; - break; - case SHCNE_DELETE: - trace("SHCNE_DELETE('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_DELETE] = 1; - break; - case SHCNE_MKDIR: - trace("SHCNE_MKDIR('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_MKDIR] = 1; - break; - case SHCNE_RMDIR: - trace("SHCNE_RMDIR('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_RMDIR] = 1; - break; - case SHCNE_MEDIAINSERTED: - trace("SHCNE_MEDIAINSERTED('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_MEDIAREMOVED: - trace("SHCNE_MEDIAREMOVED('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_DRIVEREMOVED: - trace("SHCNE_DRIVEREMOVED('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_DRIVEADD: - trace("SHCNE_DRIVEADD('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_NETSHARE: - trace("SHCNE_NETSHARE('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_NETUNSHARE: - trace("SHCNE_NETUNSHARE('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_ATTRIBUTES: - trace("SHCNE_ATTRIBUTES('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_UPDATEDIR: - trace("SHCNE_UPDATEDIR('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_UPDATEDIR] = 1; - break; - case SHCNE_UPDATEITEM: - trace("SHCNE_UPDATEITEM('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_UPDATEITEM] = 1; - break; - case SHCNE_SERVERDISCONNECT: - trace("SHCNE_SERVERDISCONNECT('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_UPDATEIMAGE: - trace("SHCNE_UPDATEIMAGE('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_DRIVEADDGUI: - trace("SHCNE_DRIVEADDGUI('%s', '%s')\n", s_path1, s_path2); - break; - case SHCNE_RENAMEFOLDER: - trace("SHCNE_RENAMEFOLDER('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_RENAMEFOLDER] = 1; - break; - case SHCNE_FREESPACE: - trace("SHCNE_FREESPACE('%s', '%s')\n", s_path1, s_path2); - s_counters[TYPE_FREESPACE] = 1; - break; - case SHCNE_EXTENDED_EVENT: - trace("SHCNE_EXTENDED_EVENT('%p', '%p')\n", pidl1, pidl2); - break; - case SHCNE_ASSOCCHANGED: - trace("SHCNE_ASSOCCHANGED('%s', '%s')\n", s_path1, s_path2); - break; - default: - trace("(lEvent:%08lX)('%s', '%s')\n", lEvent, s_path1, s_path2); - break; + trace("szPath: %S\n", szPath); + PathRemoveFileSpecW(szPath); + PathAppendW(szPath, L"testdata\\shell-notify.exe"); + + if (!PathFileExistsW(szPath)) + { + trace("szPath: %S\n", szPath); + skip("shell-notify.exe not found\n"); + return; + } } -} -static INT_PTR -OnShellNotify(HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - LONG lEvent; - PIDLIST_ABSOLUTE *pidlAbsolute; - HANDLE hLock = SHChangeNotification_Lock((HANDLE)wParam, (DWORD)lParam, &pidlAbsolute, &lEvent); - if (hLock) - { - DoShellNotify(hwnd, pidlAbsolute[0], pidlAbsolute[1], lEvent); - SHChangeNotification_Unlock(hLock); - } - else + HINSTANCE hinst = ShellExecuteW(NULL, NULL, szPath, NULL, NULL, SW_SHOWNORMAL); + if ((INT_PTR)hinst <= 32) { - pidlAbsolute = (PIDLIST_ABSOLUTE *)wParam; - DoShellNotify(hwnd, pidlAbsolute[0], pidlAbsolute[1], lParam); + skip("Unable to run shell-notify.exe.\n"); + return; } - return TRUE; -} -static LRESULT CALLBACK -WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - switch (uMsg) + for (int i = 0; i < 10; ++i) { - case WM_CREATE: - return (OnCreate(hwnd) ? 0 : -1); - - case WM_COMMAND: - OnCommand(hwnd, LOWORD(wParam)); - break; - - case WM_SHELL_NOTIFY: - return OnShellNotify(hwnd, wParam, lParam); - - case WM_DESTROY: - OnDestroy(hwnd); + s_hwnd = FindWindowW(s_szName, s_szName); + if (s_hwnd) break; - default: - return DefWindowProcW(hwnd, uMsg, wParam, lParam); + Sleep(100); } - return 0; -} -START_TEST(SHChangeNotify) -{ - WNDCLASSW wc; - ZeroMemory(&wc, sizeof(wc)); - wc.lpfnWndProc = WindowProc; - wc.hInstance = GetModuleHandleW(NULL); - wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); - wc.lpszClassName = s_szName; - if (!RegisterClassW(&wc)) + if (!s_hwnd) { - skip("RegisterClassW failed\n"); + skip("Unable to find window.\n"); return; } - HWND hwnd = CreateWindowW(s_szName, s_szName, WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, - NULL, NULL, GetModuleHandleW(NULL), NULL); - if (!hwnd) + if (!DoInit(s_hwnd)) { - skip("CreateWindowW failed\n"); + skip("Unable to initialize.\n"); return; } - ShowWindow(hwnd, SW_SHOWNORMAL); - UpdateWindow(hwnd); - MSG msg; - while (GetMessageW(&msg, NULL, 0, 0)) + for (size_t i = 0; i < _countof(s_TestEntries); ++i) { - TranslateMessage(&msg); - DispatchMessageW(&msg); + DoTestEntry(&s_TestEntries[i]); } + + DoEnd(s_hwnd); } diff --git a/modules/rostests/apitests/shell32/shell-notify.cpp b/modules/rostests/apitests/shell32/shell-notify.cpp new file mode 100644 index 00000000000..f6ac62e8a5d --- /dev/null +++ b/modules/rostests/apitests/shell32/shell-notify.cpp @@ -0,0 +1,256 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for SHChangeNotify + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "shelltest.h" +#include <shlwapi.h> +#include <stdio.h> + +#define WM_SHELL_NOTIFY (WM_USER + 100) +#define WM_GET_NOTIFY_FLAGS (WM_USER + 101) +#define WM_CLEAR_FLAGS (WM_USER + 102) + +static HWND s_hwnd = NULL; +static const WCHAR s_szName[] = L"SHChangeNotify testcase"; + +typedef enum TYPE +{ + TYPE_RENAMEITEM, + TYPE_CREATE, + TYPE_DELETE, + TYPE_MKDIR, + TYPE_RMDIR, + TYPE_UPDATEDIR, + TYPE_UPDATEITEM, + TYPE_RENAMEFOLDER, + TYPE_FREESPACE +} TYPE; + +static BYTE s_counters[TYPE_FREESPACE + 1]; +static UINT s_uRegID = 0; +static WCHAR s_dir1[MAX_PATH]; // "%TEMP%\\WatchDir1" +static LPITEMIDLIST s_pidl = NULL; +static SHChangeNotifyEntry s_entry; + +static BOOL +OnCreate(HWND hwnd) +{ + s_hwnd = hwnd; + + WCHAR szTemp[MAX_PATH], szPath[MAX_PATH]; + + GetTempPathW(_countof(szTemp), szTemp); + GetLongPathNameW(szTemp, szPath, _countof(szPath)); + + lstrcpyW(s_dir1, szPath); + PathAppendW(s_dir1, L"WatchDir1"); + + s_pidl = ILCreateFromPathW(s_dir1); + + s_entry.pidl = s_pidl; + s_entry.fRecursive = TRUE; + LONG fEvents = SHCNE_ALLEVENTS; + s_uRegID = SHChangeNotifyRegister(hwnd, SHCNRF_ShellLevel, fEvents, WM_SHELL_NOTIFY, + 1, &s_entry); + return s_uRegID != 0; +} + +static void +OnCommand(HWND hwnd, UINT id) +{ + switch (id) + { + case IDOK: + case IDCANCEL: + DestroyWindow(hwnd); + break; + } +} + +static void +OnDestroy(HWND hwnd) +{ + SHChangeNotifyDeregister(s_uRegID); + s_uRegID = 0; + + CoTaskMemFree(s_pidl); + s_pidl = NULL; + + PostQuitMessage(0); + s_hwnd = NULL; +} + +static void +DoShellNotify(HWND hwnd, PIDLIST_ABSOLUTE pidl1, PIDLIST_ABSOLUTE pidl2, LONG lEvent) +{ + CHAR path1[MAX_PATH], path2[MAX_PATH]; + + if (pidl1) + SHGetPathFromIDListA(pidl1, path1); + else + path1[0] = 0; + + if (pidl2) + SHGetPathFromIDListA(pidl2, path2); + else + path2[0] = 0; + + switch (lEvent) + { + case SHCNE_RENAMEITEM: + s_counters[TYPE_RENAMEITEM] = 1; + break; + case SHCNE_CREATE: + s_counters[TYPE_CREATE] = 1; + break; + case SHCNE_DELETE: + s_counters[TYPE_DELETE] = 1; + break; + case SHCNE_MKDIR: + s_counters[TYPE_MKDIR] = 1; + break; + case SHCNE_RMDIR: + s_counters[TYPE_RMDIR] = 1; + break; + case SHCNE_MEDIAINSERTED: + break; + case SHCNE_MEDIAREMOVED: + break; + case SHCNE_DRIVEREMOVED: + break; + case SHCNE_DRIVEADD: + break; + case SHCNE_NETSHARE: + break; + case SHCNE_NETUNSHARE: + break; + case SHCNE_ATTRIBUTES: + break; + case SHCNE_UPDATEDIR: + s_counters[TYPE_UPDATEDIR] = 1; + break; + case SHCNE_UPDATEITEM: + s_counters[TYPE_UPDATEITEM] = 1; + break; + case SHCNE_SERVERDISCONNECT: + break; + case SHCNE_UPDATEIMAGE: + break; + case SHCNE_DRIVEADDGUI: + break; + case SHCNE_RENAMEFOLDER: + s_counters[TYPE_RENAMEFOLDER] = 1; + break; + case SHCNE_FREESPACE: + s_counters[TYPE_FREESPACE] = 1; + break; + case SHCNE_EXTENDED_EVENT: + break; + case SHCNE_ASSOCCHANGED: + break; + default: + break; + } +} + +static INT_PTR +OnShellNotify(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + LONG lEvent; + PIDLIST_ABSOLUTE *pidlAbsolute; + HANDLE hLock = SHChangeNotification_Lock((HANDLE)wParam, (DWORD)lParam, &pidlAbsolute, &lEvent); + if (hLock) + { + DoShellNotify(hwnd, pidlAbsolute[0], pidlAbsolute[1], lEvent); + SHChangeNotification_Unlock(hLock); + } + else + { + pidlAbsolute = (PIDLIST_ABSOLUTE *)wParam; + DoShellNotify(hwnd, pidlAbsolute[0], pidlAbsolute[1], lParam); + } + return TRUE; +} + +static LRESULT +OnGetNotifyFlags(HWND hwnd) +{ + DWORD dwFlags = 0; + for (size_t i = 0; i < _countof(s_counters); ++i) + { + if (s_counters[i]) + dwFlags |= (1 << i); + } + return dwFlags; +} + +static LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + return (OnCreate(hwnd) ? 0 : -1); + + case WM_COMMAND: + OnCommand(hwnd, LOWORD(wParam)); + break; + + case WM_SHELL_NOTIFY: + return OnShellNotify(hwnd, wParam, lParam); + + case WM_DESTROY: + OnDestroy(hwnd); + break; + + case WM_GET_NOTIFY_FLAGS: + return OnGetNotifyFlags(hwnd); + + case WM_CLEAR_FLAGS: + ZeroMemory(&s_counters, sizeof(s_counters)); + break; + + default: + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + return 0; +} + +INT APIENTRY +wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + INT nCmdShow) +{ + WNDCLASSW wc; + ZeroMemory(&wc, sizeof(wc)); + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleW(NULL); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szName; + if (!RegisterClassW(&wc)) + return -1; + + HWND hwnd = CreateWindowW(s_szName, s_szName, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, GetModuleHandleW(NULL), NULL); + if (!hwnd) + return -1; + + ShowWindow(hwnd, SW_SHOWNORMAL); + UpdateWindow(hwnd); + + MSG msg; + while (GetMessageW(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + return 0; +} [View Less]

5 years, 2 months

[reactos] 01/01: [SHELL32][BOOTDATA] Unselect filename extension upon renaming (#2398)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4df9355d0c2657062b035… commit 4df9355d0c2657062b0357829d90b79474c1a26c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 29 08:08:26 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 29 08:08:26 2020 +0900 [SHELL32][BOOTDATA] Unselect filename extension upon renaming (#2398) You can disable unselecting by setting TRUE to SelectExtOnRename value of HKCU\… [View More]SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer. CORE-15242 --- boot/bootdata/hivedef.inf | 2 +- dll/win32/shell32/CDefView.cpp | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index f2a7625204f..45e5d8e64c5 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1883,6 +1883,7 @@ HKCU,"SOFTWARE\Classes\Applications",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer","SelectExtOnRename",0x00010001,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts",,0x00000012 @@ -1901,7 +1902,6 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32\LastVisitedMRU",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32\OpenSaveMRU",,0x00000012 - ; Default shell for the current user (overrides the defaults from the HKLM Winlogon sub-key) HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 ;HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index f2cfcead5f7..f2cb36153d9 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1783,6 +1783,26 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand return 0; } +static BOOL +SelectExtOnRename(void) +{ + HKEY hKey; + LONG error; + DWORD dwValue = FALSE, cbValue; + + error = RegOpenKeyExW(HKEY_CURRENT_USER, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer", + 0, KEY_READ, &hKey); + if (error) + return dwValue; + + cbValue = sizeof(dwValue); + RegQueryValueExW(hKey, L"SelectExtOnRename", NULL, NULL, (LPBYTE)&dwValue, &cbValue); + + RegCloseKey(hKey); + return !!dwValue; +} + /********************************************************** * ShellView_OnNotify() */ @@ -1995,6 +2015,14 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl HWND hEdit = reinterpret_cast<HWND>(m_ListView.SendMessage(LVM_GETEDITCONTROL)); SHLimitInputEdit(hEdit, m_pSFParent); + if (!(dwAttr & SFGAO_LINK) && (lpdi->item.mask & LVIF_TEXT) && !SelectExtOnRename()) + { + LPWSTR pszText = lpdi->item.pszText; + LPWSTR pchDotExt = PathFindExtensionW(pszText); + ::PostMessageW(hEdit, EM_SETSEL, 0, pchDotExt - pszText); + ::PostMessageW(hEdit, EM_SCROLLCARET, 0, 0); + } + m_isEditing = TRUE; return FALSE; } [View Less]

5 years, 2 months

[reactos] 01/01: [DOC] 3rd Party Files.txt: Add 'Schily Tools, mkisofs' entry

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebeeb9dcb85726f08f5cc… commit ebeeb9dcb85726f08f5ccaaaabbf28d20249cf21 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Feb 25 03:12:35 2020 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Feb 27 21:22:11 2020 +0300 [DOC] 3rd Party Files.txt: Add 'Schily Tools, mkisofs' entry --- media/doc/3rd Party Files.txt | 5 +++++ 1 file changed, 5 insertions(+) … [View More]

5 years, 2 months

[reactos] 01/01: [UTILMAN] Small refactor on process management code (#2375)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfe5e810cc493898c9ffe… commit dfe5e810cc493898c9ffe482f0460325bededc35 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Feb 27 18:45:21 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 28 02:45:21 2020 +0900 [UTILMAN] Small refactor on process management code (#2375) Implement a small helper, GetProcessID(), that will be used to return the process ID which we are … [View More]interested in. This largely removes some duplicated code. The following patch addresses the Jansen's comment on #1608 PR. --- base/applications/utilman/precomp.h | 1 + base/applications/utilman/process.c | 127 +++++++++++++++++++++++------------- 2 files changed, 81 insertions(+), 47 deletions(-) diff --git a/base/applications/utilman/precomp.h b/base/applications/utilman/precomp.h index db665e793c2..fba37387efc 100644 --- a/base/applications/utilman/precomp.h +++ b/base/applications/utilman/precomp.h @@ -59,6 +59,7 @@ INT ListBoxRefreshContents(VOID); VOID CheckUtilityState(BOOL bUtilState); /* process.c */ +DWORD GetProcessID(IN LPCWSTR lpProcessName); BOOL IsProcessRunning(IN LPCWSTR lpProcessName); BOOL LaunchProcess(LPCWSTR lpProcessName); BOOL CloseProcess(IN LPCWSTR lpProcessName); diff --git a/base/applications/utilman/process.c b/base/applications/utilman/process.c index 45bae49276f..71e4c589360 100644 --- a/base/applications/utilman/process.c +++ b/base/applications/utilman/process.c @@ -12,29 +12,28 @@ /* FUNCTIONS ******************************************************************/ /** - * @IsProcessRunning + * @GetProcessID * - * Checks if a process is running. + * Returns the process executable ID based on the given executable name. * - * @param[in] ProcName + * @param[in] lpProcessName * The name of the executable process. * * @return - * Returns TRUE if the given process' name is running, - * FALSE otherwise. + * Returns the ID number of the process, otherwise 0. * */ -BOOL IsProcessRunning(IN LPCWSTR lpProcessName) +DWORD GetProcessID(IN LPCWSTR lpProcessName) { - BOOL bIsRunning = FALSE; - PROCESSENTRY32W Process = {0}; + PROCESSENTRY32W Process; - /* Create a snapshot and check whether the given process' executable name is running */ + /* Create a snapshot and check if the given process name matches with the one from the process entry structure */ HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); if (hSnapshot == INVALID_HANDLE_VALUE) - return FALSE; + return 0; + /* Get the whole size of the structure */ Process.dwSize = sizeof(Process); /* Enumerate the processes */ @@ -44,17 +43,62 @@ BOOL IsProcessRunning(IN LPCWSTR lpProcessName) { if (_wcsicmp(Process.szExeFile, lpProcessName) == 0) { - /* The process we are searching for is running */ - bIsRunning = TRUE; - break; + /* The names match, return the process ID we're interested */ + CloseHandle(hSnapshot); + return Process.th32ProcessID; } } while (Process32NextW(hSnapshot, &Process)); } - /* Free the handle and return */ CloseHandle(hSnapshot); - return bIsRunning; + return 0; +} + +/** + * @IsProcessRunning + * + * Checks if a process is running. + * + * @param[in] lpProcessName + * The name of the executable process. + * + * @return + * Returns TRUE if the given process' name is running, + * FALSE otherwise. + * + */ +BOOL IsProcessRunning(IN LPCWSTR lpProcessName) +{ + DWORD dwReturn, dwProcessID; + HANDLE hProcess; + + /* Get the process ID */ + dwProcessID = GetProcessID(lpProcessName); + if (dwProcessID == 0) + { + return FALSE; + } + + /* Synchronize the process to get its signaling state */ + hProcess = OpenProcess(SYNCHRONIZE, FALSE, dwProcessID); + if (!hProcess) + { + DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)", GetLastError()); + return FALSE; + } + + /* Wait for the process */ + dwReturn = WaitForSingleObject(hProcess, 0); + if (dwReturn == WAIT_TIMEOUT) + { + /* The process is still running */ + CloseHandle(hProcess); + return TRUE; + } + + CloseHandle(hProcess); + return FALSE; } /** @@ -147,43 +191,32 @@ BOOL LaunchProcess(LPCWSTR lpProcessName) */ BOOL CloseProcess(IN LPCWSTR lpProcessName) { - BOOL bSuccess = FALSE; - PROCESSENTRY32W Process = {0}; + HANDLE hProcess; + DWORD dwProcessID; - /* Create a snapshot and check if the given process' executable name is running */ - HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); - - if (hSnapshot == INVALID_HANDLE_VALUE) + /* Get the process ID */ + dwProcessID = GetProcessID(lpProcessName); + if (dwProcessID == 0) + { return FALSE; + } - Process.dwSize = sizeof(Process); + /* Make sure that the given process ID is not ours, the parent process, so that we do not kill ourselves */ + if (dwProcessID == GetCurrentProcessId()) + { + return FALSE; + } - /* Enumerate the processes */ - if (Process32FirstW(hSnapshot, &Process)) + /* Open the process so that we can terminate it */ + hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessID); + if (!hProcess) { - do - { - if (_wcsicmp(Process.szExeFile, lpProcessName) == 0) - { - /* - * We have found the process. However we must make - * sure that we DO NOT kill ourselves (the process ID - * matching with the current parent process ID). - */ - HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, 0, Process.th32ProcessID); - if ((hProcess != NULL) && (Process.th32ProcessID != GetCurrentProcessId())) - { - TerminateProcess(hProcess, 0); - CloseHandle(hProcess); - } - bSuccess = TRUE; - break; - } - } - while (Process32NextW(hSnapshot, &Process)); + DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)", GetLastError()); + return FALSE; } - /* Free the handle and return */ - CloseHandle(hSnapshot); - return bSuccess; + /* Terminate it */ + TerminateProcess(hProcess, 0); + CloseHandle(hProcess); + return TRUE; } [View Less]

5 years, 2 months

[reactos] 01/01: [CMD] Fix 'if' command for root directories (#2394)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e263367f861f58173643… commit 4e263367f861f58173643eb511f8db88f7c6dd6b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 27 23:12:20 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 27 23:12:19 2020 +0900 [CMD] Fix 'if' command for root directories (#2394) CORE-14797 --- base/shell/cmd/if.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), … [View More]

5 years, 2 months

[reactos] 74/74: [WINESYNC]: d3dx9 is now in sync with wine-staging wine-4.2

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b067d649417ff9d379ad… commit 2b067d649417ff9d379adda2e53736c321682b87 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 5 22:14:09 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]: d3dx9 is now in sync with wine-staging wine-4.2 --- sdk/tools/winesync/d3dx9.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) … [View More]

5 years, 2 months

[reactos] 73/74: [WINESYNC] d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c7529df7ecf39bf811cc… commit 8c7529df7ecf39bf811cc3ec6b07dd263d5d5d3e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Wed Feb 5 22:14:01 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh. This patch fixes last problem of bug 32572. wine-staging patch by Christian … [View More]Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/skin.c | 86 ++++++++- modules/rostests/winetests/d3dx9_36/mesh.c | 83 +++++++++ ...lement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff | 206 +++++++++++++++++++++ 3 files changed, 372 insertions(+), 3 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c index bed4b9f49d2..0a305a99236 100644 --- a/dll/directx/wine/d3dx9_36/skin.c +++ b/dll/directx/wine/d3dx9_36/skin.c @@ -2,6 +2,7 @@ * Skin Info operations specific to D3DX9. * * Copyright (C) 2011 Dylan Smith + * Copyright (C) 2013 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -377,10 +378,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface, static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms, const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) { - FIXME("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p stub!\n", - iface, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); + struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); + DWORD size = D3DXGetFVFVertexSize(skin->fvf); + DWORD i, j; - return E_NOTIMPL; + TRACE("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p\n", + skin, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); + + if (bone_inv_transpose_transforms) + FIXME("Skinning vertices with two position elements not supported\n"); + + if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) { + FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK); + return E_FAIL; + } + + /* Reset all positions */ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *position = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i); + position->x = 0.0f; + position->y = 0.0f; + position->z = 0.0f; + } + + /* Update positions that are influenced by bones */ + for (i = 0; i < skin->num_bones; i++) { + D3DXMATRIX bone_inverse, matrix; + + D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); + D3DXMatrixMultiply(&matrix, &bone_transforms[i], &bone_inverse); + D3DXMatrixMultiply(&matrix, &matrix, &skin->bones[i].transform); + + for (j = 0; j < skin->bones[i].num_influences; j++) { + D3DXVECTOR3 position; + D3DXVECTOR3 *position_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j]); + D3DXVECTOR3 *position_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j]); + FLOAT weight = skin->bones[i].weights[j]; + + D3DXVec3TransformCoord(&position, position_src, &matrix); + position_dest->x += weight * position.x; + position_dest->y += weight * position.y; + position_dest->z += weight * position.z; + } + } + + if (skin->fvf & D3DFVF_NORMAL) { + /* Reset all normals */ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *normal = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i + sizeof(D3DXVECTOR3)); + normal->x = 0.0f; + normal->y = 0.0f; + normal->z = 0.0f; + } + + /* Update normals that are influenced by bones */ + for (i = 0; i < skin->num_bones; i++) { + D3DXMATRIX bone_inverse, matrix; + + D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); + D3DXMatrixMultiply(&matrix, &skin->bones[i].transform, &bone_transforms[i]); + + for (j = 0; j < skin->bones[i].num_influences; j++) { + D3DXVECTOR3 normal; + D3DXVECTOR3 *normal_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); + D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); + FLOAT weight = skin->bones[i].weights[j]; + + D3DXVec3TransformNormal(&normal, normal_src, &bone_inverse); + D3DXVec3TransformNormal(&normal, &normal, &matrix); + normal_dest->x += weight * normal.x; + normal_dest->y += weight * normal.y; + normal_dest->z += weight * normal.z; + } + } + + /* Normalize all normals that are influenced by bones*/ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + (i * size) + sizeof(D3DXVECTOR3)); + if ((normal_dest->x != 0.0f) && (normal_dest->y != 0.0f) && (normal_dest->z != 0.0f)) + D3DXVec3Normalize(normal_dest, normal_dest); + } + } + + return D3D_OK; } static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 35dd6c4c3b0..77f513f78dc 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -5316,6 +5316,88 @@ static void test_create_skin_info(void) ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); } +static void test_update_skinned_mesh(void) +{ + static DWORD bone0_vertices[2] = { 1, 3 }; + static FLOAT bone0_weights[2] = { 1.0f, 0.5f }; + static DWORD bone1_vertices[2] = { 2, 3 }; + static FLOAT bone1_weights[2] = { 1.0f, 0.5f }; + static D3DMATRIX bones_matrix[2] = + { { { { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 2.0f, 2.0f, 4.0f, 1.0f + } } }, + { { { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + -4.0f, -4.0f, 4.0f, 1.0f + } } } }; + static D3DVECTOR vertices_src[] = {{ 1.0f, 1.0f, 1.0f }, + { 1.0f, 0.0f, 0.0f }, + { 1.0f, 1.0f, -1.0f }, + { 0.0f, 1.0f, 0.0f }, + { -1.0f, -1.0f, 1.0f }, + { 0.0f, 0.0f, 1.0f }, + { -1.0f, -1.0f, -1.0f }, + { -1.0f, 0.0f, 0.0f }, + }; + static D3DVECTOR vertices_ref[] = {{ 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f }, + { 3.0f, 3.0f, 3.0f }, + { 0.0f, 1.0f, 0.0f }, + { -5.0f, -5.0f, 5.0f }, + { 0.0f, 0.0f, 1.0f }, + { -2.0f, -2.0f, 3.0f }, + { -1.0f, 0.0f, 0.0f }, + }; + D3DVECTOR vertices_dest[8]; + HRESULT hr; + ID3DXSkinInfo *skin_info; + D3DXMATRIX matrix; + int i; + + D3DXMatrixIdentity(&matrix); + for (i = 0; i < 8; i++) + { + vertices_dest[i].x = 10000.0f; + vertices_dest[i].y = 10000.0f; + vertices_dest[i].z = 10000.0f; + } + + hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + + skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + for (i = 0; i < 4; i++) + { + ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n", + i, vertices_dest[i*2].x, vertices_ref[i*2].x); + ok(compare(vertices_dest[i*2].y, vertices_ref[i*2].y), "Vertex[%d].position.y: got %g, expected %g\n", + i, vertices_dest[i*2].y, vertices_ref[i*2].y); + ok(compare(vertices_dest[i*2].z, vertices_ref[i*2].z), "Vertex[%d].position.z: got %g, expected %g\n", + i, vertices_dest[i*2].z, vertices_ref[i*2].z); + ok(compare(vertices_dest[i*2+1].x, vertices_ref[i*2+1].x), "Vertex[%d].normal.x: got %g, expected %g\n", + i, vertices_dest[i*2+1].x, vertices_ref[i*2+1].x); + ok(compare(vertices_dest[i*2+1].y, vertices_ref[i*2+1].y), "Vertex[%d].normal.y: got %g, expected %g\n", + i, vertices_dest[i*2+1].y, vertices_ref[i*2+1].y); + ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n", + i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z); + } + skin_info->lpVtbl->Release(skin_info); +} + static void test_convert_adjacency_to_point_reps(void) { HRESULT hr; @@ -11393,6 +11475,7 @@ START_TEST(mesh) D3DXGenerateAdjacencyTest(); test_update_semantics(); test_create_skin_info(); + test_update_skinned_mesh(); test_convert_adjacency_to_point_reps(); test_convert_point_reps_to_adjacency(); test_weld_vertices(); diff --git a/sdk/tools/winesync/d3dx9_staging/0024-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff b/sdk/tools/winesync/d3dx9_staging/0024-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff new file mode 100644 index 00000000000..9ef27a4688c --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0024-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff @@ -0,0 +1,206 @@ +diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c +index bed4b9f..0a305a9 100644 +--- a/dll/directx/wine/d3dx9_36/skin.c ++++ b/dll/directx/wine/d3dx9_36/skin.c +@@ -2,6 +2,7 @@ + * Skin Info operations specific to D3DX9. + * + * Copyright (C) 2011 Dylan Smith ++ * Copyright (C) 2013 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -377,10 +378,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface, + static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms, + const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) + { +- FIXME("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p stub!\n", +- iface, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); ++ struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); ++ DWORD size = D3DXGetFVFVertexSize(skin->fvf); ++ DWORD i, j; + +- return E_NOTIMPL; ++ TRACE("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p\n", ++ skin, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); ++ ++ if (bone_inv_transpose_transforms) ++ FIXME("Skinning vertices with two position elements not supported\n"); ++ ++ if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) { ++ FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK); ++ return E_FAIL; ++ } ++ ++ /* Reset all positions */ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *position = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i); ++ position->x = 0.0f; ++ position->y = 0.0f; ++ position->z = 0.0f; ++ } ++ ++ /* Update positions that are influenced by bones */ ++ for (i = 0; i < skin->num_bones; i++) { ++ D3DXMATRIX bone_inverse, matrix; ++ ++ D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); ++ D3DXMatrixMultiply(&matrix, &bone_transforms[i], &bone_inverse); ++ D3DXMatrixMultiply(&matrix, &matrix, &skin->bones[i].transform); ++ ++ for (j = 0; j < skin->bones[i].num_influences; j++) { ++ D3DXVECTOR3 position; ++ D3DXVECTOR3 *position_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j]); ++ D3DXVECTOR3 *position_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j]); ++ FLOAT weight = skin->bones[i].weights[j]; ++ ++ D3DXVec3TransformCoord(&position, position_src, &matrix); ++ position_dest->x += weight * position.x; ++ position_dest->y += weight * position.y; ++ position_dest->z += weight * position.z; ++ } ++ } ++ ++ if (skin->fvf & D3DFVF_NORMAL) { ++ /* Reset all normals */ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *normal = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i + sizeof(D3DXVECTOR3)); ++ normal->x = 0.0f; ++ normal->y = 0.0f; ++ normal->z = 0.0f; ++ } ++ ++ /* Update normals that are influenced by bones */ ++ for (i = 0; i < skin->num_bones; i++) { ++ D3DXMATRIX bone_inverse, matrix; ++ ++ D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); ++ D3DXMatrixMultiply(&matrix, &skin->bones[i].transform, &bone_transforms[i]); ++ ++ for (j = 0; j < skin->bones[i].num_influences; j++) { ++ D3DXVECTOR3 normal; ++ D3DXVECTOR3 *normal_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); ++ D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); ++ FLOAT weight = skin->bones[i].weights[j]; ++ ++ D3DXVec3TransformNormal(&normal, normal_src, &bone_inverse); ++ D3DXVec3TransformNormal(&normal, &normal, &matrix); ++ normal_dest->x += weight * normal.x; ++ normal_dest->y += weight * normal.y; ++ normal_dest->z += weight * normal.z; ++ } ++ } ++ ++ /* Normalize all normals that are influenced by bones*/ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + (i * size) + sizeof(D3DXVECTOR3)); ++ if ((normal_dest->x != 0.0f) && (normal_dest->y != 0.0f) && (normal_dest->z != 0.0f)) ++ D3DXVec3Normalize(normal_dest, normal_dest); ++ } ++ } ++ ++ return D3D_OK; + } + + static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index ea0b867..c12bf60 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -5316,6 +5316,88 @@ static void test_create_skin_info(void) + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + } + ++static void test_update_skinned_mesh(void) ++{ ++ static DWORD bone0_vertices[2] = { 1, 3 }; ++ static FLOAT bone0_weights[2] = { 1.0f, 0.5f }; ++ static DWORD bone1_vertices[2] = { 2, 3 }; ++ static FLOAT bone1_weights[2] = { 1.0f, 0.5f }; ++ static D3DMATRIX bones_matrix[2] = ++ { { { { ++ 1.0f, 0.0f, 0.0f, 0.0f, ++ 0.0f, 1.0f, 0.0f, 0.0f, ++ 0.0f, 0.0f, 1.0f, 0.0f, ++ 2.0f, 2.0f, 4.0f, 1.0f ++ } } }, ++ { { { ++ 1.0f, 0.0f, 0.0f, 0.0f, ++ 0.0f, 1.0f, 0.0f, 0.0f, ++ 0.0f, 0.0f, 1.0f, 0.0f, ++ -4.0f, -4.0f, 4.0f, 1.0f ++ } } } }; ++ static D3DVECTOR vertices_src[] = {{ 1.0f, 1.0f, 1.0f }, ++ { 1.0f, 0.0f, 0.0f }, ++ { 1.0f, 1.0f, -1.0f }, ++ { 0.0f, 1.0f, 0.0f }, ++ { -1.0f, -1.0f, 1.0f }, ++ { 0.0f, 0.0f, 1.0f }, ++ { -1.0f, -1.0f, -1.0f }, ++ { -1.0f, 0.0f, 0.0f }, ++ }; ++ static D3DVECTOR vertices_ref[] = {{ 0.0f, 0.0f, 0.0f }, ++ { 0.0f, 0.0f, 0.0f }, ++ { 3.0f, 3.0f, 3.0f }, ++ { 0.0f, 1.0f, 0.0f }, ++ { -5.0f, -5.0f, 5.0f }, ++ { 0.0f, 0.0f, 1.0f }, ++ { -2.0f, -2.0f, 3.0f }, ++ { -1.0f, 0.0f, 0.0f }, ++ }; ++ D3DVECTOR vertices_dest[8]; ++ HRESULT hr; ++ ID3DXSkinInfo *skin_info; ++ D3DXMATRIX matrix; ++ int i; ++ ++ D3DXMatrixIdentity(&matrix); ++ for (i = 0; i < 8; i++) ++ { ++ vertices_dest[i].x = 10000.0f; ++ vertices_dest[i].y = 10000.0f; ++ vertices_dest[i].z = 10000.0f; ++ } ++ ++ hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ++ skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ for (i = 0; i < 4; i++) ++ { ++ ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n", ++ i, vertices_dest[i*2].x, vertices_ref[i*2].x); ++ ok(compare(vertices_dest[i*2].y, vertices_ref[i*2].y), "Vertex[%d].position.y: got %g, expected %g\n", ++ i, vertices_dest[i*2].y, vertices_ref[i*2].y); ++ ok(compare(vertices_dest[i*2].z, vertices_ref[i*2].z), "Vertex[%d].position.z: got %g, expected %g\n", ++ i, vertices_dest[i*2].z, vertices_ref[i*2].z); ++ ok(compare(vertices_dest[i*2+1].x, vertices_ref[i*2+1].x), "Vertex[%d].normal.x: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].x, vertices_ref[i*2+1].x); ++ ok(compare(vertices_dest[i*2+1].y, vertices_ref[i*2+1].y), "Vertex[%d].normal.y: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].y, vertices_ref[i*2+1].y); ++ ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z); ++ } ++ skin_info->lpVtbl->Release(skin_info); ++} ++ + static void test_convert_adjacency_to_point_reps(void) + { + HRESULT hr; +@@ -11362,6 +11444,7 @@ START_TEST(mesh) + D3DXGenerateAdjacencyTest(); + test_update_semantics(); + test_create_skin_info(); ++ test_update_skinned_mesh(); + test_convert_adjacency_to_point_reps(); + test_convert_point_reps_to_adjacency(); + test_weld_vertices(); [View Less]

5 years, 2 months

[reactos] 72/74: [WINESYNC] d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69a02efd33ff8c4065c40… commit 69a02efd33ff8c4065c40e3c66ad52431cffc651 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Wed Feb 5 22:13:59 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC] d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements. wine-staging patch by Christian Costa … [View More]<titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/texture.c | 8 ++--- modules/rostests/winetests/d3dx9_36/texture.c | 10 ++++++ ...d_textures_in_D3DXCheckTextureRequirements.diff | 40 ++++++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c index 9f0e541cb61..552d02a30e9 100644 --- a/dll/directx/wine/d3dx9_36/texture.c +++ b/dll/directx/wine/d3dx9_36/texture.c @@ -335,10 +335,10 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN if (fmt->block_width != 1 || fmt->block_height != 1) { - if (w < fmt->block_width) - w = fmt->block_width; - if (h < fmt->block_height) - h = fmt->block_height; + if (w % fmt->block_width) + w += fmt->block_width - w % fmt->block_width; + if (h % fmt->block_height) + h += fmt->block_height - h % fmt->block_height; } if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) diff --git a/modules/rostests/winetests/d3dx9_36/texture.c b/modules/rostests/winetests/d3dx9_36/texture.c index 6c25a158118..98a9fc344db 100644 --- a/modules/rostests/winetests/d3dx9_36/texture.c +++ b/modules/rostests/winetests/d3dx9_36/texture.c @@ -400,6 +400,16 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(height == 4, "Returned height %d, expected %d\n", height, 4); ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + + format = D3DFMT_DXT5; + width = 5; height = 5; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 8, "Returned width %d, expected %d\n", width, 8); + ok(height == 8, "Returned height %d, expected %d\n", height, 8); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); } else { diff --git a/sdk/tools/winesync/d3dx9_staging/0023-d3dx9_36__Align_texture_dimensions_to_block_size_for_compressed_textures_in_D3DXCheckTextureRequirements.diff b/sdk/tools/winesync/d3dx9_staging/0023-d3dx9_36__Align_texture_dimensions_to_block_size_for_compressed_textures_in_D3DXCheckTextureRequirements.diff new file mode 100644 index 00000000000..07ae161b293 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0023-d3dx9_36__Align_texture_dimensions_to_block_size_for_compressed_textures_in_D3DXCheckTextureRequirements.diff @@ -0,0 +1,40 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/texture.c b/modules/rostests/winetests/d3dx9_36/texture.c +index 6c25a15..98a9fc3 100644 +--- a/modules/rostests/winetests/d3dx9_36/texture.c ++++ b/modules/rostests/winetests/d3dx9_36/texture.c +@@ -400,6 +400,16 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) + ok(height == 4, "Returned height %d, expected %d\n", height, 4); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); ++ ++ format = D3DFMT_DXT5; ++ width = 5; height = 5; ++ mipmaps = 1; ++ hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); ++ ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ++ ok(width == 8, "Returned width %d, expected %d\n", width, 8); ++ ok(height == 8, "Returned height %d, expected %d\n", height, 8); ++ ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); ++ ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + } + else + { +diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c +index 9f0e541..552d02a 100644 +--- a/dll/directx/wine/d3dx9_36/texture.c ++++ b/dll/directx/wine/d3dx9_36/texture.c +@@ -335,10 +335,10 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN + + if (fmt->block_width != 1 || fmt->block_height != 1) + { +- if (w < fmt->block_width) +- w = fmt->block_width; +- if (h < fmt->block_height) +- h = fmt->block_height; ++ if (w % fmt->block_width) ++ w += fmt->block_width - w % fmt->block_width; ++ if (h % fmt->block_height) ++ h += fmt->block_height - h % fmt->block_height; + } + + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) [View Less]

5 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2020