wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Juan Lang : wintrust: Test the pgKnownSubject field of WINTRUST_FILE_INFO.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: cd084ff1f910b839cb983a43ef4045a5e5dabb68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd084ff1f910b839cb983a43e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 3 18:49:36 2009 -0800 wintrust: Test the pgKnownSubject field of WINTRUST_FILE_INFO. --- dlls/wintrust/tests/softpub.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 3e4347d..31a51a2 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -266,6 +266,8 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) PROVDATA_SIP provDataSIP = { 0 }; static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; + static GUID bogusGuid = { 0xdeadbeef, 0xbaad, 0xf00d, { 0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00 } }; ret = funcs->pfnObjectTrust(&data); ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); @@ -317,6 +319,28 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) ok(provDataSIP.psSipSubjectInfo != NULL, "Expected a subject info\n"); } + /* Specifying the GUID results in that GUID being the subject GUID */ + fileInfo.pgKnownSubject = &bogusGuid; + ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_NOSIGNATURE || + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); + if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_NOSIGNATURE) + { + ok(!memcmp(&provDataSIP.gSubject, &bogusGuid, sizeof(bogusGuid)), + "unexpected subject GUID\n"); + } + /* Specifying a bogus GUID pointer crashes */ + if (0) + { + fileInfo.pgKnownSubject = (GUID *)0xdeadbeef; + ret = funcs->pfnObjectTrust(&data); + } funcs->pfnFree(data.padwTrustStepErrors); } }

1 0

Alexandre Julliard : msvcrt: Implement __lconv_init.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 1f4febdb55e1573d70ea3538d01832396746d711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4febdb55e1573d70ea3538d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 22:26:45 2009 +0200 msvcrt: Implement __lconv_init. --- dlls/msvcrt/locale.c | 66 ++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3e15abd..b216838 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" +#include <limits.h> #include <locale.h> #include <stdarg.h> #include <stdio.h> @@ -47,6 +48,7 @@ LCID MSVCRT_current_lc_all_lcid = 0; int MSVCRT___lc_codepage = 0; int MSVCRT___lc_collate_cp = 0; HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; +unsigned char charmax = CHAR_MAX; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); @@ -571,33 +573,40 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i /********************************************************************* * localeconv (MSVCRT.@) */ -struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) { - - struct lconv *ylconv; - static struct MSVCRT_lconv xlconv; - - ylconv = localeconv(); - -#define X(x) xlconv.x = ylconv->x; - X(decimal_point); - X(thousands_sep); - X(grouping); - X(int_curr_symbol); - X(currency_symbol); - X(mon_decimal_point); - X(mon_thousands_sep); - X(mon_grouping); - X(positive_sign); - X(negative_sign); - X(int_frac_digits); - X(frac_digits); - X(p_cs_precedes); - X(p_sep_by_space); - X(n_cs_precedes); - X(n_sep_by_space); - X(p_sign_posn); - X(n_sign_posn); - return &xlconv; +struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) +{ + static struct MSVCRT_lconv xlconv; + struct lconv *ylconv = localeconv(); + + xlconv.decimal_point = ylconv->decimal_point; + xlconv.thousands_sep = ylconv->thousands_sep; + xlconv.grouping = ylconv->grouping; /* FIXME: fixup charmax here too */ + xlconv.int_curr_symbol = ylconv->int_curr_symbol; + xlconv.currency_symbol = ylconv->currency_symbol; + xlconv.mon_decimal_point = ylconv->mon_decimal_point; + xlconv.mon_thousands_sep = ylconv->mon_thousands_sep; + xlconv.mon_grouping = ylconv->mon_grouping; + xlconv.positive_sign = ylconv->positive_sign; + xlconv.negative_sign = ylconv->negative_sign; + xlconv.int_frac_digits = ylconv->int_frac_digits; + xlconv.frac_digits = ylconv->frac_digits; + xlconv.p_cs_precedes = ylconv->p_cs_precedes; + xlconv.p_sep_by_space = ylconv->p_sep_by_space; + xlconv.n_cs_precedes = ylconv->n_cs_precedes; + xlconv.n_sep_by_space = ylconv->n_sep_by_space; + xlconv.p_sign_posn = ylconv->p_sign_posn; + xlconv.n_sign_posn = ylconv->n_sign_posn; + + if (ylconv->int_frac_digits == CHAR_MAX) xlconv.int_frac_digits = charmax; + if (ylconv->frac_digits == CHAR_MAX) xlconv.frac_digits = charmax; + if (ylconv->p_cs_precedes == CHAR_MAX) xlconv.p_cs_precedes = charmax; + if (ylconv->p_sep_by_space == CHAR_MAX) xlconv.p_sep_by_space = charmax; + if (ylconv->n_cs_precedes == CHAR_MAX) xlconv.n_cs_precedes = charmax; + if (ylconv->n_sep_by_space == CHAR_MAX) xlconv.n_sep_by_space = charmax; + if (ylconv->p_sign_posn == CHAR_MAX) xlconv.p_sign_posn = charmax; + if (ylconv->n_sign_posn == CHAR_MAX) xlconv.n_sign_posn = charmax; + + return &xlconv; } /********************************************************************* @@ -605,7 +614,8 @@ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) { */ void CDECL __lconv_init(void) { - FIXME(" stub\n"); + /* this is used to make chars unsigned */ + charmax = 255; } /*********************************************************************

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

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: 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 : 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

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

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

22 Oct '09

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

Andrew Eikum : mshtml: Handle DISPATCH_CONSTRUCT flag for DispatchEx objects.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 753aa4ca98cf9d71da3268324b8a6b5fd7efc104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753aa4ca98cf9d71da3268324… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 21 16:25:14 2009 -0500 mshtml: Handle DISPATCH_CONSTRUCT flag for DispatchEx objects. --- dlls/mshtml/dispex.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 34865c2..d1c9e30 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -804,8 +804,16 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); if(wFlags == DISPATCH_CONSTRUCT) { - FIXME("DISPATCH_CONSTRUCT not implemented\n"); - return E_NOTIMPL; + if(id == DISPID_VALUE) { + if(This->data->vtbl && This->data->vtbl->value) { + return This->data->vtbl->value(This->outer, lcid, wFlags, pdp, + pvarRes, pei, pspCaller); + } + FIXME("DISPATCH_CONSTRUCT flag but missing value function\n"); + return E_FAIL; + } + FIXME("DISPATCH_CONSTRUCT flag without DISPID_VALUE\n"); + return E_FAIL; } if(is_dynamic_dispid(id)) {

1 0

Andrey Turkin : server: Open mem file for write when writing memory.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 5116dca8e1e3430bc66d672a9f1afcebf5859526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5116dca8e1e3430bc66d672a9… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Thu Oct 22 17:09:51 2009 +0400 server: Open mem file for write when writing memory. --- server/procfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/procfs.c b/server/procfs.c index f7d9073..5caa02b 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -161,7 +161,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, size_t size return 0; } - if ((fd = open_proc_as( process, O_RDONLY )) == -1) return 0; + if ((fd = open_proc_as( process, O_WRONLY )) == -1) return 0; ret = pwrite( fd, src, size, (off_t)ptr ); close( fd );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009