wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Sebastian Lackner : server: Fix handling of MAXIMUM_ALLOWED in token_access_check.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 0e42bce0b6bd606565de64158348725efa65bb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e42bce0b6bd606565de64158… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 3 09:57:10 2017 +0100 server: Fix handling of MAXIMUM_ALLOWED in token_access_check. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 6 ++++++ server/token.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f339607..3250544 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1376,6 +1376,12 @@ static void test_AccessCheck(void) ok(AccessStatus && (Access == KEY_READ), "AccessCheck failed to grant access with error %d\n", GetLastError()); + ret = AccessCheck(SecurityDescriptor, Token, MAXIMUM_ALLOWED, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); + ok(AccessStatus && (Access == KEY_ALL_ACCESS), + "AccessCheck failed to grant access with error %d\n", + GetLastError()); /* sd with blank dacl */ ret = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); diff --git a/server/token.c b/server/token.c index 8c5e836..9489529 100644 --- a/server/token.c +++ b/server/token.c @@ -844,7 +844,10 @@ static unsigned int token_access_check( struct token *token, if (!dacl_present || !dacl) { if (priv_count) *priv_count = 0; - *granted_access = desired_access; + if (desired_access & MAXIMUM_ALLOWED) + *granted_access = mapping->GenericAll; + else + *granted_access = desired_access; return *status = STATUS_SUCCESS; }

1 0

Andrew Wesie : ntdll: Prevent NULL dereference in NtSuspendThread.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: a39d67d8c914d9c34725e1265fdf933614c6726b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39d67d8c914d9c34725e1265… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Feb 3 04:20:39 2017 -0600 ntdll: Prevent NULL dereference in NtSuspendThread. Overwatch calls NtSuspendThread directly, and expects to be able to pass in a NULL pointer for the count argument. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6127c8f..e3cc11a 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -632,7 +632,10 @@ NTSTATUS WINAPI NtSuspendThread( HANDLE handle, PULONG count ) SERVER_START_REQ( suspend_thread ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) *count = reply->count; + if (!(ret = wine_server_call( req ))) + { + if (count) *count = reply->count; + } } SERVER_END_REQ; return ret; @@ -650,7 +653,10 @@ NTSTATUS WINAPI NtResumeThread( HANDLE handle, PULONG count ) SERVER_START_REQ( resume_thread ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) *count = reply->count; + if (!(ret = wine_server_call( req ))) + { + if (count) *count = reply->count; + } } SERVER_END_REQ; return ret;

1 0

