September 2018 - Wine-Commits

Alex Henrie : iphlpapi: Cast caddr_t to char* before doing pointer arithmetic.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: c6599788a6f1cff586a0d8d09e548da0c123f1ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6599788a6f1cff586a0d8d0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 28 13:54:45 2018 +0200 iphlpapi: Cast caddr_t to char* before doing pointer arithmetic. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b626f512037a8ca615b0ef4d210096df11d3663) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/ifenum.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index eed1be1..c3abdf0 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -1013,13 +1013,13 @@ static DWORD enumIPAddresses(PDWORD pcAddresses, struct ifconf *ifc) if (ioctlRet == 0) { ifPtr = ifc->ifc_buf; - while (ifPtr && ifPtr < ifc->ifc_buf + ifc->ifc_len) { + while (ifPtr && (char *)ifPtr < ifc->ifc_buf + ifc->ifc_len) { struct ifreq *ifr = (struct ifreq *)ifPtr; if (ifr->ifr_addr.sa_family == AF_INET) numAddresses++; - ifPtr += ifreq_len((struct ifreq *)ifPtr); + ifPtr = (char *)ifPtr + ifreq_len((struct ifreq *)ifPtr); } } else @@ -1074,10 +1074,10 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ret = NO_ERROR; (*ppIpAddrTable)->dwNumEntries = numAddresses; ifPtr = ifc.ifc_buf; - while (!ret && ifPtr && ifPtr < ifc.ifc_buf + ifc.ifc_len) { + while (!ret && ifPtr && (char *)ifPtr < ifc.ifc_buf + ifc.ifc_len) { struct ifreq *ifr = (struct ifreq *)ifPtr; - ifPtr += ifreq_len(ifr); + ifPtr = (char *)ifPtr + ifreq_len(ifr); if (ifr->ifr_addr.sa_family != AF_INET) continue;

1 0

André Hentschel : dbghelp: Map SIMD dwarf registers on ARM64.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

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

Alex Henrie : include: Add wmemcpy to wchar.h.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 705bb892ee5b67bb0985dc94c3b643dc84cb6dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=705bb892ee5b67bb0985dc94… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 28 15:49:55 2018 -0600 include: Add wmemcpy to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e093cbcc7146e6185895e41ddae01cbc6e4678c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/wchar.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 0bf684d..b6e9109 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -10,6 +10,7 @@ #include <crtdefs.h> #include <stdarg.h> +#include <string.h> #include <pshpack8.h> @@ -494,6 +495,11 @@ static inline int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n) return 0; } +static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t n) +{ + return memcpy(dst, src, n * sizeof(wchar_t)); +} + #ifdef __cplusplus } #endif

1 0

Alistair Leslie-Hughes : netapi32: Add DsEnumerateDomainTrustsA/W stubs.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

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

Matej Špindler : kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

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

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

Sept. 13, 2018

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

Hans Leidekker : winhttp: Fix invalid option error returned from WinHttpSetOption.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

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

Martin Storsjo : arm64: Use __builtin_ms_va_list and __attribute__((ms_abi )) on arm64.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 295359a17447d6ad487b6c652c3a98bbe17cee6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=295359a17447d6ad487b6c65… Author: Martin Storsjo <martin(a)martin.st> Date: Wed May 9 23:34:57 2018 +0300 arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64. Windows uses a different ABI for va_list on arm64 just like on x86_64. On x86_64, the calling convention for windows functions is completely different from the one on other platforms. On arm64, they're mostly the same, with the only exception being variadic functions (where all float arguments are passed in integer registers, since the va_list is a single pointer). Any functions using __builtin_ms_va_start need to be decorated with __attribute__((ms_abi)). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8fb8cc03c3edb599dd98f369e14a08f899cbff95) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 24 ++++++++++++++++++++++++ configure.ac | 7 +++++++ include/msvcrt/crtdefs.h | 6 +++++- include/windef.h | 6 +++++- include/wine/test.h | 4 ++-- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 9f17560..8a7ea65 100755 --- a/configure +++ b/configure @@ -5314,6 +5314,30 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm -mfloat-abi=$float_abi" ;; + aarch64*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 +$as_echo_n "checking whether $CC supports __builtin_ms_va_list... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdarg.h> +int +main () +{ +void func(__builtin_ms_va_list *args); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index ec2e16f..201ef0c 100644 --- a/configure.ac +++ b/configure.ac @@ -202,6 +202,13 @@ case $host in CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") ;; + aarch64*) + AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) + ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index a9edef5..0c0b087 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -62,6 +62,8 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -82,13 +84,15 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index 8a9f944..d12b14f 100644 --- a/include/windef.h +++ b/include/windef.h @@ -71,6 +71,8 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -91,13 +93,15 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/wine/test.h b/include/wine/test.h index 4ec66d5..3caff6c 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -87,7 +87,7 @@ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) #define START_TEST(name) void func_##name(void) #endif -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) #define __winetest_cdecl __cdecl #define __winetest_va_list __builtin_ms_va_list #else @@ -178,7 +178,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #include <stdio.h> #include <excpt.h> -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __winetest_va_end(list) __builtin_ms_va_end(list) #else

1 0

Marcos Gutierrez : include: Fixed casts in some HANDLE_MSG_WM_* macros.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: cb92dc2b8102bd19c36da274b6ed9721fe785e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb92dc2b8102bd19c36da274… Author: Marcos Gutierrez <sacrom(a)gmail.com> Date: Thu May 24 10:19:04 2018 +0200 include: Fixed casts in some HANDLE_MSG_WM_* macros. Signed-off-by: Marcos Gutierrez <sacrom(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 62f253b592b51f4f3515267f956e00d8e7b00937) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/windowsx.h | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index fa27b49..7a87314 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -412,7 +412,7 @@ extern "C" { ((BOOL)SendMessage((hwndCtl), EM_SCROLLCARET, 0, 0L)) #define Edit_SetHandle(hwndCtl, h) \ - ((void)SendMessage((hwndCtl), EM_SETHANDLE, (WPARAM)(UINT)(HLOCAL)(h), 0L)) + ((void)SendMessage((hwndCtl), EM_SETHANDLE, (WPARAM)(HLOCAL)(h), 0L)) #define Edit_SetModify(hwndCtl, fModified) \ ((void)SendMessage((hwndCtl), EM_SETMODIFY, (WPARAM)(UINT)(fModified), 0L)) @@ -1081,9 +1081,9 @@ extern "C" { /* HANDLE Cls_OnRenderFormat(HWND hwnd, UINT fmt) */ #define HANDLE_WM_RENDERFORMAT(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HANDLE)(fn)((hwnd), (UINT)(wParam)) + (LRESULT)(UINT_PTR)(HANDLE)(fn)((hwnd), (UINT)(wParam)) #define FORWARD_WM_RENDERFORMAT(hwnd, fmt, fn) \ - (HANDLE)(UINT)(DWORD)(fn)((hwnd), WM_RENDERFORMAT, (WPARAM)(UINT)(fmt), 0L) + (HANDLE)(UINT_PTR)(fn)((hwnd), WM_RENDERFORMAT, (WPARAM)(UINT)(fmt), 0L) /* void Cls_OnRenderAllFormats(HWND hwnd) */ #define HANDLE_WM_RENDERALLFORMATS(hwnd, wParam, lParam, fn) ((fn)(hwnd), 0L) @@ -1174,7 +1174,7 @@ extern "C" { #define HANDLE_WM_MDINEXT(hwnd, wParam, lParam, fn) \ (LRESULT)(HWND)(fn)((hwnd), (HWND)(wParam), (BOOL)lParam) #define FORWARD_WM_MDINEXT(hwnd, hwndCur, fPrev, fn) \ - (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDINEXT, (WPARAM)(hwndCur), (LPARAM)(fPrev)) + (HWND)(UINT_PTR)(fn)((hwnd), WM_MDINEXT, (WPARAM)(hwndCur), (LPARAM)(fPrev)) /* void Cls_MDIMaximize(HWND hwnd, HWND hwndMaximize) */ #define HANDLE_WM_MDIMAXIMIZE(hwnd, wParam, lParam, fn) \ @@ -1202,15 +1202,15 @@ extern "C" { /* HWND Cls_MDIGetActive(HWND hwnd) */ #define HANDLE_WM_MDIGETACTIVE(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(fn)(hwnd) + (LRESULT)(UINT_PTR)(fn)(hwnd) #define FORWARD_WM_MDIGETACTIVE(hwnd, fn) \ - (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDIGETACTIVE, 0L, 0L) + (HWND)(UINT_PTR)(fn)((hwnd), WM_MDIGETACTIVE, 0L, 0L) /* HMENU Cls_MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow) */ #define HANDLE_WM_MDISETMENU(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(fn)((hwnd), (BOOL)(wParam), (HMENU)(wParam), (HMENU)(lParam)) + (LRESULT)(UINT_PTR)(fn)((hwnd), (BOOL)(wParam), (HMENU)(wParam), (HMENU)(lParam)) #define FORWARD_WM_MDISETMENU(hwnd, fRefresh, hmenuFrame, hmenuWindow, fn) \ - (HMENU)(UINT)(DWORD)(fn)((hwnd), WM_MDISETMENU, (WPARAM)((fRefresh) ? (hmenuFrame) : 0), (LPARAM)(hmenuWindow)) + (HMENU)(UINT_PTR)(fn)((hwnd), WM_MDISETMENU, (WPARAM)((fRefresh) ? (hmenuFrame) : 0), (LPARAM)(hmenuWindow)) /* void Cls_OnChildActivate(HWND hwnd) */ #define HANDLE_WM_CHILDACTIVATE(hwnd, wParam, lParam, fn) \ @@ -1226,9 +1226,9 @@ extern "C" { /* HWND Cls_OnNextDlgCtl(HWND hwnd, HWND hwndSetFocus, BOOL fNext) */ #define HANDLE_WM_NEXTDLGCTL(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HWND)(fn)((hwnd), (HWND)(wParam), (BOOL)(lParam)) + (LRESULT)(UINT_PTR)(HWND)(fn)((hwnd), (HWND)(wParam), (BOOL)(lParam)) #define FORWARD_WM_NEXTDLGCTL(hwnd, hwndSetFocus, fNext, fn) \ - (HWND)(UINT)(DWORD)(fn)((hwnd), WM_NEXTDLGCTL, (WPARAM)(HWND)(hwndSetFocus), (LPARAM)(fNext)) + (HWND)(UINT_PTR)(fn)((hwnd), WM_NEXTDLGCTL, (WPARAM)(HWND)(hwndSetFocus), (LPARAM)(fNext)) /* void Cls_OnParentNotify(HWND hwnd, UINT msg, HWND hwndChild, int idChild) */ #define HANDLE_WM_PARENTNOTIFY(hwnd, wParam, lParam, fn) \ @@ -1250,39 +1250,39 @@ extern "C" { /* HBRUSH Cls_OnCtlColor(HWND hwnd, HDC hdc, HWND hwndChild, int type) */ #define HANDLE_WM_CTLCOLORMSGBOX(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_MSGBOX) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_MSGBOX) #define FORWARD_WM_CTLCOLORMSGBOX(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORMSGBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORMSGBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLOREDIT(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_EDIT) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_EDIT) #define FORWARD_WM_CTLCOLOREDIT(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLOREDIT, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLOREDIT, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORLISTBOX(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_LISTBOX) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_LISTBOX) #define FORWARD_WM_CTLCOLORLISTBOX(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORLISTBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORLISTBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORBTN(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_BTN) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_BTN) #define FORWARD_WM_CTLCOLORBTN(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORBTN, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORBTN, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORDLG(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_DLG) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_DLG) #define FORWARD_WM_CTLCOLORDLG(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORDLG, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORDLG, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORSCROLLBAR(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_SCROLLBAR) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_SCROLLBAR) #define FORWARD_WM_CTLCOLORSCROLLBAR(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORSCROLLBAR, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORSCROLLBAR, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORSTATIC(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_STATIC) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_STATIC) #define FORWARD_WM_CTLCOLORSTATIC(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORSTATIC, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORSTATIC, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) /* void Cls_OnDeleteItem(HWND hwnd, const DELETEITEMSTRUCT * lpDeleteItem) */ #define HANDLE_WM_DELETEITEM(hwnd, wParam, lParam, fn) \ @@ -1366,8 +1366,8 @@ extern "C" { (UINT)(DWORD)(fn)((hwnd), WM_NCHITTEST, 0L, MAKELPARAM((x), (y))) /* HFONT Cls_OnGetFont(HWND hwnd) */ -#define HANDLE_WM_GETFONT(hwnd, wParam, lParam, fn) (LRESULT)(DWORD)(UINT)(HFONT)(fn)(hwnd) -#define FORWARD_WM_GETFONT(hwnd, fn) (HFONT)(UINT)(DWORD)(fn)((hwnd), WM_GETFONT, 0L, 0L) +#define HANDLE_WM_GETFONT(hwnd, wParam, lParam, fn) (LRESULT)(UINT_PTR)(HFONT)(fn)(hwnd) +#define FORWARD_WM_GETFONT(hwnd, fn) (HFONT)(UINT_PTR)(fn)((hwnd), WM_GETFONT, 0L, 0L) /* void Cls_OnSetFont(HWND hwndCtl, HFONT hfont, BOOL fRedraw) */ #define HANDLE_WM_SETFONT(hwnd, wParam, lParam, fn) \

1 0

Alex Henrie : include: Add wmemchr to wchar.h.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: d04baa1655de9940df8f06f45f8467cddb825c05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d04baa1655de9940df8f06f4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 27 21:05:52 2018 -0600 include: Add wmemchr to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e1bfd4b4cb9c05039e29ae769d1582b63ed6fe46) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/wchar.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 7f5428f..8f184e7 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -475,6 +475,14 @@ size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*); size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); int __cdecl wctob(wint_t); +static inline wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) +{ + const wchar_t *end; + for (end = s + n; s < end; s++) + if (*s == c) return (wchar_t*)s; + return NULL; +} + #ifdef __cplusplus } #endif

1 0