wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alexandre Julliard : user32: Implement SetProcessDpiAwarenessContext().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: bd0cd09e69ef5feed483fb11401667544c68ee21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0cd09e69ef5feed483fb11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 12:37:55 2018 +0200 user32: Implement SetProcessDpiAwarenessContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 27 +++++++++++++++++++++++++-- dlls/user32/tests/sysparams.c | 26 ++++++++++++++++++++++++++ dlls/user32/user32.spec | 3 ++- include/winuser.h | 1 + 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 42e6a44..2c4ff5e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2942,6 +2942,28 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); } + +static DPI_AWARENESS_CONTEXT dpi_awareness; + +/********************************************************************** + * SetProcessDpiAwarenessContext (USER32.@) + */ +BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) +{ + if (!IsValidDpiAwarenessContext( context )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (InterlockedCompareExchangePointer( (void **)&dpi_awareness, context, NULL )) + { + SetLastError( ERROR_ACCESS_DENIED ); + return FALSE; + } + TRACE( "set to %p\n", context ); + return TRUE; +} + /*********************************************************************** * AreDpiAwarenessContextsEqual (USER32.@) */ @@ -2980,6 +3002,7 @@ BOOL WINAPI IsValidDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) BOOL WINAPI SetProcessDPIAware(void) { TRACE("\n"); + InterlockedCompareExchangePointer( (void **)&dpi_awareness, DPI_AWARENESS_CONTEXT_SYSTEM_AWARE, NULL ); return TRUE; } @@ -2988,8 +3011,8 @@ BOOL WINAPI SetProcessDPIAware(void) */ BOOL WINAPI IsProcessDPIAware(void) { - TRACE("returning TRUE\n"); - return TRUE; + /* FIXME: should default to FALSE when not set */ + return dpi_awareness != DPI_AWARENESS_CONTEXT_UNAWARE; } /*********************************************************************** diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 5dd8e58..03fa8d5 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -41,6 +41,7 @@ static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL (WINAPI *pIsProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDPIAware)(void); +static BOOL (WINAPI *pSetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; @@ -2995,6 +2996,30 @@ static void test_dpi_aware(void) return; } + if (pSetProcessDpiAwarenessContext) + { + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( NULL ); + ok( !ret, "got %d\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)-5 ); + ok( !ret, "got %d\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ret = pSetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + ok( ret, "got %d\n", ret ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + ok( !ret, "got %d\n", ret ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pSetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + ok( !ret, "got %d\n", ret ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + ret = pIsProcessDPIAware(); + ok(ret, "got %d\n", ret); + } + ret = pSetProcessDPIAware(); ok(ret, "got %d\n", ret); @@ -3019,6 +3044,7 @@ START_TEST(sysparams) pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware"); pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); + pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext"); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f37b6a4..b0109cb 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -671,8 +671,9 @@ @ stdcall SetMessageQueue(long) @ stdcall SetParent(long long) @ stdcall SetPhysicalCursorPos(long long) -@ stdcall SetProcessDefaultLayout(long) @ stdcall SetProcessDPIAware() +@ stdcall SetProcessDefaultLayout(long) +@ stdcall SetProcessDpiAwarenessContext(long) @ stdcall SetProcessWindowStation(long) @ stdcall SetProgmanWindow (long) @ stdcall SetPropA(long str long) diff --git a/include/winuser.h b/include/winuser.h index 213a83a..24d9e57 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4064,6 +4064,7 @@ 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 SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT); WINUSERAPI BOOL WINAPI SetProcessWindowStation(HWINSTA); WINUSERAPI BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE); WINUSERAPI BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE);

1 0

Alexandre Julliard : user32: Implement AreDpiAwarenessContextsEqual().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: ff7961e152506f4ecf841ff77c369fe481d549d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7961e152506f4ecf841ff7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 12:37:05 2018 +0200 user32: Implement AreDpiAwarenessContextsEqual(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0f1ca6d..42e6a44 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2943,6 +2943,15 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, } /*********************************************************************** + * AreDpiAwarenessContextsEqual (USER32.@) + */ +BOOL WINAPI AreDpiAwarenessContextsEqual( DPI_AWARENESS_CONTEXT ctx1, DPI_AWARENESS_CONTEXT ctx2 ) +{ + if (!IsValidDpiAwarenessContext( ctx1 )) return FALSE; + return ctx1 == ctx2; +} + +/*********************************************************************** * GetAwarenessFromDpiAwarenessContext (USER32.@) */ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a076624..f37b6a4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -9,6 +9,7 @@ @ stdcall AnyPopup() @ stdcall AppendMenuA(long long long ptr) @ stdcall AppendMenuW(long long long ptr) +@ stdcall AreDpiAwarenessContextsEqual(long long) @ stdcall ArrangeIconicWindows(long) @ stdcall AttachThreadInput(long long long) @ stdcall BeginDeferWindowPos(long) diff --git a/include/winuser.h b/include/winuser.h index f782a46..213a83a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3393,6 +3393,7 @@ WINUSERAPI BOOL WINAPI AnyPopup(void); WINUSERAPI BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR); WINUSERAPI BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR); #define AppendMenu WINELIB_NAME_AW(AppendMenu) +WINUSERAPI BOOL WINAPI AreDpiAwarenessContextsEqual(DPI_AWARENESS_CONTEXT,DPI_AWARENESS_CONTEXT); WINUSERAPI UINT WINAPI ArrangeIconicWindows(HWND); WINUSERAPI BOOL WINAPI AttachThreadInput(DWORD,DWORD,BOOL); WINUSERAPI HDWP WINAPI BeginDeferWindowPos(INT);

