February 2016 - Wine-commits

Charles Davis : winemac.drv: Don't print 32-bit values as long integers ( Clang).
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: d2f7becc0f1394a8369f667f97096ceaa0db2122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f7becc0f1394a8369f667f9… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 13:17:03 2016 -0700 winemac.drv: Don't print 32-bit values as long integers (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/keyboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 6f38885..6680e6b 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1545,7 +1545,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState INT ret = 0; int keyc; BOOL is_menu = (flags & 0x1); - OSStatus status; + int status; const UCKeyboardLayout *uchr; UInt16 keyAction; UInt32 modifierKeyState; @@ -1664,7 +1664,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState &len, bufW); if (status != noErr) { - ERR_(key)("Couldn't translate keycode 0x%04x, status %ld\n", keyc, status); + ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status); goto done; } if (!is_menu) @@ -1687,7 +1687,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState &savedDeadKeyState, bufW_size, &len, bufW); if (status != noErr) { - ERR_(key)("Couldn't translate keycode 0x%04x, status %ld\n", keyc, status); + ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status); goto done; }

1 0

Charles Davis : secur32: Don't print 32-bit values as long integers (Clang ).
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: c1d61f649d9c7fc6b6d6a78adebbe68c4b4a88af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d61f649d9c7fc6b6d6a78ad… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 15:08:02 2016 -0700 secur32: Don't print 32-bit values as long integers (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index cfd2371..1c9b35d 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -362,14 +362,14 @@ static const struct cipher_suite* get_cipher_suite(SSLCipherSuite cipher_suite) static DWORD schan_get_session_protocol(struct mac_session* s) { SSLProtocol protocol; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLGetNegotiatedProtocolVersion(s->context, &protocol); if (status != noErr) { - ERR("Failed to get session protocol: %ld\n", status); + ERR("Failed to get session protocol: %d\n", status); return 0; } @@ -652,7 +652,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre { struct mac_session *s; unsigned i; - OSStatus status; + int status; TRACE("(%p)\n", session); @@ -663,21 +663,21 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { - ERR("Failed to create session context: %ld\n", (long)status); + ERR("Failed to create session context: %d\n", status); goto fail; } status = SSLSetConnection(s->context, s); if (status != noErr) { - ERR("Failed to set session connection: %ld\n", (long)status); + ERR("Failed to set session connection: %d\n", status); goto fail; } status = SSLSetEnableCertVerify(s->context, FALSE); if (status != noErr) { - ERR("Failed to disable certificate verification: %ld\n", (long)status); + ERR("Failed to disable certificate verification: %d\n", status); goto fail; } @@ -689,7 +689,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) != 0); if (status != noErr) { - ERR("Failed to set SSL version %d: %ld\n", protocol_priority_flags[i].mac_version, (long)status); + ERR("Failed to set SSL version %d: %d\n", protocol_priority_flags[i].mac_version, status); goto fail; } } @@ -697,7 +697,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre status = SSLSetIOFuncs(s->context, schan_pull_adapter, schan_push_adapter); if (status != noErr) { - ERR("Failed to set session I/O funcs: %ld\n", (long)status); + ERR("Failed to set session I/O funcs: %d\n", status); goto fail; } @@ -714,13 +714,13 @@ fail: void schan_imp_dispose_session(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLDisposeContext(s->context); if (status != noErr) - ERR("Failed to dispose of session context: %ld\n", status); + ERR("Failed to dispose of session context: %d\n", status); HeapFree(GetProcessHeap(), 0, s); } @@ -746,7 +746,7 @@ void schan_imp_set_session_target(schan_imp_session session, const char *target) SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); @@ -768,7 +768,7 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) } else { - ERR("Handshake failed: %ld\n", (long)status); + ERR("Handshake failed: %d\n", status); cssmPerror("SSLHandshake", status); return SEC_E_INTERNAL_ERROR; } @@ -782,14 +782,14 @@ unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) struct mac_session* s = (struct mac_session*)session; SSLCipherSuite cipherSuite; const struct cipher_suite* c; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLGetNegotiatedCipher(s->context, &cipherSuite); if (status != noErr) { - ERR("Failed to get session cipher suite: %ld\n", status); + ERR("Failed to get session cipher suite: %d\n", status); return 0; } @@ -838,14 +838,14 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, struct mac_session* s = (struct mac_session*)session; SSLCipherSuite cipherSuite; const struct cipher_suite* c; - OSStatus status; + int status; TRACE("(%p/%p, %p)\n", s, s->context, info); status = SSLGetNegotiatedCipher(s->context, &cipherSuite); if (status != noErr) { - ERR("Failed to get session cipher suite: %ld\n", status); + ERR("Failed to get session cipher suite: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -883,7 +883,7 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session PCCERT_CONTEXT cert = NULL; SecCertificateRef mac_cert; CFArrayRef cert_array; - OSStatus status; + int status; CFIndex cnt, i; CFDataRef data; BOOL res; @@ -897,7 +897,7 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session #endif if (status != noErr || !cert_array) { - WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); + WARN("SSLCopyPeerCertificates failed: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -942,7 +942,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { struct mac_session* s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); @@ -961,7 +961,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, } else { - WARN("SSLWrite failed: %ld\n", (long)status); + WARN("SSLWrite failed: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -972,7 +972,7 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) { struct mac_session* s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); @@ -991,7 +991,7 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, } else { - WARN("SSLRead failed: %ld\n", (long)status); + WARN("SSLRead failed: %d\n", status); return SEC_E_INTERNAL_ERROR; }

