wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Austin English : api-ms-win-core-file-l1-2-1: Add dll.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: c78a7b419cc49c01ff49e79ea808db7868a98b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78a7b419cc49c01ff49e79ea… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:41:33 2016 -0600 api-ms-win-core-file-l1-2-1: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-file-l1-2-1/Makefile.in | 1 + .../api-ms-win-core-file-l1-2-1.spec | 82 ++++++++++++++++++++++ tools/make_specfiles | 5 +- 5 files changed, 89 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0985314..4792246 100755 --- a/configure +++ b/configure @@ -886,6 +886,7 @@ enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 +enable_api_ms_win_core_file_l1_2_1 enable_api_ms_win_core_file_l2_1_0 enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 @@ -17325,6 +17326,7 @@ wine_fn_config_dll api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 +wine_fn_config_dll api-ms-win-core-file-l1-2-1 enable_api_ms_win_core_file_l1_2_1 wine_fn_config_dll api-ms-win-core-file-l2-1-0 enable_api_ms_win_core_file_l2_1_0 wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 diff --git a/configure.ac b/configure.ac index ffcb01f..dc4f85b 100644 --- a/configure.ac +++ b/configure.ac @@ -2638,6 +2638,7 @@ WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) diff --git a/dlls/api-ms-win-core-file-l1-2-1/Makefile.in b/dlls/api-ms-win-core-file-l1-2-1/Makefile.in new file mode 100644 index 0000000..0c7dafe --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l1-2-1.dll diff --git a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec new file mode 100644 index 0000000..c7691a4 --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec @@ -0,0 +1,82 @@ +@ stdcall CompareFileTime(ptr ptr) kernel32.CompareFileTime +@ stdcall CreateDirectoryA(str ptr) kernel32.CreateDirectoryA +@ stdcall CreateDirectoryW(wstr ptr) kernel32.CreateDirectoryW +@ stdcall CreateFile2(wstr long long long ptr) kernel32.CreateFile2 +@ stdcall CreateFileA(str long long ptr long long long) kernel32.CreateFileA +@ stdcall CreateFileW(wstr long long ptr long long long) kernel32.CreateFileW +@ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW +@ stdcall DeleteFileA(str) kernel32.DeleteFileA +@ stdcall DeleteFileW(wstr) kernel32.DeleteFileW +@ stdcall DeleteVolumeMountPointW(wstr) kernel32.DeleteVolumeMountPointW +@ stdcall FileTimeToLocalFileTime(ptr ptr) kernel32.FileTimeToLocalFileTime +@ stdcall FindClose(long) kernel32.FindClose +@ stdcall FindCloseChangeNotification(long) kernel32.FindCloseChangeNotification +@ stdcall FindFirstChangeNotificationA(str long long) kernel32.FindFirstChangeNotificationA +@ stdcall FindFirstChangeNotificationW(wstr long long) kernel32.FindFirstChangeNotificationW +@ stdcall FindFirstFileA(str ptr) kernel32.FindFirstFileA +@ stdcall FindFirstFileExA(str long ptr long ptr long) kernel32.FindFirstFileExA +@ stdcall FindFirstFileExW(wstr long ptr long ptr long) kernel32.FindFirstFileExW +@ stdcall FindFirstFileW(wstr ptr) kernel32.FindFirstFileW +@ stdcall FindFirstVolumeW(ptr long) kernel32.FindFirstVolumeW +@ stdcall FindNextChangeNotification(long) kernel32.FindNextChangeNotification +@ stdcall FindNextFileA(long ptr) kernel32.FindNextFileA +@ stdcall FindNextFileW(long ptr) kernel32.FindNextFileW +@ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW +@ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose +@ stdcall FlushFileBuffers(long) kernel32.FlushFileBuffers +@ stdcall GetCompressedFileSizeA(long ptr) kernel32.GetCompressedFileSizeA +@ stdcall GetCompressedFileSizeW(long ptr) kernel32.GetCompressedFileSizeW +@ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceA +@ stdcall GetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +@ stdcall GetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW +@ stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceW +@ stdcall GetDriveTypeA(str) kernel32.GetDriveTypeA +@ stdcall GetDriveTypeW(wstr) kernel32.GetDriveTypeW +@ stdcall GetFileAttributesA(str) kernel32.GetFileAttributesA +@ stdcall GetFileAttributesExA(str long ptr) kernel32.GetFileAttributesExA +@ stdcall GetFileAttributesExW(wstr long ptr) kernel32.GetFileAttributesExW +@ stdcall GetFileAttributesW(wstr) kernel32.GetFileAttributesW +@ stdcall GetFileInformationByHandle(long ptr) kernel32.GetFileInformationByHandle +@ stdcall GetFileSize(long ptr) kernel32.GetFileSize +@ stdcall GetFileSizeEx(long ptr) kernel32.GetFileSizeEx +@ stdcall GetFileTime(long ptr ptr ptr) kernel32.GetFileTime +@ stdcall GetFileType(long) kernel32.GetFileType +@ stub GetFinalPathNameByHandleA +@ stub GetFinalPathNameByHandleW +@ stdcall GetFullPathNameA(str long ptr ptr) kernel32.GetFullPathNameA +@ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW +@ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW +@ stdcall GetLogicalDrives() kernel32.GetLogicalDrives +@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW +@ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW +@ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW +@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW +@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW +@ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW +@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) kernel32.GetVolumePathNamesForVolumeNameW +@ stdcall LocalFileTimeToFileTime(ptr ptr) kernel32.LocalFileTimeToFileTime +@ stdcall LockFile(long long long long long) kernel32.LockFile +@ stdcall LockFileEx(long long long long long ptr) kernel32.LockFileEx +@ stdcall QueryDosDeviceW(wstr ptr long) kernel32.QueryDosDeviceW +@ stdcall ReadFile(long ptr long ptr ptr) kernel32.ReadFile +@ stdcall ReadFileEx(long ptr long ptr ptr) kernel32.ReadFileEx +@ stdcall ReadFileScatter(long ptr long ptr ptr) kernel32.ReadFileScatter +@ stdcall RemoveDirectoryA(str) kernel32.RemoveDirectoryA +@ stdcall RemoveDirectoryW(wstr) kernel32.RemoveDirectoryW +@ stdcall SetEndOfFile(long) kernel32.SetEndOfFile +@ stdcall SetFileAttributesA(str long) kernel32.SetFileAttributesA +@ stdcall SetFileAttributesW(wstr long) kernel32.SetFileAttributesW +@ stdcall SetFileInformationByHandle(long long ptr long) kernel32.SetFileInformationByHandle +@ stub SetFileIoOverlappedRange +@ stdcall SetFilePointer(long long ptr long) kernel32.SetFilePointer +@ stdcall SetFilePointerEx(long int64 ptr long) kernel32.SetFilePointerEx +@ stdcall SetFileTime(long ptr ptr ptr) kernel32.SetFileTime +@ stdcall SetFileValidData(ptr int64) kernel32.SetFileValidData +@ stdcall UnlockFile(long long long long long) kernel32.UnlockFile +@ stdcall UnlockFileEx(long long long long ptr) kernel32.UnlockFileEx +@ stdcall WriteFile(long ptr long ptr ptr) kernel32.WriteFile +@ stdcall WriteFileEx(long ptr long ptr ptr) kernel32.WriteFileEx +@ stdcall WriteFileGather(long ptr long ptr ptr) kernel32.WriteFileGather diff --git a/tools/make_specfiles b/tools/make_specfiles index 223af07..b91ec93 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -181,7 +181,10 @@ my @dll_groups = "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-file-l1-1-0", + "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0", + "api-ms-win-core-file-l2-1-0", + "api-ms-win-core-file-l2-1-1", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0", @@ -200,12 +203,10 @@ my @dll_groups = "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", - "api-ms-win-core-file-l2-1-1", "api-ms-win-core-sysinfo-l1-2-1", "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", - "api-ms-win-core-file-l2-1-0", "api-ms-win-core-localization-l1-2-1", "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1",