1 0

Alexandre Julliard : user32: Implement GetAwarenessFromDpiAwarenessContext ().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: d17ca871dd82b674816212735e143cd3d699fadd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d17ca871dd82b67481621273… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 12:34:29 2018 +0200 user32: Implement GetAwarenessFromDpiAwarenessContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 12 ++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 565838f..0f1ca6d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2943,6 +2943,18 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, } /*********************************************************************** + * GetAwarenessFromDpiAwarenessContext (USER32.@) + */ +DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) +{ + if (context == DPI_AWARENESS_CONTEXT_UNAWARE) return DPI_AWARENESS_UNAWARE; + if (context == DPI_AWARENESS_CONTEXT_SYSTEM_AWARE) return DPI_AWARENESS_SYSTEM_AWARE; + if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE) return DPI_AWARENESS_PER_MONITOR_AWARE; + if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) return DPI_AWARENESS_PER_MONITOR_AWARE; + return DPI_AWARENESS_INVALID; +} + +/*********************************************************************** * IsValidDpiAwarenessContext (USER32.@) */ BOOL WINAPI IsValidDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 6ace359..a076624 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -253,6 +253,7 @@ @ stdcall GetAppCompatFlags2(long) @ stdcall GetAsyncKeyState(long) @ stdcall GetAutoRotationState(ptr) +@ stdcall GetAwarenessFromDpiAwarenessContext(long) @ stdcall GetCapture() @ stdcall GetCaretBlinkTime() @ stdcall GetCaretPos(ptr) diff --git a/include/winuser.h b/include/winuser.h index 90c257d..f782a46 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3625,6 +3625,7 @@ WINUSERAPI HWND WINAPI GetAncestor(HWND,UINT); WINUSERAPI DWORD WINAPI GetAppCompatFlags(HTASK); WINUSERAPI SHORT WINAPI GetAsyncKeyState(INT); WINUSERAPI BOOL WINAPI GetAutoRotationState(AR_STATE*); +WINUSERAPI DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext(DPI_AWARENESS_CONTEXT); WINUSERAPI HWND WINAPI GetCapture(void); WINUSERAPI UINT WINAPI GetCaretBlinkTime(void); WINUSERAPI BOOL WINAPI GetCaretPos(LPPOINT);

1 0

