January 2016 - Wine-commits

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on key press.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 88ea4c520b9c4a810bf88b7053d36f7151272943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ea4c520b9c4a810bf88b705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 19:43:57 2016 +1100 comctl32/trackbar: Update thumb immediately on key press. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 9 ++++++++- dlls/comctl32/trackbar.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7c04d15..adb1b12 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -672,7 +672,14 @@ static void test_position(void) r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); ok(r == 30, "got %d\n", r); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); - ok(rect.left != rect2.left, "got %d\n", rect.left); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect2.left, rect.left); + + /* now move it with keys */ + SendMessageA(hWndTrackbar, WM_KEYDOWN, VK_END, 0); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 100, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect.left, rect2.left); DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c0f58db..87d955c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1821,7 +1821,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey) } if (pos != infoPtr->lPos) { - infoPtr->flags |=TB_THUMBPOSCHANGED; + TRACKBAR_UpdateThumb (infoPtr); TRACKBAR_InvalidateThumbMove (infoPtr, pos, infoPtr->lPos); }

1 0

Huw Davies : bcrypt: Ensure we have gnutls_hash() available.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 625801ed7e765a89fe98e410d6272e9ce09adeb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625801ed7e765a89fe98e410d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 18 12:52:40 2016 +0000 bcrypt: Ensure we have gnutls_hash() available. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++++++++++ configure.ac | 2 ++ dlls/bcrypt/bcrypt_main.c | 10 +++++----- include/config.h.in | 3 +++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ab5434a..d82731e 100755 --- a/configure +++ b/configure @@ -11595,6 +11595,22 @@ CPPFLAGS=$ac_save_CPPFLAGS test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + ac_wine_check_funcs_save_LIBS="$LIBS" +LIBS="$LIBS $GNUTLS_LIBS" +for ac_func in gnutls_hash +do : + ac_fn_c_check_func "$LINENO" "gnutls_hash" "ac_cv_func_gnutls_hash" +if test "x$ac_cv_func_gnutls_hash" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GNUTLS_HASH 1 +_ACEOF + +else + as_fn_append wine_notices "|libgnutls ${notice_platform}development files too old, no bcrypt hash support." +fi +done + +LIBS="$ac_wine_check_funcs_save_LIBS" fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : case "x$with_gnutls" in diff --git a/configure.ac b/configure.ac index 0766edf..d2eac29 100644 --- a/configure.ac +++ b/configure.ac @@ -1270,6 +1270,8 @@ then #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], [GNUTLS_CFLAGS=""])]) + WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], [libgnutls ${notice_platform}development files not found, no schannel support.]) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 227399f..fdd6911 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); static HINSTANCE instance; -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgnutls_handle; @@ -116,7 +116,7 @@ static void gnutls_uninitialize(void) wine_dlclose( libgnutls_handle, NULL, 0 ); libgnutls_handle = NULL; } -#endif /* SONAME_LIBGNUTLS && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ +#endif /* HAVE_GNUTLS_HASH && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -338,7 +338,7 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) } return STATUS_SUCCESS; } -#elif defined(SONAME_LIBGNUTLS) +#elif defined(HAVE_GNUTLS_HASH) struct hash { struct object hdr; @@ -642,14 +642,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) gnutls_uninitialize(); #endif break; diff --git a/include/config.h.in b/include/config.h.in index 514e5fe..805374e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -228,6 +228,9 @@ /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID +/* Define to 1 if you have the `gnutls_hash' function. */ +#undef HAVE_GNUTLS_HASH + /* Define if we have the libgphoto2 development environment */ #undef HAVE_GPHOTO2

1 0

