August 2009 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added support for partial reads in read_stream_data.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 902829ea70b6ef9a25954e3c061c997c46f58b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902829ea70b6ef9a25954e3c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 19:14:48 2009 +0200 mshtml: Added support for partial reads in read_stream_data. --- dlls/mshtml/navigate.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fb743f4..8b1b27e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -854,12 +854,12 @@ struct nsChannelBSC { static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) { + DWORD read; nsresult nsres; HRESULT hres; if(!This->nslistener) { BYTE buf[1024]; - DWORD read; do { read = 0; @@ -873,17 +873,20 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) This->nsstream = create_nsprotocol_stream(); do { - hres = IStream_Read(stream, This->nsstream->buf, sizeof(This->nsstream->buf), - &This->nsstream->buf_size); - if(!This->nsstream->buf_size) + read = 0; + hres = IStream_Read(stream, This->nsstream->buf+This->nsstream->buf_size, + sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read); + if(!read) break; - if(!This->bsc.readed && This->nsstream->buf_size >= 2 && *(WORD*)This->nsstream->buf == 0xfeff) { - This->nschannel->charset = heap_alloc(sizeof(UTF16_STR)); - memcpy(This->nschannel->charset, UTF16_STR, sizeof(UTF16_STR)); - } + This->nsstream->buf_size += read; if(!This->bsc.readed) { + if(This->nsstream->buf_size >= 2 + && (BYTE)This->nsstream->buf[0] == 0xff + && (BYTE)This->nsstream->buf[1] == 0xfe) + This->nschannel->charset = heap_strdupA(UTF16_STR); + nsres = nsIStreamListener_OnStartRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); if(NS_FAILED(nsres)) @@ -905,8 +908,10 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) if(NS_FAILED(nsres)) ERR("OnDataAvailable failed: %08x\n", nsres); - if(This->nsstream->buf_size) - FIXME("buffer is not empty!\n"); + if(This->nsstream->buf_size == sizeof(This->nsstream->buf)) { + ERR("buffer is full\n"); + break; + } }while(hres == S_OK); return S_OK;

1 0

Paul Vriens : transl: Port checkmakefile perl script to a php script.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: tools Branch: master Commit: 7ac7fab5e3de504324b0b2c26616415f1b38b3ae URL: http://source.winehq.org/git/tools.git/?a=commit;h=7ac7fab5e3de504324b0b2c2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Aug 11 08:19:13 2009 +0200 transl: Port checkmakefile perl script to a php script. --- transl/php/lib_res.php | 92 ++++++++ transl/scripts/Master.sh | 2 +- transl/scripts/checkmakefile.pl | 448 ------------------------------------- transl/scripts/parse_resfiles.php | 387 ++++++++++++++++++++++++++++++++ winetest/make-winetest | 2 +- 5 files changed, 481 insertions(+), 450 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=7ac7fab5e3de504324b0…

1 0

Paul Vriens : transl: Write more information to the lang and summary files.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: tools Branch: master Commit: 7e64d9bf346771fd0aefb5e657beeb697f71061a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7e64d9bf346771fd0aefb5e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Aug 11 10:30:01 2009 +0200 transl: Write more information to the lang and summary files. --- transl/php/lang.php | 2 +- transl/scripts/parse_resfiles.php | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/transl/php/lang.php b/transl/php/lang.php index 304783d..91aee9d 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -19,7 +19,7 @@ function parse_file($lang) $curr_file = ""; while ($line = fgets($file, 4096)) { - if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) + if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { $curr_file = $m[2]; if ($m[1] == "NONE") diff --git a/transl/scripts/parse_resfiles.php b/transl/scripts/parse_resfiles.php index b1d8b82..41ed364 100644 --- a/transl/scripts/parse_resfiles.php +++ b/transl/scripts/parse_resfiles.php @@ -285,7 +285,7 @@ foreach (array_keys($checks) as $dir) if (!isset($file_langs[$lang]) && !isset($file_langs[$basic_lang])) { $langout = fopen("$workdir/$lang", "a+"); - fwrite($langout, "FILE NONE $dir 0 $mastercount 0\n"); + fwrite($langout, "FILE NONE $dir 0 $mastercount 0 0 0 0\n"); fclose($langout); continue; } @@ -293,7 +293,9 @@ foreach (array_keys($checks) as $dir) $translated = 0; $missing = 0; $errors = 0; + $total_errors = 0; $warnings = 0; + $total_warnings = 0; $errors_rl = array(); $missing_rl = array(); @@ -328,6 +330,9 @@ foreach (array_keys($checks) as $dir) ": Translation inherited from @LANG($basic_lang)"; $translated++; } + + if ($res_warnings) + $warnings++; } } else @@ -347,11 +352,17 @@ foreach (array_keys($checks) as $dir) ": Resource translated"; $translated++; } + + if ($res_warnings) + $warnings++; } + + $total_errors += $res_errors; + $total_warnings += $res_warnings; } $langout = fopen("$workdir/$lang", "a+"); - fwrite($langout, "FILE STAT $dir $translated $missing $errors\n"); + fwrite($langout, "FILE STAT $dir $translated $missing $errors $total_errors $warnings $total_warnings\n"); foreach ($errors_rl as $msg) fwrite($langout, "$msg\n"); foreach ($missing_rl as $msg) @@ -369,19 +380,25 @@ foreach ($languages as $lang) $transl = 0; $missing = 0; $errors = 0; + $total_errors = 0; + $warnings = 0; + $total_warnings = 0; $file = fopen("$workdir/$lang", "r"); while ($line = fgets($file, 4096)) { - if (preg_match("/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+)$/", $line, $m)) + if (preg_match("/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)$/", $line, $m)) { $transl += $m[1]; $missing += $m[2]; $errors += $m[3]; + $total_errors += $m[4]; + $warnings += $m[5]; + $total_warnings += $m[6]; } } fclose($file); $sum = $transl + $missing + $errors; - fwrite($summary, "LANG $lang $sum $transl $missing $errors\n"); + fwrite($summary, "LANG $lang $sum $transl $missing $errors $total_errors $warnings $total_warnings\n"); } fclose($summary); ?>