Alexandre Julliard : user32: Implement IsValidDpiAwarenessContext().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 4e752086d7d9331dba7434b8f1c124572b17ea0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e752086d7d9331dba7434b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 12:33:14 2018 +0200 user32: Implement IsValidDpiAwarenessContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 11 +++++++++++ dlls/user32/user32.spec | 1 + include/windef.h | 14 ++++++++++++++ include/winuser.h | 1 + 4 files changed, 27 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 34e0a37..565838f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2943,6 +2943,17 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, } /*********************************************************************** + * IsValidDpiAwarenessContext (USER32.@) + */ +BOOL WINAPI IsValidDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) +{ + return (context == DPI_AWARENESS_CONTEXT_UNAWARE || + context == DPI_AWARENESS_CONTEXT_SYSTEM_AWARE || + context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE || + context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); +} + +/*********************************************************************** * SetProcessDPIAware (USER32.@) */ BOOL WINAPI SetProcessDPIAware(void) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e0fdd3a..6ace359 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -460,6 +460,7 @@ @ stdcall IsRectEmpty(ptr) # @ stub IsServerSideWindow @ stdcall IsTouchWindow(long ptr) +@ stdcall IsValidDpiAwarenessContext(long) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) diff --git a/include/windef.h b/include/windef.h index df0eb77..40028f3 100644 --- a/include/windef.h +++ b/include/windef.h @@ -433,6 +433,20 @@ typedef struct _RECTL typedef const RECTL *LPCRECTL; +/* DPI awareness */ +typedef enum DPI_AWARENESS +{ + DPI_AWARENESS_INVALID = -1, + DPI_AWARENESS_UNAWARE = 0, + DPI_AWARENESS_SYSTEM_AWARE, + DPI_AWARENESS_PER_MONITOR_AWARE +} DPI_AWARENESS; + +#define DPI_AWARENESS_CONTEXT_UNAWARE ((DPI_AWARENESS_CONTEXT)-1) +#define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ((DPI_AWARENESS_CONTEXT)-2) +#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ((DPI_AWARENESS_CONTEXT)-3) +#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT)-4) + #ifdef __cplusplus } #endif diff --git a/include/winuser.h b/include/winuser.h index ece0109..90c257d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3848,6 +3848,7 @@ WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); WINUSERAPI BOOL WINAPI IsProcessDPIAware(void); WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); +WINUSERAPI BOOL WINAPI IsValidDpiAwarenessContext(DPI_AWARENESS_CONTEXT); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); WINUSERAPI BOOL WINAPI IsWindowEnabled(HWND);

1 0

Stefan Leichter : wiaservc: Add some tests for SelectDeviceDlg.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: daf7f3c4ae41c5547e88ef40971e3adc1f9aab06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf7f3c4ae41c5547e88ef40… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Mar 29 23:08:29 2018 +0200 wiaservc: Add some tests for SelectDeviceDlg. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/tests/wia.c | 16 ++++++++++++++++ include/wiadef.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index c7c2fd9..6183cef 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -25,6 +25,8 @@ #include "objbase.h" #include "initguid.h" #include "wia_lh.h" +#include "sti.h" +#include "wiadef.h" #include "wine/test.h" @@ -54,6 +56,19 @@ todo_wine IEnumWIA_DEV_INFO_Release(devenum); } +static void test_SelectDeviceDlg(void) +{ + HRESULT hr; + IWiaItem *root; + hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL); +todo_wine + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root); +todo_wine + ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr); +} + START_TEST(wia) { HRESULT hr; @@ -68,6 +83,7 @@ START_TEST(wia) } test_EnumDeviceInfo(); + test_SelectDeviceDlg(); IWiaDevMgr_Release(devmanager); CoUninitialize(); diff --git a/include/wiadef.h b/include/wiadef.h index 28e43e0..bd95872 100644 --- a/include/wiadef.h +++ b/include/wiadef.h @@ -20,3 +20,9 @@ #define WIA_DEVINFO_ENUM_ALL 0x0000000f #define WIA_DEVINFO_ENUM_LOCAL 0x00000010 + +#define FACILITY_WIA 33 + +#define BASE_VAL_WIA_ERROR 0x00000000 + +#define WIA_S_NO_DEVICE_AVAILABLE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIA, (BASE_VAL_WIA_ERROR + 21))

1 0

