September 2008 - Wine-Commits

Jacek Caban : jscript: Added Array.push implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 34e82951c3ebaa78fed3bd1d9315d1f605011973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e82951c3ebaa78fed3bd1d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:35:58 2008 +0200 jscript: Added Array.push implementation. --- dlls/jscript/array.c | 28 ++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index c131865..18ee3f5 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -89,11 +89,35 @@ static HRESULT Array_pop(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.4.4.7 */ static HRESULT Array_push(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DWORD length = 0; + int i, n; + HRESULT hres; + + TRACE("\n"); + + if(dispex->builtin_info->class == JSCLASS_ARRAY) { + length = ((ArrayInstance*)dispex)->length; + }else { + FIXME("not Array this\n"); + return E_NOTIMPL; + } + + n = dp->cArgs - dp->cNamedArgs; + for(i=0; i < n; i++) { + hres = jsdisp_propput_idx(dispex, length+i, lcid, get_arg(dp, i), ei, sp); + if(FAILED(hres)) + return hres; + } + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = length+n; + } + return S_OK; } static HRESULT Array_reverse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 45765ed..c76a485 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -60,4 +60,12 @@ ok(typeof(arr) === "object", "arr (6) is not object"); ok((arr.length === 6), "arr.length is not 6"); ok(arr["0"] === undefined, "arr[0] is not undefined"); +ok(arr.push() === 6, "arr.push() !== 6"); +ok(arr.push(1) === 7, "arr.push(1) !== 7"); +ok(arr[6] === 1, "arr[6] != 1"); +ok(arr.length === 7, "arr.length != 10"); +ok(arr.push(true, 'b', false) === 10, "arr.push(true, 'b', false) !== 10"); +ok(arr[8] === "b", "arr[8] != 'b'"); +ok(arr.length === 10, "arr.length != 10"); + reportSuccess();

1 0

Jacek Caban : jscript: Added string to number conversion implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 91b798ddf802bb9d7e812d84df308a324f555652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b798ddf802bb9d7e812d84d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 19:47:31 2008 +0200 jscript: Added string to number conversion implementation. --- dlls/jscript/jsutils.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/lex.c | 2 +- dlls/jscript/tests/lang.js | 5 ++ 3 files changed, 112 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index f368c3e..6c0707d 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -217,6 +217,110 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) return S_OK; } +static int hex_to_int(WCHAR c) +{ + if('0' <= c && c <= '9') + return c-'0'; + + if('a' <= c && c <= 'f') + return c-'a'+10; + + if('A' <= c && c <= 'F') + return c-'A'+10; + + return -1; +} + +/* ECMA-262 3rd Edition 9.3.1 */ +static HRESULT str_to_number(BSTR str, VARIANT *ret) +{ + const WCHAR *ptr = str; + BOOL neg = FALSE; + DOUBLE d = 0.0; + + static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; + + while(isspaceW(*ptr)) + ptr++; + + if(!strncmpW(ptr, infinityW, sizeof(infinityW)/sizeof(WCHAR))) { + ptr += sizeof(infinityW)/sizeof(WCHAR); + while(*ptr && isspaceW(*ptr)) + ptr++; + + if(*ptr) { + FIXME("NaN\n"); + return E_NOTIMPL; + } + + FIXME("inf\n"); + return E_NOTIMPL; + } + + if(*ptr == '-') { + neg = TRUE; + ptr++; + }else if(*ptr == '+') { + ptr++; + }else if(*ptr == '0' && ptr[1] == 'x') { + DWORD l = 0; + + ptr += 2; + while((l = hex_to_int(*ptr)) != -1) { + d = d*16 + l; + ptr++; + } + + num_set_val(ret, d); + return S_OK; + } + + while(isdigitW(*ptr)) + d = d*10 + (*ptr++ - '0'); + + if(*ptr == 'e' || *ptr == 'E') { + BOOL eneg = FALSE; + LONG l = 0; + + ptr++; + if(*ptr == '-') { + ptr++; + eneg = TRUE; + }else if(*ptr == '+') { + ptr++; + } + + while(isdigitW(*ptr)) + l = l*10 + (*ptr++ - '0'); + if(eneg) + l = -l; + + d *= pow(10, l); + }else if(*ptr == '.') { + DOUBLE dec = 0.1; + + ptr++; + while(isdigitW(*ptr)) { + d += dec * (*ptr++ - '0'); + dec *= 0.1; + } + } + + while(isspaceW(*ptr)) + ptr++; + + if(*ptr) { + FIXME("NaN\n"); + return E_NOTIMPL; + } + + if(neg) + d = -d; + + num_set_val(ret, d); + return S_OK; +} + /* ECMA-262 3rd Edition 9.3 */ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) { @@ -229,6 +333,8 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) case VT_R8: *ret = *v; break; + case VT_BSTR: + return str_to_number(V_BSTR(v), ret); case VT_BOOL: V_VT(ret) = VT_I4; V_I4(ret) = V_BOOL(v) ? 1 : 0; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index ed73202..ba80154 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -387,7 +387,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li e = e*10 + *ctx->ptr++ - '0'; e *= sign; - d = pow(d, e); + d *= pow(10, e); } *literal = parser_alloc(ctx, sizeof(literal_t)); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 83732a2..484d192 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -344,6 +344,11 @@ ok(+3 === 3, "+3 !== 3"); ok(+true === 1, "+true !== 1"); ok(+false === 0, "+false !== 0"); ok(+null === 0, "+null !== 0"); +ok(+"0" === 0, "+'0' !== 0"); +ok(+"3" === 3, "+'3' !== 3"); +ok(+"-3" === -3, "+'-3' !== -3"); +ok(+"0xff" === 255, "+'0xff' !== 255"); +ok(+"3e3" === 3000, "+'3e3' !== 3000"); ok("" + 0 === "0", "\"\" + 0 !== \"0\""); ok("" + 123 === "123", "\"\" + 123 !== \"123\"");