Piotr Caban : msvcr120: Add _dpcomp implementation.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 4083af404b2ef9e0b0928a6f685f2efa8567c80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4083af404b2ef9e0b0928a6f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 18 12:57:39 2016 +0100 msvcr120: Add _dpcomp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120/tests/msvcr120.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 21 +++++++++++++++++++++ 4 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b738155..361e3d2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1110,7 +1110,7 @@ @ cdecl _difftime32(long long) MSVCRT__difftime32 @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dosmaperr -@ stub _dpcomp +@ cdecl _dpcomp(double double) MSVCR120__dpcomp @ cdecl _dsign(double) MSVCR120__dsign @ extern _dstbias MSVCRT__dstbias @ cdecl _dtest(ptr) MSVCR120__dtest @@ -1144,7 +1144,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdclass(float) MSVCR120__fdclass @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) MSVCR120__fdpcomp @ cdecl _fdsign(float) MSVCR120__fdsign @ cdecl _fdtest(ptr) MSVCR120__fdtest @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @@ -1392,7 +1392,7 @@ @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() @ cdecl _ldclass(double) MSVCR120__ldclass -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) MSVCR120__dpcomp @ cdecl _ldsign(double) MSVCR120__dsign @ cdecl _ldtest(ptr) MSVCR120__ldtest @ cdecl _lfind(ptr ptr ptr long ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 330c6b1..708fada 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -28,6 +28,20 @@ #include <locale.h> +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + struct MSVCRT_lconv { char* decimal_point; @@ -63,6 +77,7 @@ static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); static int (CDECL *p__dsign)(double); static int (CDECL *p__fdsign)(float); +static int (__cdecl *p__dpcomp)(double x, double y); static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); @@ -82,6 +97,7 @@ static BOOL init(void) p_wcstombs_s = (void*)GetProcAddress(module, "wcstombs_s"); p__dsign = (void*)GetProcAddress(module, "_dsign"); p__fdsign = (void*)GetProcAddress(module, "_fdsign"); + p__dpcomp = (void*)GetProcAddress(module, "_dpcomp"); p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); return TRUE; @@ -175,6 +191,26 @@ static void test__dsign(void) ok(ret == 0x8000, "p_fdsign(-1) = %x\n", ret); } +static void test__dpcomp(void) +{ + struct { + double x, y; + int ret; + } tests[] = { + {0, 0, 2}, {1, 1, 2}, {-1, -1, 2}, + {-2, -1, 1}, {-1, 1, 1}, {1, 2, 1}, + {1, -1, 4}, {2, 1, 4}, {-1, -2, 4}, + {NAN, NAN, 0}, {NAN, 1, 0}, {1, NAN, 0}, + {INFINITY, INFINITY, 2}, {-1, INFINITY, 1}, {1, INFINITY, 1}, + }; + int i, ret; + + for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + ret = p__dpcomp(tests[i].x, tests[i].y); + ok(ret == tests[i].ret, "%d) dpcomp(%f, %f) = %x\n", i, tests[i].x, tests[i].y, ret); + } +} + static void test____lc_locale_name_func(void) { struct { @@ -238,6 +274,7 @@ START_TEST(msvcr120) if (!init()) return; test_lconv(); test__dsign(); + test__dpcomp(); test____lc_locale_name_func(); test__GetConcurrency(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index ec18f21..1e4554f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1049,7 +1049,7 @@ @ cdecl _difftime32(long long) msvcr120._difftime32 @ cdecl _difftime64(long long) msvcr120._difftime64 @ stub _dosmaperr -@ stub _dpcomp +@ cdecl _dpcomp(double double) msvcr120._dpcomp @ cdecl _dsign(double) msvcr120._dsign @ extern _dstbias msvcr120._dstbias @ cdecl _dtest(ptr) msvcr120._dtest @@ -1072,7 +1072,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) msvcr120._fcvt_s @ cdecl _fdclass(float) msvcr120._fdclass @ cdecl _fdopen(long str) msvcr120._fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) msvcr120._fdpcomp @ cdecl _fdsign(float) msvcr120._fdsign @ cdecl _fdtest(ptr) msvcr120._fdtest @ cdecl _fflush_nolock(ptr) msvcr120._fflush_nolock @@ -1256,7 +1256,7 @@ @ cdecl _j1(double) msvcr120._j1 @ cdecl _jn(long double) msvcr120._jn @ cdecl _ldclass(double) msvcr120._ldclass -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) msvcr120._ldpcomp @ cdecl _ldsign(double) msvcr120._ldsign @ cdecl _ldtest(ptr) msvcr120._ldtest @ cdecl _lfind(ptr ptr ptr long ptr) msvcr120._lfind diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 661a1b4..fc88f03 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2684,6 +2684,27 @@ int CDECL MSVCR120__dsign(double x) return signbit(x) ? 0x8000 : 0; } + +/********************************************************************* + * _dpcomp (MSVCR120.@) + */ +int CDECL MSVCR120__dpcomp(double x, double y) +{ + if(isnan(x) || isnan(y)) + return 0; + + if(x == y) return 2; + return x < y ? 1 : 4; +} + +/********************************************************************* + * _fdpcomp (MSVCR120.@) + */ +int CDECL MSVCR120__fdpcomp(float x, float y) +{ + return MSVCR120__dpcomp(x, y); +} + /********************************************************************* * fminf (MSVCR120.@) */

1 0

Aaryaman Vasishta : d3drm/tests: Add texture loading tests.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 889176b9d2b3f0d2a7ec5e8e1658e4a78a2ecef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889176b9d2b3f0d2a7ec5e8e1… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Jan 15 12:55:52 2016 +0100 d3drm/tests: Add texture loading tests. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=889176b9d2b3f0d2a7ec5…

1 0

Andrew Eikum : maintainers: Add DirectShow section.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 7cad73c6cb4ccdd0bc443dcda79388873a0eebb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cad73c6cb4ccdd0bc443dcda… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:42:33 2016 -0600 maintainers: Add DirectShow section. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 3e7d48d..ac3f515 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -90,6 +90,17 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +DirectShow +P: Andrew Eikum <aeikum(a)codeweavers.com> +F: dlls/amstream/ +F: dlls/mciqtz32/ +F: dlls/qcap/ +F: dlls/qedit/ +F: dlls/quartz/ +F: dlls/strmbase/ +F: dlls/winegstreamer/ +F: dlls/wineqtdecoder/ + DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/

1 0

Andrew Eikum : mciqtz32: Support MCI_DGV_PUT_DESTINATION.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 708a6b06cbcb78afa39fb42116b504c9289c2fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708a6b06cbcb78afa39fb4211… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:43:52 2016 -0600 mciqtz32: Support MCI_DGV_PUT_DESTINATION. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index d018a54..24d48f3 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -936,6 +936,53 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS return 0; } +/*************************************************************************** + * MCIQTZ_mciPut [internal] + */ +static DWORD MCIQTZ_mciPut(UINT wDevID, DWORD dwFlags, MCI_GENERIC_PARMS *lpParms) +{ + WINE_MCIQTZ *wma = MCIQTZ_mciGetOpenDev(wDevID); + MCI_DGV_RECT_PARMS *rectparms; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (!(dwFlags & MCI_DGV_RECT)) { + FIXME("No support for non-RECT MCI_PUT\n"); + return 1; + } + + if (dwFlags & MCI_TEST) + return 0; + + dwFlags &= ~MCI_DGV_RECT; + rectparms = (MCI_DGV_RECT_PARMS*)lpParms; + + if (dwFlags & MCI_DGV_PUT_DESTINATION) { + hr = IVideoWindow_SetWindowPosition(wma->vidwin, + rectparms->rc.left, rectparms->rc.top, + rectparms->rc.right - rectparms->rc.left, + rectparms->rc.bottom - rectparms->rc.top); + if(FAILED(hr)) + WARN("IVideoWindow_SetWindowPosition failed: 0x%x\n", hr); + + dwFlags &= ~MCI_DGV_PUT_DESTINATION; + } + + if (dwFlags & MCI_NOTIFY) { + MCIQTZ_mciNotify(lpParms->dwCallback, wma, MCI_NOTIFY_SUCCESSFUL); + dwFlags &= ~MCI_NOTIFY; + } + + if (dwFlags) + FIXME("No support for some flags: 0x%x\n", dwFlags); + + return 0; +} + /****************************************************************************** * MCIAVI_mciUpdate [internal] */ @@ -1099,6 +1146,9 @@ static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) case MCI_WINDOW: task->res = MCIQTZ_mciWindow(task->devid, task->flags, (LPMCI_DGV_WINDOW_PARMSW)task->parms); break; + case MCI_PUT: + task->res = MCIQTZ_mciPut(task->devid, task->flags, (MCI_GENERIC_PARMS*)task->parms); + break; case MCI_CLOSE: /* Special internal message */ SetEvent(task->done); @@ -1163,9 +1213,9 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SETAUDIO: case MCI_UPDATE: case MCI_WINDOW: + case MCI_PUT: if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); - case MCI_PUT: case MCI_RECORD: case MCI_RESUME: case MCI_INFO:

