September 2018 - Wine-commits

Zebediah Figura : devenum: Use separate factories for CLSID_SystemDeviceEnum and CLSID_CDeviceMoniker.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: bbd54291614e4740242734856ed5547ca6a49363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd54291614e474024273485… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 26 09:05:30 2018 -0500 devenum: Use separate factories for CLSID_SystemDeviceEnum and CLSID_CDeviceMoniker. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 47921c19e06254a0b66b41c73979aca2978afd5b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/devenum_main.c | 46 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 7bfc593..3499f99 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -56,6 +56,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } +struct class_factory +{ + IClassFactory IClassFactory_iface; + IUnknown *obj; +}; + +static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **obj) { TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), obj); @@ -87,24 +98,15 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **obj) { + struct class_factory *This = impl_from_IClassFactory( iface ); + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(iid), obj); if (!obj) return E_POINTER; if (outer) return CLASS_E_NOAGGREGATION; - if (IsEqualGUID(&IID_ICreateDevEnum, iid)) - { - *obj = &DEVENUM_CreateDevEnum; - return S_OK; - } - if (IsEqualGUID(&IID_IParseDisplayName, iid)) - { - *obj = &DEVENUM_ParseDisplayName; - return S_OK; - } - - return CLASS_E_CLASSNOTAVAILABLE; + return IUnknown_QueryInterface(This->obj, iid, obj); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) @@ -124,24 +126,24 @@ static const IClassFactoryVtbl ClassFactory_vtbl = { ClassFactory_LockServer }; -static IClassFactory devenum_cf = { &ClassFactory_vtbl }; +static struct class_factory create_devenum_cf = { { &ClassFactory_vtbl }, (IUnknown *)&DEVENUM_CreateDevEnum }; +static struct class_factory device_moniker_cf = { { &ClassFactory_vtbl }, (IUnknown *)&DEVENUM_ParseDisplayName }; /*********************************************************************** * DllGetClassObject (DEVENUM.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) { - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + TRACE("(%s, %s, %p)\n", debugstr_guid(clsid), debugstr_guid(iid), obj); - *ppv = NULL; + *obj = NULL; - /* FIXME: we should really have two class factories. - * Oh well - works just fine as it is */ - if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) || - IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) - return IClassFactory_QueryInterface(&devenum_cf, iid, ppv); + if (IsEqualGUID(clsid, &CLSID_SystemDeviceEnum)) + return IClassFactory_QueryInterface(&create_devenum_cf.IClassFactory_iface, iid, obj); + else if (IsEqualGUID(clsid, &CLSID_CDeviceMoniker)) + return IClassFactory_QueryInterface(&device_moniker_cf.IClassFactory_iface, iid, obj); - FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + FIXME("class %s not available\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

André Hentschel : dbghelp: Map SIMD dwarf registers on ARM64.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 190cefe4e5818fd5e79cec867e1859df81a92494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=190cefe4e5818fd5e79cec86… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 28 19:39:06 2018 +0200 dbghelp: Map SIMD dwarf registers on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 86864486be64a277f6edf8e66709cd0f17a4eed9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/cpu_arm64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index dd2ccfb..71d4e67 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -158,6 +158,7 @@ static unsigned arm64_map_dwarf_register(unsigned regno, BOOL eh_frame) if (regno == 29) return CV_ARM64_FP; if (regno == 30) return CV_ARM64_LR; if (regno == 31) return CV_ARM64_SP; + if (regno >= 64 && regno <= 95) return CV_ARM64_Q0 + regno - 64; FIXME("Don't know how to map register %d\n", regno); return CV_ARM64_NOREG;

1 0

Alistair Leslie-Hughes : netapi32: Add DsEnumerateDomainTrustsA/W stubs.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 73dab7f05ce84ba4ca23237d16f11793b270e3be URL: https://source.winehq.org/git/wine.git/?a=commit;h=73dab7f05ce84ba4ca23237d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 29 01:49:57 2018 +0000 netapi32: Add DsEnumerateDomainTrustsA/W stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 07e41e4c9ba913d895e50715ff8cc70bd6f9d855) Conflicts: dlls/netapi32/netapi32.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/netapi32/netapi32.c | 18 ++++++++++++++++++ dlls/netapi32/netapi32.spec | 3 ++- include/dsgetdc.h | 26 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 278d452..bf4dcbc 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -3527,3 +3527,21 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu return ERROR_SUCCESS; } + +/************************************************************ + * DsEnumerateDomainTrustsA (NETAPI32.@) + */ +DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR server, ULONG flags, PDS_DOMAIN_TRUSTSA* domains, PULONG count) +{ + FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_a(server), flags, domains, count); + return ERROR_NO_LOGON_SERVERS; +} + +/************************************************************ + * DsEnumerateDomainTrustsW (NETAPI32.@) + */ +DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR server, ULONG flags, PDS_DOMAIN_TRUSTSW* domains, PULONG count) +{ + FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_w(server), flags, domains, count); + return ERROR_NO_LOGON_SERVERS; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 8dbd378..e846baa 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -3,7 +3,8 @@ @ stub DsAddressToSiteNames @ stub DsAddressToSiteNamesEx @ stub DsDeregisterDnsHostRecords -@ stub DsEnumerateDomainTrusts +@ stdcall DsEnumerateDomainTrustsA(str long ptr ptr) +@ stdcall DsEnumerateDomainTrustsW(wstr long ptr ptr) @ stub DsGetDcClose @ stdcall DsGetDcNameA(str str ptr str long ptr) @ stdcall DsGetDcNameW(wstr wstr ptr wstr long ptr) diff --git a/include/dsgetdc.h b/include/dsgetdc.h index faae31a..c53fcc2 100644 --- a/include/dsgetdc.h +++ b/include/dsgetdc.h @@ -86,6 +86,28 @@ typedef struct _DOMAIN_CONTROLLER_INFOW { LPWSTR ClientSiteName; } DOMAIN_CONTROLLER_INFOW, *PDOMAIN_CONTROLLER_INFOW; +typedef struct _DS_DOMAIN_TRUSTSA { + LPSTR NetbiosDomainName; + LPSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSA, *PDS_DOMAIN_TRUSTSA; + +typedef struct _DS_DOMAIN_TRUSTSW { + LPWSTR NetbiosDomainName; + LPWSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSW, *PDS_DOMAIN_TRUSTSW; + DECL_WINELIB_TYPE_AW(DOMAIN_CONTROLLER_INFO) DWORD WINAPI DsGetDcNameA(LPCSTR,LPCSTR,GUID*,LPCSTR,ULONG,PDOMAIN_CONTROLLER_INFOA*); @@ -96,6 +118,10 @@ DWORD WINAPI DsGetSiteNameA(LPCSTR ComputerName, LPSTR *SiteName); DWORD WINAPI DsGetSiteNameW(LPCWSTR ComputerName, LPWSTR *SiteName); #define DsGetSiteName WINELIB_NAME_AW(DsGetSiteName) +DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR, ULONG, PDS_DOMAIN_TRUSTSA*, PULONG); +DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR, ULONG, PDS_DOMAIN_TRUSTSW*, PULONG); +#define DsEnumerateDomainTrusts WINELIB_NAME_AW(DsEnumerateDomainTrusts) + #ifdef __cplusplus } #endif

1 0

Hans Leidekker : winhttp: Fix invalid option error returned from WinHttpSetOption.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 69677737ffaf4d9a8e938bfca9c14603396cede5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69677737ffaf4d9a8e938bfc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 3 13:30:21 2018 +0200 winhttp: Fix invalid option error returned from WinHttpSetOption. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0b61334b9d6392e8c8a9772d762efaf0c2eb0835) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/session.c | 6 +++--- dlls/winhttp/tests/winhttp.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b54e77b..c878d68 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -225,7 +225,7 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe return TRUE; default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_INVALID_PARAMETER ); + set_last_error( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } } @@ -1024,8 +1024,8 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe return TRUE; default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_INVALID_PARAMETER ); - return TRUE; + set_last_error( ERROR_WINHTTP_INVALID_OPTION ); + return FALSE; } } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4399cf6..302974c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2267,12 +2267,36 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(ses, 0, buffer, sizeof(buffer)); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(ses, 0, buffer, &size); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + con = WinHttpConnect(ses, localhostW, port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(con, 0, buffer, sizeof(buffer)); + todo_wine ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(con, 0, buffer, &size); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(req, 0, buffer, sizeof(buffer)); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, 0, buffer, &size); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError());

