February 2018 - Wine-Commits

Alexandre Julliard : kernel32: Hardcode the windows and system directories.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 59a7777f8494d909b9366015157d8be4ef1edb46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59a7777f8494d909b9366015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 19:45:58 2018 +0100 kernel32: Hardcode the windows and system directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 4 ++-- dlls/kernel32/process.c | 50 ++++++------------------------------------ 2 files changed, 9 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 1af11f5..6f60413 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -55,8 +55,8 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; -extern const WCHAR *DIR_Windows DECLSPEC_HIDDEN; -extern const WCHAR *DIR_System DECLSPEC_HIDDEN; +extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; +extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; extern const WCHAR *DIR_SysWow64 DECLSPEC_HIDDEN; extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index bbadae0..0a3fd70 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -64,7 +64,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(process); -WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ @@ -90,8 +89,9 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); HMODULE kernel32_handle = 0; SYSTEM_BASIC_INFORMATION system_info = { 0 }; -const WCHAR *DIR_Windows = NULL; -const WCHAR *DIR_System = NULL; +const WCHAR DIR_Windows[] = {'C',':','\\','w','i','n','d','o','w','s',0}; +const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s', + '\\','s','y','s','t','e','m','3','2',0}; const WCHAR *DIR_SysWow64 = NULL; /* Process flags */ @@ -954,41 +954,12 @@ done: /*********************************************************************** * init_windows_dirs * - * Initialize the windows and system directories from the environment. + * Create the windows and system directories if necessary. */ static void init_windows_dirs(void) { - static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; - static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; - static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; - static const WCHAR default_sysdirW[] = {'\\','s','y','s','t','e','m','3','2',0}; - static const WCHAR default_syswow64W[] = {'\\','s','y','s','w','o','w','6','4',0}; - - DWORD len; - WCHAR *buffer; - - if ((len = GetEnvironmentVariableW( windirW, NULL, 0 ))) - { - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - GetEnvironmentVariableW( windirW, buffer, len ); - DIR_Windows = buffer; - } - else DIR_Windows = default_windirW; - - if ((len = GetEnvironmentVariableW( winsysdirW, NULL, 0 ))) - { - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - GetEnvironmentVariableW( winsysdirW, buffer, len ); - DIR_System = buffer; - } - else - { - len = strlenW( DIR_Windows ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_sysdirW) ); - memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); - memcpy( buffer + len, default_sysdirW, sizeof(default_sysdirW) ); - DIR_System = buffer; - } + static const WCHAR default_syswow64W[] = {'C',':','\\','w','i','n','d','o','w','s', + '\\','s','y','s','w','o','w','6','4',0}; if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", @@ -999,18 +970,11 @@ static void init_windows_dirs(void) if (is_win64 || is_wow64) /* SysWow64 is always defined on 64-bit */ { - len = strlenW( DIR_Windows ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_syswow64W) ); - memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); - memcpy( buffer + len, default_syswow64W, sizeof(default_syswow64W) ); - DIR_SysWow64 = buffer; + DIR_SysWow64 = default_syswow64W; if (!CreateDirectoryW( DIR_SysWow64, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", debugstr_w(DIR_SysWow64), GetLastError() ); } - - TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); - TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) ); }

1 0

