June 2020 - Wine-Commits - list.winehq.org

Piotr Caban : msi: Add stub support for MSITRANSFORM_ERROR_VIEWTRANSFORM flag in MsiApplyTransform.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 8bc835b4517728fac8ff8a9cfa5e59b843e9a8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc835b4517728fac8ff8a9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:43 2020 +0200 msi: Add stub support for MSITRANSFORM_ERROR_VIEWTRANSFORM flag in MsiApplyTransform. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 +- dlls/msi/patch.c | 2 +- dlls/msi/table.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 161 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc835b4517728fac8ff…

1 0

Alexandre Julliard : ntdll: Use Windows APIs to handle the dll overrides variable.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: dde38fda6eacf453cb48f75b7579647ceb75e9fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=dde38fda6eacf453cb48f75b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 19:38:29 2020 +0200 ntdll: Use Windows APIs to handle the dll overrides variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loadorder.c | 40 ++++++++++++++++++++-------------------- dlls/ntdll/unix/env.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 59 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index dad5d915da..6e4a502e75 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -27,6 +27,8 @@ #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" #include "ntdll_misc.h" @@ -181,7 +183,7 @@ static void add_load_order( const module_loadorder_t *plo ) if(!env_list.order) { MESSAGE("Virtual memory exhausted\n"); - exit(1); + NtTerminateProcess( GetCurrentProcess(), 1 ); } } env_list.order[i].loadorder = plo->loadorder; @@ -225,29 +227,28 @@ static void add_load_order_set( WCHAR *entry ) */ static void init_load_order(void) { - const char *order = getenv( "WINEDLLOVERRIDES" ); - UNICODE_STRING strW; - WCHAR *entry, *next; + static const WCHAR winedlloverridesW[] = {'W','I','N','E','D','L','L','O','V','E','R','R','I','D','E','S',0}; + WCHAR *entry, *next, *order; + SIZE_T len = 1024; + NTSTATUS status; init_done = TRUE; - if (!order) return; - if (!strcmp( order, "help" )) + for (;;) { - MESSAGE( "Syntax:\n" - " WINEDLLOVERRIDES=\"entry;entry;entry...\"\n" - " where each entry is of the form:\n" - " module[,module...]={native|builtin}[,{b|n}]\n" - "\n" - " Only the first letter of the override (native or builtin)\n" - " is significant.\n\n" - "Example:\n" - " WINEDLLOVERRIDES=\"comdlg32=n,b;shell32,shlwapi=b\"\n" ); - exit(0); + order = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + status = RtlQueryEnvironmentVariable( NULL, winedlloverridesW, wcslen(winedlloverridesW), + order, len - 1, &len ); + if (!status) + { + order[len] = 0; + break; + } + RtlFreeHeap( GetProcessHeap(), 0, order ); + if (status != STATUS_BUFFER_TOO_SMALL) return; } - RtlCreateUnicodeStringFromAsciiz( &strW, order ); - entry = strW.Buffer; + entry = order; while (*entry) { while (*entry == ';') entry++; @@ -263,8 +264,7 @@ static void init_load_order(void) if (env_list.count) qsort(env_list.order, env_list.count, sizeof(env_list.order[0]), cmp_sort_func); - /* Note: we don't free the Unicode string because the - * stored module names point inside it */ + /* note: we don't free the string because the stored module names point inside it */ } diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index d90990c092..7bf57a228f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -802,6 +802,17 @@ void init_environment( int argc, char *argv[], char *envp[] ) } +static const char overrides_help_message[] = + "Syntax:\n" + " WINEDLLOVERRIDES=\"entry;entry;entry...\"\n" + " where each entry is of the form:\n" + " module[,module...]={native|builtin}[,{b|n}]\n" + "\n" + " Only the first letter of the override (native or builtin)\n" + " is significant.\n\n" + "Example:\n" + " WINEDLLOVERRIDES=\"comdlg32=n,b;shell32,shlwapi=b\"\n"; + /************************************************************************* * get_initial_environment * @@ -822,6 +833,11 @@ NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *siz { if (is_special_env_var( str + 4 )) str += 4; else if (!strncmp( str, "WINEPRELOADRESERVE=", 19 )) continue; /* skip it */ + else if (!strcmp( str, "WINEDLLOVERRIDES=help" )) + { + MESSAGE( overrides_help_message ); + exit(0); + } } else if (is_special_env_var( str )) continue; /* skip it */ @@ -842,7 +858,21 @@ NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *siz /* append a variable to the environment */ -static void append_env( WCHAR *env, SIZE_T *pos, const char *name, const WCHAR *value ) +static void append_envA( WCHAR *env, SIZE_T *pos, const char *name, const char *value ) +{ + SIZE_T i = *pos; + + while (*name) env[i++] = (unsigned char)*name++; + if (value) + { + env[i++] = '='; + i += ntdll_umbstowcs( value, strlen(value), env + i, strlen(value) ); + } + env[i++] = 0; + *pos = i; +} + +static void append_envW( WCHAR *env, SIZE_T *pos, const char *name, const WCHAR *value ) { SIZE_T i = *pos; @@ -862,12 +892,12 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char UNICODE_STRING nt_name; ANSI_STRING unix_name; - if (!path) append_env( env, pos, name, NULL ); + if (!path) append_envW( env, pos, name, NULL ); else { RtlInitAnsiString( &unix_name, path ); if (unix_to_nt_file_name( &unix_name, &nt_name )) return; - append_env( env, pos, name, nt_name.Buffer ); + append_envW( env, pos, name, nt_name.Buffer ); RtlFreeUnicodeString( &nt_name ); } } @@ -880,19 +910,20 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char */ NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) { + const char *overrides = getenv( "WINEDLLOVERRIDES" ); SIZE_T alloc, pos = 0; WCHAR *buffer; DWORD i; - WCHAR buf[256]; char dlldir[22]; NTSTATUS status = STATUS_SUCCESS; - alloc = 20 * 6; /* 6 variable names */ + alloc = 20 * 7; /* 7 variable names */ if (data_dir) alloc += strlen( data_dir ) + 9; if (home_dir) alloc += strlen( home_dir ) + 9; if (build_dir) alloc += strlen( build_dir ) + 9; if (config_dir) alloc += strlen( config_dir ) + 9; if (user_name) alloc += strlen( user_name ); + if (overrides) alloc += strlen( overrides ); for (i = 0; dll_paths[i]; i++) alloc += 20 + strlen( dll_paths[i] ) + 9; if (!(buffer = malloc( alloc * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; @@ -907,9 +938,9 @@ NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) add_path_var( buffer, &pos, dlldir, dll_paths[i] ); } sprintf( dlldir, "WINEDLLDIR%u", i ); - append_env( buffer, &pos, dlldir, NULL ); - ntdll_umbstowcs( user_name, strlen(user_name) + 1, buf, ARRAY_SIZE(buf) ); - append_env( buffer, &pos, "WINEUSERNAME", buf ); + append_envW( buffer, &pos, dlldir, NULL ); + append_envA( buffer, &pos, "WINEUSERNAME", user_name ); + append_envA( buffer, &pos, "WINEDLLOVERRIDES", overrides ); assert( pos <= alloc ); if (pos < *size)