1 0

Austin English : wmasf: Add stub dll.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 1d5a95ba20eb3dbe69a33a6a1e57dccdc336f6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5a95ba20eb3dbe69a33a6a1… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:29:48 2016 -0600 wmasf: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wmasf/Makefile.in | 4 ++++ dlls/wmasf/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wmasf/wmasf.spec | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+) diff --git a/configure b/configure index bee8e6b..0985314 100755 --- a/configure +++ b/configure @@ -1387,6 +1387,7 @@ enable_wintab32 enable_wintrust enable_wlanapi enable_wldap32 +enable_wmasf enable_wmi enable_wmiutils enable_wmp @@ -18053,6 +18054,7 @@ wine_fn_config_test dlls/wintrust/tests wintrust_test wine_fn_config_dll wlanapi enable_wlanapi wine_fn_config_dll wldap32 enable_wldap32 clean,implib wine_fn_config_test dlls/wldap32/tests wldap32_test +wine_fn_config_dll wmasf enable_wmasf wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test diff --git a/configure.ac b/configure.ac index 09e0f53..ffcb01f 100644 --- a/configure.ac +++ b/configure.ac @@ -3367,6 +3367,7 @@ WINE_CONFIG_TEST(dlls/wintrust/tests) WINE_CONFIG_DLL(wlanapi) WINE_CONFIG_DLL(wldap32,,[clean,implib]) WINE_CONFIG_TEST(dlls/wldap32/tests) +WINE_CONFIG_DLL(wmasf) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) diff --git a/dlls/wmasf/Makefile.in b/dlls/wmasf/Makefile.in new file mode 100644 index 0000000..6fec158 --- /dev/null +++ b/dlls/wmasf/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wmasf.dll + +C_SRCS = \ + main.c diff --git a/dlls/wmasf/main.c b/dlls/wmasf/main.c new file mode 100644 index 0000000..baf7619 --- /dev/null +++ b/dlls/wmasf/main.c @@ -0,0 +1,44 @@ +/* + * WMASF.dll + * + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmasf); + +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + TRACE("(0x%p, %d, %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(dll); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/wmasf/wmasf.spec b/dlls/wmasf/wmasf.spec new file mode 100644 index 0000000..80624e9 --- /dev/null +++ b/dlls/wmasf/wmasf.spec @@ -0,0 +1,35 @@ +@ stub ASFCreateLibrary +@ stub ASFGetHeaderObject +@ stub ASFGetRootObject +@ stub ASFGetStreamPropertiesObject +@ stub ASFFindHeaderObject +@ stub ASFFindRootObject +@ stub ASFFindStreamPropertiesObject +@ stub CreateAsfCellPoolAllocator +@ stub ASFCreateIndexMaker +@ stub ASFCreateIndexMakerFileSink +@ stub ASFAddPresDelta +@ stub ASFAddSendDelta +@ stub ASFGUIDFromCodecID +@ stub ASFGUIDToCodecID +@ stub ASFReadHeaderFromFile +@ stub ASFCalculatePresDelta +@ stub ASFCreateBitrateTracker +@ stub ASFWriteHeaderToFile +@ stub ASFCreateIOMonitor +@ stub ASFGetDataUnitInfo +@ stub ASFCreateMediaObjectIndexMaker +@ stub ASFCreateStreamSelector +@ stub ASFGetTimeBase +@ stub ASFPresDeltaTimeToTime +@ stub ASFPresDeltaToFull +@ stub ASFPresFullToDelta +@ stub ASFPresTimeToSendTime +@ stub ASFPresTimeToTime +@ stub ASFReadHeaderFromFileHandle +@ stub ASFSendTimeToPresTime +@ stub ASFSendTimeToTime +@ stub ASFSetDataUnitInfo +@ stub ASFTimeToPresDeltaTime +@ stub ASFTimeToPresTime +@ stub ASFTimeToSendTime

1 0

Piotr Caban : user32/tests: Show that messages are not converted when function pointer is passed to CallWindowProc.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: f729e62a27e2e6fdeb05d01511b85302e96d3054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f729e62a27e2e6fdeb05d0151… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:47 2016 +0100 user32/tests: Show that messages are not converted when function pointer is passed to CallWindowProc. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cf7ddc8..957e8a1d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8798,6 +8798,12 @@ static void test_winproc_limit(void) ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n"); + /* Show that there's no message conversion when CallWindowProc is used */ + ok(CallWindowProcA(winproc_convW, hwnd, WM_SETTEXT, 0, (LPARAM)textW) == 1, + "winproc_convW returned error\n"); + ok(CallWindowProcW(winproc_convW, hwnd, WM_SETTEXT, 0, (LPARAM)textW) == 1, + "winproc_convW returned error\n"); + i = 0; CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i); ok(i == 1, "winproc should be called once (%d)\n", i);