Stefan Leichter : include: Fix declaration of SelectDeviceDlg.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 208fa59202227f09e5074b06f5ec8aae1fe6becb URL: https://source.winehq.org/git/wine.git/?a=commit;h=208fa59202227f09e5074b06… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Mar 29 23:08:21 2018 +0200 include: Fix declaration of SelectDeviceDlg. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wia_lh.idl | 2 +- include/wia_xp.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 284528a..2e3ecf4 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -47,7 +47,7 @@ interface IWiaDevMgr : IUnknown [in] HWND hwndParent, [in] LONG lDeviceType, [in] LONG lFlags, - [in, out] BSTR *pbstrDeviceID, + [in, out, unique] BSTR *pbstrDeviceID, [retval, out] IWiaItem **ppItemRoot); HRESULT SelectDeviceDlgID( diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 284528a..2e3ecf4 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -47,7 +47,7 @@ interface IWiaDevMgr : IUnknown [in] HWND hwndParent, [in] LONG lDeviceType, [in] LONG lFlags, - [in, out] BSTR *pbstrDeviceID, + [in, out, unique] BSTR *pbstrDeviceID, [retval, out] IWiaItem **ppItemRoot); HRESULT SelectDeviceDlgID(

1 0

André Hentschel : schedsvc/tests: Recognize newer Windows 10's RPC version.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: b164e4dc8d9b61878a2a6ccacabfd9d223b7290e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b164e4dc8d9b61878a2a6cca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:46 2018 +0200 schedsvc/tests: Recognize newer Windows 10's RPC version. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index be1e5eb..a383538 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -115,7 +115,8 @@ START_TEST(rpcapi) hr = SchRpcHighestVersion(&version); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(version == 0x10002 /* vista */ || version == 0x10003 /* win7 */ || - version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */, + version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */ || + version == 0x10006 /* win10 1709 */, "wrong version %#x\n", version); SetUnhandledExceptionFilter(old_exception_filter);

1 0

André Hentschel : kernel32/tests: Allow GetLastError to be unchanged in a test.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: d28628e9204e684bb695d1580abbf06eab89a2ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28628e9204e684bb695d158… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:57 2018 +0200 kernel32/tests: Allow GetLastError to be unchanged in a test. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 5d5cc17..d8f51d3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4660,7 +4660,8 @@ static void test_GetGeoInfo(void) SetLastError(0xdeadbeef); ret = pGetGeoInfoA(344, GEO_ISO2, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef /* Win10 */), "got %d\n", GetLastError()); ret = pGetGeoInfoA(203, GEO_ISO2, NULL, 0, 0); ok(ret == 3, "got %d\n", ret);

1 0

André Hentschel : kernel32/tests: Fix check for invalid type value.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 3d8d811be165cd9586d1389206c568b5c6975305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8d811be165cd9586d13892… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:50 2018 +0200 kernel32/tests: Fix check for invalid type value. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- include/winnls.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index efb4231..5d5cc17 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4720,7 +4720,7 @@ static void test_GetGeoInfo(void) /* try invalid type value */ SetLastError(0xdeadbeef); - ret = pGetGeoInfoA(203, GEO_CURRENCYSYMBOL + 1, NULL, 0, 0); + ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); } diff --git a/include/winnls.h b/include/winnls.h index 1191111..99a30e4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -826,7 +826,9 @@ enum SYSGEOTYPE GEO_PARENT, GEO_DIALINGCODE, GEO_CURRENCYCODE, - GEO_CURRENCYSYMBOL + GEO_CURRENCYSYMBOL, + GEO_NAME, + GEO_ID }; enum SYSGEOCLASS

1 0

André Hentschel : usp10: Don' t increment variable both in the loop header and body (clang).
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 24172215311ddea6fd0fb395128cbfb37789274a URL: https://source.winehq.org/git/wine.git/?a=commit;h=24172215311ddea6fd0fb395… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 19:52:59 2018 +0200 usp10: Don't increment variable both in the loop header and body (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 4031386..3827000 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1696,7 +1696,7 @@ static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Co int offset = 0; int cWalk; - for (cWalk = 0; cWalk < *pcChars; cWalk++) + for (cWalk = 0; cWalk < *pcChars; cWalk += 2) { for (i = 0; consonants[i].output!= 0x0; i++) { @@ -1721,7 +1721,6 @@ static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Co break; } } - cWalk++; } }

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 March 2018