wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Jacek Caban : server: Associate named pipe device waiters queue with its fd.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 54234b8a47065b33df9a6a38b9f6ceec4bbdd472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54234b8a47065b33df9a6a38b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 15:07:54 2017 +0200 server: Associate named pipe device waiters queue with its fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index c0bfc2a..97ded91 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1231,7 +1231,7 @@ static int named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, struct asy if (!(server = find_available_server( pipe ))) { - if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; + if (!pipe->waiters && !(pipe->waiters = create_async_queue( fd ))) goto done; queue_async( pipe->waiters, async ); when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout;

1 0

Jacek Caban : server: Use default poll only for default read and write queue asyncs.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 328f178c2519d51eda4992b07c514670f8d46385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328f178c2519d51eda4992b07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 15:06:43 2017 +0200 server: Use default poll only for default read and write queue asyncs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index f64c8c9..baf7e8d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2101,7 +2101,7 @@ void default_fd_queue_async( struct fd *fd, struct async *async, int type, int c /* default reselect_async() fd routine */ void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ) { - if (queue != fd->wait_q) + if (queue == fd->read_q || queue == fd->write_q) { int poll_events = fd->fd_ops->get_poll_events( fd ); int events = check_fd_events( fd, poll_events );

1 0

André Hentschel : include: Add some more prototypes to winuser.h.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 112553734a4e1ceb0e03703c04c00c9b133293e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112553734a4e1ceb0e03703c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 29 19:44:04 2017 +0200 include: Add some more prototypes to winuser.h. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 0d6c5d6..ad786f3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3361,6 +3361,7 @@ WINUSERAPI UINT WINAPI ArrangeIconicWindows(HWND); WINUSERAPI BOOL WINAPI AttachThreadInput(DWORD,DWORD,BOOL); WINUSERAPI HDWP WINAPI BeginDeferWindowPos(INT); WINUSERAPI HDC WINAPI BeginPaint(HWND,LPPAINTSTRUCT); +WINUSERAPI BOOL WINAPI BlockInput(BOOL); WINUSERAPI BOOL WINAPI BringWindowToTop(HWND); WINUSERAPI LONG WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM); WINUSERAPI LONG WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM); @@ -3482,6 +3483,7 @@ WINUSERAPI LRESULT WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM); WINUSERAPI LRESULT WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM); #define DefWindowProc WINELIB_NAME_AW(DefWindowProc) WINUSERAPI BOOL WINAPI DeleteMenu(HMENU,UINT,UINT); +WINUSERAPI BOOL WINAPI DeregisterShellHookWindow(HWND); WINUSERAPI BOOL WINAPI DestroyAcceleratorTable(HACCEL); WINUSERAPI BOOL WINAPI DestroyCaret(void); WINUSERAPI BOOL WINAPI DestroyCursor(HCURSOR); @@ -3500,6 +3502,7 @@ WINUSERAPI INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW, WINUSERAPI INT_PTR WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); WINUSERAPI INT_PTR WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM); #define DialogBoxParam WINELIB_NAME_AW(DialogBoxParam) +WINUSERAPI VOID WINAPI DisableProcessWindowsGhosting(VOID); WINUSERAPI LRESULT WINAPI DispatchMessageA(const MSG*); WINUSERAPI LRESULT WINAPI DispatchMessageW(const MSG*); #define DispatchMessage WINELIB_NAME_AW(DispatchMessage) @@ -3638,6 +3641,7 @@ WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); WINUSERAPI BOOL WINAPI GetGestureConfig(HWND,DWORD,DWORD,UINT*,GESTURECONFIG*,UINT); WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*); +WINUSERAPI DWORD WINAPI GetGuiResources(HANDLE,DWORD); WINUSERAPI BOOL WINAPI GetIconInfo(HICON,PICONINFO); WINUSERAPI BOOL WINAPI GetIconInfoExA(HICON,ICONINFOEXA*); WINUSERAPI BOOL WINAPI GetIconInfoExW(HICON,ICONINFOEXW*); @@ -3658,6 +3662,7 @@ WINUSERAPI BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR); WINUSERAPI SHORT WINAPI GetKeyState(INT); WINUSERAPI HWND WINAPI GetLastActivePopup(HWND); WINUSERAPI BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO); +WINUSERAPI DWORD WINAPI GetListBoxInfo(HWND); WINUSERAPI UINT WINAPI GetRawInputBuffer(PRAWINPUT,PUINT,UINT); WINUSERAPI UINT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT); WINUSERAPI UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT); @@ -3696,6 +3701,7 @@ WINUSERAPI HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL); #define GetNextWindow GetWindow WINUSERAPI HWND WINAPI GetOpenClipboardWindow(void); WINUSERAPI HWND WINAPI GetParent(HWND); +WINUSERAPI BOOL WINAPI GetPhysicalCursorPos(POINT*); WINUSERAPI INT WINAPI GetPriorityClipboardFormat(UINT*,INT); WINUSERAPI BOOL WINAPI GetProcessDefaultLayout(DWORD*); WINUSERAPI HANDLE WINAPI GetPropA(HWND,LPCSTR); @@ -3745,6 +3751,7 @@ WINUSERAPI UINT WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT); #define GetWindowModuleFileName WINELIB_NAME_AW(GetWindowModuleFileName) WINUSERAPI BOOL WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT); WINUSERAPI BOOL WINAPI GetWindowRect(HWND,LPRECT); +WINUSERAPI INT WINAPI GetWindowRgnBox(HWND,LPRECT); WINUSERAPI INT WINAPI GetWindowRgn(HWND,HRGN); WINUSERAPI HWINSTA WINAPI GetProcessWindowStation(void); #define GetWindowTask(hwnd) ((HTASK)GetWindowThreadProcessId(hwnd,NULL)) @@ -3836,8 +3843,10 @@ WINUSERAPI HMENU WINAPI LoadMenuIndirectW(LPCVOID); WINUSERAPI INT WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,INT); WINUSERAPI INT WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,INT); #define LoadString WINELIB_NAME_AW(LoadString) +WINUSERAPI BOOL WINAPI LogicalToPhysicalPoint(HWND,POINT*); WINUSERAPI BOOL WINAPI LockSetForegroundWindow(UINT); WINUSERAPI BOOL WINAPI LockWindowUpdate(HWND); +WINUSERAPI BOOL WINAPI LockWorkStation(void); WINUSERAPI INT WINAPI LookupIconIdFromDirectory(LPBYTE,BOOL); WINUSERAPI INT WINAPI LookupIconIdFromDirectoryEx(LPBYTE,BOOL,INT,INT,UINT); WINUSERAPI UINT WINAPI MapVirtualKeyA(UINT,UINT); @@ -3889,6 +3898,7 @@ WINUSERAPI BOOL WINAPI PaintDesktop(HDC); WINUSERAPI BOOL WINAPI PeekMessageA(LPMSG,HWND,UINT,UINT,UINT); WINUSERAPI BOOL WINAPI PeekMessageW(LPMSG,HWND,UINT,UINT,UINT); #define PeekMessage WINELIB_NAME_AW(PeekMessage) +WINUSERAPI BOOL WINAPI PhysicalToLogicalPoint(HWND,POINT*); #define PostAppMessageA(thread,msg,wparam,lparam) PostThreadMessageA((DWORD)(thread),msg,wparam,lparam) #define PostAppMessageW(thread,msg,wparam,lparam) PostThreadMessageW((DWORD)(thread),msg,wparam,lparam) #define PostAppMessage WINELIB_NAME_AW(PostAppMessage) @@ -3899,6 +3909,7 @@ WINUSERAPI void WINAPI PostQuitMessage(INT); WINUSERAPI BOOL WINAPI PostThreadMessageA(DWORD,UINT,WPARAM,LPARAM); WINUSERAPI BOOL WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM); #define PostThreadMessage WINELIB_NAME_AW(PostThreadMessage) +WINUSERAPI BOOL WINAPI PrintWindow(HWND,HDC,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); @@ -3924,6 +3935,8 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); +WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); WINUSERAPI UINT WINAPI RegisterWindowMessageA(LPCSTR); WINUSERAPI UINT WINAPI RegisterWindowMessageW(LPCWSTR); #define RegisterWindowMessage WINELIB_NAME_AW(RegisterWindowMessage) @@ -4002,6 +4015,7 @@ WINUSERAPI BOOL WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINF WINUSERAPI LPARAM WINAPI SetMessageExtraInfo(LPARAM); WINUSERAPI BOOL WINAPI SetMessageQueue(INT); WINUSERAPI HWND WINAPI SetParent(HWND,HWND); +WINUSERAPI BOOL WINAPI SetPhysicalCursorPos(INT,INT); WINUSERAPI BOOL WINAPI SetProcessDPIAware(void); WINUSERAPI BOOL WINAPI SetProcessDefaultLayout(DWORD); WINUSERAPI BOOL WINAPI SetProcessWindowStation(HWINSTA);