1 0

Piotr Caban : user32/tests: Show that message conversion should work on window procedures without handles.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: b1132531bf6d9c589829f43bc049f29606934c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1132531bf6d9c589829f43bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:43 2016 +0100 user32/tests: Show that message conversion should work on window procedures without handles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e121809..cf7ddc8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8686,8 +8686,30 @@ static LRESULT WINAPI winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) return 0; } -static LRESULT WINAPI winproc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +static LRESULT WINAPI winproc_convA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + if(msg == WM_SETTEXT) + { + const char *text = (const char*)lparam; + + ok(!wparam, "wparam = %08lx\n", wparam); + ok(!strcmp(text, "text"), "WM_SETTEXT lparam = %s\n", text); + return 1; + } + return 0; +} + +static const WCHAR textW[] = {'t','e','x','t',0}; +static LRESULT WINAPI winproc_convW(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if(msg == WM_SETTEXT) + { + const WCHAR *text = (const WCHAR*)lparam; + + ok(!wparam, "wparam = %08lx\n", wparam); + ok(!lstrcmpW(text, textW), "WM_SETTEXT lparam = %s\n", wine_dbgstr_w(text)); + return 1; + } return 0; } @@ -8765,8 +8787,16 @@ static void test_winproc_limit(void) break; } ok(i != 0xffff, "unable to run out of winproc slots\n"); - ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc2), + + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convA), + "SetWindowLongPtr failed with error %d\n", GetLastError()); + ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); + ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n"); + + ok(SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convW), "SetWindowLongPtr failed with error %d\n", GetLastError()); + ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); + ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n"); i = 0; CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i);