1 0

Nikolay Sivov : comctl32/trackbar: Don' t update page size if it was explicitly set.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: c9a060afbcbc624206b99b26656d3913e8a54b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9a060afbcbc624206b99b26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 5 19:18:58 2018 +0300 comctl32/trackbar: Don't update page size if it was explicitly set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6dc3c6ba879b79fac7e4c9c0693539a614229978) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 9cc8b27..d4a9eb7 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -576,6 +576,47 @@ static void test_page_size(void) hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 20, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGE, 0, MAKELPARAM(0, 65)); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 13, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, 0, 10); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 11, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 50); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 8, "Unexpected page size %d.\n", r); + + r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, 10); + ok(r == 8, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGE, 0, MAKELPARAM(0, 30)); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, 0, 5); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 40); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Failed to create trackbar window.\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCE); /* test TBM_SETPAGESIZE */ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index cdbf859..074304c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -69,7 +69,7 @@ typedef struct HWND hwndBuddyLA; HWND hwndBuddyRB; INT fLocation; - INT flags; + DWORD flags; BOOL bUnicode; BOOL bFocussed; RECT rcChannel; @@ -88,15 +88,18 @@ typedef struct /* Used by TRACKBAR_Refresh to find out which parts of the control need to be recalculated */ -#define TB_THUMBPOSCHANGED 1 -#define TB_THUMBSIZECHANGED 2 -#define TB_THUMBCHANGED (TB_THUMBPOSCHANGED | TB_THUMBSIZECHANGED) -#define TB_SELECTIONCHANGED 4 -#define TB_DRAG_MODE 8 /* we're dragging the slider */ -#define TB_AUTO_PAGE_LEFT 16 -#define TB_AUTO_PAGE_RIGHT 32 -#define TB_AUTO_PAGE (TB_AUTO_PAGE_LEFT | TB_AUTO_PAGE_RIGHT) -#define TB_THUMB_HOT 64 /* mouse hovers above thumb */ +#define TB_THUMBPOSCHANGED 0x00000001 +#define TB_THUMBSIZECHANGED 0x00000002 +#define TB_THUMBCHANGED (TB_THUMBPOSCHANGED | TB_THUMBSIZECHANGED) +#define TB_SELECTIONCHANGED 0x00000004 +#define TB_DRAG_MODE 0x00000008 /* we're dragging the slider */ +#define TB_AUTO_PAGE_LEFT 0x00000010 +#define TB_AUTO_PAGE_RIGHT 0x00000020 +#define TB_AUTO_PAGE (TB_AUTO_PAGE_LEFT | TB_AUTO_PAGE_RIGHT) +#define TB_THUMB_HOT 0x00000040 /* mouse hovers above thumb */ + +/* Page was set with TBM_SETPAGESIZE */ +#define TB_USER_PAGE 0x00000080 /* helper defines for TRACKBAR_DrawTic */ #define TIC_EDGE 0x20 @@ -1214,6 +1217,8 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) else infoPtr->lPageSize = TB_DEFAULTPAGESIZE; + infoPtr->flags |= TB_USER_PAGE; + return lTemp; } @@ -1239,6 +1244,14 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) return 0; } +static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->flags & TB_USER_PAGE) + return; + + infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; + if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; +} static inline LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) @@ -1256,8 +1269,7 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed) { if (infoPtr->dwStyle & TBS_AUTOTICKS) @@ -1283,8 +1295,7 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) infoPtr->flags |= TB_THUMBPOSCHANGED; } - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) TRACKBAR_RecalculateTics (infoPtr); @@ -1306,8 +1317,7 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMin) infoPtr->flags |= TB_THUMBPOSCHANGED; } - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) TRACKBAR_RecalculateTics (infoPtr);

