December 2008 - Wine-commits

Jacek Caban : jscript: Added Math.LOG10E implementation.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 06050f86d57aa1524bd80162d35af6e48144e9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06050f86d57aa1524bd80162d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 12:28:30 2008 +0100 jscript: Added Math.LOG10E implementation. --- dlls/jscript/math.c | 7 ++++--- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 93e1ee4..f2a3d0c 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); static const WCHAR EW[] = {'E',0}; static const WCHAR LOG2EW[] = {'L','O','G','2','E',0}; -static const WCHAR LOG10EW[] = {'L','O','G','1','0',0}; +static const WCHAR LOG10EW[] = {'L','O','G','1','0','E',0}; static const WCHAR LN2W[] = {'L','N','2',0}; static const WCHAR LN10W[] = {'L','N','1','0',0}; static const WCHAR PIW[] = {'P','I',0}; @@ -85,11 +85,12 @@ static HRESULT Math_LOG2E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return math_constant(M_LOG2E, flags, retv); } +/* ECMA-262 3rd Edition 15.8.1.4 */ static HRESULT Math_LOG10E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_LOG10E, flags, retv); } static HRESULT Math_LN2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 71a1518..16fba15 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -624,4 +624,9 @@ ok(Math.floor(Math.LOG2E*100) === 144, "Math.LOG2E = " + Math.LOG2E); Math.LOG2E = "test"; ok(Math.floor(Math.LOG2E*100) === 144, "modified Math.LOG2E = " + Math.LOG2E); +ok(typeof(Math.LOG10E) === "number", "typeof(Math.LOG10E) = " + typeof(Math.LOG10E)); +ok(Math.floor(Math.LOG10E*100) === 43, "Math.LOG10E = " + Math.LOG10E); +Math.LOG10E = "test"; +ok(Math.floor(Math.LOG10E*100) === 43, "modified Math.LOG10E = " + Math.LOG10E); + reportSuccess();

1 0

Jacek Caban : jscript: Added Math.LOG2E implementation.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 0c6b427aaae1a228c95052725f1e38c55f7e878e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6b427aaae1a228c95052725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 12:28:12 2008 +0100 jscript: Added Math.LOG2E implementation. --- dlls/jscript/math.c | 11 ++++++----- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index fd8bb55..93e1ee4 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -77,11 +77,12 @@ static HRESULT Math_E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, return math_constant(M_E, flags, retv); } +/* ECMA-262 3rd Edition 15.8.1.4 */ static HRESULT Math_LOG2E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_LOG2E, flags, retv); } static HRESULT Math_LOG10E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -403,10 +404,10 @@ static HRESULT Math_tan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static const builtin_prop_t Math_props[] = { {EW, Math_E, 0}, - {LOG2EW, Math_LOG2E, 0}, - {LOG10EW, Math_LOG10E, 0}, - {LN2W, Math_LN2, 0}, {LN10W, Math_LN10, 0}, + {LN2W, Math_LN2, 0}, + {LOG10EW, Math_LOG10E, 0}, + {LOG2EW, Math_LOG2E, 0}, {PIW, Math_PI, 0}, {SQRT1_2W, Math_SQRT1_2, 0}, {SQRT2W, Math_SQRT2, 0}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 169bc94..71a1518 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -619,4 +619,9 @@ ok(Math.floor(Math.E*100) === 271, "Math.E = " + Math.E); Math.E = "test"; ok(Math.floor(Math.E*100) === 271, "modified Math.E = " + Math.E); +ok(typeof(Math.LOG2E) === "number", "typeof(Math.LOG2E) = " + typeof(Math.LOG2E)); +ok(Math.floor(Math.LOG2E*100) === 144, "Math.LOG2E = " + Math.LOG2E); +Math.LOG2E = "test"; +ok(Math.floor(Math.LOG2E*100) === 144, "modified Math.LOG2E = " + Math.LOG2E); + reportSuccess();

1 0

Jacek Caban : jscript: Added Math.E implementation.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: da03e6779d36e27f4bf1652db019c108e1267c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da03e6779d36e27f4bf1652db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 12:27:52 2008 +0100 jscript: Added Math.E implementation. --- dlls/jscript/math.c | 5 +++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index ceabc36..fd8bb55 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -69,11 +69,12 @@ static HRESULT math_constant(DOUBLE val, WORD flags, VARIANT *retv) return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.8.1.1 */ static HRESULT Math_E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_E, flags, retv); } static HRESULT Math_LOG2E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7381612..169bc94 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -614,4 +614,9 @@ ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Math.PI = "test"; ok(Math.floor(Math.PI*100) === 314, "modified Math.PI = " + Math.PI); +ok(typeof(Math.E) === "number", "typeof(Math.E) = " + typeof(Math.E)); +ok(Math.floor(Math.E*100) === 271, "Math.E = " + Math.E); +Math.E = "test"; +ok(Math.floor(Math.E*100) === 271, "modified Math.E = " + Math.E); + reportSuccess();