1 0

Alexandre Julliard : ntdll: Move the math functions to the Unix library.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: e60591919850a79a483ec3c138fce96f8e1edb57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e60591919850a79a483ec3c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 09:12:11 2020 +0200 ntdll: Move the math functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 30 +++++++++++------------------- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 23 +++++++++++++++++++++++ dlls/ntdll/unixlib.h | 14 +++++++++++++- 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 362c68e5e0..4e2175b89b 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -77,15 +77,7 @@ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **relea */ int CDECL NTDLL_abs( int i ) { - return abs( i ); -} - -/********************************************************************* - * labs (NTDLL.@) - */ -LONG CDECL NTDLL_labs( LONG i ) -{ - return labs( i ); + return i >= 0 ? i : -i; } /********************************************************************* @@ -93,7 +85,7 @@ LONG CDECL NTDLL_labs( LONG i ) */ double CDECL NTDLL_atan( double d ) { - return atan( d ); + return unix_funcs->atan( d ); } /********************************************************************* @@ -101,7 +93,7 @@ double CDECL NTDLL_atan( double d ) */ double CDECL NTDLL_ceil( double d ) { - return ceil( d ); + return unix_funcs->ceil( d ); } /********************************************************************* @@ -109,7 +101,7 @@ double CDECL NTDLL_ceil( double d ) */ double CDECL NTDLL_cos( double d ) { - return cos( d ); + return unix_funcs->cos( d ); } /********************************************************************* @@ -117,7 +109,7 @@ double CDECL NTDLL_cos( double d ) */ double CDECL NTDLL_fabs( double d ) { - return fabs( d ); + return unix_funcs->fabs( d ); } /********************************************************************* @@ -125,7 +117,7 @@ double CDECL NTDLL_fabs( double d ) */ double CDECL NTDLL_floor( double d ) { - return floor( d ); + return unix_funcs->floor( d ); } /********************************************************************* @@ -133,7 +125,7 @@ double CDECL NTDLL_floor( double d ) */ double CDECL NTDLL_log( double d ) { - return log( d ); + return unix_funcs->log( d ); } /********************************************************************* @@ -141,7 +133,7 @@ double CDECL NTDLL_log( double d ) */ double CDECL NTDLL_pow( double x, double y ) { - return pow( x, y ); + return unix_funcs->pow( x, y ); } /********************************************************************* @@ -149,7 +141,7 @@ double CDECL NTDLL_pow( double x, double y ) */ double CDECL NTDLL_sin( double d ) { - return sin( d ); + return unix_funcs->sin( d ); } /********************************************************************* @@ -157,7 +149,7 @@ double CDECL NTDLL_sin( double d ) */ double CDECL NTDLL_sqrt( double d ) { - return sqrt( d ); + return unix_funcs->sqrt( d ); } /********************************************************************* @@ -165,7 +157,7 @@ double CDECL NTDLL_sqrt( double d ) */ double CDECL NTDLL_tan( double d ) { - return tan( d ); + return unix_funcs->tan( d ); } #if defined(__GNUC__) && defined(__i386__) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0b0d458796..913d6cacc4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1508,7 +1508,7 @@ @ cdecl iswspace(long) NTDLL_iswspace @ cdecl iswxdigit(long) NTDLL_iswxdigit @ cdecl isxdigit(long) NTDLL_isxdigit -@ cdecl labs(long) NTDLL_labs +@ cdecl labs(long) NTDLL_abs @ cdecl log(double) NTDLL_log @ cdecl mbstowcs(ptr str long) NTDLL_mbstowcs @ cdecl memchr(ptr long long) NTDLL_memchr diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 68018b49fb..be71498343 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1331,6 +1331,19 @@ ULONG_PTR get_image_address(void) } +/* math function wrappers */ +static double CDECL ntdll_atan( double d ) { return atan( d ); } +static double CDECL ntdll_ceil( double d ) { return ceil( d ); } +static double CDECL ntdll_cos( double d ) { return cos( d ); } +static double CDECL ntdll_fabs( double d ) { return fabs( d ); } +static double CDECL ntdll_floor( double d ) { return floor( d ); } +static double CDECL ntdll_log( double d ) { return log( d ); } +static double CDECL ntdll_pow( double x, double y ) { return pow( x, y ); } +static double CDECL ntdll_sin( double d ) { return sin( d ); } +static double CDECL ntdll_sqrt( double d ) { return sqrt( d ); } +static double CDECL ntdll_tan( double d ) { return tan( d ); } + + /*********************************************************************** * unix_funcs */ @@ -1466,6 +1479,16 @@ static struct unix_funcs unix_funcs = fast_RtlSleepConditionVariableSRW, fast_RtlSleepConditionVariableCS, fast_RtlWakeConditionVariable, + ntdll_atan, + ntdll_ceil, + ntdll_cos, + ntdll_fabs, + ntdll_floor, + ntdll_log, + ntdll_pow, + ntdll_sin, + ntdll_sqrt, + ntdll_tan, get_initial_environment, get_dynamic_environment, get_initial_directory, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 62117eabb6..cec36b58c0 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -29,7 +29,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 63 +#define NTDLL_UNIXLIB_VERSION 64 struct unix_funcs { @@ -285,6 +285,18 @@ struct unix_funcs const LARGE_INTEGER *timeout ); NTSTATUS (CDECL *fast_RtlWakeConditionVariable)( RTL_CONDITION_VARIABLE *variable, int count ); + /* math functions */ + double (CDECL *atan)( double d ); + double (CDECL *ceil)( double d ); + double (CDECL *cos)( double d ); + double (CDECL *fabs)( double d ); + double (CDECL *floor)( double d ); + double (CDECL *log)( double d ); + double (CDECL *pow)( double x, double y ); + double (CDECL *sin)( double d ); + double (CDECL *sqrt)( double d ); + double (CDECL *tan)( double d ); + /* environment functions */ NTSTATUS (CDECL *get_initial_environment)( WCHAR **wargv[], WCHAR *env, SIZE_T *size ); NTSTATUS (CDECL *get_dynamic_environment)( WCHAR *env, SIZE_T *size );