1 0

Charles Davis : quartz: Remove unused variable (Clang).
by Alexandre Julliard 19 Feb '16

19 Feb '16

Module: wine Branch: master Commit: 51ed908467ecd8299333456ef8b2fcfb7a13ea56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ed908467ecd8299333456ef… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 13:22:34 2016 -0700 quartz: Remove unused variable (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 0a2c507..7212807 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -844,25 +844,3 @@ HRESULT WINAPI PullPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE return SendFurther( iface, deliver_newsegment, &args, NULL ); } - -static const IPinVtbl PullPin_Vtbl = -{ - PullPin_QueryInterface, - BasePinImpl_AddRef, - PullPin_Release, - BaseInputPinImpl_Connect, - PullPin_ReceiveConnection, - PullPin_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - PullPin_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - PullPin_EndOfStream, - PullPin_BeginFlush, - PullPin_EndFlush, - PullPin_NewSegment -};

1 0

Sebastian Lackner : mshtml/tests: Fix operator priority in ok() condition.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 11c2f370b6b7ca0d41236eb8b3b0e82c0b717f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c2f370b6b7ca0d41236eb8b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 06:36:14 2016 +0100 mshtml/tests: Fix operator priority in ok() condition. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 71519ed..904322e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6355,7 +6355,7 @@ static void _test_QueryStatus(unsigned line, IUnknown *unk, REFIID cgid, ULONG c return; hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); - ok(hres == cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED, "QueryStatus(%u) failed: %08x\n", cmdid, hres); + ok(hres == (cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED), "QueryStatus(%u) failed: %08x\n", cmdid, hres); IOleCommandTarget_Release(cmdtrg);

1 0

