August 2015 - Wine-commits - list.winehq.org

André Hentschel : winedbg: Update minidump output.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: b952703a2e6bbdff3b27fdb770ac359977fd4021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b952703a2e6bbdff3b27fdb77… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 28 20:24:42 2015 +0200 winedbg: Update minidump output. --- programs/winedbg/tgt_minidump.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index e3a823a..5bf5a60 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -289,6 +289,9 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_ARM: str = "ARM"; break; + case PROCESSOR_ARCHITECTURE_ARM64: + str = "ARM64"; + break; case PROCESSOR_ARCHITECTURE_MSIL: str = "MSIL"; break; @@ -346,10 +349,29 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) else if (msi->u.s.ProductType == 3) str = "Server 2008"; else str = "6-????"; break; - case 2: str = "Win8"; break; + case 2: + if (msi->u.s.ProductType == 1) str = "Win8"; + else if (msi->u.s.ProductType == 3) str = "Server 2012"; + else str = "6-????"; + break; + case 3: + if (msi->u.s.ProductType == 1) str = "Win8.1"; + else if (msi->u.s.ProductType == 3) str = "Server 2012 R2"; + else str = "6-????"; + break; default: str = "6-????"; break; } break; + case 10: + switch (msi->MinorVersion) + { + case 0: + if (msi->u.s.ProductType == 1) str = "Win10"; + else str = "10-????"; + break; + default: str = "10-????"; break; + } + break; default: str = "???"; break; } dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber);

1 0

André Hentschel : winedump: Update minidump output.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 8b7a0c0f58d66730a6a33d4a353f2cb226cc427a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7a0c0f58d66730a6a33d4a3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 28 20:28:38 2015 +0200 winedump: Update minidump output. --- tools/winedump/minidump.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 2641868..da1369c 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -287,6 +287,9 @@ void mdmp_dump(void) case PROCESSOR_ARCHITECTURE_ARM: str = "ARM"; break; + case PROCESSOR_ARCHITECTURE_ARM64: + str = "ARM64"; + break; case PROCESSOR_ARCHITECTURE_AMD64: str = "X86_64"; break; @@ -358,6 +361,16 @@ void mdmp_dump(void) default: str = "6-????"; break; } break; + case 10: + switch (msi->MinorVersion) + { + case 0: + if (msi->u.s.ProductType == 1) str = "Win10"; + else str = "10-????"; + break; + default: str = "10-????"; break; + } + break; default: str = "???"; break; } printf(" Version: Windows %s (%u)\n", str, msi->BuildNumber);

1 0

Bruno Jesus : mciavi32: Add partial support for MCI_DGV_PLAY_REPEAT.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 1c82aca1d444d198d3cdeacc808faf15e7619d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c82aca1d444d198d3cdeacc8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 31 01:39:56 2015 +0800 mciavi32: Add partial support for MCI_DGV_PLAY_REPEAT. --- dlls/mciavi32/mciavi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 079c696..b1c89f0 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -402,14 +402,19 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP } ReleaseDC(wma->hWndPaint, hDC); } - if(wma->dwCurrVideoFrame >= wma->dwToVideoFrame) - break; + if (wma->dwCurrVideoFrame >= wma->dwToVideoFrame) + { + if (!(dwFlags & MCI_DGV_PLAY_REPEAT)) + break; + TRACE("repeat media as requested\n"); + wma->dwCurrVideoFrame = wma->dwCurrAudioBlock = 0; + } if (wma->lpWaveFormat) MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); tc = currenttime_us(); - if(tc < next_frame_us) + if (tc < next_frame_us) delta = next_frame_us - tc; else delta = 0; @@ -532,7 +537,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION; if (dwFlags & MCI_TEST) return 0; - if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) + if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) FIXME("Unsupported flag %08x\n", dwFlags); EnterCriticalSection(&wma->cs);

1 0