1 0

Piotr Caban : user32: Call window procedure even if we' re out of winproc handles.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: c9ae38e4c77023eeb3e3bd49dd4506943e19d37e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ae38e4c77023eeb3e3bd49d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:37 2016 +0100 user32: Call window procedure even if we're out of winproc handles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 507a36a..aa71c8e 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -876,6 +876,7 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, WND *wndPtr; WNDPROC func; WINDOWPROC *proc; + BOOL unicode_win; if (!(wndPtr = WIN_GetPtr( hwnd ))) return FALSE; if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; @@ -886,10 +887,9 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } func = wndPtr->winproc; proc = handle_to_proc( wndPtr->winproc ); + unicode_win = wndPtr->flags & WIN_ISUNICODE; WIN_ReleasePtr( wndPtr ); - if (!proc) return TRUE; - if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; thread_info->recursion_count++; @@ -897,19 +897,27 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, { if (proc == WINPROC_PROC16) WINPROC_CallProcWtoA( wow_handlers.call_window_proc, hwnd, msg, wParam, lParam, result, func ); - else if (proc->procW) + else if (proc && proc->procW) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procW ); - else + else if (proc) WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procA ); + else if (unicode_win) + call_window_proc( hwnd, msg, wParam, lParam, result, func ); + else + WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, func ); } else { if (proc == WINPROC_PROC16) wow_handlers.call_window_proc( hwnd, msg, wParam, lParam, result, func ); - else if (proc->procA) + else if (proc && proc->procA) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procA ); - else + else if (proc) WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procW, mapping ); + else if (unicode_win) + WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, func, mapping ); + else + call_window_proc( hwnd, msg, wParam, lParam, result, func ); } thread_info->recursion_count--; return TRUE;

1 0