1 0

Jacek Caban : jscript: Added Math.PI implementation.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 0e8bcbd9de6d2f824bc47662f4891ee0f241b7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8bcbd9de6d2f824bc47662f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 12:27:39 2008 +0100 jscript: Added Math.PI implementation. --- dlls/jscript/math.c | 20 ++++++++++++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index e6b7202..ceabc36 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -54,6 +54,21 @@ static const WCHAR sinW[] = {'s','i','n',0}; static const WCHAR sqrtW[] = {'s','q','r','t',0}; static const WCHAR tanW[] = {'t','a','n',0}; +static HRESULT math_constant(DOUBLE val, WORD flags, VARIANT *retv) +{ + switch(flags) { + case DISPATCH_PROPERTYGET: + V_VT(retv) = VT_R8; + V_R8(retv) = val; + return S_OK; + case DISPATCH_PROPERTYPUT: + return S_OK; + } + + FIXME("unhandled flags %x\n", flags); + return E_NOTIMPL; +} + static HRESULT Math_E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -89,11 +104,12 @@ static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.8.1.6 */ static HRESULT Math_PI(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_PI, flags, retv); } static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2868c0f..7381612 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -609,4 +609,9 @@ date = new Date(100); ok(date.getTime() === 100, "date.getTime() = " + date.getTime()); ok(Date.prototype.getTime() === 0, "date.prototype.getTime() = " + Date.prototype.getTime()); +ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); +ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); +Math.PI = "test"; +ok(Math.floor(Math.PI*100) === 314, "modified Math.PI = " + Math.PI); + reportSuccess();

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle put_fontStyle.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: f82df0ac6313cbfb82f0ee07459c43ae0537b1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82df0ac6313cbfb82f0ee074… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 11 22:16:28 2008 +1100 mshtml: Implement IHTMLStyle put_fontStyle. --- dlls/mshtml/htmlstyle.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4d7fd1a..208b6fb 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -133,6 +133,8 @@ static const WCHAR valLineThrough[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; static const WCHAR valUnderline[] = {'u','n','d','e','r','l','i','n','e',0}; +static const WCHAR szNormal[] = + {'n','o','r','m','a','l',0}; static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -515,8 +517,19 @@ static HRESULT WINAPI HTMLStyle_get_fontFamily(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_fontStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + static const WCHAR szItalic[] = {'i','t','a','l','i','c',0}; + static const WCHAR szOblique[] = {'o','b','l','i','q','u','e',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + /* fontStyle can only be one of the follow values. */ + if(!v || strcmpiW(szNormal, v) == 0 || strcmpiW(szItalic, v) == 0 || + strcmpiW(szOblique, v) == 0) + { + return set_nsstyle_attr(This->nsstyle, STYLEID_FONT_STYLE, v, 0); + } + + return E_INVALIDARG; } static HRESULT WINAPI HTMLStyle_get_fontStyle(IHTMLStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c1f5105..7410687 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2294,6 +2294,7 @@ static void test_default_style(IHTMLStyle *style) HRESULT hres; float f; BSTR sOverflowDefault; + BSTR sDefault; test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); @@ -2636,6 +2637,33 @@ static void test_default_style(IHTMLStyle *style) ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); VariantClear(&v); + /* fontStyle */ + hres = IHTMLStyle_get_fontStyle(style, &sDefault); + ok(hres == S_OK, "get_fontStyle failed: %08x\n", hres); + + str = a2bstr("test"); + hres = IHTMLStyle_put_fontStyle(style, str); + ok(hres == E_INVALIDARG, "put_fontStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("italic"); + hres = IHTMLStyle_put_fontStyle(style, str); + ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("oblique"); + hres = IHTMLStyle_put_fontStyle(style, str); + ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("normal"); + hres = IHTMLStyle_put_fontStyle(style, str); + ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_put_fontStyle(style, sDefault); + ok(hres == S_OK, "get_fontStyle failed: %08x\n", hres); + /* overflow */ hres = IHTMLStyle_get_overflow(style, NULL); ok(hres == E_INVALIDARG, "get_overflow failed: %08x\n", hres);

1 0

ByeongSik Jeon : *Zh.rc: Update the Chinese resource font name to " MS Shell Dlg".
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 1b0297a7f903a0b6b4878cb2b78b4a4c668ca475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0297a7f903a0b6b4878cb2b… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Thu Dec 11 03:29:14 2008 +0900 *Zh.rc: Update the Chinese resource font name to "MS Shell Dlg". --- dlls/appwiz.cpl/Zh.rc | 8 +++--- dlls/avifil32/avifile_Zh.rc | 4 +- dlls/browseui/rsrc_Zh.rc | 4 +- dlls/comctl32/comctl_Zh.rc | 12 +++++----- dlls/comdlg32/cdlg_Zh.rc | 38 ++++++++++++++++---------------- dlls/credui/credui_Zh.rc | 4 +- dlls/gphoto2.ds/gphoto2_Zh.rc | 12 +++++----- dlls/localui/ui_Zh.rc | 8 +++--- dlls/mpr/mpr_Zh.rc | 4 +- dlls/msacm32/msacm_Zh.rc | 4 +- dlls/mshtml/Zh.rc | 8 +++--- dlls/msvfw32/msvfw32_Zh.rc | 4 +- dlls/oledlg/oledlg_Zh.rc | 8 +++--- dlls/sane.ds/sane_Zh.rc | 4 +- dlls/serialui/Zh.rc | 4 +- dlls/setupapi/Zh.rc | 4 +- dlls/shell32/shell32_Zh.rc | 8 +++--- dlls/shlwapi/shlwapi_Zh.rc | 4 +- dlls/user32/resources/user32_Zh.rc | 4 +- dlls/wineps.drv/wps_Zh.rc | 4 +- dlls/wininet/wininet_Zh.rc | 4 +- dlls/winspool.drv/Zh.rc | 4 +- programs/notepad/Zh.rc | 4 +- programs/oleview/Zh.rc | 20 ++++++++-------- programs/regedit/Zh.rc | 32 +++++++++++++------------- programs/taskmgr/Zh.rc | 28 +++++++++++----------- programs/wineboot/wineboot_Zh.rc | 4 +- programs/winecfg/Zh.rc | 32 +++++++++++++------------- programs/wineconsole/wineconsole_Zh.rc | 16 ++++++------ programs/winefile/Zh.rc | 4 +- programs/wordpad/Zh.rc | 20 ++++++++-------- 31 files changed, 159 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b0297a7f903a0b6b4878…

1 0

ByeongSik Jeon : *Ko.rc: Update Korean resource.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 5f3287d79fd0408ceb1a6b58c8e06ccc8415098a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3287d79fd0408ceb1a6b58c… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Thu Dec 11 03:29:21 2008 +0900 *Ko.rc: Update Korean resource. Fix the unnecessary SUBLANG_NATURAL. Change the font size from 8 to 9. --- dlls/appwiz.cpl/Ko.rc | 6 +++--- dlls/avifil32/avifile_Ko.rc | 4 ++-- dlls/browseui/rsrc_Ko.rc | 2 +- dlls/comctl32/comctl_Ko.rc | 2 +- dlls/credui/credui_Ko.rc | 2 +- dlls/crypt32/crypt32_Ko.rc | 2 +- dlls/cryptdlg/cryptdlg_Ko.rc | 2 +- dlls/devenum/devenum.rc | 14 +++++++------- dlls/gphoto2.ds/gphoto2_Ko.rc | 8 ++++---- dlls/hhctrl.ocx/Ko.rc | 2 +- dlls/iccvid/iccvid_Ko.rc | 2 +- dlls/localspl/spl_Ko.rc | 2 +- dlls/localui/ui_Ko.rc | 4 ++-- dlls/mpr/mpr_Ko.rc | 4 ++-- dlls/msacm32/msacm_Ko.rc | 4 ++-- dlls/mshtml/Ko.rc | 6 +++--- dlls/msi/msi_Ko.rc | 2 +- dlls/msrle32/msrle_Ko.rc | 2 +- dlls/msvfw32/msvfw32_Ko.rc | 4 ++-- dlls/msvidc32/msvidc32_Ko.rc | 2 +- dlls/oleaut32/oleaut32_Ko.rc | 2 +- dlls/oledlg/oledlg_Ko.rc | 6 +++--- dlls/sane.ds/sane_Ko.rc | 4 ++-- dlls/serialui/Ko.rc | 4 ++-- dlls/setupapi/Ko.rc | 4 ++-- dlls/shell32/shell32_Ko.rc | 10 +++++----- dlls/shlwapi/shlwapi_Ko.rc | 4 ++-- dlls/user32/resources/user32_Ko.rc | 2 +- dlls/wineps.drv/wps_Ko.rc | 2 +- dlls/wininet/wininet_Ko.rc | 4 ++-- dlls/winmm/winmm_Ko.rc | 2 +- dlls/winspool.drv/Ko.rc | 4 ++-- dlls/wldap32/wldap32_Ko.rc | 2 +- programs/clock/Ko.rc | 4 ++-- programs/cmd/Ko.rc | 2 +- programs/cmdlgtst/Ko.rc | 20 ++++++++++---------- programs/notepad/Ko.rc | 2 +- programs/oleview/Ko.rc | 12 ++++++------ programs/progman/Ko.rc | 18 +++++++++--------- programs/regedit/Ko.rc | 2 +- programs/taskmgr/Ko.rc | 16 ++++++++-------- programs/uninstaller/Ko.rc | 2 +- programs/view/Ko.rc | 2 +- programs/wineboot/wineboot_Ko.rc | 4 ++-- programs/wineconsole/wineconsole_Ko.rc | 10 +++++----- programs/winefile/Ko.rc | 10 +++++----- programs/winemine/Ko.rc | 2 +- programs/winhlp32/Ko.rc | 10 +++++----- programs/wordpad/Ko.rc | 8 ++++---- 49 files changed, 125 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f3287d79fd0408ceb1a6…

1 0

Alexandre Julliard : cabinet: Don't allocate a huge buffer on the stack.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 16fb8fd843cbf23f74768aee86e3c808e92b6ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16fb8fd843cbf23f74768aee8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 12:24:33 2008 +0100 cabinet: Don't allocate a huge buffer on the stack. --- dlls/cabinet/fdi.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 09d0fe7..4923404 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2279,8 +2279,7 @@ static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, } static void free_decompression_mem(HFDI hfdi, struct fdi_folder *fol, - fdi_decomp_state *decomp_state, fdi_decomp_state *sentinel_decomp_state, - struct fdi_file *file) + fdi_decomp_state *decomp_state, struct fdi_file *file) { while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2306,8 +2305,7 @@ static void free_decompression_mem(HFDI hfdi, struct fdi_folder *fol, } prev_fds = decomp_state; decomp_state = CAB(next); - if (prev_fds != sentinel_decomp_state) - PFDI_FREE(hfdi, prev_fds); + PFDI_FREE(hfdi, prev_fds); } } @@ -2495,8 +2493,7 @@ BOOL __cdecl FDICopy( cab_UBYTE buf[64]; struct fdi_folder *fol = NULL, *linkfol = NULL; struct fdi_file *file = NULL, *linkfile = NULL; - fdi_decomp_state _decomp_state; - fdi_decomp_state *decomp_state = &_decomp_state; + fdi_decomp_state *decomp_state; TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, " "pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", @@ -2507,6 +2504,11 @@ BOOL __cdecl FDICopy( return FALSE; } + if (!(decomp_state = PFDI_ALLOC(hfdi, sizeof(fdi_decomp_state)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } ZeroMemory(decomp_state, sizeof(fdi_decomp_state)); pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; @@ -2893,7 +2895,7 @@ BOOL __cdecl FDICopy( } free_decompression_temps(hfdi, fol, decomp_state); - free_decompression_mem(hfdi, fol, decomp_state, &_decomp_state, file); + free_decompression_mem(hfdi, fol, decomp_state, file); return TRUE; @@ -2903,7 +2905,7 @@ BOOL __cdecl FDICopy( if (filehf) PFDI_CLOSE(hfdi, filehf); - free_decompression_mem(hfdi, fol, decomp_state, &_decomp_state, file); + free_decompression_mem(hfdi, fol, decomp_state, file); return FALSE; }

1 0

Henri Verbeet : wined3d: Don't trace the shader if nobody's looking.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 441f515d0830b916ee01a2c7c223ed903573d7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441f515d0830b916ee01a2c7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 11 11:52:37 2008 +0100 wined3d: Don't trace the shader if nobody's looking. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 659a9b4..c5f3c3e 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -323,7 +323,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i TRACE("(%p) : pFunction %p\n", iface, pFunction); /* First pass: trace shader */ - shader_trace_init(pFunction, This->baseShader.shader_ins); + if (TRACE_ON(d3d_shader)) shader_trace_init(pFunction, This->baseShader.shader_ins); /* Initialize immediate constant lists */ list_init(&This->baseShader.constantsF); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 434fa05..529fe7a 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -435,7 +435,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader TRACE("(%p) : pFunction %p\n", iface, pFunction); /* First pass: trace shader */ - shader_trace_init(pFunction, This->baseShader.shader_ins); + if (TRACE_ON(d3d_shader)) shader_trace_init(pFunction, This->baseShader.shader_ins); /* Initialize immediate constant lists */ list_init(&This->baseShader.constantsF);

1 0

Alexandre Julliard : ntdll: Add a heuristic to detect dlls that are wrongly marked as using native subsystem .
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: b8e8cb66216e315b3588fe2f13d35ee10f8d6a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e8cb66216e315b3588fe2f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 12:18:35 2008 +0100 ntdll: Add a heuristic to detect dlls that are wrongly marked as using native subsystem. --- dlls/ntdll/loader.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b0d9aeb..7526465 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -682,6 +682,44 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) /************************************************************************* + * is_dll_native_subsystem + * + * Check if dll is a proper native driver. + * Some dlls (corpol.dll from IE6 for instance) are incorrectly marked as native + * while being perfectly normal DLLs. This heuristic should catch such breakages. + */ +static BOOL is_dll_native_subsystem( HMODULE module, const IMAGE_NT_HEADERS *nt, LPCWSTR filename ) +{ + static const WCHAR ntdllW[] = {'n','t','d','l','l','.','d','l','l',0}; + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + const IMAGE_IMPORT_DESCRIPTOR *imports; + DWORD i, size; + WCHAR buffer[16]; + + if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE; + if (nt->OptionalHeader.SectionAlignment < getpagesize()) return TRUE; + + if ((imports = RtlImageDirectoryEntryToData( module, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) + { + for (i = 0; imports[i].Name; i++) + { + const char *name = get_rva( module, imports[i].Name ); + DWORD len = strlen(name); + if (len * sizeof(WCHAR) >= sizeof(buffer)) continue; + ascii_to_unicode( buffer, name, len + 1 ); + if (!strcmpiW( buffer, ntdllW ) || !strcmpiW( buffer, kernel32W )) + { + TRACE( "%s imports %s, assuming not native\n", debugstr_w(filename), debugstr_w(buffer) ); + return FALSE; + } + } + } + return TRUE; +} + + +/************************************************************************* * alloc_module * * Allocate a WINE_MODREF structure and add it to the process list @@ -715,8 +753,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); - if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE && - (nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) + if ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && !is_dll_native_subsystem( hModule, nt, p )) { wm->ldr.Flags |= LDR_IMAGE_IS_DLL; if (nt->OptionalHeader.AddressOfEntryPoint)

1 0