1 0

Andrew Eikum : xaudio2: Remove run-time version checks for XAudio2 object.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: fb9f616b2ba1b4bccda39f7e933612aba4cd562b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9f616b2ba1b4bccda39f7e9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:48:34 2016 -0600 xaudio2: Remove run-time version checks for XAudio2 object. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 186 ++++++++++++++++++++-------------------- dlls/xaudio2_7/xaudio_private.h | 2 - 2 files changed, 91 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb9f616b2ba1b4bccda39…

1 0

Andrew Eikum : xaudio2: Remove run-time versioning of xapo objects.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 0a8e8d190fcc979b25c6f1d675458cf51c60d0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8e8d190fcc979b25c6f1d67… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:48:37 2016 -0600 xaudio2: Remove run-time versioning of xapo objects. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapofx.c | 29 +++++++------------- dlls/xaudio2_7/xaudio_dll.c | 59 +++++++++++++---------------------------- dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 30 insertions(+), 60 deletions(-) diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 9b9a077..44dfb47 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -53,8 +53,6 @@ typedef struct _VUMeterImpl { IXAPOParameters IXAPOParameters_iface; LONG ref; - - DWORD version; } VUMeterImpl; static VUMeterImpl *VUMeterImpl_from_IXAPO(IXAPO *iface) @@ -258,8 +256,6 @@ typedef struct _ReverbImpl { IXAPOParameters IXAPOParameters_iface; LONG ref; - - DWORD version; } ReverbImpl; static ReverbImpl *ReverbImpl_from_IXAPO(IXAPO *iface) @@ -461,8 +457,6 @@ typedef struct _EQImpl { IXAPOParameters IXAPOParameters_iface; LONG ref; - - DWORD version; } EQImpl; static EQImpl *EQImpl_from_IXAPO(IXAPO *iface) @@ -662,7 +656,6 @@ static const IXAPOParametersVtbl EQXAPOParameters_Vtbl = { struct xapo_cf { IClassFactory IClassFactory_iface; LONG ref; - DWORD version; const CLSID *class; }; @@ -726,14 +719,13 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut object->IXAPO_iface.lpVtbl = &VUMXAPO_Vtbl; object->IXAPOParameters_iface.lpVtbl = &VUMXAPOParameters_Vtbl; - object->version = This->version; hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, object); return hr; } - }else if(IsEqualGUID(This->class, &CLSID_AudioReverb27)){ + }else if(IsEqualGUID(This->class, &CLSID_FXReverb)){ ReverbImpl *object; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -742,7 +734,6 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut object->IXAPO_iface.lpVtbl = &RVBXAPO_Vtbl; object->IXAPOParameters_iface.lpVtbl = &RVBXAPOParameters_Vtbl; - object->version = This->version; hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); if(FAILED(hr)){ @@ -758,7 +749,6 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut object->IXAPO_iface.lpVtbl = &EQXAPO_Vtbl; object->IXAPOParameters_iface.lpVtbl = &EQXAPOParameters_Vtbl; - object->version = This->version; hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); if(FAILED(hr)){ @@ -766,6 +756,7 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut return hr; } }else + /* TODO FXECHO, FXMasteringLimiter, */ return E_INVALIDARG; return S_OK; @@ -786,11 +777,10 @@ static const IClassFactoryVtbl xapo_Vtbl = xapocf_LockServer }; -IClassFactory *make_xapo_factory(REFCLSID clsid, DWORD version) +IClassFactory *make_xapo_factory(REFCLSID clsid) { struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; - ret->version = version; ret->class = clsid; ret->ref = 0; return &ret->IClassFactory_iface; @@ -802,7 +792,7 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_AudioVolumeMeter27, 28); + cf = make_xapo_factory(&CLSID_AudioVolumeMeter27); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -816,7 +806,7 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_AudioReverb27, 28); + cf = make_xapo_factory(&CLSID_FXReverb); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -836,13 +826,13 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in if(IsEqualGUID(clsid, &CLSID_FXReverb27) || IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_AudioReverb27; + class = &CLSID_FXReverb; else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; if(class){ - cf = make_xapo_factory(class, 20 + XAUDIO2_VER); + cf = make_xapo_factory(class); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); @@ -893,13 +883,14 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) if(IsEqualGUID(clsid, &CLSID_FXReverb27) || IsEqualGUID(clsid, &CLSID_FXReverb)) - class = &CLSID_AudioReverb27; + class = &CLSID_FXReverb; else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; + /* TODO FXECHO, FXMasteringLimiter, */ if(class){ - cf = make_xapo_factory(class, 20 + XAUDIO2_VER); + cf = make_xapo_factory(class); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 6517b40..efa6279 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2020,46 +2020,25 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_XAudio27)){ factory = make_xaudio2_factory(); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 20); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 21); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 22); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 23); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 24); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 25); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 26); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27, 27); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 20); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb21)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 21); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb22)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 22); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb23)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 23); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb24)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 24); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb25)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 25); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb26)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 26); - - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ - factory = make_xapo_factory(&CLSID_AudioReverb27, 27); + }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26) || + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ + factory = make_xapo_factory(&CLSID_AudioVolumeMeter27); + + }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || + IsEqualGUID(rclsid, &CLSID_AudioReverb21) || + IsEqualGUID(rclsid, &CLSID_AudioReverb22) || + IsEqualGUID(rclsid, &CLSID_AudioReverb23) || + IsEqualGUID(rclsid, &CLSID_AudioReverb24) || + IsEqualGUID(rclsid, &CLSID_AudioReverb25) || + IsEqualGUID(rclsid, &CLSID_AudioReverb26) || + IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ + factory = make_xapo_factory(&CLSID_FXReverb); } if(!factory) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 81db339..a75f721 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -149,4 +149,4 @@ extern const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl DECLSPEC_HIDDEN; -extern IClassFactory *make_xapo_factory(REFCLSID clsid, DWORD version); +extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN;