Alexandre Julliard : ntdll: Hardcode the windows and system directories.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 12276796c95007fc12eb38a41ca25b4daee7e1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12276796c95007fc12eb38a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 19:38:29 2018 +0100 ntdll: Hardcode the windows and system directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 5 ----- dlls/ntdll/directory.c | 10 ++-------- dlls/ntdll/loader.c | 46 +++++++--------------------------------------- dlls/ntdll/loadorder.c | 6 ++---- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/rtlstr.c | 1 + dlls/ntdll/thread.c | 2 ++ 8 files changed, 16 insertions(+), 59 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 62dc815..bbadae0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -958,8 +958,6 @@ done: */ static void init_windows_dirs(void) { - extern void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ); - static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; @@ -1013,9 +1011,6 @@ static void init_windows_dirs(void) TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) ); - - /* set the directories in ntdll too */ - __wine_init_windows_dir( DIR_Windows, DIR_System ); } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 3b76f9b..4655a634 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -205,8 +205,6 @@ static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* at some point we may want to allow Winelib apps to set this */ static const BOOL is_case_sensitive = FALSE; -UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ - static struct file_identity windir; static RTL_CRITICAL_SECTION dir_section; @@ -2378,14 +2376,10 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l #endif /*********************************************************************** - * DIR_init_windows_dir + * init_directories */ -void DIR_init_windows_dir( const WCHAR *win, const WCHAR *sys ) +void init_directories(void) { - /* FIXME: should probably store paths as NT file names */ - - RtlCreateUnicodeString( &system_dir, sys ); - #ifndef _WIN64 if (is_wow64) init_redirects(); #endif diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 77a16b3..3fcbbf7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -63,6 +63,10 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); +/* system directory with trailing backslash */ +const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\',0}; + static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1521,12 +1525,10 @@ static WCHAR *get_builtin_fullname( const WCHAR *path, const char *filename ) } if ((fullname = RtlAllocateHeap( GetProcessHeap(), 0, - system_dir.MaximumLength + (len + 1) * sizeof(WCHAR) ))) + (strlenW(system_dir) + len + 1) * sizeof(WCHAR) ))) { - memcpy( fullname, system_dir.Buffer, system_dir.Length ); - p = fullname + system_dir.Length / sizeof(WCHAR); - if (p > fullname && p[-1] != '\\') *p++ = '\\'; - ascii_to_unicode( p, filename, len + 1 ); + strcpyW( fullname, system_dir ); + ascii_to_unicode( fullname + strlenW(fullname), filename, len + 1 ); } return fullname; } @@ -3284,40 +3286,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -/****************************************************************** - * __wine_init_windows_dir (NTDLL.@) - * - * Windows and system dir initialization once kernel32 has been loaded. - */ -void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) -{ - PLIST_ENTRY mark, entry; - LPWSTR buffer, p; - - strcpyW( user_shared_data->NtSystemRoot, windir ); - DIR_init_windows_dir( windir, sysdir ); - - /* prepend the system dir to the name of the already created modules */ - mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - LDR_MODULE *mod = CONTAINING_RECORD( entry, LDR_MODULE, InLoadOrderModuleList ); - - assert( mod->Flags & LDR_WINE_INTERNAL ); - - buffer = RtlAllocateHeap( GetProcessHeap(), 0, - system_dir.Length + mod->FullDllName.Length + 2*sizeof(WCHAR) ); - if (!buffer) continue; - strcpyW( buffer, system_dir.Buffer ); - p = buffer + strlenW( buffer ); - if (p > buffer && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, mod->FullDllName.Buffer ); - RtlInitUnicodeString( &mod->FullDllName, buffer ); - RtlInitUnicodeString( &mod->BaseDllName, p ); - } -} - - /*********************************************************************** * __wine_process_init */ diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 157d2cb..c6c0245 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -434,7 +434,6 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; WCHAR *module, *basename; - UNICODE_STRING path_str; int len; if (!init_done) init_load_order(); @@ -445,10 +444,9 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) /* Strip path information if the module resides in the system directory */ - RtlInitUnicodeString( &path_str, path ); - if (RtlPrefixUnicodeString( &system_dir, &path_str, TRUE )) + if (!strncmpiW( system_dir, path, strlenW( system_dir ))) { - const WCHAR *p = path + system_dir.Length / sizeof(WCHAR); + const WCHAR *p = path + strlenW( system_dir ); while (*p == '\\' || *p == '/') p++; if (!strchrW( p, '\\' ) && !strchrW( p, '/' )) path = p; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 29d4f58..0f70feb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1496,4 +1496,3 @@ # Filesystem @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) -@ cdecl __wine_init_windows_dir(wstr wstr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8a64338..3fbccba 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -113,7 +113,7 @@ extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY FARPROC origfun, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; -extern UNICODE_STRING system_dir DECLSPEC_HIDDEN; +extern const WCHAR system_dir[] DECLSPEC_HIDDEN; typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter DECLSPEC_HIDDEN; @@ -155,7 +155,7 @@ extern int get_file_info( const char *path, struct stat *st, ULONG *attr ) DECLS extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr, FILE_INFORMATION_CLASS class ) DECLSPEC_HIDDEN; extern NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) DECLSPEC_HIDDEN; -extern void DIR_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) DECLSPEC_HIDDEN; +extern void init_directories(void) DECLSPEC_HIDDEN; extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ) DECLSPEC_HIDDEN; extern NTSTATUS DIR_unmount_device( HANDLE handle ) DECLSPEC_HIDDEN; extern NTSTATUS DIR_get_unix_cwd( char **cwd ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 3013658..190bc01 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -61,6 +61,7 @@ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable oem_table = oem; unix_table = ucp; NlsAnsiCodePage = ansi->info.codepage; + init_directories(); } int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c999d4b..9ec94d6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -53,6 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); #endif struct _KUSER_SHARED_DATA *user_shared_data = NULL; +static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; @@ -298,6 +299,7 @@ HANDLE thread_init(void) exit(1); } user_shared_data = addr; + memcpy( user_shared_data->NtSystemRoot, default_windirW, sizeof(default_windirW) ); /* allocate and initialize the PEB */

1 0

