March 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/tests: Add some tests for IBasicAudio on the DirectSound renderer.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 3b8770df8d4668c43cea149215b7a5bbd6632cf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b8770df8d4668c43cea1492… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 13 09:54:01 2019 -0500 quartz/tests: Add some tests for IBasicAudio on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 0d48bec..dcaedd5 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -146,6 +146,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE); check_interface(filter, &IID_IPin, FALSE); check_interface(filter, &IID_IQualProp, FALSE); @@ -336,6 +337,70 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_basic_audio(void) +{ + IBaseFilter *filter = create_dsound_render(); + LONG balance, volume; + ITypeInfo *typeinfo; + IBasicAudio *audio; + TYPEATTR *typeattr; + ULONG ref, count; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IBasicAudio, (void **)&audio); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, &balance); + if (hr != VFW_E_MONO_AUDIO_HW) + { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(balance == 0, "Got balance %d.\n", balance); + + hr = IBasicAudio_put_Balance(audio, DSBPAN_LEFT - 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IBasicAudio_put_Balance(audio, DSBPAN_LEFT); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Balance(audio, &balance); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(balance == DSBPAN_LEFT, "Got balance %d.\n", balance); + } + + hr = IBasicAudio_get_Volume(audio, &volume); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(volume == 0, "Got volume %d.\n", volume); + + hr = IBasicAudio_put_Volume(audio, DSBVOLUME_MIN - 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IBasicAudio_put_Volume(audio, DSBVOLUME_MIN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBasicAudio_get_Volume(audio, &volume); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(volume == DSBVOLUME_MIN, "Got volume %d.\n", volume); + + hr = IBasicAudio_GetTypeInfoCount(audio, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + + hr = IBasicAudio_GetTypeInfo(audio, 0, 0, &typeinfo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(typeattr->typekind == TKIND_DISPATCH, "Got kind %u.\n", typeattr->typekind); + ok(IsEqualGUID(&typeattr->guid, &IID_IBasicAudio), "Got IID %s.\n", wine_dbgstr_guid(&typeattr->guid)); + ITypeInfo_Release(typeinfo); + + IBasicAudio_Release(audio); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -415,6 +480,7 @@ START_TEST(dsoundrender) test_enum_pins(); test_find_pin(); test_pin_info(); + test_basic_audio(); test_basefilter(); CoUninitialize();

1 0

Alexandre Julliard : configure: Hardcode some headers for Windows platforms.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 667bc336fecd380c734c313664134943776ab11f URL: https://source.winehq.org/git/wine.git/?a=commit;h=667bc336fecd380c734c3136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 17:05:06 2019 +0100 configure: Hardcode some headers for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 3 --- include/config.h.in | 9 --------- include/wine/port.h | 21 ++++++++++++--------- 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 1818eac..611dd44 100755 --- a/configure +++ b/configure @@ -7296,7 +7296,6 @@ for ac_header in \ asm/types.h \ asm/user.h \ curses.h \ - direct.h \ dirent.h \ dlfcn.h \ elf.h \ @@ -7309,7 +7308,6 @@ for ac_header in \ gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ - io.h \ kstat.h \ libproc.h \ link.h \ @@ -7344,7 +7342,6 @@ for ac_header in \ pcap/pcap.h \ poll.h \ port.h \ - process.h \ pthread.h \ pwd.h \ sched.h \ diff --git a/configure.ac b/configure.ac index 7aa4fb8..9ab6cfc 100644 --- a/configure.ac +++ b/configure.ac @@ -433,7 +433,6 @@ AC_CHECK_HEADERS(\ asm/types.h \ asm/user.h \ curses.h \ - direct.h \ dirent.h \ dlfcn.h \ elf.h \ @@ -446,7 +445,6 @@ AC_CHECK_HEADERS(\ gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ - io.h \ kstat.h \ libproc.h \ link.h \ @@ -481,7 +479,6 @@ AC_CHECK_HEADERS(\ pcap/pcap.h \ poll.h \ port.h \ - process.h \ pthread.h \ pwd.h \ sched.h \ diff --git a/include/config.h.in b/include/config.h.in index 5efa27e..0ff9410 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -110,9 +110,6 @@ /* Define if you have the daylight variable */ #undef HAVE_DAYLIGHT -/* Define to 1 if you have the <direct.h> header file. */ -#undef HAVE_DIRECT_H - /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H @@ -333,9 +330,6 @@ /* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ #undef HAVE_IOKIT_IOKITLIB_H -/* Define to 1 if you have the <io.h> header file. */ -#undef HAVE_IO_H - /* Define to 1 if you have the `isfinite' function. */ #undef HAVE_ISFINITE @@ -765,9 +759,6 @@ /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD -/* Define to 1 if you have the <process.h> header file. */ -#undef HAVE_PROCESS_H - /* Define to 1 if you have the `proc_pidinfo' function. */ #undef HAVE_PROC_PIDINFO diff --git a/include/wine/port.h b/include/wine/port.h index e32818e..7b56013 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -36,15 +36,6 @@ #include <math.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_DIRECT_H -# include <direct.h> -#endif -#ifdef HAVE_IO_H -# include <io.h> -#endif -#ifdef HAVE_PROCESS_H -# include <process.h> -#endif #include <string.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -53,6 +44,18 @@ /**************************************************************** + * Hard-coded values for the Windows platform + */ + +#ifdef _WIN32 + +#include <direct.h> +#include <io.h> +#include <process.h> + +#endif /* _WIN32 */ + +/**************************************************************** * Type definitions */

1 0

Alexandre Julliard : configure: Hardcode some types for Windows platforms.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 4d4c55d061e286a9397af1e220865bf32a748195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d4c55d061e286a9397af1e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 17:12:36 2019 +0100 configure: Hardcode some types for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 54 ----------------------------------------------------- configure.ac | 2 +- include/config.h.in | 18 ------------------ include/wine/port.h | 36 ++++++++++++++++------------------- 4 files changed, 17 insertions(+), 93 deletions(-) diff --git a/configure b/configure index 611dd44..3c624df 100755 --- a/configure +++ b/configure @@ -17471,60 +17471,6 @@ _ACEOF ;; esac -ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_MODE_T 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_OFF_T 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_PID_T 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SIZE_T 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SSIZE_T 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" -if test "x$ac_cv_type_long_long" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_LONG_LONG 1 -_ACEOF - - -fi ac_fn_c_check_type "$LINENO" "fsblkcnt_t" "ac_cv_type_fsblkcnt_t" "$ac_includes_default" if test "x$ac_cv_type_fsblkcnt_t" = xyes; then : diff --git a/configure.ac b/configure.ac index 9ab6cfc..d604602 100644 --- a/configure.ac +++ b/configure.ac @@ -2312,7 +2312,7 @@ fi dnl **** Check for types **** AC_C_INLINE -AC_CHECK_TYPES([mode_t, off_t, pid_t, size_t, ssize_t, long long, fsblkcnt_t, fsfilcnt_t]) +AC_CHECK_TYPES([fsblkcnt_t, fsfilcnt_t]) AC_CHECK_TYPES([sigset_t],,,[#include <sys/types.h> #include <signal.h>]) AC_CHECK_TYPES([request_sense],,,[#include <linux/cdrom.h>]) diff --git a/include/config.h.in b/include/config.h.in index 0ff9410..5e2c259 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -549,9 +549,6 @@ /* Define to 1 if you have the `log2f' function. */ #undef HAVE_LOG2F -/* Define to 1 if the system has the type `long long'. */ -#undef HAVE_LONG_LONG - /* Define to 1 if you have the `lrint' function. */ #undef HAVE_LRINT @@ -606,9 +603,6 @@ /* Define to 1 if you have the <mntent.h> header file. */ #undef HAVE_MNTENT_H -/* Define to 1 if the system has the type `mode_t'. */ -#undef HAVE_MODE_T - /* Define to 1 if you have the `mousemask' function. */ #undef HAVE_MOUSEMASK @@ -699,9 +693,6 @@ /* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */ #undef HAVE_NS_MSG__MSG_PTR -/* Define to 1 if the system has the type `off_t'. */ -#undef HAVE_OFF_T - /* Define if mkdir takes only one argument */ #undef HAVE_ONE_ARG_MKDIR @@ -723,9 +714,6 @@ /* Define to 1 if you have the `pclose' function. */ #undef HAVE_PCLOSE -/* Define to 1 if the system has the type `pid_t'. */ -#undef HAVE_PID_T - /* Define to 1 if you have the `pipe2' function. */ #undef HAVE_PIPE2 @@ -891,18 +879,12 @@ /* Define to 1 if the system has the type `sigset_t'. */ #undef HAVE_SIGSET_T -/* Define to 1 if the system has the type `size_t'. */ -#undef HAVE_SIZE_T - /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF /* Define to 1 if you have the `socketpair' function. */ #undef HAVE_SOCKETPAIR -/* Define to 1 if the system has the type `ssize_t'. */ -#undef HAVE_SSIZE_T - /* Define to 1 if you have the `SSLCopyPeerCertificates' function. */ #undef HAVE_SSLCOPYPEERCERTIFICATES diff --git a/include/wine/port.h b/include/wine/port.h index 7b56013..4462e58 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -53,13 +53,18 @@ #include <io.h> #include <process.h> -#endif /* _WIN32 */ +#ifdef _MSC_VER -/**************************************************************** - * Type definitions - */ +typedef int mode_t; +typedef long off_t; +typedef int pid_t; +typedef int ssize_t; + +#endif /* _MSC_VER */ + +#else /* _WIN32 */ -#if !defined(_MSC_VER) && !defined(__int64) +#ifndef __int64 # if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) # define __int64 long # else @@ -67,21 +72,12 @@ # endif #endif -#ifndef HAVE_MODE_T -typedef int mode_t; -#endif -#ifndef HAVE_OFF_T -typedef long off_t; -#endif -#ifndef HAVE_PID_T -typedef int pid_t; -#endif -#ifndef HAVE_SIZE_T -typedef unsigned int size_t; -#endif -#ifndef HAVE_SSIZE_T -typedef int ssize_t; -#endif +#endif /* _WIN32 */ + +/**************************************************************** + * Type definitions + */ + #ifndef HAVE_FSBLKCNT_T typedef unsigned long fsblkcnt_t; #endif

1 0

Zebediah Figura : include: Correct IDL attributes for control.idl.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 27ffc60c1fc79ae2e50bab70fcbd3cbb5f3d1bf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ffc60c1fc79ae2e50bab70… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 13 09:54:00 2019 -0500 include: Correct IDL attributes for control.idl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/control.idl | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/include/control.idl b/include/control.idl index 529d435..265444a 100644 --- a/include/control.idl +++ b/include/control.idl @@ -42,7 +42,8 @@ library QuartzTypeLib [ object, uuid(56a868b1-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaControl : IDispatch { @@ -52,8 +53,8 @@ library QuartzTypeLib HRESULT GetState( [in] LONG msTimeout, [out] OAFilterState *pfs ); HRESULT RenderFile( [in] BSTR strFilename ); HRESULT AddSourceFilter( [in] BSTR strFilename, [out] IDispatch **ppUnk ); - [propget] HRESULT FilterCollection( [out] IDispatch **ppUnk ); - [propget] HRESULT RegFilterCollection( [out] IDispatch **ppUnk ); + [propget] HRESULT FilterCollection( [out, retval] IDispatch **ppUnk ); + [propget] HRESULT RegFilterCollection( [out, retval] IDispatch **ppUnk ); HRESULT StopWhenReady(); } @@ -64,7 +65,8 @@ library QuartzTypeLib [ object, uuid(56a868b3-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IBasicAudio : IDispatch { @@ -81,7 +83,8 @@ library QuartzTypeLib [ object, uuid(56a868b4-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IVideoWindow : IDispatch { @@ -133,7 +136,8 @@ library QuartzTypeLib [ object, uuid(56a868b5-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IBasicVideo : IDispatch { @@ -168,9 +172,9 @@ library QuartzTypeLib HRESULT GetVideoPaletteEntries( [in] LONG StartIndex, [in] LONG Entries, [out] LONG *pRetrieved, - [out, size_is(Entries), length_is(*pRetrieved)] LONG *pPalette ); + [out] LONG *pPalette ); HRESULT GetCurrentImage( [in, out] LONG *pBufferSize, - [out, size_is(*pBufferSize), length_is(*pBufferSize)] LONG *pDIBImage ); + [out] LONG *pDIBImage ); HRESULT IsUsingDefaultSource(); HRESULT IsUsingDefaultDestination(); } @@ -193,7 +197,8 @@ library QuartzTypeLib [ object, uuid(56a868b6-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaEvent : IDispatch { @@ -212,7 +217,6 @@ library QuartzTypeLib [ object, uuid(56a868c0-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) ] interface IMediaEventEx : IMediaEvent { @@ -228,21 +232,22 @@ library QuartzTypeLib [ object, uuid(56a868b2-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaPosition : IDispatch { - HRESULT get_Duration( [out] REFTIME *plength ); - HRESULT put_CurrentPosition( [in] REFTIME llTime ); - HRESULT get_CurrentPosition( [out] REFTIME *pllTime ); - HRESULT get_StopTime( [out] REFTIME *pllTime ); - HRESULT put_StopTime( [in] REFTIME llTime ); - HRESULT get_PrerollTime( [out] REFTIME *pllTime ); - HRESULT put_PrerollTime( [in] REFTIME llTime ); - HRESULT put_Rate( [in] double dRate ); - HRESULT get_Rate( [out] double *pdRate ); - HRESULT CanSeekForward( [out] LONG *pCanSeekForward ); - HRESULT CanSeekBackward( [out] LONG *pCanSeekBackward ); + [propget] HRESULT Duration( [out, retval] REFTIME *plength ); + [propput] HRESULT CurrentPosition( [in] REFTIME llTime ); + [propget] HRESULT CurrentPosition( [out, retval] REFTIME *pllTime ); + [propget] HRESULT StopTime( [out, retval] REFTIME *pllTime ); + [propput] HRESULT StopTime( [in] REFTIME llTime ); + [propget] HRESULT PrerollTime( [out, retval] REFTIME *pllTime ); + [propput] HRESULT PrerollTime( [in] REFTIME llTime ); + [propput] HRESULT Rate( [in] double dRate ); + [propget] HRESULT Rate( [out, retval] double *pdRate ); + HRESULT CanSeekForward( [out, retval] LONG *pCanSeekForward ); + HRESULT CanSeekBackward( [out, retval] LONG *pCanSeekBackward ); } } /* library QuartzTypeLib */

1 0

Nikolay Sivov : imm32: Get rid of some casts in attributes helper, document arguments.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: a6a8a034bda35f88848e6b0f03f3c070d27bab55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a8a034bda35f88848e6b0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 13:12:24 2019 +0300 imm32: Get rid of some casts in attributes helper, document arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 948ef78..b462141 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1231,33 +1231,40 @@ static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *s return ret; } -static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, INT sslen, - LPBYTE target, INT tlen, BOOL unicode ) +/* Composition string encoding is defined by context, returned attributes correspond to string, converted according to + passed mode. String length is in characters, attributes are in byte arrays. */ +static INT CopyCompAttrIMEtoClient(const InputContextData *data, const BYTE *src, INT src_len, const void *comp_string, + INT str_len, BYTE *dst, INT dst_len, BOOL unicode) { + union + { + const void *str; + const WCHAR *strW; + const char *strA; + } string; INT rc; + string.str = comp_string; + if (is_himc_ime_unicode(data) && !unicode) { - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, sslen, NULL, 0, NULL, NULL); - if (tlen) + rc = WideCharToMultiByte(CP_ACP, 0, string.strW, str_len, NULL, 0, NULL, NULL); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0, k = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { int len; - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)ssource + i, 1, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, string.strW + i, 1, NULL, 0, NULL, NULL); for (; len > 0; --len) { dst[j++] = src[k]; - if (j >= tlen) + if (j >= dst_len) goto end; } ++k; @@ -1268,23 +1275,21 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else if (!is_himc_ime_unicode(data) && unicode) { - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, sslen, NULL, 0); - if (tlen) + rc = MultiByteToWideChar(CP_ACP, 0, string.strA, str_len, NULL, 0); + if (dst_len) { - const BYTE *src = source; - LPBYTE dst = target; int i, j = 0; - if (rc < tlen) - tlen = rc; - for (i = 0; i < sslen; ++i) + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) { - if (IsDBCSLeadByte(((LPSTR)ssource)[i])) + if (IsDBCSLeadByte(string.strA[i])) continue; dst[j++] = src[i]; - if (j >= tlen) + if (j >= dst_len) break; } rc = j; @@ -1292,8 +1297,8 @@ static INT CopyCompAttrIMEtoClient(InputContextData *data, LPBYTE source, INT sl } else { - memcpy( target, source, min(slen,tlen)); - rc = slen; + memcpy(dst, src, min(src_len, dst_len)); + rc = src_len; } return rc;

1 0

Alexandre Julliard : configure: Hardcode some functions for Windows platforms.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 817fb9755cbf48162fe1b7d37e77d7e25afa7520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=817fb9755cbf48162fe1b7d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 17:14:48 2019 +0100 configure: Hardcode some functions for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 56 +-------------------------------------- configure.ac | 33 +---------------------- include/config.h.in | 69 ------------------------------------------------- include/wine/port.h | 69 ++++++++++--------------------------------------- libs/port/Makefile.in | 2 -- libs/port/isfinite.c | 8 ------ libs/port/isinf.c | 8 ------ libs/port/isnan.c | 8 ------ libs/port/strcasecmp.c | 39 ---------------------------- libs/port/strncasecmp.c | 43 ------------------------------ 10 files changed, 16 insertions(+), 319 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=817fb9755cbf48162fe1…

1 0

Matteo Bruni : d3d8/tests: Set FVF in test_draw_primitive().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 62dda27f53b59b2404276213bd4d45e16c7b44fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=62dda27f53b59b2404276213… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:07 2019 +0100 d3d8/tests: Set FVF in test_draw_primitive(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d5989b8..1a5a040 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9475,6 +9475,8 @@ static void test_draw_primitive(void) ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); hr = IDirect3DDevice8_SetStreamSource(device, 0, vertex_buffer, sizeof(*quad)); ok(SUCCEEDED(hr), "SetStreamSource failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &index_buffer);

1 0

Matteo Bruni : d3d8/tests: Skip test_lost_device() on WARP.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 7912a19ad35a8ca3040858651e7e7c1bd808587a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7912a19ad35a8ca304085865… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:08 2019 +0100 d3d8/tests: Skip test_lost_device() on WARP. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1a5a040..0564154 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7739,6 +7739,7 @@ static void test_writeonly_resource(void) static void test_lost_device(void) { + D3DADAPTER_IDENTIFIER8 identifier; struct device_desc device_desc; IDirect3DDevice8 *device; IDirect3D8 *d3d; @@ -7750,6 +7751,8 @@ static void test_lost_device(void) window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); device_desc.device_window = window; device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; @@ -7767,6 +7770,13 @@ static void test_lost_device(void) IDirect3DDevice8_Release(device); goto done; } + if (adapter_is_warp(&identifier)) + { + win_skip("Windows 10 WARP crashes during this test.\n"); + IDirect3DDevice8_Release(device); + goto done; + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9/tests: Fix test_frame_latency() D3D9Ex test on Windows 10.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 88107118d51f4c70497a62feb3b137988a587f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88107118d51f4c70497a62fe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:06 2019 +0100 d3d9/tests: Fix test_frame_latency() D3D9Ex test on Windows 10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 9067f3a..7f46ced 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4140,7 +4140,7 @@ static void test_frame_latency(void) hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); - ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); + ok(latency == 3 || !latency, "Unexpected default max frame latency %u.\n", latency); hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 30); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr);

1 0

Alexandre Julliard : libwpp: Use __int64 instead of long long.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 595386250ab6e54e9dbadd8e209852ff61babbf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595386250ab6e54e9dbadd8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 16:47:26 2019 +0100 libwpp: Use __int64 instead of long long. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/ppl.l | 40 ++++++++++++++++------------------------ libs/wpp/ppy.y | 20 ++++++++++---------- libs/wpp/wpp_private.h | 27 ++------------------------- 3 files changed, 28 insertions(+), 59 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 1a04860..0a3768b 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -171,11 +171,11 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] #include <limits.h> #ifndef LLONG_MAX -# define LLONG_MAX ((long long)0x7fffffff << 32 | 0xffffffff) +# define LLONG_MAX ((__int64)0x7fffffff << 32 | 0xffffffff) # define LLONG_MIN (-LLONG_MAX - 1) #endif #ifndef ULLONG_MAX -# define ULLONG_MAX ((long long)0xffffffff << 32 | 0xffffffff) +# define ULLONG_MAX ((__int64)0xffffffff << 32 | 0xffffffff) #endif #ifndef HAVE_UNISTD_H @@ -899,29 +899,21 @@ static int make_number(int radix, YYSTYPE *val, const char *str, int len) is_u++; } - if(is_ll) + if(is_u && is_ll) { -/* Assume as in the declaration of wrc_ull_t and wrc_sll_t */ -#ifdef HAVE_LONG_LONG - if (is_u) - { - errno = 0; - val->ull = strtoull(str, NULL, radix); - if (val->ull == ULLONG_MAX && errno == ERANGE) - ppy_error("integer constant %s is too large\n", str); - return tULONGLONG; - } - else - { - errno = 0; - val->sll = strtoll(str, NULL, radix); - if ((val->sll == LLONG_MIN || val->sll == LLONG_MAX) && errno == ERANGE) - ppy_error("integer constant %s is too large\n", str); - return tSLONGLONG; - } -#else - pp_internal_error(__FILE__, __LINE__, "long long constants not supported on this platform"); -#endif + errno = 0; + val->ull = strtoull(str, NULL, radix); + if (val->ull == ULLONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); + return tULONGLONG; + } + else if(!is_u && is_ll) + { + errno = 0; + val->sll = strtoll(str, NULL, radix); + if ((val->sll == LLONG_MIN || val->sll == LLONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); + return tSLONGLONG; } else if(is_u && is_l) { diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index dbbe972..eb4f15a 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -81,9 +81,9 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.sll; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.sll = v1.val.sll OP (wrc_sll_t) v2.val.ull; \ + r.val.sll = v1.val.sll OP (__int64) v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.sll = (wrc_sll_t) v1.val.ull OP v2.val.sll; \ + r.val.sll = (__int64) v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull; @@ -128,8 +128,8 @@ static int nmacro_args; unsigned int uint; long slong; unsigned long ulong; - wrc_sll_t sll; - wrc_ull_t ull; + __int64 sll; + unsigned __int64 ull; int *iptr; char *cptr; cval_t cval; @@ -539,12 +539,12 @@ static int boolean(cval_t *v) { switch(v->type) { - case cv_sint: return v->val.si != (int)0; - case cv_uint: return v->val.ui != (unsigned int)0; - case cv_slong: return v->val.sl != (long)0; - case cv_ulong: return v->val.ul != (unsigned long)0; - case cv_sll: return v->val.sll != (wrc_sll_t)0; - case cv_ull: return v->val.ull != (wrc_ull_t)0; + case cv_sint: return v->val.si != 0; + case cv_uint: return v->val.ui != 0; + case cv_slong: return v->val.sl != 0; + case cv_ulong: return v->val.ul != 0; + case cv_sll: return v->val.sll != 0; + case cv_ull: return v->val.ull != 0; } return 0; } diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index caa52b9..093f221 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -20,10 +20,6 @@ #ifndef __WINE_WPP_PRIVATE_H #define __WINE_WPP_PRIVATE_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - #include <stdio.h> #include <string.h> @@ -136,25 +132,6 @@ typedef struct int seen_junk; /* Set when junk is seen */ } include_state_t; - -/* - * If the configure says we have long long then we can use it. Presumably - * if we have long long then we have strtoull and strtoll too. If that is - * not the case we will need to add to the configure tests. - * If we do not have long long , then we revert to a simple 'long' for now. - * This should prevent most unexpected things with other compilers than - * gcc and egcs for now. - * In the future it should be possible to use another way, like a - * structure, so that we can emulate the MS compiler. - */ -#ifdef HAVE_LONG_LONG -typedef long long wrc_sll_t; -typedef unsigned long long wrc_ull_t; -#else -typedef long wrc_sll_t; -typedef unsigned long wrc_ull_t; -#endif - #define SIZE_CHAR 1 #define SIZE_SHORT 2 #define SIZE_INT 3 @@ -191,8 +168,8 @@ typedef struct cval { unsigned int ui; long sl; unsigned long ul; - wrc_sll_t sll; - wrc_ull_t ull; + __int64 sll; + unsigned __int64 ull; } val; } cval_t;

1 0