Sebastian Lackner : vbscript/tests: Fix operator priority in ok() condition.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 39dfd38d82230f2bd0874d2c914a0c3f0c5b5c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dfd38d82230f2bd0874d2c9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 06:36:32 2016 +0100 vbscript/tests: Fix operator priority in ok() condition. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d8c5467..5662719 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -561,7 +561,7 @@ static void test_safearray(SAFEARRAY *safearray, unsigned indims) ok(!safearray->cLocks, "safearray->cLocks = %x\n", safearray->cLocks); for(i=0; i < safearray->cDims; i++) { - ok(safearray->rgsabound[i].cElements == indims ? i+4 : 1, "safearray->rgsabound[%d].cElements = %d\n", i, + ok(safearray->rgsabound[i].cElements == (indims ? i+4 : 1), "safearray->rgsabound[%d].cElements = %d\n", i, safearray->rgsabound[i].cElements); ok(!safearray->rgsabound[i].lLbound, "safearray->rgsabound[%d].lLbound = %d\n", i, safearray->rgsabound[i].lLbound); }

1 0

Charles Davis : advapi32: Don't print 32-bit values as long integers.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 09b14675755619f77eefe5df682165ca97995524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b14675755619f77eefe5df6… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Wed Feb 17 14:35:09 2016 -0700 advapi32: Don't print 32-bit values as long integers. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/cred.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 10e58eb..7fa1a0b 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -239,7 +239,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require PCREDENTIALW credential, char *buffer, DWORD *len) { - OSStatus status; + int status; UInt32 i, cred_blob_len; void *cred_blob; WCHAR *user = NULL; @@ -260,7 +260,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require } if (status != noErr) { - WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); + WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); return ERROR_NOT_FOUND; } @@ -371,7 +371,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require } break; default: - FIXME("unhandled attribute %lu\n", attr_list->attr[i].tag); + FIXME("unhandled attribute %u\n", (unsigned)attr_list->attr[i].tag); break; } } @@ -496,7 +496,7 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, #ifdef __APPLE__ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_blob) { - OSStatus status; + int status; SecKeychainItemRef keychain_item; char *username, *password, *servername; UInt32 userlen, pwlen, serverlen; @@ -529,13 +529,13 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b status = SecKeychainAddGenericPassword(NULL, strlen(servername), servername, strlen(username), username, strlen(password), password, &keychain_item); if (status != noErr) - ERR("SecKeychainAddGenericPassword returned %ld\n", status); + ERR("SecKeychainAddGenericPassword returned %d\n", status); if (status == errSecDuplicateItem) { status = SecKeychainFindGenericPassword(NULL, strlen(servername), servername, strlen(username), username, NULL, NULL, &keychain_item); if (status != noErr) - ERR("SecKeychainFindGenericPassword returned %ld\n", status); + ERR("SecKeychainFindGenericPassword returned %d\n", status); } heap_free(username); heap_free(servername); @@ -774,7 +774,7 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials { SecKeychainSearchRef search; SecKeychainItemRef item; - OSStatus status; + int status; Boolean saved_user_interaction_allowed; DWORD ret; @@ -797,7 +797,7 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); if (status != noErr) { - WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); + WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); continue; } if (buffer) @@ -830,14 +830,14 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials CFRelease(search); } else - ERR("SecKeychainSearchCreateFromAttributes returned status %ld\n", status); + ERR("SecKeychainSearchCreateFromAttributes returned status %d\n", status); SecKeychainSetUserInteractionAllowed(saved_user_interaction_allowed); return ERROR_SUCCESS; } static DWORD mac_delete_credential(LPCWSTR TargetName) { - OSStatus status; + int status; SecKeychainSearchRef search; status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); if (status == noErr) @@ -856,7 +856,7 @@ static DWORD mac_delete_credential(LPCWSTR TargetName) status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); if (status != noErr) { - WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); + WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); continue; } if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr) @@ -1425,7 +1425,7 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW #ifdef __APPLE__ if (Type == CRED_TYPE_DOMAIN_PASSWORD) { - OSStatus status; + int status; SecKeychainSearchRef search; status = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, NULL, &search); if (status == noErr) @@ -1445,7 +1445,7 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW len = sizeof(**Credential); if (status != noErr) { - WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); + WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", status); continue; } if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServiceItemAttr)

1 0

Piotr Caban : user32: Select text control content while setting dialog focus.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 73ee2a8b4f7d13701c756721b2b9b92b4ddabd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ee2a8b4f7d13701c756721b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 16 14:49:10 2016 +0100 user32: Select text control content while setting dialog focus. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 4 ++++ dlls/user32/tests/dialog.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/tests/resource.rc | 8 ++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8340850..e841152 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -707,7 +707,11 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, focus = GetNextDlgTabItem( hwnd, 0, FALSE ); if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (focus) + { + if (SendMessageW( focus, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) + SendMessageW( focus, EM_SETSEL, 0, MAXLONG ); SetFocus( focus ); + } } } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index eede834..a6cd1be 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -786,7 +786,8 @@ static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, switch (uiMsg) { case WM_INITDIALOG: - return TRUE; + SetWindowTextA(GetDlgItem(hDlg, 200), "new caption"); + return TRUE; case WM_COMMAND: if (LOWORD(wParam) == 200) @@ -958,6 +959,34 @@ static void test_focus(void) DestroyWindow(hDlg); } + + /* Test 5: + * Select textbox's text on creation */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND edit; + DWORD selectionStart = 0xdead, selectionEnd = 0xbeef; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_3", (LPCSTR)RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + edit = GetDlgItem(hDlg, 200); + + ok(GetFocus() == edit, "Focus not set to edit, focus=%p, dialog=%p, edit=%p\n", + GetFocus(), hDlg, edit); + SendMessageA(edit, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 11, + "Text selection after WM_SETFOCUS is [%i, %i) expected [0, 11)\n", + selectionStart, selectionEnd); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void) diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index be47038..fdef5a9 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -107,6 +107,14 @@ FONT 8, "MS Shell Dlg" LTEXT "Hello world", 200,4,4,50,14 } +FOCUS_TEST_DIALOG_3 DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test dialog" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT 200,4,4,50,14 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0