1 0

Nikolay Sivov : comctl32/trackbar: Fix reseting to default page size.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: f4fdf94697788217ba77a5e2510a452092d0f414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4fdf94697788217ba77a5e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 01:30:52 2018 +0300 comctl32/trackbar: Fix reseting to default page size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 38e715387da75458874a22efb34419cc469f9624) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 11 +++++++++++ dlls/comctl32/trackbar.c | 31 +++++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index d4a9eb7..56f0a67 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -612,6 +612,17 @@ static void test_page_size(void) r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); ok(r == 10, "Unexpected page size %d.\n", r); + r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, -1); + ok(r == 10, "Unexpected page size %d.\n", r); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 7, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 100); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 19, "Unexpected page size %d.\n", r); + DestroyWindow(hWndTrackbar); hWndTrackbar = create_trackbar(defaultstyle, hWndParent); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 074304c..bf489fe 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1206,18 +1206,30 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) return lTemp; } +static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->flags & TB_USER_PAGE) + return; + + infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; + if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; +} static inline LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; - if (lPageSize != -1) - infoPtr->lPageSize = lPageSize; + if (lPageSize == -1) + { + infoPtr->flags &= ~TB_USER_PAGE; + TRACKBAR_UpdatePageSize(infoPtr); + } else - infoPtr->lPageSize = TB_DEFAULTPAGESIZE; - - infoPtr->flags |= TB_USER_PAGE; + { + infoPtr->flags |= TB_USER_PAGE; + infoPtr->lPageSize = lPageSize; + } return lTemp; } @@ -1244,15 +1256,6 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) return 0; } -static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) -{ - if (infoPtr->flags & TB_USER_PAGE) - return; - - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; -} - static inline LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) {

1 0

Zebediah Figura : jscript: Avoid crash when calling stringify() with no arguments.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 91917df545258aceb4eaa6e785ab7b8176b98c94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91917df545258aceb4eaa6e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 5 14:13:12 2018 -0500 jscript: Avoid crash when calling stringify() with no arguments. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bf47aebdeeda0ccd16178bf0a52fd0cbd69794fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/json.c | 6 ++++++ dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 7d69cf5..0db32cd 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -765,6 +765,12 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); + if(!argc) { + if(r) + *r = jsval_undefined(); + return S_OK; + } + if(argc >= 2 && is_object_instance(argv[1])) { FIXME("Replacer %s not yet supported\n", debugstr_jsval(argv[1])); return E_NOTIMPL; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 5a78b3a..b825b93 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1807,6 +1807,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); return; var stringify_tests = [ + [[], undefined], [[true], "true"], [[false], "false"], [[null], "null"], @@ -1833,6 +1834,9 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); "["+i+"] stringify(" + stringify_tests[i][0] + ") returned " + s + " expected " + stringify_tests[i][1]); } + s = JSON.stringify(); + ok(s === undefined, "stringify() returned " + s + " expected undefined"); + s = JSON.stringify(testObj); ok(s === undefined || s === "undefined" /* broken on some old versions */, "stringify(testObj) returned " + s + " expected undfined");