Huw Davies : riched20: Return the underline pen as the return value.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 08c15246ca3de32f5f375d261c51b70e98b02665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c15246ca3de32f5f375d26… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:01 2018 +0000 riched20: Return the underline pen as the return value. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b4b6697..d3b908a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } -static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) +static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { - *pen = NULL; /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) { @@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) case CFU_UNDERLINE: case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ - *pen = CreatePen( PS_SOLID, 1, color ); - break; + return CreatePen( PS_SOLID, 1, color ); case CFU_UNDERLINEDOTTED: - *pen = CreatePen( PS_DOT, 1, color ); - break; + return CreatePen( PS_DOT, 1, color ); default: FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType ); /* fall through */ @@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) break; } } - return; + return NULL; } static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color ) { HPEN pen; - get_underline_pen( run->style, color, &pen ); + pen = get_underline_pen( run->style, color ); if (pen) { HPEN old_pen = SelectObject( c->hDC, pen );

1 0

Huw Davies : winedbg: Fix the operand order of some XMM instructions.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: e5b9057ba00f7e6ad35361f954557eee55d8f64b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b9057ba00f7e6ad35361f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 11:52:05 2018 +0000 winedbg: Fix the operand order of some XMM instructions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm.c | 30 +++++++++++++++--------------- programs/winedbg/db_disasm64.c | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index c745617..b8a2152 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -301,23 +301,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = { diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 3db0b5e..b1556ad 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -351,23 +351,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = {

1 0

Nikolay Sivov : user32: Don' t convert message arguments when calling dialog procedure.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 9640990e43e351ff2702713cde9fae7203a8ed9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9640990e43e351ff2702713c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:37:06 2018 +0300 user32: Don't convert message arguments when calling dialog procedure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 108 +++++++++++++++++++++++++++++++++++++-------- dlls/user32/winproc.c | 54 +++++++++++++++++------ 2 files changed, 130 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9640990e43e351ff2702…

1 0

Alex Henrie : shlwapi/tests: Drop ordinal test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: a5c66523891d8a2a87a369fa14d80a3edb11de6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5c66523891d8a2a87a369fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Feb 18 21:05:44 2018 -0700 shlwapi/tests: Drop ordinal test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 205 +++-------------------------------------- 2 files changed, 16 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5c66523891d8a2a87a3…

1 0

Huw Davies : winedbg: Add cvtdq2ps and cvtps2pd opcodes.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: ca9f7cc5eb9f312ffcae9cabf32a96e233258e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9f7cc5eb9f312ffcae9cab… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 11:52:06 2018 +0000 winedbg: Add cvtdq2ps and cvtps2pd opcodes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm.c | 4 ++-- programs/winedbg/db_disasm64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index b8a2152..fc25e1c 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -312,8 +312,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index b1556ad..4d9aca9 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -362,8 +362,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 },

1 0

Jacek Caban : mshtml: Get owner document from Gecko node in get_node.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 23b1d3a79df224f14f39278731477ff3ee86f194 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b1d3a79df224f14f392787… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:48:44 2018 +0100 mshtml: Get owner document from Gecko node in get_node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 19 +++++++++++++++++++ dlls/mshtml/htmlnode.c | 18 +++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 174ef20..a4e281b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5205,6 +5205,25 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do return S_OK; } +HRESULT get_document_node(nsIDOMDocument *dom_document, HTMLDocumentNode **ret) +{ + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(NULL, (nsIDOMNode*)dom_document, FALSE, &node); + if(FAILED(hres)) + return hres; + + if(!node) { + ERR("document not initialized\n"); + return E_FAIL; + } + + assert(node->vtbl == &HTMLDocumentNodeImplVtbl); + *ret = impl_from_HTMLDOMNode(node); + return S_OK; +} + static inline HTMLDocumentObj *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_outer); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 0aad491..44983bc 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1616,8 +1616,11 @@ void init_node_cc(void) HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) { + nsIDOMDocument *dom_document; + HTMLDocumentNode *document; nsISupports *unk = NULL; nsresult nsres; + HRESULT hres; nsres = nsIDOMNode_GetMshtmlNode(nsnode, &unk); assert(nsres == NS_OK); @@ -1633,5 +1636,18 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO return S_OK; } - return create_node(This, nsnode, ret); + nsres = nsIDOMNode_GetOwnerDocument(nsnode, &dom_document); + if(NS_FAILED(nsres) || !dom_document) { + ERR("GetOwnerDocument failed: %08x\n", nsres); + return E_FAIL; + } + + hres = get_document_node(dom_document, &document); + nsIDOMDocument_Release(dom_document); + if(!document) + return E_FAIL; + + hres = create_node(document, nsnode, ret); + htmldoc_release(&document->basedoc); + return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index de200cf..cd5b9c3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1074,6 +1074,7 @@ void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT get_document_node(nsIDOMDocument*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml/tests: Added more ownerDocument property tests.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 7586334008364935ac3c8cc2699474cf7e859ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7586334008364935ac3c8cc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:48:54 2018 +0100 mshtml/tests: Added more ownerDocument property tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/elements.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index a16194f..089d356 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -187,6 +187,27 @@ function test_compare_position() { next_test(); } +function test_document_owner() { + var node; + + ok(document.ownerDocument === null, "ownerDocument = " + document.ownerDocument); + ok(document.body.ownerDocument === document, + "body.ownerDocument = " + document.body.ownerDocument); + ok(document.documentElement.ownerDocument === document, + "documentElement.ownerDocument = " + document.documentElement.ownerDocument); + + node = document.createElement("test"); + ok(node.ownerDocument === document, "element.ownerDocument = " + node.ownerDocument); + + node = document.createDocumentFragment("test"); + ok(node.ownerDocument === document, "fragment.ownerDocument = " + node.ownerDocument); + + node = document.createTextNode("test"); + ok(node.ownerDocument === document, "text.ownerDocument = " + node.ownerDocument); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, @@ -195,5 +216,6 @@ var tests = [ test_head, test_iframe, test_query_selector, - test_compare_position + test_compare_position, + test_document_owner ];

1 0

Jacek Caban : mshtml: Get rid of no loner needed document node reference in HTMLDOMChildrenCollection.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: a19caad9d08db947e9cd9290ed1d87da92e4e510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a19caad9d08db947e9cd9290… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:25 2018 +0100 mshtml: Get rid of no loner needed document node reference in HTMLDOMChildrenCollection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlnode.c | 11 ++--------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7f5f869..5bd1da1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4306,7 +4306,7 @@ static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface return E_FAIL; } - *pel = create_child_collection(This->doc_node, node_list); + *pel = create_child_collection(node_list); nsIDOMNodeList_Release(node_list); return *pel ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 964e85c..f75a9ec 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4964,7 +4964,7 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, return E_FAIL; } - *pel = create_child_collection(This->node.doc, node_list); + *pel = create_child_collection(node_list); nsIDOMNodeList_Release(node_list); return *pel ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 5557729..aec12fc 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -44,9 +44,6 @@ typedef struct { LONG ref; - /* FIXME: implement weak reference */ - HTMLDocumentNode *doc; - nsIDOMNodeList *nslist; } HTMLDOMChildrenCollection; @@ -244,7 +241,6 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - htmldoc_release(&This->doc->basedoc); nsIDOMNodeList_Release(This->nslist); heap_free(This); } @@ -440,7 +436,7 @@ static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { HTMLDOMNode_init_dispex_info }; -IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) +IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList *nslist) { HTMLDOMChildrenCollection *ret; @@ -454,9 +450,6 @@ IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc, nsIDO nsIDOMNodeList_AddRef(nslist); ret->nslist = nslist; - htmldoc_addref(&doc->basedoc); - ret->doc = doc; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMChildrenCollection_iface, &HTMLDOMChildrenCollection_dispex); @@ -628,7 +621,7 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch return E_FAIL; } - *p = (IDispatch*)create_child_collection(This->doc, nslist); + *p = (IDispatch*)create_child_collection(nslist); nsIDOMNodeList_Release(nslist); return *p ? S_OK : E_OUTOFMEMORY; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 85671a3..0bb3a96 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1089,7 +1089,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; -IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; +IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList*) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Underline links.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: ec2bcdf279116fdff38f11eb1326116898b21d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2bcdf279116fdff38f11eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:02 2018 +0000 riched20: Underline links. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3b908a..fcc4e10 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -218,6 +218,9 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { + if (style->fmt.dwEffects & CFE_LINK) + return CreatePen( PS_SOLID, 1, color ); + /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) {

1 0

Huw Davies : riched20: Don't use logfont-style underlining for links.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: ff8fba389dc2e69cac1dd6d18b73065eb1477e10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8fba389dc2e69cac1dd6d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:00 2018 +0000 riched20: Don't use logfont-style underlining for links. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 48d57e8..0b85d69 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -306,7 +306,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) lf->lfItalic = 1; - if ((s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) && + if ((s->fmt.dwEffects & s->fmt.dwMask & CFM_UNDERLINE) && + !(s->fmt.dwEffects & CFE_LINK) && s->fmt.bUnderlineType == CFU_CF1UNDERLINE) lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT)