1 0

Alistair Leslie-Hughes : dmusic/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 24463315ba026c7802568dea216fdabf99abdfff URL: http://source.winehq.org/git/wine.git/?a=commit;h=24463315ba026c7802568dea2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:33 2017 +0000 dmusic/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 7da8aab..961e2cd 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -29,16 +29,6 @@ #include "dmusici.h" #include "dmksctrl.h" -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static void test_dmusic(void) { IDirectMusic *dmusic = NULL; @@ -334,7 +324,7 @@ static void test_dmbuffer(void) data += sizeof(DMUS_EVENTHEADER); ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent); ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup); - ok(header->rtDelta == 0, "rtDelta is %s instead of 0\n", debugstr_longlong(header->rtDelta)); + ok(header->rtDelta == 0, "rtDelta is %s instead of 0\n", wine_dbgstr_longlong(header->rtDelta)); ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED); message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */ data += sizeof(DWORD); @@ -345,7 +335,7 @@ static void test_dmbuffer(void) data += sizeof(DMUS_EVENTHEADER); ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent); ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup); - ok(header->rtDelta == 10, "rtDelta is %s instead of 0\n", debugstr_longlong(header->rtDelta)); + ok(header->rtDelta == 10, "rtDelta is %s instead of 0\n", wine_dbgstr_longlong(header->rtDelta)); ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED); message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */ ok(message == 0x000080, "Message 2 is %0x instead of 0x000080\n", message);