1 0

André Hentschel : include: Add manifest related defines.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: d05587afb8c0dc149a8ce874608318dafc0c785a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05587afb8c0dc149a8ce8746… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 14 23:40:56 2016 +0100 include: Add manifest related defines. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index 50821f4..74d3cd5 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -766,6 +766,21 @@ typedef struct tagWINDOWPLACEMENT #define RT_ANIICON MAKEINTRESOURCE(22) #define RT_HTML MAKEINTRESOURCE(23) +#ifdef RC_INVOKED +#define RT_MANIFEST 24 +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 +#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID 1 +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID 16 +#else +#define RT_MANIFEST MAKEINTRESOURCE(24) +#define CREATEPROCESS_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1) +#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(2) +#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(3) +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(1) +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID MAKEINTRESOURCE(16) +#endif /* cbWndExtra bytes for dialog class */ #define DLGWINDOWEXTRA 30

1 0

Alexandre Julliard : server: Pass full object attributes in the create_timer request.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: b5245a15a82770da5dcc1c50e5960786e0e4b6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5245a15a82770da5dcc1c50e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:47:06 2016 +0900 server: Pass full object attributes in the create_timer request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 15 ++++++++------- include/wine/server_protocol.h | 8 +++----- server/protocol.def | 4 +--- server/request.h | 6 ++---- server/timer.c | 17 ++++++++++------- server/trace.c | 4 +--- 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 36a9c86..1206627 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -745,25 +745,26 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE *handle, IN const OBJECT_ATTRIBUTES *attr OPTIONAL, IN TIMER_TYPE timer_type) { - DWORD len = (attr && attr->ObjectName) ? attr->ObjectName->Length : 0; - NTSTATUS status; - - if (len >= MAX_PATH * sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; + NTSTATUS status; + data_size_t len; + struct object_attributes *objattr; if (timer_type != NotificationTimer && timer_type != SynchronizationTimer) return STATUS_INVALID_PARAMETER; + if ((status = alloc_object_attributes( attr, &objattr, &len ))) return status; + SERVER_START_REQ( create_timer ) { req->access = access; - req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = wine_server_obj_handle( attr ? attr->RootDirectory : 0 ); req->manual = (timer_type == NotificationTimer); - if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); + wine_server_add_data( req, objattr, len ); status = wine_server_call( req ); *handle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8dd4994..aba649e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2601,11 +2601,9 @@ struct create_timer_request { struct request_header __header; unsigned int access; - unsigned int attributes; - obj_handle_t rootdir; int manual; - /* VARARG(name,unicode_str); */ - char __pad_28[4]; + /* VARARG(objattr,object_attributes); */ + char __pad_20[4]; }; struct create_timer_reply { @@ -6171,6 +6169,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 494 +#define SERVER_PROTOCOL_VERSION 495 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4becb8f..8250bed 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1950,10 +1950,8 @@ enum char_info_mode /* Create a waitable timer */ @REQ(create_timer) unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ int manual; /* manual reset */ - VARARG(name,unicode_str); /* object name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the timer */ @END diff --git a/server/request.h b/server/request.h index b2e5719..d9163a0 100644 --- a/server/request.h +++ b/server/request.h @@ -1352,10 +1352,8 @@ C_ASSERT( FIELD_OFFSET(struct set_registry_notification_request, subtree) == 20 C_ASSERT( FIELD_OFFSET(struct set_registry_notification_request, filter) == 24 ); C_ASSERT( sizeof(struct set_registry_notification_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_timer_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_timer_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_timer_request, rootdir) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_timer_request, manual) == 24 ); -C_ASSERT( sizeof(struct create_timer_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct create_timer_request, manual) == 16 ); +C_ASSERT( sizeof(struct create_timer_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_timer_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_timer_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_timer_request, access) == 12 ); diff --git a/server/timer.c b/server/timer.c index 9c293f2..2c0522c 100644 --- a/server/timer.c +++ b/server/timer.c @@ -80,7 +80,7 @@ static const struct object_ops timer_ops = /* create a timer object */ static struct timer *create_timer( struct directory *root, const struct unicode_str *name, - unsigned int attr, int manual ) + unsigned int attr, int manual, const struct security_descriptor *sd ) { struct timer *timer; @@ -95,6 +95,9 @@ static struct timer *create_timer( struct directory *root, const struct unicode_ timer->period = 0; timer->timeout = NULL; timer->thread = NULL; + if (sd) default_set_sd( &timer->obj, sd, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); } } return timer; @@ -232,15 +235,15 @@ DECL_HANDLER(create_timer) struct timer *timer; struct unicode_str name; struct directory *root = NULL; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); - reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; + if (!objattr) return; + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((timer = create_timer( root, &name, req->attributes, req->manual ))) + if ((timer = create_timer( root, &name, objattr->attributes, req->manual, sd ))) { - reply->handle = alloc_handle( current->process, timer, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, timer, req->access, objattr->attributes ); release_object( timer ); } diff --git a/server/trace.c b/server/trace.c index edfcaf5..552e8c2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2441,10 +2441,8 @@ static void dump_set_registry_notification_request( const struct set_registry_no static void dump_create_timer_request( const struct create_timer_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); fprintf( stderr, ", manual=%d", req->manual ); - dump_varargs_unicode_str( ", name=", cur_size ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_timer_reply( const struct create_timer_reply *req )

1 0