February 2016 - Wine-Commits

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

Feb. 18, 2016

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

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

Feb. 18, 2016

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

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

Feb. 18, 2016

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

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

Feb. 18, 2016

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

Alexandre Julliard : libwine: Move the CP_SYMBOL conversion functions to libwine_port.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 18699623b3ad43c2baa37ebd0ea211adda867479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18699623b3ad43c2baa37ebd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 18:49:28 2016 +0900 libwine: Move the CP_SYMBOL conversion functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/cpsymbol.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/mbtowc.c | 19 ----------------- libs/wine/port.c | 2 ++ libs/wine/wctomb.c | 21 ------------------- 5 files changed, 61 insertions(+), 40 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index ede38c5..67fb999 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -73,6 +73,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + cpsymbol.c \ cptable.c \ digitmap.c \ ffs.c \ diff --git a/libs/port/cpsymbol.c b/libs/port/cpsymbol.c new file mode 100644 index 0000000..e35a359 --- /dev/null +++ b/libs/port/cpsymbol.c @@ -0,0 +1,58 @@ +/* + * CP_SYMBOL support + * + * Copyright 2000 Alexandre Julliard + * Copyright 2004 Rein Klazes + * + * 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 + */ + +#include "wine/unicode.h" + +/* return -1 on dst buffer overflow */ +int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen) +{ + int len, i; + + if (dstlen == 0) return srclen; + len = dstlen > srclen ? srclen : dstlen; + for (i = 0; i < len; i++) + { + unsigned char c = src[i]; + dst[i] = (c < 0x20) ? c : c + 0xf000; + } + if (srclen > len) return -1; + return len; +} + +/* return -1 on dst buffer overflow, -2 on invalid character */ +int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen) +{ + int len, i; + + if (dstlen == 0) return srclen; + len = dstlen > srclen ? srclen : dstlen; + for (i = 0; i < len; i++) + { + if (src[i] < 0x20) + dst[i] = src[i]; + else if (src[i] >= 0xf020 && src[i] < 0xf100) + dst[i] = src[i] - 0xf000; + else + return -2; + } + if (srclen > len) return -1; + return len; +} diff --git a/libs/wine/mbtowc.c b/libs/wine/mbtowc.c index 6fc38ca..9267d9d 100644 --- a/libs/wine/mbtowc.c +++ b/libs/wine/mbtowc.c @@ -291,22 +291,3 @@ int wine_cp_mbstowcs( const union cptable *table, int flags, return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); } } - -/* CP_SYMBOL implementation */ -/* return -1 on dst buffer overflow */ -int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen) -{ - int len, i; - if( dstlen == 0) return srclen; - len = dstlen > srclen ? srclen : dstlen; - for( i = 0; i < len; i++) - { - unsigned char c = src [ i ]; - if( c < 0x20 ) - dst[i] = c; - else - dst[i] = c + 0xf000; - } - if( srclen > len) return -1; - return len; -} diff --git a/libs/wine/port.c b/libs/wine/port.c index dc08b71..070dfd9 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -33,6 +33,8 @@ const void *libwine_port_functions[] = { wine_cp_enum_table, wine_cp_get_table, + wine_cpsymbol_mbstowcs, + wine_cpsymbol_wcstombs, wine_fold_string }; diff --git a/libs/wine/wctomb.c b/libs/wine/wctomb.c index 29a3d92..62c0fc2 100644 --- a/libs/wine/wctomb.c +++ b/libs/wine/wctomb.c @@ -470,24 +470,3 @@ int wine_cp_wcstombs( const union cptable *table, int flags, return wcstombs_dbcs( &table->dbcs, src, srclen, dst, dstlen ); } } - -/* CP_SYMBOL implementation */ -/* return -1 on dst buffer overflow, -2 on invalid character */ -int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen) -{ - int len, i; - if( dstlen == 0) return srclen; - len = dstlen > srclen ? srclen : dstlen; - for( i = 0; i < len; i++) - { - WCHAR w = src [ i ]; - if( w < 0x20 ) - dst[i] = w; - else if( w >= 0xf020 && w < 0xf100) - dst[i] = w - 0xf000; - else - return -2; - } - if( srclen > len) return -1; - return len; -}

