October 2009 - Wine-commits

Jacek Caban : mshtml: Call pop_mutation_queue in MUTATION_IFRAME handler.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 501e680ea91ae34021b08770cf7aadf2181e7391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=501e680ea91ae34021b08770c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 22 23:35:51 2009 +0200 mshtml: Call pop_mutation_queue in MUTATION_IFRAME handler. --- dlls/mshtml/mutation.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 6c9f9ac..783c131 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -340,7 +340,8 @@ static nsresult NSAPI nsRunnable_Run(nsIRunnable *iface) } case MUTATION_IFRAME: - return init_iframe_window(This, This->mutation_queue->nsiface); + init_iframe_window(This, This->mutation_queue->nsiface); + break; case MUTATION_SCRIPT: { nsIDOMHTMLScriptElement *nsscript; @@ -577,6 +578,8 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); if(NS_SUCCEEDED(nsres)) { + TRACE("iframe node\n"); + push_mutation_queue(This, MUTATION_IFRAME, (nsISupports*)nsiframe); nsIDOMHTMLIFrameElement_Release(nsiframe); add_script_runner(This); @@ -594,6 +597,8 @@ static void NSAPI nsDocumentObserver_DoneAddingChildren(nsIDocumentObserver *ifa nsres = nsISupports_QueryInterface(aContent, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript); if(NS_SUCCEEDED(nsres)) { + TRACE("script node\n"); + push_mutation_queue(This, MUTATION_SCRIPT, (nsISupports*)nsscript); nsIDOMHTMLScriptElement_Release(nsscript); add_script_runner(This);

1 0

Nikolay Sivov : kernel32: Fix copied data length.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: e94587c98d286b2f060f8c855cab87c8407c6d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94587c98d286b2f060f8c855… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 23 03:57:23 2009 +0400 kernel32: Fix copied data length. --- dlls/kernel32/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index dcbef36..c1888ac 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1337,7 +1337,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) if (i <= *p && (lcflags & LOCALE_RETURN_GENITIVE_NAMES)) { - ret = *p - i - 1; + ret = *p - i + 1; p += i; } else ret = i;

1 0

Alexandre Julliard : kernel32: Create the syswow64 directory if necessary.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: c9689897d9ea8152d8fcdd1f6f39fe7f8f771213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9689897d9ea8152d8fcdd1f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 19:52:12 2009 +0200 kernel32: Create the syswow64 directory if necessary. --- dlls/kernel32/process.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f867cc9..c2e8e22 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -863,6 +863,13 @@ static void init_windows_dirs(void) DIR_System = buffer; } + if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) + ERR( "directory %s could not be created, error %u\n", + debugstr_w(DIR_Windows), GetLastError() ); + if (!CreateDirectoryW( DIR_System, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) + ERR( "directory %s could not be created, error %u\n", + debugstr_w(DIR_System), GetLastError() ); + #ifndef _WIN64 /* SysWow64 is always defined on 64-bit */ if (is_wow64) #endif @@ -872,15 +879,11 @@ static void init_windows_dirs(void) memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); memcpy( buffer + len, default_syswow64W, sizeof(default_syswow64W) ); DIR_SysWow64 = buffer; + if (!CreateDirectoryW( DIR_SysWow64, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) + ERR( "directory %s could not be created, error %u\n", + debugstr_w(DIR_SysWow64), GetLastError() ); } - if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) - ERR( "directory %s could not be created, error %u\n", - debugstr_w(DIR_Windows), GetLastError() ); - if (!CreateDirectoryW( DIR_System, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) - ERR( "directory %s could not be created, error %u\n", - debugstr_w(DIR_System), GetLastError() ); - TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) );

1 0

Alexandre Julliard : ntdll: Move the window and system dir variables to directory.c
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 4e77222820d0e0b32b02a2a4c677ff98a47ba824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e77222820d0e0b32b02a2a4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 19:55:02 2009 +0200 ntdll: Move the window and system dir variables to directory.c --- dlls/ntdll/directory.c | 15 +++++++++++++++ dlls/ntdll/loader.c | 6 +----- dlls/ntdll/ntdll_misc.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 413b96f..ce9e81d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -153,6 +153,9 @@ static int show_dot_files = -1; /* at some point we may want to allow Winelib apps to set this */ static const int is_case_sensitive = FALSE; +UNICODE_STRING windows_dir = { 0, 0, NULL }; /* windows directory */ +UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ + static RTL_CRITICAL_SECTION dir_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -1835,6 +1838,18 @@ not_found: } +/*********************************************************************** + * DIR_init_windows_dir + */ +void DIR_init_windows_dir( const WCHAR *win, const WCHAR *sys ) +{ + /* FIXME: should probably store paths as NT file names */ + + RtlCreateUnicodeString( &windows_dir, win ); + RtlCreateUnicodeString( &system_dir, sys ); +} + + /****************************************************************************** * get_dos_device * diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 42c4225..6ce51e7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -98,9 +98,6 @@ static UINT tls_module_count; /* number of modules with TLS directory */ static UINT tls_total_size; /* total size of TLS storage */ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ -UNICODE_STRING windows_dir = { 0, 0, NULL }; /* windows directory */ -UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ - static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = { @@ -2654,8 +2651,7 @@ void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) PLIST_ENTRY mark, entry; LPWSTR buffer, p; - RtlCreateUnicodeString( &windows_dir, windir ); - RtlCreateUnicodeString( &system_dir, sysdir ); + DIR_init_windows_dir( windir, sysdir ); strcpyW( user_shared_data->NtSystemRoot, windir ); /* prepend the system dir to the name of the already created modules */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e80d502..b3842e0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -139,6 +139,7 @@ extern NTSTATUS TAPE_DeviceIoControl(HANDLE hDevice, /* file I/O */ extern NTSTATUS FILE_GetNtStatus(void); +extern void DIR_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ); extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ); extern NTSTATUS DIR_unmount_device( HANDLE handle ); extern NTSTATUS DIR_get_unix_cwd( char **cwd );