1 0

Jacek Caban : mshtml: Fixed dynamic properties allocation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: e9277986c85463f638328ffd7e64a48a21940427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9277986c85463f638328ffd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 17:26:01 2008 +0200 mshtml: Fixed dynamic properties allocation. --- dlls/mshtml/dispex.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 587d953..e176711 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -463,18 +463,37 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } if(grfdex & fdexNameEnsure) { + dispex_dynamic_data_t *dynamic_data; + TRACE("creating dynamic prop %s\n", debugstr_w(bstrName)); - if(!This->dynamic_data) { - This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); - This->dynamic_data->props = heap_alloc(This->dynamic_data->buf_size = 4); - }else if(This->dynamic_data->buf_size == This->dynamic_data->prop_cnt) { - This->dynamic_data->props = heap_realloc(This->dynamic_data->props, This->dynamic_data->buf_size<<=1); + if(This->dynamic_data) { + dynamic_data = This->dynamic_data; + }else { + dynamic_data = This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); + if(!dynamic_data) + return E_OUTOFMEMORY; + } + + if(!dynamic_data->buf_size) { + dynamic_data->props = heap_alloc(sizeof(dynamic_prop_t)*4); + if(!dynamic_data->props) + return E_OUTOFMEMORY; + dynamic_data->buf_size = 4; + }else if(dynamic_data->buf_size == dynamic_data->prop_cnt) { + dynamic_prop_t *new_props; + + new_props = heap_realloc(dynamic_data->props, sizeof(dynamic_prop_t)*(dynamic_data->buf_size<<1)); + if(!new_props) + return E_OUTOFMEMORY; + + dynamic_data->props = new_props; + dynamic_data->buf_size <<= 1; } - This->dynamic_data->props[This->dynamic_data->prop_cnt].name = heap_strdupW(bstrName); - VariantInit(&This->dynamic_data->props[This->dynamic_data->prop_cnt].var); - *pid = DISPID_DYNPROP_0 + This->dynamic_data->prop_cnt++; + dynamic_data->props[dynamic_data->prop_cnt].name = heap_strdupW(bstrName); + VariantInit(&dynamic_data->props[dynamic_data->prop_cnt].var); + *pid = DISPID_DYNPROP_0 + dynamic_data->prop_cnt++; return S_OK; }

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLElementCollection.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 129bf15883635e87c7cea9c2ebecda4cf97c74d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129bf15883635e87c7cea9c2e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 20 20:01:04 2008 +1000 mshtml: Implement IDispatch for IHTMLElementCollection. --- dlls/mshtml/htmlelem.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a2e3439..78e9c9b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1615,25 +1615,21 @@ static HRESULT WINAPI HTMLElementCollection_GetTypeInfoCount(IHTMLElementCollect UINT *pctinfo) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLElementCollection_GetTypeInfo(IHTMLElementCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLElementCollection_GetIDsOfNames(IHTMLElementCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface, @@ -1641,9 +1637,8 @@ static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *iface,

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLDOMNode.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 1965a25866577d5286fb231c0a24399cf12b9848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1965a25866577d5286fb231c0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 20 20:06:14 2008 +1000 mshtml: Implement IDispatch for IHTMLDOMNode. --- dlls/mshtml/htmlnode.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 14c941e..6618c55 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -315,16 +315,14 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) static HRESULT WINAPI HTMLDOMNode_GetTypeInfoCount(IHTMLDOMNode *iface, UINT *pctinfo) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLDOMNode_GetTypeInfo(IHTMLDOMNode *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDOMNode_GetIDsOfNames(IHTMLDOMNode *iface, REFIID riid, @@ -332,9 +330,7 @@ static HRESULT WINAPI HTMLDOMNode_GetIDsOfNames(IHTMLDOMNode *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMember, @@ -342,9 +338,8 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, long *p)

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLDOMNode2.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 7ada1edfe29adf9f87ac9b4e042cd5fe622d2ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ada1edfe29adf9f87ac9b4e0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 20 20:07:32 2008 +1000 mshtml: Implement IDispatch for IHTMLDOMNode2. --- dlls/mshtml/htmlnode.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 7c03a96..14c941e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -739,16 +739,14 @@ static ULONG WINAPI HTMLDOMNode2_Release(IHTMLDOMNode2 *iface) static HRESULT WINAPI HTMLDOMNode2_GetTypeInfoCount(IHTMLDOMNode2 *iface, UINT *pctinfo) { HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLDOMNode2_GetTypeInfo(IHTMLDOMNode2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDOMNode2_GetIDsOfNames(IHTMLDOMNode2 *iface, REFIID riid, @@ -756,9 +754,7 @@ static HRESULT WINAPI HTMLDOMNode2_GetIDsOfNames(IHTMLDOMNode2 *iface, REFIID ri LCID lcid, DISPID *rgDispId) { HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLDOMNode2_Invoke(IHTMLDOMNode2 *iface, DISPID dispIdMember, @@ -766,9 +762,8 @@ static HRESULT WINAPI HTMLDOMNode2_Invoke(IHTMLDOMNode2 *iface, DISPID dispIdMem VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDispatch **p)

1 0

Andrew Talbot : comctl32: Sign-compare warnings fix.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: d0e860b8a3900be7ebe78aa4fa22870ce5531506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e860b8a3900be7ebe78aa4f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 20 22:29:32 2008 +0100 comctl32: Sign-compare warnings fix. --- dlls/comctl32/syslink.c | 2 +- dlls/comctl32/theming.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index a78a00c..7f74b36 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -136,7 +136,7 @@ static PDOC_ITEM SYSLINK_AppendDocItem (SYSLINK_INFO *infoPtr, LPCWSTR Text, UIN { PDOC_ITEM Item; - textlen = min(textlen, lstrlenW(Text)); + textlen = min(textlen, strlenW(Text)); Item = Alloc(FIELD_OFFSET(DOC_ITEM, Text[textlen + 1])); if(Item == NULL) { diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 090fe27..bab87cc 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -113,7 +113,7 @@ static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { */ void THEMING_Initialize (void) { - int i; + unsigned int i; static const WCHAR subclassPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','S','u','b','C','l',0 }; static const WCHAR refDataPropName[] = @@ -161,7 +161,7 @@ void THEMING_Initialize (void) */ void THEMING_Uninitialize (void) { - int i; + unsigned int i; if (!atSubclassProp) return; /* not initialized */

1 0

Andrew Talbot : comdlg32: Sign-compare warnings fix.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 4f1fabf33566d0e1b0ea99a349acc70538cb700a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1fabf33566d0e1b0ea99a34… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 20 22:29:36 2008 +0100 comdlg32: Sign-compare warnings fix. --- dlls/comdlg32/fontdlg.c | 4 ++-- dlls/comdlg32/printdlg.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 9174ce0..b893282 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -150,7 +150,7 @@ static const struct { void _dump_cf_flags(DWORD cflags) { - int i; + unsigned int i; for (i = 0; i < sizeof(cfflags)/sizeof(cfflags[0]); i++) if (cfflags[i].mask & cflags) @@ -428,7 +428,7 @@ static int AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf) static int SetFontSizesToCombo3(HWND hwnd, const CHOOSEFONTW *lpcf) { static const BYTE sizes[]={6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; - int i; + unsigned int i; for (i = 0; i < sizeof(sizes)/sizeof(sizes[0]); i++) if (AddFontSizeToCombo3(hwnd, sizes[i], lpcf)) return 1; diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ccf5145..d8d2082 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1040,7 +1040,7 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, HWND hQuality = GetDlgItem(hDlg, cmb1); LONG* Resolutions; char buf[255]; - int i; + DWORD i; int dpiX, dpiY; HDC hPrinterDC = CreateDCA(PrintStructures->lpPrinterInfo->pDriverName, PrintStructures->lpPrinterInfo->pPrinterName,

1 0

Francois Gouget : kernel32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 7af03a041aaf7da3f55808c53d1f58d1f557aaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af03a041aaf7da3f55808c53… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 20 13:26:20 2008 +0200 kernel32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/kernel32/tests/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 37f4c92..59588f8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -526,7 +526,7 @@ static void test_ImportDescriptors(void) LPCSTR module_name = (LPCSTR) RVAToAddr( import_chunk->Name, kernel32_module); PIMAGE_THUNK_DATA name_table = (PIMAGE_THUNK_DATA) RVAToAddr( - import_chunk->OriginalFirstThunk, kernel32_module); + U(*import_chunk).OriginalFirstThunk, kernel32_module); PIMAGE_THUNK_DATA iat = (PIMAGE_THUNK_DATA) RVAToAddr( import_chunk->FirstThunk, kernel32_module); ok(module_name != NULL, "Imported module name should not be NULL\n");

1 0

Christian Costa : d3dxof: Rewrite check_TOKEN and parse_TOKEN_* to work properly and be more logical .
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 055e6bfb63b99d14294341bca76517d86be52e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055e6bfb63b99d14294341bca… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Sep 20 12:34:00 2008 +0200 d3dxof: Rewrite check_TOKEN and parse_TOKEN_* to work properly and be more logical. --- dlls/d3dxof/d3dxof.c | 115 ++++++++++++++++++++---------------------- dlls/d3dxof/d3dxof_private.h | 2 + 2 files changed, 57 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=055e6bfb63b99d1429434…

1 0