October 2009 - Wine-Commits

Damjan Jovanovic : winemenubuilder: Ignore Windows MIME types without a slash.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: df4b68b77221fc878b2904341449b19e9e32f7a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4b68b77221fc878b2904341… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 22 19:38:37 2009 +0200 winemenubuilder: Ignore Windows MIME types without a slash. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ba6fa64..fb13878 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1941,7 +1941,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (mimeTypeA == NULL) { - if (contentTypeW != NULL) + if (contentTypeW != NULL && strchrW(contentTypeW, '/')) mimeTypeA = wchars_to_utf8_chars(contentTypeW); else mimeTypeA = heap_printf("application/x-wine-extension-%s", &extensionA[1]);

1 0

Juan Lang : advapi32: Fix a comment typo.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: 18ba0ae59fb34f03e0816dd8db320c161bbfd428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ba0ae59fb34f03e0816dd8d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 22 12:06:32 2009 -0700 advapi32: Fix a comment typo. --- dlls/advapi32/tests/crypt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index d408f96..131e605 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -993,7 +993,7 @@ static void test_rc2_keylen(void) GetLastError() == NTE_BAD_TYPE || /* W2K */ GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */ "unexpected error %08x\n", GetLastError()); - /* but importing an 8-bit (7-byte) key does.. */ + /* but importing an 56-bit (7-byte) key does.. */ key_blob.key_size = 7; SetLastError(0xdeadbeef); ret = pCryptImportKey(provider, (BYTE*)&key_blob,

1 0

Alexandre Julliard : ntdll: Add Windows directory redirections for Wow64.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

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

Alexandre Julliard : ntdll: Abstract the support for comparing file identities.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

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 : kernel32: Create the syswow64 directory if necessary.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

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 Oct. 23, 2009

Oct. 23, 2009

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

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

Oct. 22, 2009

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

Andrew Eikum : mshtml: Add HTMLImageElementFactory:: value for constructing IHTMLImgElement objects.
by Alexandre Julliard Oct. 22, 2009

Oct. 22, 2009

Module: wine Branch: master Commit: ad158f6efddd1ff95db5b93dfa77b7b949d6957d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad158f6efddd1ff95db5b93df… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 21 16:25:29 2009 -0500 mshtml: Add HTMLImageElementFactory::value for constructing IHTMLImgElement objects. --- dlls/mshtml/htmlimg.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index cc999c0..983002b 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -743,6 +743,33 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return S_OK; } +static HRESULT HTMLImageElementFactory_value(IUnknown *iface, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, + IServiceProvider *caller) +{ + HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + IHTMLImgElement *img; + VARIANT empty, *width, *height; + HRESULT hres; + int argc = params->cArgs - params->cNamedArgs; + + V_VT(res) = VT_NULL; + + V_VT(&empty) = VT_EMPTY; + + width = argc >= 1 ? params->rgvarg + (params->cArgs - 1) : ∅ + height = argc >= 2 ? params->rgvarg + (params->cArgs - 2) : ∅ + + hres = IHTMLImageElementFactory_create(HTMLIMGFACTORY(This), *width, *height, &img); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)img; + + return S_OK; +} + #undef HTMLIMGFACTORY_THIS static const IHTMLImageElementFactoryVtbl HTMLImageElementFactoryVtbl = { @@ -761,8 +788,14 @@ static const tid_t HTMLImageElementFactory_iface_tids[] = { 0 }; -static dispex_static_data_t HTMLImageElementFactory_dispex = { +static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { + HTMLImageElementFactory_value, NULL, + NULL +}; + +static dispex_static_data_t HTMLImageElementFactory_dispex = { + &HTMLImageElementFactory_dispex_vtbl, IHTMLImageElementFactory_tid, NULL, HTMLImageElementFactory_iface_tids

1 0

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

Oct. 22, 2009

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

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

Oct. 22, 2009

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