1 0

Alexandre Julliard : ntdll: Abstract the support for comparing file identities.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 639e07bead189626dc2b1e02fb30cd74d39c01bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=639e07bead189626dc2b1e02f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 19:59:04 2009 +0200 ntdll: Abstract the support for comparing file identities. --- dlls/ntdll/directory.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index ce9e81d..2e0aba0 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -139,11 +139,13 @@ static inline int getdents64( int fd, char *de, unsigned int size ) #define MAX_IGNORED_FILES 4 -static struct +struct file_identity { dev_t dev; ino_t ino; -} ignored_files[MAX_IGNORED_FILES]; +}; + +static struct file_identity ignored_files[MAX_IGNORED_FILES]; static int ignored_files_count; static const unsigned int max_dir_info_size = FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[MAX_DIR_ENTRY_LEN] ); @@ -197,13 +199,17 @@ static inline void ignore_file( const char *name ) } } +static inline BOOL is_same_file( const struct file_identity *file, const struct stat *st ) +{ + return st->st_dev == file->dev && st->st_ino == file->ino; +} + static inline BOOL is_ignored_file( const struct stat *st ) { unsigned int i; for (i = 0; i < ignored_files_count; i++) - if (ignored_files[i].dev == st->st_dev && ignored_files[i].ino == st->st_ino) - return TRUE; + if (is_same_file( &ignored_files[i], st )) return TRUE; return FALSE; }

1 0

Alexandre Julliard : ntdll: Add Windows directory redirections for Wow64.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: b102fcadef8ff4eba484345abdd23d9d35f426e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b102fcadef8ff4eba484345ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 20:06:06 2009 +0200 ntdll: Add Windows directory redirections for Wow64. --- dlls/ntdll/directory.c | 243 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 231 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b102fcadef8ff4eba4843…

1 0