1 0

Paul Vriens : transl: Add the ability to retrieve warnings or errors.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: tools Branch: master Commit: 198a926677d76890fdd88d02bf1237eda3dffccf URL: http://source.winehq.org/git/tools.git/?a=commit;h=198a926677d76890fdd88d02… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Aug 10 17:23:46 2009 +0200 transl: Add the ability to retrieve warnings or errors. --- transl/php/lib_res.php | 70 +++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 24 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index 21ba98d..ddc65ab 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -174,8 +174,16 @@ function dump_resource_row($id, &$resource, &$master, $method_name, $diff_method { $extra = ""; if ($master && $diff_method_name) - if ($resource->$diff_method_name($master, $lparam, $master_lparam)) - $extra = " class=\"diff\""; + if ($master_lparam == NULL) + { + if ($resource->$diff_method_name($master, $lparam, TRUE)) + $extra = " class=\"diff\""; + } + else + { + if ($resource->$diff_method_name($master, $lparam, $master_lparam, TRUE)) + $extra = " class=\"diff\""; + } if ($master_lparam == NULL) $master_lparam = $lparam; @@ -430,13 +438,18 @@ class StringTable extends Resource dump_unicode_or_empty($this->strings[$lparam]); } - function is_string_different(&$other, $lparam) + function is_string_different(&$other, $lparam, $pedantic = TRUE) { $uni_str = $this->strings[$lparam]; $other_uni_str = $other->strings[$lparam]; - return ((!$other_uni_str && $uni_str) || - ($other_uni_str && !$uni_str) || - (($uni_str && $other_uni_str) && ($uni_str == $other_uni_str))); + + $generic = (!$other_uni_str && $uni_str) || ($other_uni_str && !$uni_str); + + if ($pedantic != TRUE) + return $generic; + + return $generic || + (($uni_str && $other_uni_str) && ($uni_str == $other_uni_str)); } function dump($master_res = NULL) @@ -506,13 +519,18 @@ class MessageTable extends Resource dump_unicode_or_empty($this->strings[$lparam]); } - function is_string_different(&$other, $lparam) + function is_string_different(&$other, $lparam, $pedantic = TRUE) { $uni_str = $this->strings[$lparam]; $other_uni_str = $other->strings[$lparam]; - return ((!$other_uni_str && $uni_str) || - ($other_uni_str && !$uni_str) || - (($uni_str && $other_uni_str) && ($uni_str == $other_uni_str))); + + $generic = (!$other_uni_str && $uni_str) || ($other_uni_str && !$uni_str); + + if ($pedantic != TRUE) + return $generic; + + return $generic || + (($uni_str && $other_uni_str) && ($uni_str == $other_uni_str)); } function dump($master_res = NULL) @@ -879,7 +897,7 @@ class DialogResource extends Resource } /* check if the row should be in red */ - function is_control_different(&$other, $lparam, $other_lparam) + function is_control_different(&$other, $lparam, $other_lparam, $pedantic = TRUE) { global $CONSTS; if (!$lparam[1] || !$other_lparam[1]) /* one item is missing */ @@ -892,18 +910,23 @@ class DialogResource extends Resource if (is_int($this_ctrl['className']) && $this_ctrl['className'] == 0x80 /* button */) $ignore_style = $CONSTS["BS_MULTILINE"]; - return ($this_ctrl['id'] != $other_ctrl['id']) || - (($this_ctrl['style'] | $ignore_style) != ($other_ctrl['style'] | $ignore_style)) || - ($this_ctrl['exStyle'] != $other_ctrl['exStyle']) || - (!is_equal_unicode_or_id($this_ctrl['className'], $other_ctrl['className'])) || - // We should have either id's or text in both - (is_int($this_ctrl['text']) ^ is_int($other_ctrl['text'])) || - // If it's an id they should be equal - (is_int($this_ctrl['text']) && - !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])) || - // If either text is empty they should be equal - (!is_int($this_ctrl['text']) && ((count($this_ctrl['text']) == 0) || (count($other_ctrl['text']) == 0)) && - !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])) || + $generic = ($this_ctrl['id'] != $other_ctrl['id']) || + (($this_ctrl['style'] | $ignore_style) != ($other_ctrl['style'] | $ignore_style)) || + ($this_ctrl['exStyle'] != $other_ctrl['exStyle']) || + (!is_equal_unicode_or_id($this_ctrl['className'], $other_ctrl['className'])) || + // We should have either id's or text in both + (is_int($this_ctrl['text']) ^ is_int($other_ctrl['text'])) || + // If it's an id they should be equal + (is_int($this_ctrl['text']) && + !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])) || + // If either text is empty they should be equal + (!is_int($this_ctrl['text']) && ((count($this_ctrl['text']) == 0) || (count($other_ctrl['text']) == 0)) && + !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])); + + if ($pedantic != TRUE) + return $generic; + + return $generic || // If we have text in both they should not be equal (!is_int($this_ctrl['text']) && ((count($this_ctrl['text']) != 0) && (count($other_ctrl['text']) != 0)) && is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])); @@ -941,7 +964,6 @@ class DialogResource extends Resource $master_pos++; } } - } ?>