Martin Storsjo : msvcrt: Test that the normal strtod doesn't handle the " NAN" string.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 8edbd9b381a921df7d8d681cd4579a1c8de5fb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8edbd9b381a921df7d8d681cd… Author: Martin Storsjo <martin(a)martin.st> Date: Sun Aug 30 23:47:15 2015 +0300 msvcrt: Test that the normal strtod doesn't handle the "NAN" string. --- dlls/msvcrt/tests/string.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 476f762..d247ba6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1728,6 +1728,7 @@ static void test__strtod(void) const char double3[] = "INF"; const char double4[] = ".21e12"; const char double5[] = "214353e-3"; + const char double6[] = "NAN"; const char overflow[] = "1d9999999999999999999"; const char white_chars[] = " d10"; @@ -1754,6 +1755,10 @@ static void test__strtod(void) ok(almost_equal(d, 214.353), "d = %lf\n", d); ok(end == double5+9, "incorrect end (%d)\n", (int)(end-double5)); + d = strtod(double6, &end); + ok(almost_equal(d, 0), "d = %lf\n", d); + ok(end == double6, "incorrect end (%d)\n", (int)(end-double6)); + d = strtod("12.1d2", NULL); ok(almost_equal(d, 12.1e2), "d = %lf\n", d);

1 0