1 0

Alistair Leslie-Hughes : vcomp/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 311b3aded17080bd43fd1369b98697cf3302627e URL: http://source.winehq.org/git/wine.git/?a=commit;h=311b3aded17080bd43fd1369b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:25 2017 +0000 vcomp/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 9aec5cc..165d710 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -188,16 +188,6 @@ static const char vcomp_manifest[] = #undef ARCH -static const char *debugstr_longlong(ULONGLONG ll) -{ - static char str[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(str, "%lx", (unsigned long)ll); - return str; -} - static void create_vcomp_manifest(void) { char temp_path[MAX_PATH]; @@ -1875,27 +1865,27 @@ static void test_atomic_integer64(void) { LONG64 val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); - ok(val == tests1[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests1[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) { LONG64 val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); todo_wine_if(tests2[i].todo) - ok(val == tests2[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests2[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) { ULONG64 val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); - ok(val == tests3[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests3[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) { ULONG64 val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); todo_wine_if(tests4[i].todo) - ok(val == tests4[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests4[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } } @@ -2152,13 +2142,13 @@ static void test_reduction_integer64(void) { LONG64 val = tests[i].v1; p_vcomp_reduction_i8(tests[i].flags, &val, tests[i].v2); - ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { ULONG64 val = tests[i].v1; p_vcomp_reduction_u8(tests[i].flags, &val, tests[i].v2); - ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, debugstr_longlong(val)); + ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } }

1 0

Alistair Leslie-Hughes : ntdll/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: a3c1fbae2aa565569961a8df2e335496776563be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c1fbae2aa565569961a8df2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:06 2017 +0000 ntdll/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9de9009..71b37e4 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -87,16 +87,6 @@ static inline BOOL is_signaled( HANDLE obj ) return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } -static const char* debugstr_longlong(ULONGLONG ll) -{ - static char str[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(str, "%lx", (unsigned long)ll); - return str; -} - #define TEST_BUF_LEN 3 static HANDLE create_temp_file( ULONG flags ) @@ -1134,10 +1124,10 @@ static void test_file_full_size_information(void) /* Test for FileFsSizeInformation */ ok(fsi.TotalAllocationUnits.QuadPart > 0, "[fsi] TotalAllocationUnits expected positive, got 0x%s\n", - debugstr_longlong(fsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.TotalAllocationUnits.QuadPart)); ok(fsi.AvailableAllocationUnits.QuadPart > 0, "[fsi] AvailableAllocationUnits expected positive, got 0x%s\n", - debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); /* Assume file system is NTFS */ ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); @@ -1147,21 +1137,21 @@ static void test_file_full_size_information(void) { ok(ffsi.TotalAllocationUnits.QuadPart > 0, "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); ok(ffsi.CallerAvailableAllocationUnits.QuadPart > 0, "[ffsi] CallerAvailableAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); ok(ffsi.ActualAvailableAllocationUnits.QuadPart > 0, "[ffsi] ActualAvailableAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); ok(ffsi.TotalAllocationUnits.QuadPart == fsi.TotalAllocationUnits.QuadPart, "[ffsi] TotalAllocationUnits error fsi:0x%s, ffsi:0x%s\n", - debugstr_longlong(fsi.TotalAllocationUnits.QuadPart), - debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.TotalAllocationUnits.QuadPart), + wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); ok(ffsi.CallerAvailableAllocationUnits.QuadPart == fsi.AvailableAllocationUnits.QuadPart, "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", - debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart), - debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), + wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); } /* Assume file system is NTFS */

1 0

Alistair Leslie-Hughes : propsys/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: b2f266906ba8e24e9adb438a99b2e2b55e0826be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f266906ba8e24e9adb438a9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:43:58 2017 +0000 propsys/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 54b45ac..776ccd0 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -763,16 +763,6 @@ static void test_PropVariantCompare(void) SysFreeString(str_b.u.bstrVal); } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static void test_intconversions(void) { PROPVARIANT propvar; @@ -796,7 +786,7 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -818,11 +808,11 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == S_OK, "hr=%x\n", hr); - ok(ullval == 5, "got wrong value %s\n", debugstr_longlong(ullval)); + ok(ullval == 5, "got wrong value %s\n", wine_dbgstr_longlong(ullval)); hr = PropVariantToInt32(&propvar, &lval); ok(hr == S_OK, "hr=%x\n", hr); @@ -845,7 +835,7 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -869,28 +859,28 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I4; propvar.u.lVal = -6; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_UI2; propvar.u.uiVal = 7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I2; propvar.u.iVal = -7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); } static void test_PropVariantChangeType_LPWSTR(void)

1 0