1 0

Alexandre Julliard : libwine: Move the wine_fold_string implementation to libwine_port.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: fa84ea255501390b0967d430de6b371149a6ff28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa84ea255501390b0967d430d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 14:10:26 2016 +0900 libwine: Move the wine_fold_string implementation to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/{wine => port}/fold.c | 0 libs/wine/Makefile.in | 1 - libs/wine/port.c | 7 +++++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 23000c9..7301555 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -3,6 +3,7 @@ STATICLIB = libwine_port.a C_SRCS = \ digitmap.c \ ffs.c \ + fold.c \ fstatvfs.c \ getopt.c \ getopt1.c \ diff --git a/libs/wine/fold.c b/libs/port/fold.c similarity index 100% rename from libs/wine/fold.c rename to libs/port/fold.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 1b7fea8..08156da 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -81,7 +81,6 @@ C_SRCS = \ config.c \ cptable.c \ debug.c \ - fold.c \ ldt.c \ loader.c \ mbtowc.c \ diff --git a/libs/wine/port.c b/libs/wine/port.c index a532b2d..7e38de7 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -25,8 +25,15 @@ #include <string.h> #include <sys/types.h> +#include "wine/unicode.h" #include "wine/library.h" +/* functions from libwine_port that are also exported from libwine for backwards compatibility */ +const void *libwine_port_functions[] = +{ + wine_fold_string +}; + /* no longer used, for backwards compatibility only */ struct wine_pthread_functions; static void *pthread_functions[8];

1 0

Alexandre Julliard : libwine: Move the digit folding tables to libwine_port.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: d59d45e457a714e2dc596b7269d1afaca3fba50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59d45e457a714e2dc596b726… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 14:02:10 2016 +0900 libwine: Move the digit folding tables to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/digitmap.c | 985 ++++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/casemap.c | 982 +------------------------------------------------ tools/make_unicode | 33 +- 4 files changed, 1016 insertions(+), 985 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d59d45e457a714e2dc596…

1 0