Piotr Caban : user32/tests: Add more dialog creation message tests.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: e7aabc640daff9ec3139e3a755b969a013335411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7aabc640daff9ec3139e3a75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 16 14:49:23 2016 +0100 user32/tests: Add more dialog creation message tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d15a8e7..1ef7841 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11901,6 +11901,47 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR return 1; } +static WNDPROC orig_edit_proc; +static LRESULT WINAPI dlg_creation_edit_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wp; + msg.lParam = lp; + msg.descr = "edit"; + add_message(&msg); + + return CallWindowProcW(orig_edit_proc, hwnd, message, wp, lp); +} + +static INT_PTR WINAPI test_dlg_proc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam|parent; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "dialog"; + add_message(&msg); + + if (message == WM_INITDIALOG) + { + orig_edit_proc = (WNDPROC)SetWindowLongPtrW(GetDlgItem(hwnd, 200), + GWLP_WNDPROC, (LONG_PTR)dlg_creation_edit_proc); + } + + return 1; +} + static const struct message WmDefDlgSetFocus_1[] = { { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, { WM_GETTEXTLENGTH, sent|wparam|lparam|optional, 0, 0 }, /* XP */ @@ -11959,6 +12000,30 @@ static const struct message WmCreateDialogParamSeq_2[] = { { 0 } }; +static const struct message WmCreateDialogParamSeq_3[] = { + { HCBT_CREATEWND, hook }, + { WM_SETFONT, sent|parent }, + { WM_INITDIALOG, sent|parent }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { EM_SETSEL, sent|wparam|lparam, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { HCBT_ACTIVATE, hook }, + { WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */ + { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, + { WM_NCACTIVATE, sent|parent }, + { WM_ACTIVATE, sent|parent|wparam, 1 }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|parent|wparam, MAKELONG(200, EN_SETFOCUS) }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_USER, sent|parent }, + { WM_CHANGEUISTATE, sent|parent|optional }, + { 0 } +}; + static void test_dialog_messages(void) { WNDCLASSA cls; @@ -12061,6 +12126,13 @@ static void test_dialog_messages(void) DestroyWindow(hdlg); flush_sequence(); + hdlg = CreateDialogParamA(0, "FOCUS_TEST_DIALOG_3", 0, test_dlg_proc2, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_3, "CreateDialogParam_3", TRUE); + EndDialog(hdlg, 0); + DestroyWindow(hdlg); + flush_sequence(); + UnregisterClassA(cls.lpszClassName, cls.hInstance); }

1 0

Alexandre Julliard : user32/tests: Add another test for dialog creation messages without DefDlgProc.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: c1ed920e151c4ecc06bd64a8df1139815e47ac47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ed920e151c4ecc06bd64a8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 22:18:56 2016 +0900 user32/tests: Add another test for dialog creation messages without DefDlgProc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 74 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 ++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1ef7841..3d4bea5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11942,6 +11942,35 @@ static INT_PTR WINAPI test_dlg_proc2(HWND hwnd, UINT message, WPARAM wParam, LPA return 1; } +static INT_PTR WINAPI test_dlg_proc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + ok( 0, "should not be called since DefDlgProc is not used\n" ); + return 0; +} + +static LRESULT WINAPI test_dlg_proc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (!ignore_message( message )) + { + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam|parent; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "dialog"; + add_message(&msg); + } + if (message == WM_INITDIALOG) + { + orig_edit_proc = (WNDPROC)SetWindowLongPtrW(GetDlgItem(hwnd, 200), + GWLP_WNDPROC, (LONG_PTR)dlg_creation_edit_proc); + return 1; + } + return DefWindowProcW( hwnd, message, wParam, lParam ); +} + static const struct message WmDefDlgSetFocus_1[] = { { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, { WM_GETTEXTLENGTH, sent|wparam|lparam|optional, 0, 0 }, /* XP */ @@ -12024,6 +12053,41 @@ static const struct message WmCreateDialogParamSeq_3[] = { { 0 } }; +static const struct message WmCreateDialogParamSeq_4[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent|parent }, + { WM_NCCALCSIZE, sent|parent|wparam, 0 }, + { WM_CREATE, sent|parent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|parent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent|parent }, + { WM_SETFONT, sent|parent }, + { WM_INITDIALOG, sent|parent }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { EM_SETSEL, sent|wparam|lparam, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { HCBT_ACTIVATE, hook }, + { WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */ + { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, + { WM_NCACTIVATE, sent|parent }, + { WM_ACTIVATE, sent|parent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|parent }, + { WM_KILLFOCUS, sent|parent }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|parent|wparam, MAKELONG(200, EN_SETFOCUS) }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_USER, sent|parent }, + { WM_CHANGEUISTATE, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { 0 } +}; + static void test_dialog_messages(void) { WNDCLASSA cls; @@ -12133,6 +12197,16 @@ static void test_dialog_messages(void) DestroyWindow(hdlg); flush_sequence(); + UnregisterClassA( cls.lpszClassName, cls.hInstance ); + cls.lpfnWndProc = test_dlg_proc4; + ok( RegisterClassA(&cls), "failed to register class again\n" ); + hdlg = CreateDialogParamA(0, "FOCUS_TEST_DIALOG_4", 0, test_dlg_proc3, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_4, "CreateDialogParam_4", TRUE); + EndDialog(hdlg, 0); + DestroyWindow(hdlg); + flush_sequence(); + UnregisterClassA(cls.lpszClassName, cls.hInstance); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index fdef5a9..f116b85 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -115,6 +115,15 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +FOCUS_TEST_DIALOG_4 DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test dialog" +CLASS "MyDialogClass" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT 200,4,4,50,14 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0

Austin English : wlanapi: Add a stub for WlanEnumInterfaces.
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: d92dc216f29223b63be086d1262c1a78ef1416a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92dc216f29223b63be086d12… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jan 24 21:32:20 2016 -0600 wlanapi: Add a stub for WlanEnumInterfaces. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 8 ++++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/Makefile.in | 1 + include/wlanapi.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 0b0d100..3674f79 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -24,8 +24,16 @@ #include "winbase.h" #include "wine/debug.h" +#include "wlanapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); +DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) +{ + FIXME("(%p, %p, %p) stub\n", client, reserved, interface_list); + return ERROR_CALL_NOT_IMPLEMENTED; +} + DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, PDWORD negotiatedVersion, PHANDLE clientHandle) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 79f9e43..e55bf06 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -3,7 +3,7 @@ @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect -@ stub WlanEnumInterfaces +@ stdcall WlanEnumInterfaces(long ptr ptr) @ stub WlanExtractPsdIEDataList @ stub WlanFreeMemory @ stub WlanGetAvailableNetworkList diff --git a/include/Makefile.in b/include/Makefile.in index 8224e28..ff1f5a6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -655,6 +655,7 @@ HEADER_SRCS = \ winuser.h \ winuser.rh \ winver.h \ + wlanapi.h \ wmistr.h \ wnaspi32.h \ wownt32.h \ diff --git a/include/wlanapi.h b/include/wlanapi.h new file mode 100644 index 0000000..63922be --- /dev/null +++ b/include/wlanapi.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 Austin English + * + * 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 _WLAN_WLANAPI_H +#define _WLAN_WLANAPI_H + +typedef enum _WLAN_INTERFACE_STATE +{ + wlan_interface_state_not_ready, + wlan_interface_state_connected, + wlan_interface_state_ad_hoc_network_formed, + wlan_interface_state_disconnecting, + wlan_interface_state_disconnected, + wlan_interface_state_associating, + wlan_interface_state_discovering, + wlan_interface_state_authenticating +} WLAN_INTERFACE_STATE, *PWLAN_INTERFACE_STATE; + +typedef struct _WLAN_INTERFACE_INFO +{ + GUID InterfaceGuid; + WCHAR strInterfaceDescription[256]; + WLAN_INTERFACE_STATE isState; +} WLAN_INTERFACE_INFO, *PWLAN_INTERFACE_INFO; + +typedef struct _WLAN_INTERFACE_INFO_LIST +{ + DWORD dwNumberOfItems; + DWORD dwIndex; + WLAN_INTERFACE_INFO InterfaceInfo[1]; +} WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; + +DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); +DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); + +#endif /* _WLAN_WLANAPI_H */

1 0