1 0

Paul Vriens : transl: Add the ability to pass a resource file.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: tools Branch: master Commit: 208510e32d3c7de6a45ab79ef233bede3d6b1ac7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=208510e32d3c7de6a45ab79e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Aug 10 17:14:57 2009 +0200 transl: Add the ability to pass a resource file. --- transl/php/lib.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 8d23291..0d69076 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -44,7 +44,7 @@ function res_enum($header, $f) } } -function enum_locale_names() +function enum_locale_names($kernel32_res = "") { include_once "lib_res.php"; include "config.php"; @@ -54,7 +54,11 @@ function enum_locale_names() { return; } - $res = new ResFile("$DATAROOT/res/dlls-kernel32.res"); + + if ($kernel32_res == "") + $kernel32_res = "$DATAROOT/res/dlls-kernel32.res"; + + $res = new ResFile($kernel32_res); $res->enumResources("res_enum"); ksort($LOCALE_NAMES); }

1 0

Paul Vriens : jscript: Add some Dutch translations.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 862bd3c61ee75477b559292a2aad44cb77620dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862bd3c61ee75477b559292a2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Aug 11 12:08:09 2009 +0200 jscript: Add some Dutch translations. --- dlls/jscript/jscript_Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index 71ba6b5..e3bd39f 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -30,6 +30,7 @@ STRINGTABLE DISCARDABLE IDS_SEMICOLON "';' verwacht" IDS_LBRACKET "'(' verwacht" IDS_RBRACKET "')' verwacht" + IDS_UNTERMINATED_STR "Onafgesloten tekenreeksconstante" IDS_NOT_FUNC "Functie verwacht" IDS_NOT_DATE "'[object]' is geen datum object" IDS_NOT_NUM "Getal verwacht"