1 0

Alex Henrie : mmdevapi/tests: Relax capture test that sometimes fails on Windows 8.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 5fcfff6e641af9a1733ff9253ceddc04a3dee692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fcfff6e641af9a1733ff925… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 02:31:30 2018 -0700 mmdevapi/tests: Relax capture test that sometimes fails on Windows 8. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 27a5cdc..0fa9f0c 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -413,9 +413,9 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); trace("Running position %d pad %u flags %x, amount of frames locked: %u\n", - hr==S_OK ? (UINT)pos : -1, pad, flags, frames); + SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames); - if(hr == S_OK){ + if(SUCCEEDED(hr)){ /* Some w7 machines signal DATA_DISCONTINUITY here following the * previous AUDCLNT_S_BUFFER_EMPTY, others not. What logic? */ ok(pos >= sum, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum);

1 0

Anton Romanov : wmp: Add IWMPControls stub implementation.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: b5aff992338215ab1b71460a7e994830886d51dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5aff992338215ab1b71460a… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sun Feb 18 23:31:25 2018 -0800 wmp: Add IWMPControls stub implementation. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 13 +++ dlls/wmp/wmp_private.h | 1 + 3 files changed, 225 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index accf540..e40422d 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -32,6 +32,11 @@ static inline WindowsMediaPlayer *impl_from_IWMPPlayer(IWMPPlayer *iface) return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer_iface); } +static inline WindowsMediaPlayer *impl_from_IWMPControls(IWMPControls *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPControls_iface); +} + static HRESULT WINAPI WMPPlayer4_QueryInterface(IWMPPlayer4 *iface, REFIID riid, void **ppv) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); @@ -121,8 +126,12 @@ static HRESULT WINAPI WMPPlayer4_get_playState(IWMPPlayer4 *iface, WMPPlayState static HRESULT WINAPI WMPPlayer4_get_controls(IWMPPlayer4 *iface, IWMPControls **ppControl) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppControl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppControl); + + IWMPControls_AddRef(&This->IWMPControls_iface); + *ppControl = &This->IWMPControls_iface; + return S_OK; } static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings **ppSettings) @@ -931,9 +940,209 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { WMPSettings_put_enableErrorDialogs }; +HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWMPControls)) { + *ppv = iface; + }else { + WARN("Unsupported interface (%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMPControls_AddRef(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI WMPControls_Release(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI WMPControls_GetTypeInfoCount(IWMPControls *iface, UINT *pctinfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetTypeInfo(IWMPControls *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_GetIDsOfNames(IWMPControls *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_play(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_stop(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_pause(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pdCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%f)\n", This, dCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pbstrCurrentPosition); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_next(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_previous(IWMPControls *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, ppIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, plMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%d)\n", This, lMarker); + return E_NOTIMPL; +} + +HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPControls(iface); + FIXME("(%p)->(%p)\n", This, pIWMPMedia); + return E_NOTIMPL; +} + +static const IWMPControlsVtbl WMPControlsVtbl = { + WMPControls_QueryInterface, + WMPControls_AddRef, + WMPControls_Release, + WMPControls_GetTypeInfoCount, + WMPControls_GetTypeInfo, + WMPControls_GetIDsOfNames, + WMPControls_Invoke, + WMPControls_get_isAvailable, + WMPControls_play, + WMPControls_stop, + WMPControls_pause, + WMPControls_fastForward, + WMPControls_fastReverse, + WMPControls_get_currentPosition, + WMPControls_put_currentPosition, + WMPControls_get_currentPositionString, + WMPControls_next, + WMPControls_previous, + WMPControls_get_currentItem, + WMPControls_put_currentItem, + WMPControls_get_currentMarker, + WMPControls_put_currentMarker, + WMPControls_playItem, +}; + void init_player_ifaces(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; wmp->IWMPPlayer_iface.lpVtbl = &WMPPlayerVtbl; wmp->IWMPSettings_iface.lpVtbl = &WMPSettingsVtbl; + wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 46b0b72..a004337 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -859,11 +859,24 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; IWMPPlayer *player; + IWMPControls *controls; HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + controls = NULL; + hres = IWMPPlayer4_get_controls(player4, &controls); + ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(controls != NULL, "controls = NULL\n"); + + player = NULL; + hres = IWMPControls_QueryInterface(controls, &IID_IWMPPlayer, (void**)&player); + ok(hres != S_OK, "Getting IWMPPlayer from IWMPControls SUCCEEDED\n"); + ok(player == NULL, "player != NULL\n"); + + IWMPControls_Release(controls); + settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); ok(hres == S_OK, "get_settings failed: %08x\n", hres); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 710793c..65de6bb 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,6 +44,7 @@ struct WindowsMediaPlayer { IWMPPlayer4 IWMPPlayer4_iface; IWMPPlayer IWMPPlayer_iface; IWMPSettings IWMPSettings_iface; + IWMPControls IWMPControls_iface; LONG ref;

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from get_element.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: b304616f8ac725bcc663334256a29bfce4401c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b304616f8ac725bcc6633342… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:50:02 2018 +0100 mshtml: Get rid of no longer needed document argument from get_element. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 18 ++++++++++-------- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5bd1da1..0fc96a5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -112,7 +112,7 @@ HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement * return S_OK; } - hres = get_elem(doc, nselem, ret); + hres = get_element(nselem, ret); nsIDOMElement_Release(nselem); return hres; } @@ -281,7 +281,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement return S_OK; } - hres = get_elem(This->doc_node, (nsIDOMElement*)nsbody, &element); + hres = get_element((nsIDOMElement*)nsbody, &element); nsIDOMHTMLElement_Release(nsbody); if(FAILED(hres)) return hres; @@ -320,7 +320,7 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM return S_OK; } - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -3161,7 +3161,7 @@ static HRESULT WINAPI HTMLDocument6_getElementById(IHTMLDocument6 *iface, return S_OK; } - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -4083,7 +4083,7 @@ static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement nsIDOMHTMLHeadElement_Release(nshead); assert(nsres == NS_OK); - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -4282,10 +4282,12 @@ static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, B return S_OK; } - hres = get_elem(This->doc_node, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); - if(SUCCEEDED(hres)) - *pel = &elem->IHTMLElement_iface; + if(FAILED(hres)) + return hres; + + *pel = &elem->IHTMLElement_iface; return S_OK; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f75a9ec..4789047 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5119,7 +5119,7 @@ static HRESULT WINAPI ElementTraversal_get_firstElementChild(IElementTraversal * return S_OK; } - hres = get_elem(This->node.doc, nselem, &elem); + hres = get_element(nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; @@ -5623,7 +5623,7 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g return S_OK; } -HRESULT get_elem(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **ret) +HRESULT get_element(nsIDOMElement *nselem, HTMLElement **ret) { HTMLDOMNode *node; HRESULT hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bb3a96..c9c6682 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1073,7 +1073,7 @@ HRESULT HTMLFrameBase_QI(HTMLFrameBase*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLFrameBase_destructor(HTMLFrameBase*) DECLSPEC_HIDDEN; HRESULT get_node(nsIDOMNode*,BOOL,HTMLDOMNode**) DECLSPEC_HIDDEN; -HRESULT get_elem(HTMLDocumentNode*,nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT get_element(nsIDOMElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT get_document_node(nsIDOMDocument*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from create_all_list.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: ae4809c7d6a4daa86efdeac4b88afccfeb602ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4809c7d6a4daa86efdeac4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:50 2018 +0100 mshtml: Get rid of no longer needed document argument from create_all_list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index d4a37a3..6671434 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -626,7 +626,7 @@ static dispex_static_data_t HTMLElementCollection_dispex = { HTMLElementCollection_iface_tids }; -static void create_all_list(HTMLDocumentNode *doc, HTMLDOMNode *elem, elem_vector_t *buf) +static void create_all_list(HTMLDOMNode *elem, elem_vector_t *buf) { nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; @@ -661,7 +661,7 @@ static void create_all_list(HTMLDocumentNode *doc, HTMLDOMNode *elem, elem_vecto } elem_vector_add(buf, elem_from_HTMLDOMNode(node)); - create_all_list(doc, node, buf); + create_all_list(node, buf); } } } @@ -676,7 +676,7 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro node_addref(node); elem_vector_add(&buf, elem_from_HTMLDOMNode(node)); } - create_all_list(node->doc, node, &buf); + create_all_list(node, &buf); elem_vector_normalize(&buf); return HTMLElementCollection_Create(buf.buf, buf.len, @@ -805,7 +805,7 @@ HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) return E_OUTOFMEMORY; } - create_all_list(elem->node.doc, node, &buf); + create_all_list(node, &buf); for(i=0; i < buf.len; i++) { if(buf.buf[i] == elem)

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument in get_node.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 69af9a4c9d82a4ea9ffe36ccc3ed10dcbda01138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69af9a4c9d82a4ea9ffe36cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:07 2018 +0100 mshtml: Get rid of no longer needed document argument in get_node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlelemcol.c | 9 ++++----- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlnode.c | 24 ++++++++++++------------ dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/npplugin.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/txtrange.c | 2 +- 18 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69af9a4c9d82a4ea9ffe…

1 0

Alex Henrie : schannel/tests: Relax GetInfo return value test.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: b834a9842c3992724a3b6c11acbd6ede09332b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b834a9842c3992724a3b6c11… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Feb 18 21:06:51 2018 -0700 schannel/tests: Relax GetInfo return value test. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index fb350d5..fc913c1 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -219,11 +219,11 @@ static void testGetInfo(void) return; } status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS || + ok(SUCCEEDED(status) || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ "status: 0x%x\n", status); - if (status == STATUS_SUCCESS) + if (SUCCEEDED(status)) { ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH),

1 0

Alex Henrie : mmdevapi/tests: Fix capture test that consistently fails on Windows 10.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 473a4aaba2e7740c43ffca7843d90ee802a0da37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=473a4aaba2e7740c43ffca78… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 02:31:29 2018 -0700 mmdevapi/tests: Fix capture test that consistently fails on Windows 10. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 3cdfda1..27a5cdc 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -308,20 +308,17 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ - /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { - /* FIXME: Some drivers fail */ - ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY){ /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); + sum = pos; + }else{ /* win10 */ + ok(pos == sum, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - - if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) - sum = pos; } hr = IAudioCaptureClient_ReleaseBuffer(acc, frames);