1 0

Jacek Caban : mshtml: Use variant_to_nsstr in IHTMLIFrameElement2::put_width.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 7e30161184ea9a629fd2f2530f0eb739ce431ea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e30161184ea9a629fd2f253… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 26 18:36:51 2020 +0200 mshtml: Use variant_to_nsstr in IHTMLIFrameElement2::put_width. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlframe.c | 9 ++++----- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 0c07f0c677..e451f03045 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1278,15 +1278,14 @@ static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, V HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); nsAString nsstr; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - if(V_VT(&v) != VT_BSTR) { - FIXME("Unsupported %s\n", debugstr_variant(&v)); - return E_NOTIMPL; - } + hres = variant_to_nsstr(&v, FALSE, &nsstr); + if(FAILED(hres)) + return hres; - nsAString_InitDepend(&nsstr, V_BSTR(&v)); nsres = nsIDOMHTMLIFrameElement_SetWidth(This->framebase.nsiframe, &nsstr); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5ef27ede89..7b19271ad4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8264,6 +8264,12 @@ static void test_iframe_elem(IHTMLElement *elem) test_iframe_width(elem, L"70%"); test_framebase_src(elem, L"about:blank"); + V_VT(&v) = VT_I4; + V_I4(&v) = 110; + hres = IHTMLIFrameElement2_put_width(iframe2, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + test_iframe_width(elem, L"110"); + str = SysAllocString(L"text/html"); V_VT(&errv) = VT_ERROR; disp = NULL;

1 0

Alexandre Julliard : ntdll: Fix some stdcall/cdecl calling convention mismatches.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 8b36885973466ca96d049445521faf8483cf8d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b36885973466ca96d049445… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 20:40:00 2020 +0200 ntdll: Fix some stdcall/cdecl calling convention mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 6 +++--- dlls/ntdll/resource.c | 2 +- dlls/ntdll/rtl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index acccf08881..72aeb9eab4 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -395,7 +395,7 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne } extern LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx ); -__ASM_GLOBAL_FUNC( relay_call, +__ASM_STDCALL_FUNC( relay_call, 8, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -414,7 +414,7 @@ __ASM_GLOBAL_FUNC( relay_call, "pushl %esi\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("relay_trace_entry") "\n\t" + "call " __ASM_STDCALL("relay_trace_entry",16) "\n\t" /* copy the arguments*/ "movzwl -16(%ebp),%ecx\n\t" /* number of args */ "jecxz 1f\n\t" @@ -441,7 +441,7 @@ __ASM_GLOBAL_FUNC( relay_call, "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("relay_trace_exit") "\n\t" + "call " __ASM_STDCALL("relay_trace_exit",20) "\n\t" /* restore return value and return */ "leal -12(%ebp),%esp\n\t" "movl %esi,%eax\n\t" diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 13b6812808..9dd2f745b6 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -367,7 +367,7 @@ __ASM_STDCALL_FUNC( LdrAccessResource, 16, "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("access_resource") "\n\t" + "call " __ASM_STDCALL("access_resource",16) "\n\t" "leave\n\t" "ret $16" ) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 4a4a7b31de..caf00ecdb1 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -439,7 +439,7 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM /****************************************************************************** * RtlEnumerateGenericTableWithoutSplaying [NTDLL.@] */ -void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous) +void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous) { static int warn_once; @@ -451,7 +451,7 @@ void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *p /****************************************************************************** * RtlNumberGenericTableElements [NTDLL.@] */ -ULONG RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) +ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) { FIXME("(%p) stub!\n", table); return 0;

1 0

Nikolay Sivov : evr: Forward some known interface queries for MR_VIDEO_MIXER_SERVICE.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 93412525350b033db59cf1a582f977528f2a9585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93412525350b033db59cf1a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 26 18:20:51 2020 +0300 evr: Forward some known interface queries for MR_VIDEO_MIXER_SERVICE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 14 +++++++++++++- dlls/evr/tests/evr.c | 18 +++++++++++++++++- include/evr.idl | 6 ++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 7663a28ab1..006427b77a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -797,7 +797,19 @@ static ULONG WINAPI video_mixer_getservice_Release(IMFGetService *iface) static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap) || + IsEqualIID(riid, &IID_IMFVideoProcessor) || + IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { + return IMFGetService_QueryInterface(iface, riid, obj); + } + } + + FIXME("Unsupported service %s, riid %s.\n", debugstr_guid(service), debugstr_guid(riid)); return E_NOTIMPL; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 4f954d868a..5bfa87014d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -383,6 +383,7 @@ static void test_default_mixer(void) DWORD input_id, output_id; IMFAttributes *attributes, *attributes2; IMFTransform *transform; + IMFGetService *gs; unsigned int i; DWORD ids[16]; IUnknown *unk; @@ -396,10 +397,25 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); - hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + IMFGetService_Release(gs); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerBitmap, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); diff --git a/include/evr.idl b/include/evr.idl index 43afca1201..4599e29879 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -218,5 +218,11 @@ interface IMFDesiredSample : IUnknown void Clear(); } +cpp_quote("DEFINE_GUID(MR_VIDEO_RENDER_SERVICE, 0x1092a86c, 0xab1a, 0x459a, 0xa3, 0x36, 0x83, 0x1f, 0xbc, 0x4d, 0x11, 0xff);") +cpp_quote("DEFINE_GUID(MR_VIDEO_MIXER_SERVICE, 0x073cd2fc, 0x6cf4, 0x40b7, 0x88, 0x59, 0xe8, 0x95, 0x52, 0xc8, 0x41, 0xf8);") +cpp_quote("DEFINE_GUID(MR_VIDEO_ACCELERATION_SERVICE, 0xefef5175, 0x5c7d, 0x4ce2, 0xbb, 0xbd, 0x34, 0xff, 0x8b, 0xca, 0x65, 0x54);") +cpp_quote("DEFINE_GUID(MR_BUFFER_SERVICE, 0xa562248c, 0x9ac6, 0x4ffc, 0x9f, 0xba, 0x3a, 0xf8, 0xf8, 0xad, 0x1a, 0x4d);") +cpp_quote("DEFINE_GUID(VIDEO_ZOOM_RECT, 0x7aaa1638, 0x1b7f, 0x4c93, 0xbd, 0x89, 0x5b, 0x9c, 0x9f, 0xb6, 0xfc, 0xf0);") + cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);")