1 0

Vincent Povirk : gdiplus: Remove an unnecessary picture reference in GdipSaveImageToFile.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: d76d00ea7eb32bffdcf41f977fe937af63ce98aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76d00ea7eb32bffdcf41f977… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 11 09:55:23 2009 -0500 gdiplus: Remove an unnecessary picture reference in GdipSaveImageToFile. --- dlls/gdiplus/image.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f06eb02..2ed64f8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1290,9 +1290,6 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam if (!image || !filename|| !clsidEncoder) return InvalidParameter; - if (!(image->picture)) - return InvalidParameter; - stat = GdipCreateStreamOnFile(filename, GENERIC_WRITE, &stream); if (stat != Ok) return GenericError;

1 0

Piotr Caban : jscript: Added $ handling to String.replace.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 59cf9c449ed04e7a8226ef66dec929a4021c2bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cf9c449ed04e7a8226ef66d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Aug 11 14:06:52 2009 +0200 jscript: Added $ handling to String.replace. --- dlls/jscript/string.c | 69 +++++++++++++++++++++++++++++++++++++---- dlls/jscript/tests/regexp.js | 33 ++++++++++++++++++++ 2 files changed, 95 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 6695bf8..4cf3783 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -802,7 +802,7 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR DWORD parens_cnt = 0, parens_size=0, rep_len=0, length; BSTR rep_str = NULL, match_str = NULL, ret_str, val_str = NULL; DispatchEx *rep_func = NULL, *regexp = NULL; - match_result_t *parens = NULL, match; + match_result_t *parens = NULL, match, **parens_ptr = &parens; strbuf_t ret = {NULL,0,0}; BOOL gcheck = FALSE; VARIANT *arg_var; @@ -884,12 +884,9 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR if(FAILED(hres)) break; - if(strchrW(rep_str, '$')) { - FIXME("unsupported $ in replace string\n"); - hres = E_NOTIMPL; - } - rep_len = SysStringLen(rep_str); + if(!strchrW(rep_str, '$')) + parens_ptr = NULL; } } @@ -900,7 +897,7 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR while(1) { if(regexp) { - hres = regexp_match_next(regexp, gcheck, str, length, &cp, rep_func ? &parens : NULL, + hres = regexp_match_next(regexp, gcheck, str, length, &cp, parens_ptr, &parens_size, &parens_cnt, &match); gcheck = TRUE; @@ -934,6 +931,64 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR SysFreeString(cstr); if(FAILED(hres)) break; + }else if(rep_str && regexp) { + const WCHAR *ptr = rep_str, *ptr2; + + while((ptr2 = strchrW(ptr, '$'))) { + hres = strbuf_append(&ret, ptr, ptr2-ptr); + if(FAILED(hres)) + break; + + switch(ptr2[1]) { + case '$': + hres = strbuf_append(&ret, ptr2, 1); + ptr = ptr2+2; + break; + case '&': + hres = strbuf_append(&ret, match.str, match.len); + ptr = ptr2+2; + break; + case '`': + hres = strbuf_append(&ret, str, match.str-str); + ptr = ptr2+2; + break; + case '\'': + hres = strbuf_append(&ret, ecp, (str+length)-ecp); + ptr = ptr2+2; + break; + default: { + DWORD idx; + + if(!isdigitW(ptr2[1])) { + hres = strbuf_append(&ret, ptr2, 1); + ptr = ptr2+1; + break; + } + + idx = ptr2[1] - '0'; + if(isdigitW(ptr[3]) && idx*10 + (ptr[2]-'0') <= parens_cnt) { + idx = idx*10 + (ptr[2]-'0'); + ptr = ptr2+3; + }else if(idx && idx <= parens_cnt) { + ptr = ptr2+2; + }else { + hres = strbuf_append(&ret, ptr2, 1); + ptr = ptr2+1; + break; + } + + hres = strbuf_append(&ret, parens[idx-1].str, parens[idx-1].len); + } + } + + if(FAILED(hres)) + break; + } + + if(SUCCEEDED(hres)) + hres = strbuf_append(&ret, ptr, (rep_str+rep_len)-ptr); + if(FAILED(hres)) + break; }else if(rep_str) { hres = strbuf_append(&ret, rep_str, rep_len); if(FAILED(hres)) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 3e4db68..4344dfe 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -158,6 +158,39 @@ function replaceFunc2(m, subm, off, str) { r = "[test1] [test2]".replace(/\[([^\[]+)\]/g, replaceFunc2); ok(r === "r0 r1", "r = '" + r + "' expected 'r0 r1'"); +r = "$1,$2".replace(/(\$(\d))/g, "$$1-$1$2"); +ok(r === "$1-$11,$1-$22", "r = '" + r + "' expected '$1-$11,$1-$22'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$&"); +ok(r === "abc &1 123", "r = '" + r + "' expected 'abc &1 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$'"); +ok(r === "abc 123 123", "r = '" + r + "' expected 'abc 123 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$`"); +ok(r === "abc abc 123", "r = '" + r + "' expected 'abc abc 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$3"); +ok(r === "abc $3 123", "r = '" + r + "' expected 'abc $3 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$"); +ok(r === "abc $ 123", "r = '" + r + "' expected 'abc $ 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$a"); +ok(r === "abc $a 123", "r = '" + r + "' expected 'abc $a 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$11"); +ok(r === "abc &11 123", "r = '" + r + "' expected 'abc &11 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$0"); +ok(r === "abc $0 123", "r = '" + r + "' expected 'abc $0 123'"); + +r = "1 2 3".replace("2", "$&"); +ok(r === "1 $& 3", "r = '" + r + "' expected '1 $& 3'"); + +r = "1 2 3".replace("2", "$'"); +ok(r === "1 $' 3", "r = '" + r + "' expected '1 $' 3'"); + r = "1,,2,3".split(/,+/g); ok(r.length === 3, "r.length = " + r.length); ok(r[0] === "1", "r[0] = " + r[0]);

1 0

Vladimir Pankratov : hhctrl.ocx: Handle NULL param.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 01128fa35b0c16e91837ff213f2d4f7cd18d4377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01128fa35b0c16e91837ff213… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Aug 11 17:07:00 2009 +0500 hhctrl.ocx: Handle NULL param. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index a19e1e6..092e97e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -129,7 +129,7 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) return FALSE; } - wsprintfW(buf, url_format, full_path, index[0] == '/' ? empty : slash, index); + wsprintfW(buf, url_format, full_path, (!index || index[0] == '/') ? empty : slash, index); /* FIXME: HACK */ if((ptr = strchrW(buf, '#')))

1 0

Alexandre Julliard : libwine: Ignore libraries that are of the wrong 32/ 64 class.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 99538272d5b4ffc852f950dd3447a7072d6316ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=99538272d5b4ffc852f950dd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 11 17:29:07 2009 +0200 libwine: Ignore libraries that are of the wrong 32/64 class. --- libs/wine/loader.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index d10a6e0..37c603e 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -147,12 +147,54 @@ static void build_dll_path(void) } } +/* check if the library is the correct architecture */ +/* only returns false for a valid library of the wrong arch */ +static int check_library_arch( int fd ) +{ +#ifdef __APPLE__ + struct /* Mach-O header */ + { + unsigned int magic; + unsigned int cputype; + } header; + + if (read( fd, &header, sizeof(header) ) != sizeof(header)) return 1; + if (header.magic != 0xfeedface) return 1; + if (sizeof(void *) == sizeof(int)) return !(header.cputype >> 24); + else return (header.cputype >> 24) == 1; /* CPU_ARCH_ABI64 */ +#else + struct /* ELF header */ + { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char version; + } header; + + if (read( fd, &header, sizeof(header) ) != sizeof(header)) return 1; + if (memcmp( header.magic, "\177ELF", 4 )) return 1; + if (header.version != 1 /* EV_CURRENT */) return 1; +#ifdef WORDS_BIGENDIAN + if (header.data != 2 /* ELFDATA2MSB */) return 1; +#else + if (header.data != 1 /* ELFDATA2LSB */) return 1; +#endif + if (sizeof(void *) == sizeof(int)) return header.class == 1; /* ELFCLASS32 */ + else return header.class == 2; /* ELFCLASS64 */ +#endif +} + /* check if a given file can be opened */ static inline int file_exists( const char *name ) { + int ret = 0; int fd = open( name, O_RDONLY ); - if (fd != -1) close( fd ); - return (fd != -1); + if (fd != -1) + { + ret = check_library_arch( fd ); + close( fd ); + } + return ret; } static inline char *prepend( char *buffer, const char *str, size_t len )

1 0