1 0

Kirill Erofeev : msvcrt/tests: Add tests for _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: e0f7fbfa5911af062fe0a55ed0778d6dd0896eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0f7fbfa5911af062fe0a55e… Author: Kirill Erofeev <erofeev.info(a)gmail.com> Date: Mon Feb 19 15:33:41 2018 +0100 msvcrt/tests: Add tests for _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s. Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/dir.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index aa273ea..a29d32b 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <stdio.h> #include <fcntl.h> +#include <direct.h> #include <sys/stat.h> #include <io.h> #include <mbctype.h> @@ -34,6 +35,8 @@ static int (__cdecl *p_makepath_s)(char *, size_t, const char *, const char *, const char *, const char *); static int (__cdecl *p_wmakepath_s)(wchar_t *, size_t, const wchar_t *,const wchar_t *, const wchar_t *, const wchar_t *); +static int (__cdecl *p_searchenv_s)(const char*, const char*, char*, size_t); +static int (__cdecl *p_wsearchenv_s)(const wchar_t*, const wchar_t*, wchar_t*, size_t); static void init(void) { @@ -41,6 +44,8 @@ static void init(void) p_makepath_s = (void *)GetProcAddress(hmod, "_makepath_s"); p_wmakepath_s = (void *)GetProcAddress(hmod, "_wmakepath_s"); + p_searchenv_s = (void *)GetProcAddress(hmod, "_searchenv_s"); + p_wsearchenv_s = (void *)GetProcAddress(hmod, "_wsearchenv_s"); } typedef struct @@ -416,6 +421,195 @@ static void test_splitpath(void) _setmbcp(prev_cp); } +static void test_searchenv(void) +{ + const char *dirs[] = { + "\\search_env_test", + "\\search_env_test\\dir1", + "\\search_env_test\\dir2", + "\\search_env_test\\dir3longer" + }; + + const char *files[] = { + "\\search_env_test\\dir1\\1.dat", + "\\search_env_test\\dir1\\2.dat", + "\\search_env_test\\dir2\\1.dat", + "\\search_env_test\\dir2\\3.dat", + "\\search_env_test\\dir3longer\\3.dat" + }; + + const WCHAR env_w[] = {'T','E','S','T','_','P','A','T','H',0}; + const WCHAR dat1_w[] = {'1','.','d','a','t',0}; + const WCHAR dat3_w[] = {'3','.','d','a','t',0}; + + char env1[4*MAX_PATH], env2[4*MAX_PATH], tmppath[MAX_PATH], path[2*MAX_PATH]; + char result[MAX_PATH], exp[2*MAX_PATH]; + WCHAR result_w[MAX_PATH]; + int i, path_len; + FILE *tmp_file; + + if (getenv("TEST_PATH")) { + skip("TEST_PATH environment variable already set\n"); + return; + } + + path_len = GetTempPathA(MAX_PATH, tmppath); + ok(path_len, "GetTempPath failed\n"); + memcpy(path, tmppath, path_len); + + for(i=0; i<sizeof(dirs)/sizeof(*dirs); i++) { + strcpy(path+path_len, dirs[i]); + ok(!mkdir(path), "mkdir failed (dir = %s)\n", path); + } + + for(i=0; i<sizeof(files)/sizeof(*files); i++) { + strcpy(path+path_len, files[i]); + tmp_file = fopen(path, "wb"); + ok(tmp_file != NULL, "fopen failed (file = %s)\n", path); + fclose(tmp_file); + } + + strcpy(env1, "TEST_PATH="); + strcpy(env2, "TEST_PATH=;"); + for(i=1; i<sizeof(dirs)/sizeof(*dirs); i++) { + strcat(env1, tmppath); + strcat(env1, dirs[i]); + strcat(env1, ";"); + + strcat(env2, tmppath); + strcat(env2, dirs[i]); + strcat(env2, ";;"); + } + + if (!p_searchenv_s || !p_wsearchenv_s) + win_skip("searchenv_s or wsearchenv_s function is not available\n"); + + putenv(env1); + memset(result, 'x', sizeof(result)); + _searchenv("fail", "TEST_PATH", result); + ok(!result[0], "got %s, expected ''\n", result); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("fail", "TEST_PATH", result, MAX_PATH); + ok(i == ENOENT, "searchenv_s returned %d\n", i); + ok(!result[0], "got %s, expected ''\n", result); + } + + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("1.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat1_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat1_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[3]); + _searchenv("3.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("3.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat3_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat3_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + putenv(env2); + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("1.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat1_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat1_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result, 'x', sizeof(result)); + strcpy(exp, tmppath); + strcat(exp, files[3]); + _searchenv("3.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_searchenv_s) { + memset(result, 'x', sizeof(result)); + i = p_searchenv_s("3.dat", "TEST_PATH", result, MAX_PATH); + ok(!i, "searchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + memset(result_w, 'x', sizeof(result_w)); + _wsearchenv(dat3_w, env_w, result_w); + WideCharToMultiByte(CP_ACP, 0, result_w, -1, result, MAX_PATH, NULL, NULL); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + if (p_wsearchenv_s) { + memset(result_w, 'x', sizeof(result_w)); + i = p_wsearchenv_s(dat3_w, env_w, result_w, MAX_PATH); + ok(!i, "wsearchenv_s returned %d\n", i); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + } + + putenv("TEST_PATH="); + + for(i=sizeof(files)/sizeof(*files)-1; i>=0; i--) { + strcpy(path+path_len, files[i]); + ok(!remove(path), "remove failed (file = %s)\n", path); + } + + for(i=sizeof(dirs)/sizeof(*dirs)-1; i>=0; i--) { + strcpy(path+path_len, dirs[i]); + ok(!rmdir(path), "rmdir failed (dir = %s)\n", path); + } +} + START_TEST(dir) { init(); @@ -424,4 +618,5 @@ START_TEST(dir) test_makepath(); test_makepath_s(); test_splitpath(); + test_searchenv(); }