Piotr Caban : user32/tests: Add initial out of window procedure slots test.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 55a5bac50037cd0f31c084d6e0898fcd8ccfb2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a5bac50037cd0f31c084d6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:31 2016 +0100 user32/tests: Add initial out of window procedure slots test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 44f0557..e121809 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8677,6 +8677,114 @@ static void test_activateapp(HWND window1) DestroyWindow(window2); } +static LRESULT WINAPI winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if(!hwnd) { + int *count = (int*)lparam; + (*count)++; + } + return 0; +} + +static LRESULT WINAPI winproc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return 0; +} + +static void test_winproc_handles(const char *argv0) +{ + static const WCHAR winproc_testW[] = {'w','i','n','p','r','o','c','_','t','e','s','t',0}; + + HINSTANCE hinst = GetModuleHandleA(NULL); + WNDCLASSA wnd_classA; + WNDCLASSW wnd_classW; + int count; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + + memset(&wnd_classA, 0, sizeof(wnd_classA)); + wnd_classA.lpszClassName = "winproc_test"; + wnd_classA.lpfnWndProc = winproc; + ok(RegisterClassA(&wnd_classA), + "RegisterClass failed with error %d\n", GetLastError()); + + ok(GetClassInfoW(hinst, winproc_testW, &wnd_classW), + "GetClassInfoW failed with error %d\n", GetLastError()); + ok(wnd_classA.lpfnWndProc != wnd_classW.lpfnWndProc, + "winproc pointers should not be identical\n"); + + count = 0; + CallWindowProcA(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + ok(count == 1, "winproc should be called once (%d)\n", count); + count = 0; + CallWindowProcW(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + ok(count == 1, "winproc should be called once (%d)\n", count); + + ok(UnregisterClassW(winproc_testW, hinst), + "UnregisterClass failed with error %d\n", GetLastError()); + /* crashes on 64-bit windows because lpfnWndProc handle is already freed */ + if (sizeof(void*) == 4) + { + count = 0; + CallWindowProcA(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + todo_wine ok(!count, "winproc should not be called (%d)\n", count); + CallWindowProcW(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + todo_wine ok(!count, "winproc should not be called (%d)\n", count); + } + + sprintf(cmd, "%s win winproc_limit", argv0); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); +} + +static void test_winproc_limit(void) +{ + WNDPROC winproc_handle; + HWND hwnd; + int i; + + hwnd = CreateWindowExA(0, "static", "test", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowEx failed\n"); + + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc), + "SetWindowLongPtr failed\n"); + winproc_handle = (WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC); + ok(winproc_handle != winproc, "winproc pointers should not be identical\n"); + + /* run out of winproc slots */ + for(i = 2; i<0xffff; i++) + { + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, i), "SetWindowLongPtr failed (%d)\n", i); + if(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == i) + break; + } + ok(i != 0xffff, "unable to run out of winproc slots\n"); + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc2), + "SetWindowLongPtr failed with error %d\n", GetLastError()); + + i = 0; + CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); + i = 0; + CallWindowProcW(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); + + DestroyWindow(hwnd); + + i = 0; + CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); + i = 0; + CallWindowProcW(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); +} + START_TEST(win) { char **argv; @@ -8711,6 +8819,12 @@ START_TEST(win) return; } + if (argc==3 && !strcmp(argv[2], "winproc_limit")) + { + test_winproc_limit(); + return; + } + if (!RegisterWindowClasses()) assert(0); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", @@ -8812,6 +8926,7 @@ START_TEST(win) test_smresult(); test_GetMessagePos(); test_activateapp(hwndMain); + test_winproc_handles(argv[0]); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Piotr Caban : user32: Return window procedure pointer in WINPROC_AllocProc if it' s not possible to allocate handle.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 7cb0e78dbf35420de4fd6302a580d8bc34e97930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb0e78dbf35420de4fd6302a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:21 2016 +0100 user32: Return window procedure pointer in WINPROC_AllocProc if it's not possible to allocate handle. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3642109..507a36a 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -165,7 +165,7 @@ static inline WINDOWPROC *alloc_winproc( WNDPROC func, BOOL unicode ) proc_to_handle(proc), unicode ? 'W' : 'A', func, winproc_used, MAX_WINPROCS ); } - else FIXME( "too many winprocs, cannot allocate one for %p\n", func ); + else WARN( "too many winprocs, cannot allocate one for %p\n", func ); } else TRACE( "reusing %p for %p\n", proc_to_handle(proc), func ); @@ -309,7 +309,7 @@ WNDPROC WINPROC_AllocProc( WNDPROC func, BOOL unicode ) { WINDOWPROC *proc; - if (!(proc = alloc_winproc( func, unicode ))) return NULL; + if (!(proc = alloc_winproc( func, unicode ))) return func; if (proc == WINPROC_PROC16) return func; return proc_to_handle( proc ); }

1 0

Jacek Caban : winex11.drv: Use grabbed window display in SetCapture.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: ecf9e9135d9d923071dbe9c598f7b5d5b6df8f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf9e9135d9d923071dbe9c59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:03:02 2016 +0100 winex11.drv: Use grabbed window display in SetCapture. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- dlls/winex11.drv/window.c | 28 ++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 63d202c..677acfa 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -602,7 +602,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU /* update the wine server Z-order */ - if (window != x11drv_thread_data()->grab_window && + if (hwnd != x11drv_thread_data()->grab_hwnd && /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { @@ -1611,7 +1611,7 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); if (event->detail == NotifyVirtual) return; - if (event->window == x11drv_thread_data()->grab_window) return; + if (hwnd == x11drv_thread_data()->grab_hwnd) return; /* simulate a mouse motion event */ input.u.mi.dx = event->x; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4a047e2..4789f98 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2116,27 +2116,31 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + struct x11drv_win_data *data; - if (!thread_data) return; if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; if (hwnd) { - Window grab_win = X11DRV_get_whole_window( GetAncestor( hwnd, GA_ROOT ) ); - - if (!grab_win) return; - XFlush( gdi_display ); - XGrabPointer( thread_data->display, grab_win, False, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); - thread_data->grab_window = grab_win; + if (!(data = get_win_data( GetAncestor( hwnd, GA_ROOT )))) return; + if (data->whole_window) + { + XFlush( gdi_display ); + XGrabPointer( data->display, data->whole_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); + thread_data->grab_hwnd = data->hwnd; + } + release_win_data( data ); } else /* release capture */ { + if (!(data = get_win_data( thread_data->grab_hwnd ))) return; XFlush( gdi_display ); - XUngrabPointer( thread_data->display, CurrentTime ); - XFlush( thread_data->display ); - thread_data->grab_window = None; + XUngrabPointer( data->display, CurrentTime ); + XFlush( data->display ); + thread_data->grab_hwnd = NULL; + release_win_data( data ); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2694d23..23f4ab6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -308,7 +308,7 @@ struct x11drv_thread_data { Display *display; XEvent *current_event; /* event currently being processed */ - Window grab_window; /* window that currently grabs the mouse */ + HWND grab_hwnd; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_map( ) and wined3d_volume_map().
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: aeefbdffba9ea77310759956007f1348920b4477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeefbdffba9ea773107599560… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 16:01:43 2016 +0100 wined3d: Merge wined3d_surface_map() and wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/volume.c | 5 +- dlls/d3d9/volume.c | 5 +- dlls/wined3d/surface.c | 153 ------------------------ dlls/wined3d/texture.c | 256 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/volume.c | 163 +------------------------- dlls/wined3d/wined3d_private.h | 12 +- 6 files changed, 245 insertions(+), 349 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aeefbdffba9ea77310759…

1 0

Henri Verbeet : d3dx9/tests: Get rid of some redundant NULL checks in D3DXCreateTextTest().
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: a9506bf952d5c76c90eb0aeed71727cdcafb4ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9506bf952d5c76c90eb0aeed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 11 16:01:42 2016 +0100 d3dx9/tests: Get rid of some redundant NULL checks in D3DXCreateTextTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1afba18..d193d1b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4401,7 +4401,7 @@ static void D3DXCreateTextTest(void) ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); number_of_vertices = d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh); number_of_faces = d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh); - if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + d3dxmesh->lpVtbl->Release(d3dxmesh); hr = D3DXCreateTextA(device, hdc, "wine", 0.0f, 0.4f, &d3dxmesh, NULL, NULL); ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); @@ -4411,7 +4411,7 @@ static void D3DXCreateTextTest(void) ok(number_of_faces == d3dxmesh->lpVtbl->GetNumFaces(d3dxmesh), "Got %d faces, expected %d\n", d3dxmesh->lpVtbl->GetNumVertices(d3dxmesh), number_of_faces); - if (SUCCEEDED(hr) && d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + d3dxmesh->lpVtbl->Release(d3dxmesh); if (0) {

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
73
Older →

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

2003

2002

2001

wine-commits March 2016