Andrew Eikum : configure: Require openal-soft at build-time for xaudio2.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: 7f72a5f4ed0f09c58bac2364c74d2ce7b4c3b967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f72a5f4ed0f09c58bac2364c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 28 08:22:18 2015 -0500 configure: Require openal-soft at build-time for xaudio2. --- configure | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- configure.ac | 17 +++++++++++++++-- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/configure b/configure index afa7bb4..6a5bf0f 100755 --- a/configure +++ b/configure @@ -773,6 +773,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1558,6 +1559,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1810,6 +1812,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1947,7 +1958,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2100,6 +2111,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -13604,14 +13616,48 @@ fi fi if test "x$ac_cv_lib_openal" != xyes; then : case "x$with_openal" in - x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL and XAudio2 won't be supported" ;; + x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported" ;; xno) ;; - *) as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL and XAudio2 won't be supported + *) as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported This is an error since --with-openal was requested." "$LINENO" 5 ;; esac fi test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no} -test "x$ac_cv_lib_openal" = xyes || enable_xaudio2_7=${enable_xaudio2_7:-no} + +if test "x$ac_cv_lib_openal" = xyes +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openal-soft" >&5 +$as_echo_n "checking for openal-soft... " >&6; } +if ${ac_cv_have_openalsoft+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <AL/alext.h> +LPALCRENDERSAMPLESSOFT x; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_openalsoft=yes +else + ac_cv_have_openalsoft=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_openalsoft" >&5 +$as_echo "$ac_cv_have_openalsoft" >&6; } +fi +if test "x$ac_cv_have_openalsoft" != xyes +then + as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_7=${enable_xaudio2_7:-no} +fi if test "$ac_cv_header_kstat_h" = "yes" then diff --git a/configure.ac b/configure.ac index b592615..aec53f6 100644 --- a/configure.ac +++ b/configure.ac @@ -1738,9 +1738,22 @@ then AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,) fi WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes], - [libopenal ${notice_platform}development files not found (or too old), OpenAL and XAudio2 won't be supported]) + [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported]) test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no} -test "x$ac_cv_lib_openal" = xyes || enable_xaudio2_7=${enable_xaudio2_7:-no} + +dnl **** Check for openal-soft **** +if test "x$ac_cv_lib_openal" = xyes +then + AC_CACHE_CHECK([for openal-soft], ac_cv_have_openalsoft, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#include <AL/alext.h> +LPALCRENDERSAMPLESSOFT x;]])],[ac_cv_have_openalsoft=yes],[ac_cv_have_openalsoft=no])) +fi +if test "x$ac_cv_have_openalsoft" != xyes +then + WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_7=${enable_xaudio2_7:-no} +fi dnl **** Check for libkstat **** if test "$ac_cv_header_kstat_h" = "yes"

1 0

Vincent Povirk : comdlg32: Implement open dropdown menu.
by Alexandre Julliard 28 Aug '15

28 Aug '15

1 0

Vincent Povirk : comdlg32: Show and hide the open dropdown menu dynamically.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: bc0abc23691bbab1456dfc17cb50beabd1dd47fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0abc23691bbab1456dfc17c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 21 15:51:51 2015 -0500 comdlg32: Show and hide the open dropdown menu dynamically. --- dlls/comdlg32/comdlg32.rc | 2 +- dlls/comdlg32/itemdlg.c | 97 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 80 insertions(+), 19 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index e4dbd8a..f5c1c9e 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -490,7 +490,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST - DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP | WS_CLIPSIBLINGS + DEFPUSHBUTTON "&Open", IDOK, 350, 240, 32, 14, WS_GROUP | WS_CLIPSIBLINGS /* drop-down menu for open button */ CONTROL "#msgctxt#do not translate#6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP | diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 9a028c5..342d5fa 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1435,6 +1435,64 @@ static HRESULT init_custom_controls(FileDialogImpl *This) /************************************************************************** * Window related functions. */ +static BOOL update_open_dropdown(FileDialogImpl *This) +{ + /* Show or hide the open dropdown button as appropriate */ + BOOL show=FALSE, showing; + HWND open_hwnd, dropdown_hwnd; + + if (This->hmenu_opendropdown) + { + INT num_visible_items=0; + cctrl_item* item; + + LIST_FOR_EACH_ENTRY(item, &This->cctrl_opendropdown.sub_items, cctrl_item, entry) + { + if (item->cdcstate & CDCS_VISIBLE) + { + num_visible_items++; + if (num_visible_items >= 2) + { + show = TRUE; + break; + } + } + } + } + + open_hwnd = GetDlgItem(This->dlg_hwnd, IDOK); + dropdown_hwnd = GetDlgItem(This->dlg_hwnd, psh1); + + showing = (GetWindowLongPtrW(dropdown_hwnd, GWL_STYLE) & WS_VISIBLE) != 0; + + if (showing != show) + { + RECT open_rc, dropdown_rc; + + GetWindowRect(open_hwnd, &open_rc); + GetWindowRect(dropdown_hwnd, &dropdown_rc); + + if (show) + { + ShowWindow(dropdown_hwnd, SW_SHOW); + + SetWindowPos(open_hwnd, NULL, 0, 0, + (open_rc.right - open_rc.left) - (dropdown_rc.right - dropdown_rc.left), + open_rc.bottom - open_rc.top, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); + } + else + { + ShowWindow(dropdown_hwnd, SW_HIDE); + + SetWindowPos(open_hwnd, NULL, 0, 0, + (open_rc.right - open_rc.left) + (dropdown_rc.right - dropdown_rc.left), + open_rc.bottom - open_rc.top, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); + } + } + + return show; +} + static void update_layout(FileDialogImpl *This) { HDWP hdwp; @@ -1445,6 +1503,7 @@ static void update_layout(FileDialogImpl *This) RECT toolbar_rc, ebrowser_rc, customctrls_rc; static const UINT vspacing = 4, hspacing = 4; static const UINT min_width = 320, min_height = 200; + BOOL show_dropdown; if (!GetClientRect(This->dlg_hwnd, &dialog_rc)) { @@ -1478,7 +1537,9 @@ static void update_layout(FileDialogImpl *This) } /* Open/Save dropdown */ - if(This->hmenu_opendropdown) + show_dropdown = update_open_dropdown(This); + + if(show_dropdown) { int dropdown_width, dropdown_height; hwnd = GetDlgItem(This->dlg_hwnd, psh1); @@ -1728,13 +1789,21 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) static void update_control_text(FileDialogImpl *This) { HWND hitem; + LPCWSTR custom_okbutton; + cctrl_item* item; + if(This->custom_title) SetWindowTextW(This->dlg_hwnd, This->custom_title); - if(This->custom_okbutton && + if(This->hmenu_opendropdown && (item = get_first_item(&This->cctrl_opendropdown))) + custom_okbutton = item->label; + else + custom_okbutton = This->custom_okbutton; + + if(custom_okbutton && (hitem = GetDlgItem(This->dlg_hwnd, IDOK))) { - SetWindowTextW(hitem, This->custom_okbutton); + SetWindowTextW(hitem, custom_okbutton); ctrl_resize(hitem, 50, 250, FALSE); } @@ -1810,25 +1879,13 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) if(This->hmenu_opendropdown) { - RECT open_rc, dropdown_rc; - HWND open_hwnd, dropdown_hwnd; + HWND dropdown_hwnd; LOGFONTW lfw, lfw_marlett; HFONT dialog_font; static const WCHAR marlett[] = {'M','a','r','l','e','t','t',0}; - open_hwnd = GetDlgItem(This->dlg_hwnd, IDOK); dropdown_hwnd = GetDlgItem(This->dlg_hwnd, psh1); - /* Show dropdown button, and remove its size from the open button */ - ShowWindow(dropdown_hwnd, SW_SHOW); - - GetWindowRect(open_hwnd, &open_rc); - GetWindowRect(dropdown_hwnd, &dropdown_rc); - - SetWindowPos(open_hwnd, NULL, 0, 0, - (open_rc.right - open_rc.left) - (dropdown_rc.right - dropdown_rc.left), - open_rc.bottom - open_rc.top, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); - /* Change dropdown button font to Marlett */ dialog_font = (HFONT)SendMessageW(dropdown_hwnd, WM_GETFONT, 0, 0); @@ -1843,8 +1900,6 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) SendMessageW(dropdown_hwnd, WM_SETFONT, (LPARAM)This->hfont_opendropdown, 0); } - else - ShowWindow(GetDlgItem(This->dlg_hwnd, psh1), SW_HIDE); ctrl_container_reparent(This, This->dlg_hwnd); init_explorerbrowser(This); @@ -4087,6 +4142,12 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCust item->cdcstate = dwState; + if (ctrl->type == IDLG_CCTRL_OPENDROPDOWN) + { + update_control_text(This); + update_layout(This); + } + return S_OK; } default:

1 0

Vincent Povirk : comdlg32: Show open dropdown menu on button press.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 6056a3f1634a72e181fb3a03ca625aaa7720523e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6056a3f1634a72e181fb3a03c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 14:51:10 2015 -0500 comdlg32: Show open dropdown menu on button press. --- dlls/comdlg32/itemdlg.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 342d5fa..8a52d71 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1822,6 +1822,25 @@ static void update_control_text(FileDialogImpl *This) } } +static LRESULT CALLBACK dropdown_subclass_proc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam) +{ + static const WCHAR prop_this[] = {'i','t','e','m','d','l','g','_','T','h','i','s',0}; + static const WCHAR prop_oldwndproc[] = {'i','t','e','m','d','l','g','_','o','l','d','w','n','d','p','r','o','c',0}; + + if (umessage == WM_LBUTTONDOWN) + { + FileDialogImpl *This = (FileDialogImpl*)GetPropW(hwnd, prop_this); + + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + show_opendropdown(This); + SendMessageW(hwnd, BM_SETCHECK, BST_UNCHECKED, 0); + + return 0; + } + + return CallWindowProcW((WNDPROC)GetPropW(hwnd, prop_oldwndproc), hwnd, umessage, wparam, lparam); +} + static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) { FileDialogImpl *This = (FileDialogImpl*)lParam; @@ -1883,6 +1902,8 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) LOGFONTW lfw, lfw_marlett; HFONT dialog_font; static const WCHAR marlett[] = {'M','a','r','l','e','t','t',0}; + static const WCHAR prop_this[] = {'i','t','e','m','d','l','g','_','T','h','i','s',0}; + static const WCHAR prop_oldwndproc[] = {'i','t','e','m','d','l','g','_','o','l','d','w','n','d','p','r','o','c',0}; dropdown_hwnd = GetDlgItem(This->dlg_hwnd, psh1); @@ -1899,6 +1920,11 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) This->hfont_opendropdown = CreateFontIndirectW(&lfw_marlett); SendMessageW(dropdown_hwnd, WM_SETFONT, (LPARAM)This->hfont_opendropdown, 0); + + /* Subclass button so we can handle LBUTTONDOWN */ + SetPropW(dropdown_hwnd, prop_this, (HANDLE)This); + SetPropW(dropdown_hwnd, prop_oldwndproc, + (HANDLE)SetWindowLongPtrW(dropdown_hwnd, GWLP_WNDPROC, (LONG_PTR)dropdown_subclass_proc)); } ctrl_container_reparent(This, This->dlg_hwnd);