1 0

Kirill Erofeev : msvcrt: Fix _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 83470d449defe1f691bf8b91e5b1ffd3ca8f90cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=83470d449defe1f691bf8b91… Author: Kirill Erofeev <erofeev.info(a)gmail.com> Date: Mon Feb 19 15:32:29 2018 +0100 msvcrt: Fix _searchenv, _searchenv_s, _wsearchenv, _wsearchenv_s. Signed-off-by: Kirill Erofeev <erofeev.info(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 214 ++++++++++++++++++++++++++---------------------------- 1 file changed, 104 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83470d449defe1f691bf…

1 0

Jacek Caban : mshtml: Get rid of no longer needed document argument from script_elem_from_nsscript.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: dfc13245f1384413b281e88d8c4faf524b55155d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfc13245f1384413b281e88d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:49:39 2018 +0100 mshtml: Get rid of no longer needed document argument from script_elem_from_nsscript. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlscript.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/script.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 565ba37..18a652e 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -447,7 +447,7 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_unlink }; -HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) +HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) { nsIDOMNode *nsnode; HTMLDOMNode *node; diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index af9192f..e63e973 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -35,7 +35,7 @@ typedef struct { HTMLScriptElement *script; } script_queue_entry_t; -HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; +HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT load_script(HTMLScriptElement*,const WCHAR*,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8a36a75..189bf84 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -334,7 +334,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } } - hres = script_elem_from_nsscript(doc, nsscript, &script_elem); + hres = script_elem_from_nsscript(nsscript, &script_elem); nsIDOMHTMLScriptElement_Release(nsscript); if(FAILED(hres)) return NS_ERROR_FAILURE; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 0cd3162..acc1b39 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1588,7 +1588,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) assert(nsres == NS_OK); nsIDOMNode_Release(script_node); - hres = script_elem_from_nsscript(doc, nsscript, &script_elem); + hres = script_elem_from_nsscript(nsscript, &script_elem); if(FAILED(hres)) continue;