1 0

Matej Špindler : kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 7a66dd34924b3baaa7efc9ccd413a574e359f757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a66dd34924b3baaa7efc9cc… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Tue May 22 17:15:01 2018 +0200 kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales. Signed-off-by: Matej Špindler <spindler.matej(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit da5112c74313b5236183135204cab38a8b0169ed) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b10491a..8dfbb3d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1812,7 +1812,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) /* special handling for neutral locale names */ if (locale && strlenW(locale) == 2) { - switch (info) + switch (info & ~LOCALE_LOCALEINFOFLAGSMASK) { case LOCALE_SNAME: if (len && len < 3) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1f0e8fb..d686e12 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4495,6 +4495,10 @@ static void test_GetLocaleInfoEx(void) ok(ret == 1, "got %d\n", ret); ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SPARENT | LOCALE_NOUSEROVERRIDE, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == 1, "got %d\n", ret); + ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||

1 0

Zebediah Figura : advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 1e259233e7e08c841224aba6291462e21879749e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e259233e7e08c841224aba6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 12 17:25:16 2018 -0500 advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3b8ec3046a62588a145ba8a92a2c257f0a06bbdb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/service.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 21693fe..d43cd40 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2435,6 +2435,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, LPVOID lpInfo) { + SERVICE_RPC_REQUIRED_PRIVILEGES_INFO rpc_privinfo; DWORD err; __TRY @@ -2442,7 +2443,19 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, SC_RPC_CONFIG_INFOW info; info.dwInfoLevel = dwInfoLevel; - info.u.descr = lpInfo; + if (dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) + { + SERVICE_REQUIRED_PRIVILEGES_INFOW *privinfo = lpInfo; + WCHAR *p; + + for (p = privinfo->pmszRequiredPrivileges; *p; p += strlenW(p) + 1); + rpc_privinfo.cbRequiredPrivileges = + (p - privinfo->pmszRequiredPrivileges + 1) * sizeof(WCHAR); + rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; + info.u.privinfo = &rpc_privinfo; + } + else + info.u.descr = lpInfo; err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter)

1 0

Qian Hong : server: Map EXDEV to STATUS_NOT_SAME_DEVICE.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: d1ea82b97ead5b482de2ac4d4bd4df9bbbbd92ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ea82b97ead5b482de2ac4d… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri May 11 04:42:48 2018 +0000 server: Map EXDEV to STATUS_NOT_SAME_DEVICE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ec4b572f8ce388fbc19eae70573f8c6d1c984bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/file.c b/server/file.c index 390b072..446621a 100644 --- a/server/file.c +++ b/server/file.c @@ -671,6 +671,7 @@ void file_set_error(void) case EFBIG: set_error( STATUS_SECTION_TOO_BIG ); break; case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; + case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif

1 0