1 0

Daniel Lehman : kernel32/tests: Add tests for Invariant.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 72922cd1eac5ece5a3c05f5361ba6e30c31dfc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72922cd1eac5ece5a3c05f536… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 26 00:06:07 2015 -0700 kernel32/tests: Add tests for Invariant. --- dlls/kernel32/tests/locale.c | 185 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c48a620..1e4fd2a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4317,6 +4317,190 @@ static void test_EnumSystemGeoID(void) } } +struct invariant_entry { + const char *name; + int id; + const char *expect; +}; + +#define X(x) #x, x +static const struct invariant_entry invariant_list[] = { + { X(LOCALE_ILANGUAGE), "007f" }, + { X(LOCALE_SENGLANGUAGE), "Invariant Language" }, + { X(LOCALE_SABBREVLANGNAME), "IVL" }, + { X(LOCALE_SNATIVELANGNAME), "Invariant Language" }, + { X(LOCALE_ICOUNTRY), "1" }, + { X(LOCALE_SENGCOUNTRY), "Invariant Country" }, + { X(LOCALE_SABBREVCTRYNAME), "IVC" }, + { X(LOCALE_SNATIVECTRYNAME), "Invariant Country" }, + { X(LOCALE_IDEFAULTLANGUAGE), "0409" }, + { X(LOCALE_IDEFAULTCOUNTRY), "1" }, + { X(LOCALE_IDEFAULTCODEPAGE), "437" }, + { X(LOCALE_IDEFAULTANSICODEPAGE), "1252" }, + { X(LOCALE_IDEFAULTMACCODEPAGE), "10000" }, + { X(LOCALE_SLIST), "," }, + { X(LOCALE_IMEASURE), "0" }, + { X(LOCALE_SDECIMAL), "." }, + { X(LOCALE_STHOUSAND), "," }, + { X(LOCALE_SGROUPING), "3;0" }, + { X(LOCALE_IDIGITS), "2" }, + { X(LOCALE_ILZERO), "1" }, + { X(LOCALE_INEGNUMBER), "1" }, + { X(LOCALE_SNATIVEDIGITS), "0123456789" }, + { X(LOCALE_SCURRENCY), "\x00a4" }, + { X(LOCALE_SINTLSYMBOL), "XDR" }, + { X(LOCALE_SMONDECIMALSEP), "." }, + { X(LOCALE_SMONTHOUSANDSEP), "," }, + { X(LOCALE_SMONGROUPING), "3;0" }, + { X(LOCALE_ICURRDIGITS), "2" }, + { X(LOCALE_IINTLCURRDIGITS), "2" }, + { X(LOCALE_ICURRENCY), "0" }, + { X(LOCALE_INEGCURR), "0" }, + { X(LOCALE_SDATE), "/" }, + { X(LOCALE_STIME), ":" }, + { X(LOCALE_SSHORTDATE), "MM/dd/yyyy" }, + { X(LOCALE_SLONGDATE), "dddd, dd MMMM yyyy" }, + { X(LOCALE_STIMEFORMAT), "HH:mm:ss" }, + { X(LOCALE_IDATE), "0" }, + { X(LOCALE_ILDATE), "1" }, + { X(LOCALE_ITIME), "1" }, + { X(LOCALE_ITIMEMARKPOSN), "0" }, + { X(LOCALE_ICENTURY), "1" }, + { X(LOCALE_ITLZERO), "1" }, + { X(LOCALE_IDAYLZERO), "1" }, + { X(LOCALE_IMONLZERO), "1" }, + { X(LOCALE_S1159), "AM" }, + { X(LOCALE_S2359), "PM" }, + { X(LOCALE_ICALENDARTYPE), "1" }, + { X(LOCALE_IOPTIONALCALENDAR), "0" }, + { X(LOCALE_IFIRSTDAYOFWEEK), "6" }, + { X(LOCALE_IFIRSTWEEKOFYEAR), "0" }, + { X(LOCALE_SDAYNAME1), "Monday" }, + { X(LOCALE_SDAYNAME2), "Tuesday" }, + { X(LOCALE_SDAYNAME3), "Wednesday" }, + { X(LOCALE_SDAYNAME4), "Thursday" }, + { X(LOCALE_SDAYNAME5), "Friday" }, + { X(LOCALE_SDAYNAME6), "Saturday" }, + { X(LOCALE_SDAYNAME7), "Sunday" }, + { X(LOCALE_SABBREVDAYNAME1), "Mon" }, + { X(LOCALE_SABBREVDAYNAME2), "Tue" }, + { X(LOCALE_SABBREVDAYNAME3), "Wed" }, + { X(LOCALE_SABBREVDAYNAME4), "Thu" }, + { X(LOCALE_SABBREVDAYNAME5), "Fri" }, + { X(LOCALE_SABBREVDAYNAME6), "Sat" }, + { X(LOCALE_SABBREVDAYNAME7), "Sun" }, + { X(LOCALE_SMONTHNAME1), "January" }, + { X(LOCALE_SMONTHNAME2), "February" }, + { X(LOCALE_SMONTHNAME3), "March" }, + { X(LOCALE_SMONTHNAME4), "April" }, + { X(LOCALE_SMONTHNAME5), "May" }, + { X(LOCALE_SMONTHNAME6), "June" }, + { X(LOCALE_SMONTHNAME7), "July" }, + { X(LOCALE_SMONTHNAME8), "August" }, + { X(LOCALE_SMONTHNAME9), "September" }, + { X(LOCALE_SMONTHNAME10), "October" }, + { X(LOCALE_SMONTHNAME11), "November" }, + { X(LOCALE_SMONTHNAME12), "December" }, + { X(LOCALE_SMONTHNAME13), "" }, + { X(LOCALE_SABBREVMONTHNAME1), "Jan" }, + { X(LOCALE_SABBREVMONTHNAME2), "Feb" }, + { X(LOCALE_SABBREVMONTHNAME3), "Mar" }, + { X(LOCALE_SABBREVMONTHNAME4), "Apr" }, + { X(LOCALE_SABBREVMONTHNAME5), "May" }, + { X(LOCALE_SABBREVMONTHNAME6), "Jun" }, + { X(LOCALE_SABBREVMONTHNAME7), "Jul" }, + { X(LOCALE_SABBREVMONTHNAME8), "Aug" }, + { X(LOCALE_SABBREVMONTHNAME9), "Sep" }, + { X(LOCALE_SABBREVMONTHNAME10), "Oct" }, + { X(LOCALE_SABBREVMONTHNAME11), "Nov" }, + { X(LOCALE_SABBREVMONTHNAME12), "Dec" }, + { X(LOCALE_SABBREVMONTHNAME13), "" }, + { X(LOCALE_SPOSITIVESIGN), "+" }, + { X(LOCALE_SNEGATIVESIGN), "-" }, + { X(LOCALE_IPOSSIGNPOSN), "3" }, + { X(LOCALE_INEGSIGNPOSN), "0" }, + { X(LOCALE_IPOSSYMPRECEDES), "1" }, + { X(LOCALE_IPOSSEPBYSPACE), "0" }, + { X(LOCALE_INEGSYMPRECEDES), "1" }, + { X(LOCALE_INEGSEPBYSPACE), "0" }, + { X(LOCALE_SISO639LANGNAME), "iv" }, + { X(LOCALE_SISO3166CTRYNAME), "IV" }, + { X(LOCALE_IDEFAULTEBCDICCODEPAGE), "037" }, + { X(LOCALE_IPAPERSIZE), "9" }, + { X(LOCALE_SENGCURRNAME), "International Monetary Fund" }, + { X(LOCALE_SNATIVECURRNAME), "International Monetary Fund" }, + { X(LOCALE_SYEARMONTH), "yyyy MMMM" }, + { X(LOCALE_IDIGITSUBSTITUTION), "1" }, + { X(LOCALE_SNAME), "" }, + { X(LOCALE_SSCRIPTS), "Latn;" }, + { 0 } +}; +#undef X + +static void test_invariant(void) +{ + int ret; + int len; + char buffer[BUFFER_SIZE]; + const struct invariant_entry *ptr = invariant_list; + + if (!GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SLANGUAGE, buffer, sizeof(buffer))) + { + win_skip("GetLocaleInfoA(LOCALE_INVARIANT) not supported\n"); /* win2k */ + return; + } + + while (ptr->name) + { + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|ptr->id, buffer, sizeof(buffer)); + if (!ret && (ptr->id == LOCALE_SNAME || ptr->id == LOCALE_SSCRIPTS)) + win_skip("not supported\n"); /* winxp/win2k3 */ + else + { + len = strlen(ptr->expect)+1; /* include \0 */ + ok(ret == len, "For id %d, expected ret == %d, got %d, error %d\n", + ptr->id, len, ret, GetLastError()); + ok(!strcmp(buffer, ptr->expect), "For id %d, Expected %s, got '%s'\n", + ptr->id, ptr->expect, buffer); + } + + ptr++; + } + + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + { + /* some locales translate these */ + static const char lang[] = "Invariant Language (Invariant Country)"; + static const char cntry[] = "Invariant Country"; + static const char sortm[] = "Math Alphanumerics"; + static const char sortd[] = "Default"; /* win2k3 */ + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SLANGUAGE, buffer, sizeof(buffer)); + len = lstrlenA(lang) + 1; + ok(ret == len, "Expected ret == %d, got %d, error %d\n", len, ret, GetLastError()); + ok(!strcmp(buffer, lang), "Expected %s, got '%s'\n", lang, buffer); + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SCOUNTRY, buffer, sizeof(buffer)); + len = lstrlenA(cntry) + 1; + ok(ret == len, "Expected ret == %d, got %d, error %d\n", len, ret, GetLastError()); + ok(!strcmp(buffer, cntry), "Expected %s, got '%s'\n", cntry, buffer); + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SSORTNAME, buffer, sizeof(buffer)); + if (ret == lstrlenA(sortm)+1) + ok(!strcmp(buffer, sortm), "Expected %s, got '%s'\n", sortm, buffer); + else if (ret == lstrlenA(sortd)+1) /* win2k3 */ + ok(!strcmp(buffer, sortd), "Expected %s, got '%s'\n", sortd, buffer); + else + ok(0, "Expected ret == %d or %d, got %d, error %d\n", + lstrlenA(sortm)+1, lstrlenA(sortd)+1, ret, GetLastError()); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -4356,6 +4540,7 @@ START_TEST(locale) test_CompareStringOrdinal(); test_GetGeoInfo(); test_EnumSystemGeoID(); + test_invariant(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Piotr Caban : imm32: Don' t use functions that use graphics driver in THREAD_DETACH/PROCESS_DETACH.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 60b996ad4b46be7c50784d4a0382060845893b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b996ad4b46be7c50784d4a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 27 16:16:09 2015 +0200 imm32: Don't use functions that use graphics driver in THREAD_DETACH/PROCESS_DETACH. --- dlls/imm32/imm.c | 1 - dlls/imm32/tests/imm32.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3629024..3fab6fc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -270,7 +270,6 @@ static void IMM_FreeThreadData(void) list_remove(&data->entry); LeaveCriticalSection(&threaddata_cs); IMM_DestroyContext(data->defaultContext); - DestroyWindow(data->hwndDefault); HeapFree(GetProcessHeap(),0,data); TRACE("Thread Data Destroyed\n"); return; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 870f5d2..b1f3913 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -782,10 +782,29 @@ static void test_ImmGetDescription(void) UnloadKeyboardLayout(hkl); } +static LRESULT (WINAPI *old_imm_wnd_proc)(HWND, UINT, WPARAM, LPARAM); +static LRESULT WINAPI imm_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ok(msg != WM_DESTROY, "got WM_DESTROY message\n"); + return old_imm_wnd_proc(hwnd, msg, wparam, lparam); +} + +static HWND thread_ime_wnd; +static DWORD WINAPI test_ImmGetDefaultIMEWnd_thread(void *arg) +{ + CreateWindowA("static", "static", WS_POPUP, 0, 0, 1, 1, NULL, NULL, NULL, NULL); + + thread_ime_wnd = ImmGetDefaultIMEWnd(0); + ok(thread_ime_wnd != 0, "ImmGetDefaultIMEWnd returned NULL\n"); + old_imm_wnd_proc = (void*)SetWindowLongPtrW(thread_ime_wnd, GWLP_WNDPROC, (LONG_PTR)imm_wnd_proc); + return 0; +} + static void test_ImmDefaultHwnd(void) { HIMC imc1, imc2, imc3; HWND def1, def3; + HANDLE thread; HWND hwnd; hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", @@ -813,6 +832,11 @@ static void test_ImmDefaultHwnd(void) ok(imc1 == imc3, "IME context should not change\n"); ImmSetOpenStatus(imc2, FALSE); + thread = CreateThread(NULL, 0, test_ImmGetDefaultIMEWnd_thread, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + ok(thread_ime_wnd != def1, "thread_ime_wnd == def1\n"); + ok(!IsWindow(thread_ime_wnd), "thread_ime_wnd was not destroyed\n"); + ImmReleaseContext(hwnd, imc1); ImmReleaseContext(hwnd, imc3); ImmDestroyContext(imc2);

1 0