1 0

Piotr Caban : msi: Support INSERT INTO when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 9130379710297cb487dbd8891b82f505e754c39d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9130379710297cb487dbd889… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:09:14 2020 +0200 msi: Support INSERT INTO when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 56d55d32cc..e6b5a09375 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2507,7 +2507,15 @@ static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { + static const WCHAR query_fmt[] = + L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`) VALUES ('%s', 'INSERT', '%s')"; + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + WCHAR buf[256], *query = buf; + MSIQUERY *q; + WCHAR *key; + int len; + UINT r; if (!wcscmp(tv->name, szTables)) return TransformView_create_table( tv, rec ); @@ -2515,8 +2523,35 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B if (!wcscmp(tv->name, szColumns)) return TransformView_add_column( tv, rec ); - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + key = create_key_string( tv, rec ); + if (!key) + return ERROR_OUTOFMEMORY; + + len = _snwprintf( NULL, 0, query_fmt, tv->name, key ) + 1; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + { + msi_free( key ); + return ERROR_OUTOFMEMORY; + } + } + swprintf( query, len, query_fmt, tv->name, key ); + msi_free( key ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + if (r != ERROR_SUCCESS) + return r; + + return TransformView_set_row( view, row, rec, ~0 ); } static UINT TransformView_delete_row( MSIVIEW *view, UINT row )

1 0

Piotr Caban : msi: Support DELETE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: b1f9f4ccee6f7d42dbeaf457e81db462a1b526af URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f9f4ccee6f7d42dbeaf457… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:09:36 2020 +0200 msi: Support DELETE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 95da84a92d..a413808e8a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2600,7 +2600,15 @@ static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) { + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column`, `Row`) VALUES ( '"; + static const WCHAR query_column[] = L"', 'DELETE', '"; + static const WCHAR query_sfx[] = L"')"; + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + WCHAR *key, buf[256], *query = buf; + UINT r, len, name_len, key_len; + MSIRECORD *rec; + MSIQUERY *q; if (!wcscmp( tv->name, szColumns )) { @@ -2611,8 +2619,49 @@ static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) if (!wcscmp( tv->name, szTables )) return TransformView_drop_table( tv, row ); - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + r = msi_view_get_row( tv->db, view, row, &rec ); + if (r != ERROR_SUCCESS) + return r; + + key = create_key_string( tv, rec ); + msiobj_release( &rec->hdr ); + if (!key) + return ERROR_OUTOFMEMORY; + + name_len = wcslen( tv->name ); + key_len = wcslen( key ); + len = ARRAY_SIZE(query_pfx) + name_len + ARRAY_SIZE(query_column) + key_len + ARRAY_SIZE(query_sfx) - 2; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + { + msi_free( tv ); + msi_free( key ); + return ERROR_OUTOFMEMORY; + } + } + + memcpy( query, query_pfx, ARRAY_SIZE(query_pfx) * sizeof(WCHAR) ); + len = ARRAY_SIZE(query_pfx) - 1; + memcpy( query + len, tv->name, name_len * sizeof(WCHAR) ); + len += name_len; + memcpy( query + len, query_column, ARRAY_SIZE(query_column) * sizeof(WCHAR) ); + len += ARRAY_SIZE(query_column) - 1; + memcpy( query + len, key, key_len * sizeof(WCHAR) ); + len += key_len; + memcpy( query + len, query_sfx, ARRAY_SIZE(query_sfx) * sizeof(WCHAR) ); + msi_free( key ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; } static UINT TransformView_execute( MSIVIEW *view, MSIRECORD *record )