Alistair Leslie-Hughes : include: Support wine_dbgstr_longlong in tests.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 87b72098c3a1e4b60b21d9a5703870e3a30fc89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b72098c3a1e4b60b21d9a57… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 23:08:09 2017 +0000 include: Support wine_dbgstr_longlong in tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index af602c0..4ec66d5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -68,6 +68,7 @@ extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); extern const char *wine_dbgstr_guid( const GUID *guid ); extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } +extern const char *wine_dbgstr_longlong( ULONGLONG ll ); /* strcmpW is available for tests compiled under Wine, but not in standalone * builds under Windows, so we reimplement it under a different name. */ @@ -541,6 +542,19 @@ const char *wine_dbgstr_rect( const RECT *rect ) return res; } +const char *wine_dbgstr_longlong( ULONGLONG ll ) +{ + char *res; + + res = get_temp_buffer( 17 ); + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf( res, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); + else + sprintf( res, "%lx", (unsigned long)ll ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Piotr Caban : winedump: Add initial support for handling EMF+ records.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 26b1c6611e35b59b4b1efc1d9ad123308fb6f432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b1c6611e35b59b4b1efc1d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 30 18:03:38 2017 +0200 winedump: Add initial support for handling EMF+ records. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 68f5b41..cce66c8 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -35,6 +35,15 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "gdiplusenums.h" + +typedef struct +{ + WORD Type; + WORD Flags; + DWORD Size; + DWORD DataSize; +} EmfPlusRecordHeader; static const char *debugstr_wn(const WCHAR *wstr, unsigned int n) { @@ -67,6 +76,7 @@ static unsigned int read_int(const unsigned char *buffer) } #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break +#define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, header->Flags, header->Size, header->DataSize); break static unsigned offset = 0; @@ -162,7 +172,120 @@ static int dump_emfrecord(void) EMRCASE(EMR_WIDENPATH); EMRCASE(EMR_SELECTCLIPPATH); EMRCASE(EMR_ABORTPATH); - EMRCASE(EMR_GDICOMMENT); + + case EMR_GDICOMMENT: + { + printf("%-20s %08x\n", "EMR_GDICOMMENT", length); + + /* Handle EMF+ records */ + if (length >= 16 && !memcmp((char*)PRD(offset + 12, sizeof(unsigned int)), "EMF+", 4)) + { + const EmfPlusRecordHeader *header; + const unsigned int *data_size; + + offset += 8; + length -= 8; + data_size = PRD(offset, sizeof(*data_size)); + printf("data size = %x\n", *data_size); + offset += 8; + length -= 8; + + while (length >= sizeof(*header)) + { + header = PRD(offset, sizeof(*header)); + switch(header->Type) + { + EMRPLUSCASE(EmfPlusRecordTypeInvalid); + EMRPLUSCASE(EmfPlusRecordTypeHeader); + EMRPLUSCASE(EmfPlusRecordTypeEndOfFile); + EMRPLUSCASE(EmfPlusRecordTypeComment); + EMRPLUSCASE(EmfPlusRecordTypeGetDC); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatStart); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatSection); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatEnd); + EMRPLUSCASE(EmfPlusRecordTypeObject); + EMRPLUSCASE(EmfPlusRecordTypeClear); + EMRPLUSCASE(EmfPlusRecordTypeFillRects); + EMRPLUSCASE(EmfPlusRecordTypeDrawRects); + EMRPLUSCASE(EmfPlusRecordTypeFillPolygon); + EMRPLUSCASE(EmfPlusRecordTypeDrawLines); + EMRPLUSCASE(EmfPlusRecordTypeFillEllipse); + EMRPLUSCASE(EmfPlusRecordTypeDrawEllipse); + EMRPLUSCASE(EmfPlusRecordTypeFillPie); + EMRPLUSCASE(EmfPlusRecordTypeDrawPie); + EMRPLUSCASE(EmfPlusRecordTypeDrawArc); + EMRPLUSCASE(EmfPlusRecordTypeFillRegion); + EMRPLUSCASE(EmfPlusRecordTypeFillPath); + EMRPLUSCASE(EmfPlusRecordTypeDrawPath); + EMRPLUSCASE(EmfPlusRecordTypeFillClosedCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawClosedCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawBeziers); + EMRPLUSCASE(EmfPlusRecordTypeDrawImage); + EMRPLUSCASE(EmfPlusRecordTypeDrawImagePoints); + EMRPLUSCASE(EmfPlusRecordTypeDrawString); + EMRPLUSCASE(EmfPlusRecordTypeSetRenderingOrigin); + EMRPLUSCASE(EmfPlusRecordTypeSetAntiAliasMode); + EMRPLUSCASE(EmfPlusRecordTypeSetTextRenderingHint); + EMRPLUSCASE(EmfPlusRecordTypeSetTextContrast); + EMRPLUSCASE(EmfPlusRecordTypeSetInterpolationMode); + EMRPLUSCASE(EmfPlusRecordTypeSetPixelOffsetMode); + EMRPLUSCASE(EmfPlusRecordTypeSetCompositingMode); + EMRPLUSCASE(EmfPlusRecordTypeSetCompositingQuality); + EMRPLUSCASE(EmfPlusRecordTypeSave); + EMRPLUSCASE(EmfPlusRecordTypeRestore); + EMRPLUSCASE(EmfPlusRecordTypeBeginContainer); + EMRPLUSCASE(EmfPlusRecordTypeBeginContainerNoParams); + EMRPLUSCASE(EmfPlusRecordTypeEndContainer); + EMRPLUSCASE(EmfPlusRecordTypeSetWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeResetWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeMultiplyWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeTranslateWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeScaleWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeRotateWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeSetPageTransform); + EMRPLUSCASE(EmfPlusRecordTypeResetClip); + EMRPLUSCASE(EmfPlusRecordTypeSetClipRect); + EMRPLUSCASE(EmfPlusRecordTypeSetClipPath); + EMRPLUSCASE(EmfPlusRecordTypeSetClipRegion); + EMRPLUSCASE(EmfPlusRecordTypeOffsetClip); + EMRPLUSCASE(EmfPlusRecordTypeDrawDriverString); + EMRPLUSCASE(EmfPlusRecordTypeStrokeFillPath); + EMRPLUSCASE(EmfPlusRecordTypeSerializableObject); + EMRPLUSCASE(EmfPlusRecordTypeSetTSGraphics); + EMRPLUSCASE(EmfPlusRecordTypeSetTSClip); + EMRPLUSCASE(EmfPlusRecordTotal); + + default: + printf(" unknown EMF+ record %x %04x %08x\n", header->Type, header->Flags, header->Size); + break; + } + + if (length<sizeof(*header) || header->Size%4) + return -1; + + length -= sizeof(*header); + offset += sizeof(*header); + + for (i=0; i<header->Size-sizeof(*header); i+=4) + { + if (i%16 == 0) + printf(" "); + if (!(ptr = PRD(offset, 4))) return -1; + length -= 4; + offset += 4; + printf("%08x ", read_int(ptr)); + if ((i % 16 == 12) || (i + 4 == header->Size - sizeof(*header))) + printf("\n"); + } + } + + return 0; + } + + break; + } + EMRCASE(EMR_FILLRGN); EMRCASE(EMR_FRAMERGN); EMRCASE(EMR_INVERTRGN); @@ -178,7 +301,7 @@ static int dump_emfrecord(void) if (length >= sizeof(*clip) + sizeof(*data)) rc_count = data->rdh.nCount; - printf("%-20s %08x\n", "EMREXTSELECTCLIPRGN", length); + printf("%-20s %08x\n", "EMR_EXTSELECTCLIPRGN", length); printf("mode %d, rects %d\n", clip->iMode, rc_count); for (i = 0, rc = (const RECT *)data->Buffer; i < rc_count; i++, rc++) printf(" (%d,%d)-(%d,%d)", rc->left, rc->top, rc->right, rc->bottom);

1 0

Hugh McMaster : regedit: Improve the parsing of multiline hex data during the registry import operation.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 032d32f94052a5e7386d07b4a4986d1140f736e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032d32f94052a5e7386d07b4a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:55 2017 +0000 regedit: Improve the parsing of multiline hex data during the registry import operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 143 +++++++++++++++++++++++++++++---------- programs/regedit/tests/regedit.c | 125 +++++++++++++++++----------------- 2 files changed, 171 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=032d32f94052a5e7386d0…

1 0

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 July 2017