December 2008 - Wine-commits

Alexandre Julliard : server: Use mem_size_t instead of file_pos_t for memory mapping sizes.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 29d97591564c269d2ec4d90e31c9ea1b7dde4a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d97591564c269d2ec4d90e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:25:49 2008 +0100 server: Use mem_size_t instead of file_pos_t for memory mapping sizes. --- dlls/ntdll/virtual.c | 12 ++++++++---- include/wine/server_protocol.h | 8 ++++---- server/mapping.c | 12 ++++++------ server/protocol.def | 8 ++++---- tools/make_requests | 3 ++- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9669b0c..bda8be1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2210,7 +2210,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p SECTION_INHERIT inherit, ULONG alloc_type, ULONG protect ) { NTSTATUS res; - ULONGLONG full_size; + mem_size_t full_size; ACCESS_MASK access; SIZE_T size = 0; SIZE_T mask = get_mask( zero_bits ); @@ -2295,9 +2295,13 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if (res) return res; size = full_size; - if (sizeof(size) < sizeof(full_size) && (size != full_size)) - ERR( "Sizes larger than 4Gb (%x%08x) not supported on this platform\n", - (DWORD)(full_size >> 32), (DWORD)full_size ); + if (size != full_size) + { + WARN( "Sizes larger than 4Gb (%s) not supported on this platform\n", + wine_dbgstr_longlong(full_size) ); + if (dup_mapping) NtClose( dup_mapping ); + return STATUS_INVALID_PARAMETER; + } if ((res = server_get_unix_fd( handle, 0, &unix_handle, &needs_close, NULL, NULL ))) goto done; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8860e5f..a8b4f0a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1673,7 +1673,7 @@ struct create_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; - file_pos_t size; + mem_size_t size; unsigned int protect; obj_handle_t file_handle; /* VARARG(objattr,object_attributes); */ @@ -1725,7 +1725,7 @@ struct get_mapping_info_request struct get_mapping_info_reply { struct reply_header __header; - file_pos_t size; + mem_size_t size; int protect; int header_size; void* base; @@ -1744,7 +1744,7 @@ struct get_mapping_committed_range_request struct get_mapping_committed_range_reply { struct reply_header __header; - file_pos_t size; + mem_size_t size; int committed; }; @@ -1755,7 +1755,7 @@ struct add_mapping_committed_range_request struct request_header __header; obj_handle_t handle; file_pos_t offset; - file_pos_t size; + mem_size_t size; }; struct add_mapping_committed_range_reply { diff --git a/server/mapping.c b/server/mapping.c index f5df22f..0982b86 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -54,7 +54,7 @@ struct ranges struct mapping { struct object obj; /* object header */ - file_pos_t size; /* mapping size */ + mem_size_t size; /* mapping size */ int protect; /* protection flags */ struct file *file; /* file mapped */ int header_size; /* size of headers (for PE image mapping) */ @@ -199,7 +199,7 @@ static void add_committed_range( struct mapping *mapping, file_pos_t start, file } /* find the range containing start and return whether it's committed */ -static int find_committed_range( struct mapping *mapping, file_pos_t start, file_pos_t *size ) +static int find_committed_range( struct mapping *mapping, file_pos_t start, mem_size_t *size ) { unsigned int i; struct range *ranges; @@ -231,7 +231,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) { unsigned int i; - file_pos_t total_size; + mem_size_t total_size; size_t file_size, map_size, max_size; off_t shared_pos, read_pos, write_pos; char *buffer = NULL; @@ -360,7 +360,7 @@ static int get_image_params( struct mapping *mapping ) } /* get the size of the unix file associated with the mapping */ -static inline int get_file_size( struct file *file, file_pos_t *size ) +static inline int get_file_size( struct file *file, mem_size_t *size ) { struct stat st; int unix_fd = get_file_unix_fd( file ); @@ -371,7 +371,7 @@ static inline int get_file_size( struct file *file, file_pos_t *size ) } static struct object *create_mapping( struct directory *root, const struct unicode_str *name, - unsigned int attr, file_pos_t size, int protect, + unsigned int attr, mem_size_t size, int protect, obj_handle_t handle, const struct security_descriptor *sd ) { struct mapping *mapping; @@ -440,7 +440,7 @@ static struct object *create_mapping( struct directory *root, const struct unico if (!(mapping->file = create_temp_file( access ))) goto error; if (!grow_file( mapping->file, size )) goto error; } - mapping->size = (size + page_mask) & ~((file_pos_t)page_mask); + mapping->size = (size + page_mask) & ~((mem_size_t)page_mask); mapping->protect = protect; return &mapping->obj; diff --git a/server/protocol.def b/server/protocol.def index afc9ace..7df2d42 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1318,7 +1318,7 @@ enum char_info_mode @REQ(create_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - file_pos_t size; /* mapping size */ + mem_size_t size; /* mapping size */ unsigned int protect; /* protection flags (see below) */ obj_handle_t file_handle; /* file handle */ VARARG(objattr,object_attributes); /* object attributes */ @@ -1357,7 +1357,7 @@ enum char_info_mode obj_handle_t handle; /* handle to the mapping */ unsigned int access; /* wanted access rights */ @REPLY - file_pos_t size; /* mapping size */ + mem_size_t size; /* mapping size */ int protect; /* protection flags */ int header_size; /* header size (for VPROT_IMAGE mapping) */ void* base; /* default base addr (for VPROT_IMAGE mapping) */ @@ -1371,7 +1371,7 @@ enum char_info_mode obj_handle_t handle; /* handle to the mapping */ file_pos_t offset; /* starting offset (page-aligned, in bytes) */ @REPLY - file_pos_t size; /* size of range starting at offset (page-aligned, in bytes) */ + mem_size_t size; /* size of range starting at offset (page-aligned, in bytes) */ int committed; /* whether it is a committed range */ @END @@ -1380,7 +1380,7 @@ enum char_info_mode @REQ(add_mapping_committed_range) obj_handle_t handle; /* handle to the mapping */ file_pos_t offset; /* starting offset (page-aligned, in bytes) */ - file_pos_t size; /* size to set (page-aligned, in bytes) or 0 if only retrieving */ + mem_size_t size; /* size to set (page-aligned, in bytes) or 0 if only retrieving */ @END diff --git a/tools/make_requests b/tools/make_requests index b2230a2..a89bc7f 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -38,6 +38,8 @@ my %formats = "thread_id_t" => [ 4, 4, "%04x" ], "lparam_t" => [ 4, 4, "%lx" ], "apc_param_t" => [ 4, 4, "%lx" ], + "file_pos_t" => [ 8, 8, "&dump_uint64" ], + "mem_size_t" => [ 8, 8, "&dump_uint64" ], "timeout_t" => [ 8, 8, "&dump_timeout" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ], "char_info_t" => [ 4, 2, "&dump_char_info" ], @@ -46,7 +48,6 @@ my %formats = "async_data_t" => [ 24, 4, "&dump_async_data" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], - "file_pos_t" => [ 8, 8, "&dump_uint64" ], ); my @requests = ();

1 0

Alexandre Julliard : server: Make apc_param_t always 64-bit.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: a6216ab927d0a3a3ac450a570c17924c53a4534e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6216ab927d0a3a3ac450a570… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 19:43:40 2008 +0100 server: Make apc_param_t always 64-bit. --- include/wine/server_protocol.h | 4 ++-- server/async.c | 4 ++-- server/protocol.def | 2 +- server/trace.c | 32 ++++++++++++++++++++++++-------- tools/make_requests | 4 ++-- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a8b4f0a..e2166ae 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -23,7 +23,7 @@ typedef unsigned int thread_id_t; typedef unsigned int data_size_t; typedef unsigned int ioctl_code_t; typedef unsigned long lparam_t; -typedef unsigned long apc_param_t; +typedef unsigned __int64 apc_param_t; typedef unsigned __int64 mem_size_t; typedef unsigned __int64 file_pos_t; @@ -5049,6 +5049,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 350 +#define SERVER_PROTOCOL_VERSION 351 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index 6dea6bc..f3186d7 100644 --- a/server/async.c +++ b/server/async.c @@ -266,8 +266,8 @@ void async_set_result( struct object *obj, unsigned int status, unsigned int tot memset( &data, 0, sizeof(data) ); data.type = APC_USER; data.user.func = async->data.apc; - data.user.args[0] = (apc_param_t)async->data.arg; - data.user.args[1] = (apc_param_t)async->data.iosb; + data.user.args[0] = (apc_param_t)(unsigned long)async->data.arg; + data.user.args[1] = (apc_param_t)(unsigned long)async->data.iosb; data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); } diff --git a/server/protocol.def b/server/protocol.def index 7df2d42..e80d302 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -39,7 +39,7 @@ typedef unsigned int thread_id_t; typedef unsigned int data_size_t; typedef unsigned int ioctl_code_t; typedef unsigned long lparam_t; -typedef unsigned long apc_param_t; +typedef unsigned __int64 apc_param_t; typedef unsigned __int64 mem_size_t; typedef unsigned __int64 file_pos_t; diff --git a/server/trace.c b/server/trace.c index 59658e9..c446f63 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,8 +114,13 @@ static void dump_apc_call( const apc_call_t *call ) fprintf( stderr, "APC_NONE" ); break; case APC_USER: - fprintf( stderr, "APC_USER,args={%lx,%lx,%lx}", - call->user.args[0], call->user.args[1], call->user.args[2] ); + fprintf( stderr, "APC_USER,args={" ); + dump_uint64( &call->user.args[0] ); + fputc( ',', stderr ); + dump_uint64( &call->user.args[1] ); + fputc( ',', stderr ); + dump_uint64( &call->user.args[2] ); + fputc( '}', stderr ); break; case APC_TIMER: fprintf( stderr, "APC_TIMER,time=" ); @@ -3753,8 +3758,12 @@ static void dump_open_completion_reply( const struct open_completion_reply *req static void dump_add_completion_request( const struct add_completion_request *req ) { fprintf( stderr, " handle=%04x,", req->handle ); - fprintf( stderr, " ckey=%lx,", req->ckey ); - fprintf( stderr, " cvalue=%lx,", req->cvalue ); + fprintf( stderr, " ckey=" ); + dump_uint64( &req->ckey ); + fprintf( stderr, "," ); + fprintf( stderr, " cvalue=" ); + dump_uint64( &req->cvalue ); + fprintf( stderr, "," ); fprintf( stderr, " information=%08x,", req->information ); fprintf( stderr, " status=%08x", req->status ); } @@ -3766,8 +3775,12 @@ static void dump_remove_completion_request( const struct remove_completion_reque static void dump_remove_completion_reply( const struct remove_completion_reply *req ) { - fprintf( stderr, " ckey=%lx,", req->ckey ); - fprintf( stderr, " cvalue=%lx,", req->cvalue ); + fprintf( stderr, " ckey=" ); + dump_uint64( &req->ckey ); + fprintf( stderr, "," ); + fprintf( stderr, " cvalue=" ); + dump_uint64( &req->cvalue ); + fprintf( stderr, "," ); fprintf( stderr, " information=%08x,", req->information ); fprintf( stderr, " status=%08x", req->status ); } @@ -3786,13 +3799,16 @@ static void dump_set_completion_info_request( const struct set_completion_info_r { fprintf( stderr, " handle=%04x,", req->handle ); fprintf( stderr, " chandle=%04x,", req->chandle ); - fprintf( stderr, " ckey=%lx", req->ckey ); + fprintf( stderr, " ckey=" ); + dump_uint64( &req->ckey ); } static void dump_add_fd_completion_request( const struct add_fd_completion_request *req ) { fprintf( stderr, " handle=%04x,", req->handle ); - fprintf( stderr, " cvalue=%lx,", req->cvalue ); + fprintf( stderr, " cvalue=" ); + dump_uint64( &req->cvalue ); + fprintf( stderr, "," ); fprintf( stderr, " status=%08x,", req->status ); fprintf( stderr, " information=%08x", req->information ); } diff --git a/tools/make_requests b/tools/make_requests index a89bc7f..d21d79d 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -37,7 +37,7 @@ my %formats = "process_id_t" => [ 4, 4, "%04x" ], "thread_id_t" => [ 4, 4, "%04x" ], "lparam_t" => [ 4, 4, "%lx" ], - "apc_param_t" => [ 4, 4, "%lx" ], + "apc_param_t" => [ 8, 8, "&dump_uint64" ], "file_pos_t" => [ 8, 8, "&dump_uint64" ], "mem_size_t" => [ 8, 8, "&dump_uint64" ], "timeout_t" => [ 8, 8, "&dump_timeout" ], @@ -45,7 +45,7 @@ my %formats = "char_info_t" => [ 4, 2, "&dump_char_info" ], "apc_call_t" => [ 40, 8, "&dump_apc_call" ], "apc_result_t" => [ 40, 8, "&dump_apc_result" ], - "async_data_t" => [ 24, 4, "&dump_async_data" ], + "async_data_t" => [ 28, 8, "&dump_async_data" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], );

1 0

Jeremy Newman : adding news post about sourceforge.net award
by Jeremy Newman 17 Dec '08

17 Dec '08

Module: website Branch: master Commit: 67944162b1ee717665c7c27e599549686bc5c491 URL: http://source.winehq.org/git/website.git/?a=commit;h=67944162b1ee717665c7c2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 17 11:25:28 2008 -0600 adding news post about sourceforge.net award --- images/misc/WineAward_2008.png | Bin 0 -> 336388 bytes images/misc/WineAward_2008_sm.png | Bin 0 -> 19124 bytes news/en/2008121701.xml | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/images/misc/WineAward_2008.png b/images/misc/WineAward_2008.png new file mode 100644 index 0000000..69921a5 Binary files /dev/null and b/images/misc/WineAward_2008.png differ diff --git a/images/misc/WineAward_2008_sm.png b/images/misc/WineAward_2008_sm.png new file mode 100644 index 0000000..2748c76 Binary files /dev/null and b/images/misc/WineAward_2008_sm.png differ diff --git a/news/en/2008121701.xml b/news/en/2008121701.xml new file mode 100644 index 0000000..de538bf --- /dev/null +++ b/news/en/2008121701.xml @@ -0,0 +1,20 @@ +<news> + <date>December 17, 2008</date> + <title>SourceForge 2008 Community Choice Awards</title> + <body> + <a href="{$root}/images/misc/WineAward_2008.png"><img src="{$root}/images/misc/WineAward_2008_sm.png" + style="float: left; margin: 0 20px 20px 0;"></a> + + The Wine project has won an award from the + <a href="http://sourceforge.net/community/cca08/">SourceForge 2008 Community Choice Awards</a>. + + + We won the category: + "Most Likely to Be Ambiguously and Baselessly Accused of Patent Violation". + + + We would like to thank to the voters of SourceForge community for this fantastic award. + + <div style="clear: both;"></div> + </body> +</news>

1 0

Alexandre Julliard : include: Use __p__iob on i386 to avoid problems with Mingw libraries.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 5646fec9b14b2d039994cdeeef141eca889e649f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5646fec9b14b2d039994cdeee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 17:38:02 2008 +0100 include: Use __p__iob on i386 to avoid problems with Mingw libraries. --- include/msvcrt/stdio.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 0f91947..98cc950 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -81,8 +81,13 @@ extern "C" { #endif #ifndef _STDIO_DEFINED +# ifdef __i386__ +FILE* __cdecl __p__iob(void); +# define _iob (__p__iob()) +# else FILE* __cdecl __iob_func(void); -# define _iob (__iob_func()) +# define _iob (__iob_func()) +# endif #endif /* _STDIO_DEFINED */ #define stdin (_iob+STDIN_FILENO)

1 0

Jeremy Newman : adding french translation
by Jeremy Newman 17 Dec '08

17 Dec '08

Module: website Branch: master Commit: d79d2bfcbd48e037ab91c0315960ba8bc6dfe4a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=d79d2bfcbd48e037ab91c0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 17 10:19:26 2008 -0600 adding french translation --- include/data.php | 4 ++++ include/winehq.conf.sample | 2 +- templates/en/lang.template | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/data.php b/include/data.php index a4cfbdc..6c5a90a 100644 --- a/include/data.php +++ b/include/data.php @@ -56,6 +56,10 @@ class data 'es' => array( 'name' => 'Español', 'change' => 'Cambiar la Lengua' + ), + 'fr' => array( + 'name' => 'Français', + 'change' => 'Changez la langue' ) ); diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 06b9c3e..2ec82ab 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -16,7 +16,7 @@ theme: winehq lang: en # available languages -(a)languages: en, de, es +(a)languages: en, de, es, fr # default base URLS (if you run the site, in a subdir, set base_root) base_root: diff --git a/templates/en/lang.template b/templates/en/lang.template index c513cc1..cdd3052 100644 --- a/templates/en/lang.template +++ b/templates/en/lang.template @@ -20,6 +20,10 @@ <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> <a href="{$root}/lang/es" title="Español">Español</a> (Spanish) </li> - + + <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/fr" title="Español">Français</a> (French) + </li> + </ul>

1 0

Jeremy Newman : match more on title and blurb
by Jeremy Newman 17 Dec '08

17 Dec '08

Module: website Branch: master Commit: 91ec4e85ac585335db8a812c50fe9802723b9cfb URL: http://source.winehq.org/git/website.git/?a=commit;h=91ec4e85ac585335db8a81… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 17 10:18:38 2008 -0600 match more on title and blurb --- include/html.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/html.php b/include/html.php index 27c2162..650cee9 100644 --- a/include/html.php +++ b/include/html.php @@ -1260,10 +1260,10 @@ class html $in = preg_replace('/\{\$[a-z0-9_\-]+\}/', '', $in); // get page name from template - if (preg_match('//', $orig, $arr)) + if (preg_match('//', $orig, $arr)) { debug("global", "adding to title: {$arr[1]}"); - $in = preg_replace('/\n/', '', $in); + $in = preg_replace('/\n/', '', $in); $this->page_title .= " - {$arr[1]}"; unset($arr); } @@ -1287,10 +1287,10 @@ class html } // get page blurb template - if (preg_match('//', $orig, $arr)) + if (preg_match('//', $orig, $arr)) { debug("global", "setting page blurb: {$arr[1]}"); - $in = preg_replace('/\n/', '', $in); + $in = preg_replace('/\n/', '', $in); $this->page_blurb = $arr[1]; unset($arr); }

1 0

Jonathan Ernst : French l10n
by Jeremy Newman 17 Dec '08

17 Dec '08

Module: website Branch: master Commit: a73c251b8f566cd6d58f3ed9f830e1c10537a09b URL: http://source.winehq.org/git/website.git/?a=commit;h=a73c251b8f566cd6d58f3e… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Dec 16 20:11:02 2008 +0100 French l10n >From d00ac529c90c09d41d6cf94c674095ce0d2c8d87 Mon Sep 17 00:00:00 2001 From: Jonathan Ernst <jernst(a)jernst-desktop.(none)> Date: Tue, 16 Dec 2008 20:02:11 +0100 Subject: First attempt at a French l10n of the website. --- templates/fr/about.template | 49 +++++++++++ templates/fr/announce.template | 7 ++ templates/fr/home.template | 90 ++++++++++++++++++++ templates/fr/interview.template | 8 ++ templates/fr/irc.template | 19 ++++ templates/fr/news.template | 11 +++ templates/fr/why.template | 174 +++++++++++++++++++++++++++++++++++++++ templates/fr/wwn.template | 9 ++ 8 files changed, 367 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a73c251b8f566cd6d5…

1 0

Jacek Caban : jscript: Correctly handle SCRIPTITEM_GLOBALMEMBERS flag in identifier_eval.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 775a6b21e9be24e9b9f70670b7363789eafda0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775a6b21e9be24e9b9f70670b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 17 12:56:12 2008 +0100 jscript: Correctly handle SCRIPTITEM_GLOBALMEMBERS flag in identifier_eval. --- dlls/jscript/engine.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5a14c5f..423df46 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -489,9 +489,11 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex } for(item = ctx->parser->script->named_items; item; item = item->next) { - hres = disp_get_id(item->disp, identifier, 0, &id); - if(SUCCEEDED(hres)) - break; + if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { + hres = disp_get_id(item->disp, identifier, 0, &id); + if(SUCCEEDED(hres)) + break; + } } if(item) {

1 0

Konstantin Kondratyuk : mshtml: Correct UIDs of interfaces.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: ba8a0b7b9d0d0798fc0bb180b1d6e064db2df39c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8a0b7b9d0d0798fc0bb180b… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Dec 12 15:15:12 2008 +0300 mshtml: Correct UIDs of interfaces. --- include/mshtml.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 8bf3efa..eabf867 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -20188,7 +20188,7 @@ interface IMarkupPointer : IUnknown [ object, pointer_default(unique), - uuid(83f65030-b598-cf11-bb82-00aa00bdce0b) + uuid(3050f683-98b5-11cf-bb82-00aa00bdce0b) ] interface ISegment : IUnknown { @@ -20220,7 +20220,7 @@ interface IElementSegment : ISegment [ object, pointer_default(unique), - uuid(99f65030-b598-cf11-bb82-00aa00bdce0b) + uuid(3050f699-98b5-11cf-bb82-00aa00bdce0b) ] interface ISelectionServicesListener : IUnknown {

1 0

Francois Gouget : devenum: Make the Romanian translation LANG_NEUTRAL.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 579b8649a180c1fb18bb05e199667c8ea8df32b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579b8649a180c1fb18bb05e19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 17 10:29:28 2008 +0100 devenum: Make the Romanian translation LANG_NEUTRAL. --- dlls/devenum/devenum.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 9313984..c5ad0fc 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -126,7 +126,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL { 7 "DirectSound implicit" 8 "DirectSound: %s"

1 0