Francois Gouget : hid/tests: Remove a space before a '\n'.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: e829de27fd56cf1bb4654e2ed0db293834a5aa95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e829de27fd56cf1bb4654e2ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:22:19 2017 +0100 hid/tests: Remove a space before a '\n'. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 91fade4..e72a500 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -204,7 +204,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D status = HidP_GetValueCaps(HidP_Input, values, &length, ppd); ok(status == HIDP_STATUS_SUCCESS, "Failed to get value caps (%x)\n",status); - trace("\tValues: \n"); + trace("\tValues:\n"); for (i = 0; i < length; i++) { status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0,

1 0

Francois Gouget : wlanapi: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 71f08b364fc829d99c3b02b5a4b2fc9a6059792d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f08b364fc829d99c3b02b5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:22:05 2017 +0100 wlanapi: Add a trailing '\n' to a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 303d173..3fae765 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -119,7 +119,7 @@ void *WINAPI WlanAllocateMemory(DWORD size) { void *ret; - TRACE("(%d)", size); + TRACE("(%d)\n", size); if (!size) {

1 0

Francois Gouget : include: Add a couple more UI language APIs.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 34784f0aa8ec451695ecc28fc9bab16c10c130a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34784f0aa8ec451695ecc28fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:21:50 2017 +0100 include: Add a couple more UI language APIs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index d6fcf6e..470acf84 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -909,6 +909,7 @@ WINBASEAPI INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMT WINBASEAPI INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,INT); #define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat) WINBASEAPI UINT WINAPI GetOEMCP(void); +WINBASEAPI BOOL WINAPI GetProcessPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); WINBASEAPI BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD); @@ -956,6 +957,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR); WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); #define SetLocaleInfo WINELIB_NAME_AW(SetLocaleInfo) WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); +WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL);

1 0

Owen Rudge : advapi32/tests: Add test of LsaLookupSids buffer behaviour.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: bbe6233734d24c96d87aaf1f783f1eca794f0d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe6233734d24c96d87aaf1f7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Feb 2 10:30:55 2017 +0000 advapi32/tests: Add test of LsaLookupSids buffer behaviour. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 1a0d211..4daf75f 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -42,8 +42,10 @@ static NTSTATUS (WINAPI *pLsaFreeMemory)(PVOID); static NTSTATUS (WINAPI *pLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); static NTSTATUS (WINAPI *pLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID,LPSTR*); +static BOOL (WINAPI *pConvertStringSidToSidA)(LPCSTR,PSID*); static NTSTATUS (WINAPI *pLsaLookupNames2)(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); static NTSTATUS (WINAPI *pLsaLookupSids)(LSA_HANDLE,ULONG,PSID*,LSA_REFERENCED_DOMAIN_LIST**,LSA_TRANSLATED_NAME**); +static PVOID (WINAPI *pFreeSid)(PSID); static BOOL init(void) { @@ -55,10 +57,12 @@ static BOOL init(void) pLsaOpenPolicy = (void*)GetProcAddress(hadvapi32, "LsaOpenPolicy"); pLsaQueryInformationPolicy = (void*)GetProcAddress(hadvapi32, "LsaQueryInformationPolicy"); pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + pConvertStringSidToSidA = (void*)GetProcAddress(hadvapi32, "ConvertStringSidToSidA"); pLsaLookupNames2 = (void*)GetProcAddress(hadvapi32, "LsaLookupNames2"); pLsaLookupSids = (void*)GetProcAddress(hadvapi32, "LsaLookupSids"); + pFreeSid = (void*)GetProcAddress(hadvapi32, "FreeSid"); - if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) + if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA && pConvertStringSidToSidA && pFreeSid) return TRUE; return FALSE; @@ -405,6 +409,48 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); } +static void test_LsaLookupSids_NullBuffers(void) +{ + LSA_REFERENCED_DOMAIN_LIST *list; + LSA_OBJECT_ATTRIBUTES attrs; + LSA_TRANSLATED_NAME *names; + LSA_HANDLE policy; + NTSTATUS status; + BOOL ret; + PSID sid; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = pLsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ret = pConvertStringSidToSidA("S-1-1-0", &sid); + ok(ret == TRUE, "pConvertStringSidToSidA returned false\n"); + + status = pLsaLookupSids(policy, 1, &sid, &list, &names); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ok(list->Entries > 0, "got %d\n", list->Entries); + + if (list->Entries) + { + ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); + ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); + ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, + list->Domains[0].Name.Length); + ok(list->Domains[0].Name.Buffer != NULL, "domain[0] name buffer is null\n"); + } + + pLsaFreeMemory(names); + pLsaFreeMemory(list); + + pFreeSid(sid); + + status = pLsaClose(policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); +} + START_TEST(lsa) { if (!init()) { @@ -415,4 +461,5 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); + test_LsaLookupSids_NullBuffers(); }

1 0

Owen Rudge : advapi32: Return null-terminated buffer instead of null pointer for LsaLookupSids domains.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 02ad092868adaba619b8ef1ac31f3e04d67d1b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ad092868adaba619b8ef1ac… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Feb 2 10:30:44 2017 +0000 advapi32: Return null-terminated buffer instead of null pointer for LsaLookupSids domains. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 2a8b791..3da6d19 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -514,14 +514,15 @@ NTSTATUS WINAPI LsaLookupSids( { (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR); (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR); - name_fullsize += (*Names)[i].Name.MaximumLength; } else { (*Names)[i].Name.Length = 0; - (*Names)[i].Name.MaximumLength = 0; + (*Names)[i].Name.MaximumLength = sizeof(WCHAR); } + name_fullsize += (*Names)[i].Name.MaximumLength; + /* This potentially allocates more than needed, cause different names will reuse same domain index. Also it's not possible to store domain name length right here for the same reason. */ if (domain_size) @@ -546,6 +547,13 @@ NTSTATUS WINAPI LsaLookupSids( heap_free(name); } + else + { + /* If we don't have a domain name, use a zero-length entry rather than a null value. */ + domain_fullsize += sizeof(WCHAR); + domain.Length = 0; + domain.MaximumLength = sizeof(WCHAR); + } } } @@ -572,18 +580,22 @@ NTSTATUS WINAPI LsaLookupSids( { domain.Length = (domain_size - 1) * sizeof(WCHAR); domain.MaximumLength = domain_size * sizeof(WCHAR); - domain.Buffer = heap_alloc(domain.MaximumLength); } + else + { + /* Use a zero-length buffer */ + domain.Length = 0; + domain.MaximumLength = sizeof(WCHAR); + } + + domain.Buffer = heap_alloc(domain.MaximumLength); (*Names)[i].Name.Buffer = name_buffer; LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use); (*Names)[i].Use = use; - if (domain_size) - { - (*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data); - heap_free(domain.Buffer); - } + (*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data); + heap_free(domain.Buffer); } name_buffer += name_size;

1 0