1 0

Piotr Caban : msi: Support DROP when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 6b6e1bd2c73ac23b03db0e656f895896936df5ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6e1bd2c73ac23b03db0e65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:09:22 2020 +0200 msi: Support DROP when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e6b5a09375..95da84a92d 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2554,8 +2554,63 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B return TransformView_set_row( view, row, rec, ~0 ); } +static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) +{ + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column` ) VALUES ( '"; + static const WCHAR query_sfx[] = L"', 'DROP' )"; + + WCHAR buf[256], *query = buf; + UINT r, table_id, len; + const WCHAR *table; + int table_len; + MSIQUERY *q; + + r = TABLE_fetch_int( &tv->view, row, 1, &table_id ); + if (r != ERROR_SUCCESS) + return r; + + table = msi_string_lookup( tv->db->strings, table_id, &table_len ); + if (!table) + return ERROR_INSTALL_TRANSFORM_FAILURE; + + len = ARRAY_SIZE(query_pfx) - 1 + table_len + ARRAY_SIZE(query_sfx); + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + return ERROR_OUTOFMEMORY; + } + + memcpy( query, query_pfx, ARRAY_SIZE(query_pfx) * sizeof(WCHAR) ); + len = ARRAY_SIZE(query_pfx) - 1; + memcpy( query + len, table, table_len * sizeof(WCHAR) ); + len += table_len; + memcpy( query + len, query_sfx, ARRAY_SIZE(query_sfx) * sizeof(WCHAR) ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; +} + static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!wcscmp( tv->name, szColumns )) + { + ERR("trying to remove column\n"); + return ERROR_INSTALL_TRANSFORM_FAILURE; + } + + if (!wcscmp( tv->name, szTables )) + return TransformView_drop_table( tv, row ); + FIXME("\n"); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

Piotr Caban : msi: Introduce msi_record_stream_name helper.
by Alexandre Julliard June 26, 2020

June 26, 2020

Module: wine Branch: master Commit: 5fc68884adec547a5343e8713e8727282b5aa25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc68884adec547a5343e871… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:39 2020 +0200 msi: Introduce msi_record_stream_name helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 93 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c0ffa99e1d..f0c36b0013 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2188,6 +2188,38 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) return ERROR_SUCCESS; } +static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, UINT *len ) +{ + UINT p = 0, l, i, r; + + l = wcslen( tv->name ); + if (name && *len > l) + memcpy(name, tv->name, l * sizeof(WCHAR)); + p += l; + + for ( i = 0; i < tv->num_cols; i++ ) + { + if (!(tv->columns[i].type & MSITYPE_KEY)) + continue; + + if (name && *len > p + 1) + name[p] = '.'; + p++; + + l = (*len > p ? *len - p : 0); + r = MSI_RecordGetStringW( rec, i + 1, name ? name + p : NULL, &l ); + if (r != ERROR_SUCCESS) + return r; + p += l; + } + + if (name && *len > p) + name[p] = 0; + + *len = p; + return ERROR_SUCCESS; +} + UINT MSI_CommitTables( MSIDATABASE *db ) { UINT r, bytes_per_strref; @@ -2252,61 +2284,30 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) { - LPWSTR stname = NULL, sval, p; - DWORD len; - UINT i, r; + UINT r, len; + WCHAR *name; TRACE("%p %p\n", tv, rec); - len = lstrlenW( tv->name ) + 1; - stname = msi_alloc( len*sizeof(WCHAR) ); - if ( !stname ) - { - r = ERROR_OUTOFMEMORY; - goto err; - } + r = msi_record_stream_name( tv, rec, NULL, &len ); + if (r != ERROR_SUCCESS) + return r; + len++; - lstrcpyW( stname, tv->name ); + name = msi_alloc( len * sizeof(WCHAR) ); + if (!name) + return ERROR_OUTOFMEMORY; - for ( i = 0; i < tv->num_cols; i++ ) + r = msi_record_stream_name( tv, rec, name, &len ); + if (r != ERROR_SUCCESS) { - if ( tv->columns[i].type & MSITYPE_KEY ) - { - sval = msi_dup_record_field( rec, i + 1 ); - if ( !sval ) - { - r = ERROR_OUTOFMEMORY; - goto err; - } - - len += lstrlenW( szDot ) + lstrlenW ( sval ); - p = msi_realloc ( stname, len*sizeof(WCHAR) ); - if ( !p ) - { - r = ERROR_OUTOFMEMORY; - msi_free(sval); - goto err; - } - stname = p; - - lstrcatW( stname, szDot ); - lstrcatW( stname, sval ); - - msi_free( sval ); - } - else - continue; + msi_free( name ); + return r; } - *pstname = encode_streamname( FALSE, stname ); - msi_free( stname ); - + *pstname = encode_streamname( FALSE, name ); + msi_free( name ); return ERROR_SUCCESS; - -err: - msi_free ( stname ); - *pstname = NULL; - return r; } static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st,

1 0