Juan Lang : crypt32: Fix test failures on older versions of crypt32.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: eea0d75ed5c693f9f082cfb615fffeef163ef7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea0d75ed5c693f9f082cfb61… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 22 07:38:56 2009 -0700 crypt32: Fix test failures on older versions of crypt32. --- dlls/crypt32/tests/chain.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index d29c86a..e66015a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1778,14 +1778,15 @@ static ChainCheck chainCheck[] = { { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus14 }, 0 }, + /* Earlier versions of crypt32 incorrectly do not complain that the end cert's + * key usage is invalid, so ignore that error. + */ { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, 0 }, 1, simpleStatus15 }, 0 }, - /* Windows XP incorrectly does not complain that the end cert's key usage is - * invalid, so ignore that error. - */ { { sizeof(chain16) / sizeof(chain16[0]), chain16 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, @@ -1797,7 +1798,8 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus17 }, 0 }, { { sizeof(chain18) / sizeof(chain18[0]), chain18 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, 0 }, 1, simpleStatus18 }, 0 },

1 0

Rico Schüller : d3d10/tests: Add variable member test.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: bc3c1b8b7f8bfb58895a7c848376ca44d71fffde URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3c1b8b7f8bfb58895a7c848… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 21 22:59:59 2009 +0200 d3d10/tests: Add variable member test. --- dlls/d3d10/tests/effect.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 184 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc3c1b8b7f8bfb58895a7…

1 0

Rico Schüller : d3d10/tests: Add ID3D10EffectVariable: :GetElement() test.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: c1265cfd129c86b2e6d954259a154384e7583963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1265cfd129c86b2e6d954259… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Oct 21 23:00:02 2009 +0200 d3d10/tests: Add ID3D10EffectVariable::GetElement() test. --- dlls/d3d10/tests/effect.c | 515 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 515 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1265cfd129c86b2e6d95…

1 0

Ilya Shpigor : programs: Add initial extrac32 utility.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 44a82859d35b2a8dfc0620e0ddad5588e6349ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a82859d35b2a8dfc0620e0d… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Thu Oct 22 11:10:16 2009 +0400 programs: Add initial extrac32 utility. --- configure | 10 ++++++++++ configure.ac | 1 + programs/extrac32/Makefile.in | 15 +++++++++++++++ programs/extrac32/extrac32.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index dae14db..1507ead 100755 --- a/configure +++ b/configure @@ -17564,6 +17564,15 @@ programs/explorer/Makefile: programs/explorer/Makefile.in programs/Makeprog.rule ac_config_files="$ac_config_files programs/explorer/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/extrac32/Makefile" +test "x$enable_extrac32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + extrac32" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + extrac32" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/extrac32/Makefile: programs/extrac32/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/extrac32/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/hh/Makefile" test "x$enable_hh" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ hh" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ @@ -19204,6 +19213,7 @@ do "programs/eject/Makefile") CONFIG_FILES="$CONFIG_FILES programs/eject/Makefile" ;; "programs/expand/Makefile") CONFIG_FILES="$CONFIG_FILES programs/expand/Makefile" ;; "programs/explorer/Makefile") CONFIG_FILES="$CONFIG_FILES programs/explorer/Makefile" ;; + "programs/extrac32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/extrac32/Makefile" ;; "programs/hh/Makefile") CONFIG_FILES="$CONFIG_FILES programs/hh/Makefile" ;; "programs/icinfo/Makefile") CONFIG_FILES="$CONFIG_FILES programs/icinfo/Makefile" ;; "programs/iexplore/Makefile") CONFIG_FILES="$CONFIG_FILES programs/iexplore/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5210c35..7fddf44 100644 --- a/configure.ac +++ b/configure.ac @@ -2581,6 +2581,7 @@ WINE_CONFIG_MAKEFILE([programs/dxdiag/Makefile],[programs/Makeprog.rules],[progr WINE_CONFIG_MAKEFILE([programs/eject/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/expand/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/explorer/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/extrac32/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/hh/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/icinfo/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/iexplore/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in new file mode 100644 index 0000000..470c196 --- /dev/null +++ b/programs/extrac32/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = extrac32.exe +APPMODE = -mwindows -municode +EXTRADEFS = -DWINE_NO_UNICODE +IMPORTS = kernel32 + +C_SRCS = \ + extrac32.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c new file mode 100644 index 0000000..7e8fbed --- /dev/null +++ b/programs/extrac32/extrac32.c @@ -0,0 +1,31 @@ +/* + * Extract - Wine-compatible program for extract *.cab files. + * + * Copyright 2007 Etersoft (Lyutin Anatoly) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(extrac32); + +int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) +{ + return 0; +}

1 0