Austin English : dhcpsvc: Add DhcpRequestParams stub.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: a2ff4f37fd10f95e8ebcd18cbe2fd477ba18523c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ff4f37fd10f95e8ebcd18cb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 2 06:53:30 2017 +0000 dhcpsvc: Add DhcpRequestParams stub. Based on a patch by Mike Ellery. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/dhcpcsvc.c | 10 ++++++++++ dlls/dhcpcsvc/dhcpcsvc.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index 3600680..20ff589 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "dhcpcsdk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); @@ -37,3 +38,12 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, + BYTE *buffer, DWORD *size, WCHAR *requestidstr ) +{ + FIXME("(%08x, %p, %s, %p, %u, %u, %p, %p, %s): stub\n", flags, reserved, debugstr_w(adaptername), classid, + sendparams.nParams, recdparams.nParams, buffer, size, debugstr_w(requestidstr)); + return ERROR_SUCCESS; +} diff --git a/dlls/dhcpcsvc/dhcpcsvc.spec b/dlls/dhcpcsvc/dhcpcsvc.spec index 97194a6..3e85cb2 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.spec +++ b/dlls/dhcpcsvc/dhcpcsvc.spec @@ -31,7 +31,7 @@ @ stub DhcpRenewIpAddressLeaseEx @ stub DhcpRequestCachedParams @ stub DhcpRequestOptions -@ stub DhcpRequestParams +@ stdcall DhcpRequestParams(long ptr wstr ptr int64 int64 ptr ptr wstr) @ stub DhcpSetMSFTVendorSpecificOptions @ stub DhcpStaticRefreshParams @ stub DhcpUndoRequestParams

1 0

Alistair Leslie-Hughes : include: Add dhcpcsdk.h.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: c84e6fb3e50946fa235d69e0275ea6ace77a013b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84e6fb3e50946fa235d69e02… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 2 06:53:17 2017 +0000 include: Add dhcpcsdk.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dhcpcsdk.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 401b02b..9f615cd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -313,6 +313,7 @@ HEADER_SRCS = \ devguid.h \ devpkey.h \ devpropdef.h \ + dhcpcsdk.h \ difxapi.h \ digitalv.h \ dinput.h \ diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h new file mode 100644 index 0000000..93c7af6 --- /dev/null +++ b/include/dhcpcsdk.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _DHCPCSDK_ +#define _DHCPCSDK_ + +typedef struct _DHCPAPI_PARAMS +{ + ULONG Flags; + ULONG OptionId; + BOOL IsVendor; + BYTE *Data; + DWORD nBytesData; +} DHCPAPI_PARAMS, *PDHCPAPI_PARAMS, *LPDHCPAPI_PARAMS; + +typedef struct _DHCPAPI_PARAMS DHCPCAPI_PARAMS, *PDHCPCAPI_PARAMS, *LPDHCPCAPI_PARAMS; + +typedef struct _DHCPCAPI_PARAMS_ARARAY +{ + ULONG nParams; + LPDHCPCAPI_PARAMS Params; +} DHCPCAPI_PARAMS_ARRAY, *PDHCPCAPI_PARAMS_ARRAY, *LPDHCPCAPI_PARAMS_ARRAY; + +typedef struct _DHCPCAPI_CLASSID +{ + ULONG Flags; + BYTE *Data; + ULONG nBytesData; +} DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID; + + +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, + BYTE *buffer, DWORD *size, WCHAR *requestidstr ); + +#endif

1 0

Fabian Maurer : user32: Don' t send WM_CHAR when a menu gets VK_ESCAPE and add tests.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 115bbf424cc0f5ea325e3052aed8ad8106045294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=115bbf424cc0f5ea325e3052a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Feb 2 16:33:54 2017 +0100 user32: Don't send WM_CHAR when a menu gets VK_ESCAPE and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 2 +- dlls/user32/tests/msg.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 59fcd9c..827bee7 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3077,7 +3077,6 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, break; } - TranslateMessage( &msg ); mt.pt = msg.pt; if ( (msg.hwnd==menu->hWnd) || (msg.message!=WM_TIMER) ) @@ -3206,6 +3205,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, } default: + TranslateMessage( &msg ); break; } break; /* WM_KEYDOWN */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 45b5222..c608c11 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1675,6 +1675,10 @@ static const struct message WmTrackPopupMenu[] = { { 0 } }; +static const struct message WmTrackPopupMenuEsc[] = { + { 0 } +}; + static const struct message WmTrackPopupMenuCapture[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -15637,6 +15641,7 @@ static LRESULT WINAPI cancel_init_proc(HWND hwnd, UINT message, WPARAM wParam, L static void test_TrackPopupMenu(void) { + MSG msg; HWND hwnd; BOOL ret; @@ -15659,6 +15664,20 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE); ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + /* Test popup closing with an ESC-press */ + flush_events(); + PostMessageW(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + PostQuitMessage(0); + flush_sequence(); + while ( PeekMessageA(&msg, 0, 0, 0, PM_REMOVE) ) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + ok_sequence(WmTrackPopupMenuEsc, "TrackPopupMenuEsc", FALSE); /* Shouldn't get any message */ + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_init_proc); flush_events();

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017