1 0

Jacek Caban : mshtml: Use get_element helper in IHTMLElement:: get_offsetParent implementation.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: d5a190b052d4f9c33a2236e8482af73fe9ad1eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a190b052d4f9c33a2236e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 14:50:21 2018 +0100 mshtml: Use get_element helper in IHTMLElement::get_offsetParent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4789047..ca935d3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1408,6 +1408,7 @@ static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLEle { HTMLElement *This = impl_from_IHTMLElement(iface); nsIDOMElement *nsparent; + HTMLElement *parent; nsresult nsres; HRESULT hres; @@ -1424,22 +1425,18 @@ static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLEle return E_FAIL; } - if(nsparent) { - HTMLDOMNode *node; - - hres = get_node((nsIDOMNode*)nsparent, TRUE, &node); - nsIDOMElement_Release(nsparent); - if(FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - node_release(node); - }else { + if(!nsparent) { *p = NULL; hres = S_OK; } - return hres; + hres = get_element(nsparent, &parent); + nsIDOMElement_Release(nsparent); + if(FAILED(hres)) + return hres; + + *p = &parent->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v)

1 0

Michael Müller : ntdll: Implement RunlevelInformationInActivationContext in RtlQueryInformationActivationContext.
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 37c983966b88ed44af774d2000a022e91653814c URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c983966b88ed44af774d20… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Feb 17 17:41:16 2018 +0300 ntdll: Implement RunlevelInformationInActivationContext in RtlQueryInformationActivationContext. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 243 ++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/actctx.c | 21 ++++ 2 files changed, 249 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37c983966b88ed44af77…

1 0

Henri Verbeet : usp10/tests: Also restore the previous font when the finger print matches in _find_font_for_range ().
by Alexandre Julliard Feb. 19, 2018

Feb. 19, 2018

Module: wine Branch: master Commit: 77c7475269fafa9f9f5afa57b071516e22ba6696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77c7475269fafa9f9f5afa57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 18 21:56:36 2018 +0330 usp10/tests: Also restore the previous font when the finger print matches in _find_font_for_range(). Otherwise the subsequent SelectObject() call will set *origFont to *hfont. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5c04441..de91cb8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1289,11 +1289,12 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co if (*hfont) { winetest_trace("using font %s\n",lParam.lf.lfFaceName); - *origFont = SelectObject(hdc,*hfont); if (fingerprint) { WORD output[10]; int i; + + *origFont = SelectObject(hdc,*hfont); if (GetGlyphIndicesW(hdc, fingerprint->check, 10, output, 0) != GDI_ERROR) { for (i=0; i < 10; i++) @@ -1307,6 +1308,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co } if (i == 10) rc = 1; } + SelectObject(hdc, *origFont); } else rc = 1; }

1 0