Frédéric Delanoy : mshtml/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 7023b20b6cebd2289a1c8d6fb0bb904f2af53c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7023b20b6cebd2289a1c8d6fb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 21:55:03 2016 +0100 mshtml/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 11 ++--------- dlls/mshtml/tests/htmldoc.c | 24 ++++++------------------ dlls/mshtml/tests/xmlhttprequest.c | 4 +--- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7b5b395..4b2b825 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7603,12 +7603,7 @@ static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, hres = IHTMLStyleSheet_get_cssText(stylesheet, &str); ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); - if(!is_todo) { - if(exstr) - ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); - else - ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); - }else todo_wine { + todo_wine_if(is_todo) { if(exstr) ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); else @@ -7625,10 +7620,8 @@ static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, HRESULT hres; hres = IHTMLStyleSheet_put_cssText(stylesheet, str); - if(!is_todo) + todo_wine_if(is_todo) ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); - else - todo_wine ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); SysFreeString(str); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 87f17d6..71519ed 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -427,9 +427,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - if(is_todo) - todo_wine ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url)); - else + todo_wine_if(is_todo) ok_(__FILE__,line)(!strcmp_wa(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url)); if(!*ptr) ok_(__FILE__,line)(!lstrcmpW(url, doc_url), "url %s != doc_url %s\n", wine_dbgstr_w(url), wine_dbgstr_w(doc_url)); @@ -2613,10 +2611,8 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, D CHECK_EXPECT(TranslateUrl); ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); ok(!dwTranslate, "dwTranslate = %x\n", dwTranslate); - if(!loading_hash) + todo_wine_if(loading_hash) ok(!strcmp_wa(pchURLIn, nav_serv_url), "pchURLIn = %s, expected %s\n", wine_dbgstr_w(pchURLIn), nav_serv_url); - else - todo_wine ok(!strcmp_wa(pchURLIn, nav_serv_url), "pchURLIn = %s, expected %s\n", wine_dbgstr_w(pchURLIn), nav_serv_url); ok(ppchURLOut != NULL, "ppchURLOut == NULL\n"); ok(!*ppchURLOut, "*ppchURLOut = %p\n", *ppchURLOut); @@ -5793,9 +5789,7 @@ static void test_download(DWORD flags) if(flags & DWL_HTTP) SET_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_EX_GETHOSTINFO) { - if(nav_url) - todo_wine CHECK_CALLED(GetHostInfo); - else + todo_wine_if(nav_url) CHECK_CALLED(GetHostInfo); } CHECK_CALLED(SetStatusText); @@ -5818,10 +5812,8 @@ static void test_download(DWORD flags) if(flags & DWL_ONREADY_LOADING) CHECK_CALLED(Invoke_OnReadyStateChange_Loading); if(!(flags & (DWL_EMPTY|DWL_JAVASCRIPT))) { - if(!is_extern) + todo_wine_if(is_extern) CHECK_CALLED(Invoke_OnReadyStateChange_Interactive); - else - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Interactive); } if(!is_js && !is_extern) CHECK_CALLED(Invoke_OnReadyStateChange_Complete); @@ -5853,10 +5845,8 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); } if(!(flags & DWL_EMPTY)) { - if(!is_extern) + todo_wine_if(is_extern) CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); - else - todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); } CLEAR_CALLED(Exec_ShellDocView_103); CLEAR_CALLED(Exec_ShellDocView_105); @@ -5883,10 +5873,8 @@ static void test_download(DWORD flags) if(!is_js && !is_extern) { if(!editmode && !(flags & DWL_REFRESH)) { if(!(flags & DWL_EMPTY)) { - if(support_wbapp) + todo_wine_if(!support_wbapp) CHECK_CALLED(FireNavigateComplete2); - else - todo_wine CHECK_CALLED(FireNavigateComplete2); } CHECK_CALLED(FireDocumentComplete); } diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index dd8e797..5d11ec0 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -850,10 +850,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); CHECK_CALLED(xmlhttprequest_onreadystatechange_done); /* Workaround for loading large files */ - if(expect_text) + todo_wine_if(!expect_text) ok(loading_cnt == 1, "loading_cnt = %d\n", loading_cnt); - else - todo_wine ok(loading_cnt == 1, "loading_cnt = %d\n", loading_cnt); if(FAILED(hres)) { IHTMLXMLHttpRequest_Release(xhr);

1 0

Frédéric Delanoy : dwrite/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 4f1a8da1cd6a6cee57351f045aca1bd4177cdbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1a8da1cd6a6cee57351f045… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 20:43:13 2016 +0100 dwrite/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3eaca0c..cd2a15f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2057,9 +2057,7 @@ todo_wine if (metrics[i].isSoftHyphen) ok(!metrics[i].isWhitespace, "%u: got %d\n", i, metrics[i].isWhitespace); if (metrics[i].isNewline) { - if (i == 17 || i == 19) - todo_wine ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); - else + todo_wine_if (i == 17 || i == 19) ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); ok(metrics[i].isWhitespace == 1, "%u: got %d\n", i, metrics[i].isWhitespace); ok(metrics[i].canWrapLineAfter == 1, "%u: got %d\n", i, metrics[i].canWrapLineAfter);

1 0

Francois Gouget : crypt32/tests: Clarify some base64 test failed messages.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: e1f0fb8b2d6d27f7498f432160d805ee3a46e16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f0fb8b2d6d27f7498f43216… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 18 03:17:36 2016 +0100 crypt32/tests: Clarify some base64 test failed messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index c6073aa..335b9b7 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -319,20 +319,20 @@ static void testStringToBinaryA(void) ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got ret=%d le=%u\n", ret, GetLastError()); ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got ret=%d le=%u\n", ret, GetLastError()); /* Bogus format */ ret = pCryptStringToBinaryA(tests[0].base64, 0, 0, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); /* Decoding doesn't expect the NOCR flag to be specified */ ret = pCryptStringToBinaryA(tests[0].base64, 1, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCR, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); /* Bad strings */ for (i = 0; i < sizeof(badStrings) / sizeof(badStrings[0]); i++) { @@ -340,7 +340,7 @@ static void testStringToBinaryA(void) ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); } /* Good strings */ for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)

1 0