November 2010 - Wine-commits

Henri Verbeet : d3d9/tests: Specify width and height when changing the display orientation.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 6ae987ea9867b87a90398dcb95f742159ee831bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae987ea9867b87a90398dcb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:41 2010 +0100 d3d9/tests: Specify width and height when changing the display orientation. This appears to be required on Windows 7, or perhaps depends on the video driver. --- dlls/d3d9/tests/d3d9ex.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 090ecfc..0058ead 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -268,9 +268,12 @@ static void test_get_adapter_displaymode_ex(void) memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); - startmode.dmFields = DM_DISPLAYORIENTATION; - S2(U1(startmode)).dmDisplayOrientation = DMDO_180; + retval = pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, 0); + ok(retval, "Failed to retrieve current display mode, retval %d.\n", retval); + if (!retval) goto out; + startmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; + S2(U1(startmode)).dmDisplayOrientation = DMDO_180; retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); if(retval == DISP_CHANGE_BADMODE)

1 0

Henri Verbeet : wined3d: Recognize Evergreen in select_card_ati_mesa().
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: bed0266a8c93f67fa5d22731ec12614ab46528ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed0266a8c93f67fa5d22731e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:42 2010 +0100 wined3d: Recognize Evergreen in select_card_ati_mesa(). --- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a06130b..ac23b3d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1102,8 +1102,11 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4800, "ATI Radeon HD 4800 Series", DRIVER_ATI_R600, 512 }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5400, "ATI Radeon HD 5400 Series", DRIVER_ATI_R600, 512 }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5600, "ATI Radeon HD 5600 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_ATI_R600, 1024}, /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1860,6 +1863,17 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ if (strstr(gl_renderer, "Gallium")) { + if (strstr(gl_renderer, "HEMLOCK")) + return CARD_ATI_RADEON_HD5900; + if (strstr(gl_renderer, "CYPRESS")) + return CARD_ATI_RADEON_HD5800; + if (strstr(gl_renderer, "JUNIPER")) + return CARD_ATI_RADEON_HD5700; + if (strstr(gl_renderer, "REDWOOD")) + return CARD_ATI_RADEON_HD5600; + if (strstr(gl_renderer, "CEDAR")) + return CARD_ATI_RADEON_HD5400; + /* Radeon R7xx HD4800 - highend */ if (strstr(gl_renderer, "R700") /* Radeon R7xx HD48xx generic renderer string */ || strstr(gl_renderer, "RV770") /* Radeon RV770 */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8550d1..8f6c96e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1346,12 +1346,15 @@ enum wined3d_pci_device CARD_ATI_RADEON_HD4850 = 0x9442, CARD_ATI_RADEON_HD4870 = 0x9440, CARD_ATI_RADEON_HD4890 = 0x9460, + CARD_ATI_RADEON_HD5400 = 0x68f9, + CARD_ATI_RADEON_HD5600 = 0x68d8, CARD_ATI_RADEON_HD5700 = 0x68BE, /* Picked HD5750 */ CARD_ATI_RADEON_HD5750 = 0x68BE, CARD_ATI_RADEON_HD5770 = 0x68B8, CARD_ATI_RADEON_HD5800 = 0x6898, /* Picked HD5850 */ CARD_ATI_RADEON_HD5850 = 0x6898, CARD_ATI_RADEON_HD5870 = 0x6899, + CARD_ATI_RADEON_HD5900 = 0x689c, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Henri Verbeet : wined3d: Use lookup tables in select_card_ati_mesa().
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: a9da30dc5f3402b547c6117e3407642d72f22574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9da30dc5f3402b547c6117e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:43 2010 +0100 wined3d: Use lookup tables in select_card_ati_mesa(). --- dlls/wined3d/directx.c | 273 +++++++++++++++++++----------------------------- 1 files changed, 107 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9da30dc5f3402b547c61…

1 0

Henri Verbeet : wined3d: Use lookup tables in select_card_nvidia_binary().
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 3bb40b07766a0e45866eb1968992c7b742de56c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb40b07766a0e45866eb1968… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:44 2010 +0100 wined3d: Use lookup tables in select_card_nvidia_binary(). --- dlls/wined3d/directx.c | 263 ++++++++++++++---------------------------------- 1 files changed, 76 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bb40b07766a0e45866eb…

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::execScript implementation.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: e560a2246f756468ce75f92962d0aa00f4936698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e560a2246f756468ce75f9296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 9 13:36:24 2010 +0100 mshtml: Added IHTMLWindow2::execScript implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/script.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1ba1101..d406997 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1140,8 +1140,10 @@ static HRESULT WINAPI HTMLWindow2_execScript(IHTMLWindow2 *iface, BSTR scode, BS VARIANT *pvarRet) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(scode), debugstr_w(language), pvarRet); - return E_NOTIMPL; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(scode), debugstr_w(language), pvarRet); + + return exec_script(This, scode, language, pvarRet); } static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d9dd563..a909943 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -856,6 +856,7 @@ void release_script_hosts(HTMLWindow*); void connect_scripts(HTMLWindow*); void doc_insert_script(HTMLWindow*,nsIDOMHTMLScriptElement*); IDispatch *script_parse_event(HTMLWindow*,LPCWSTR); +HRESULT exec_script(HTMLWindow*,const WCHAR*,const WCHAR*,VARIANT*); void set_script_mode(HTMLWindow*,SCRIPTMODE); BOOL find_global_prop(HTMLWindow*,BSTR,DWORD,ScriptHost**,DISPID*); IDispatch *get_script_disp(ScriptHost*); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 0b78e17..4d50e36 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -874,6 +874,42 @@ IDispatch *script_parse_event(HTMLWindow *window, LPCWSTR text) return disp; } +HRESULT exec_script(HTMLWindow *window, const WCHAR *code, const WCHAR *lang, VARIANT *ret) +{ + ScriptHost *script_host; + EXCEPINFO ei; + GUID guid; + HRESULT hres; + + static const WCHAR delimW[] = {'"',0}; + + if(!get_guid_from_language(lang, &guid)) { + WARN("Could not find script GUID\n"); + return CO_E_CLASSSTRING; + } + + script_host = get_script_host(window, &guid); + if(!script_host) { + FIXME("No script host\n"); + return E_FAIL; + } + + if(!script_host->parse) { + FIXME("script_host->parse == NULL\n"); + return E_FAIL; + } + + memset(&ei, 0, sizeof(ei)); + TRACE(">>>\n"); + hres = IActiveScriptParse64_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei); + if(SUCCEEDED(hres)) + TRACE("<<<\n"); + else + WARN("<<< %08x\n", hres); + + return hres; +} + IDispatch *get_script_disp(ScriptHost *script_host) { IDispatch *disp;

1 0

Jacek Caban : mshtml: Added execScript tests.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 6c35f1356b08c684be9269c19d63782ee82a05a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c35f1356b08c684be9269c19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 9 13:36:39 2010 +0100 mshtml: Added execScript tests. --- dlls/mshtml/tests/jstest.html | 6 +++ dlls/mshtml/tests/script.c | 82 +++++++++++++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 3363c5a..b977ad3 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -31,6 +31,8 @@ function test_select_index() { ok(s[2] === null, "s[2] = " + s[2]); } +var globalVar = false; + function runTest() { obj = new Object(); ok(obj === window.obj, "obj !== window.obj"); @@ -41,6 +43,10 @@ function runTest() { test_removeAttribute(document.body); test_select_index(); + var r = window.execScript("globalVar = true;"); + ok(r === undefined, "execScript returned " + r); + ok(globalVar === true, "globalVar = " + globalVar); + external.reportSuccess(); } </script> diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 23f1ab8..4da0df7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -113,7 +113,8 @@ DEFINE_EXPECT(SetScriptState_STARTED); DEFINE_EXPECT(SetScriptState_CONNECTED); DEFINE_EXPECT(SetScriptState_DISCONNECTED); DEFINE_EXPECT(AddNamedItem); -DEFINE_EXPECT(ParseScriptText); +DEFINE_EXPECT(ParseScriptText_script); +DEFINE_EXPECT(ParseScriptText_execScript); DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(funcDisp); DEFINE_EXPECT(script_divid_d); @@ -423,7 +424,7 @@ static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_FAIL; } - ok(0, "unexpected call\n"); + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; } @@ -1732,10 +1733,7 @@ static void test_global_id(void) VariantClear(&var); } -static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, - LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, - LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, - DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) +static void test_script_run(void) { IDispatchEx *document, *dispex; IHTMLWindow2 *window; @@ -1752,8 +1750,6 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR funcW[] = {'f','u','n','c',0}; - CHECK_EXPECT(ParseScriptText); - SET_EXPECT(GetScriptDispatch); tmp = SysAllocString(documentW); @@ -1943,8 +1939,38 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac test_global_id(); test_security(); +} - return S_OK; +static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, + LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, + LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, + DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) +{ + ok(!punkContext, "punkContext = %p\n", punkContext); + ok(pvarResult != NULL, "pvarResult == NULL\n"); + ok(pexcepinfo != NULL, "pexcepinfo == NULL\n"); + + if(!strcmp_wa(pstrCode, "execScript call")) { + CHECK_EXPECT(ParseScriptText_execScript); + ok(!pstrItemName, "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!strcmp_wa(pstrDelimiter, "\""), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(dwFlags == SCRIPTTEXT_ISVISIBLE, "dwFlags = %x\n", dwFlags); + + V_VT(pvarResult) = VT_I4; + V_I4(pvarResult) = 10; + return S_OK; + }else if(!strcmp_wa(pstrCode, "simple script")) { + CHECK_EXPECT(ParseScriptText_script); + ok(!strcmp_wa(pstrItemName, "window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!strcmp_wa(pstrDelimiter, "</SCRIPT>"), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(dwFlags == (SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE), "dwFlags = %x\n", dwFlags); + + test_script_run(); + return S_OK; + } + + ok(0, "unexpected script %s\n", wine_dbgstr_w(pstrCode)); + return E_FAIL; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -2265,6 +2291,38 @@ static const char simple_script_str[] = "<script language=\"TestScript\">simple script</script>" "</body></html>"; +static void test_exec_script(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + BSTR code, lang; + VARIANT v; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + code = a2bstr("execScript call"); + lang = a2bstr("TestScript"); + + SET_EXPECT(ParseScriptText_execScript); + hres = IHTMLWindow2_execScript(window, code, lang, &v); + ok(hres == S_OK, "execScript failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 10, "V_I4(v) = %d\n", V_I4(&v)); + CHECK_CALLED(ParseScriptText_execScript); + SysFreeString(lang); + + lang = a2bstr("invalid"); + V_VT(&v) = 100; + hres = IHTMLWindow2_execScript(window, code, lang, &v); + ok(hres == CO_E_CLASSSTRING, "execScript failed: %08x, expected CO_E_CLASSSTRING\n", hres); + ok(V_VT(&v) == 100, "V_VT(v) = %d\n", V_VT(&v)); + SysFreeString(lang); + SysFreeString(code); + + IHTMLWindow2_Release(window); +} + static void test_simple_script(void) { IHTMLDocument2 *doc; @@ -2284,7 +2342,7 @@ static void test_simple_script(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(AddNamedItem); SET_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ - SET_EXPECT(ParseScriptText); + SET_EXPECT(ParseScriptText_script); SET_EXPECT(SetScriptState_CONNECTED); load_doc(doc, simple_script_str); @@ -2300,9 +2358,11 @@ static void test_simple_script(void) CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(AddNamedItem); CHECK_CALLED_BROKEN(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ - CHECK_CALLED(ParseScriptText); + CHECK_CALLED(ParseScriptText_script); CHECK_CALLED(SetScriptState_CONNECTED); + test_exec_script(doc); + if(site) IActiveScriptSite_Release(site); if(window_dispex)

1 0

André Hentschel : winebuild: Add subsystem wince.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: d5aa3d1cc960047cdc2e8714deac3e9adbcc79b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5aa3d1cc960047cdc2e8714d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 8 18:52:12 2010 +0100 winebuild: Add subsystem wince. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 3 ++- tools/winebuild/winebuild.man.in | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index eec682f..b03b6b2 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -207,6 +207,7 @@ struct strarray #define IMAGE_SUBSYSTEM_NATIVE 1 #define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 #define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 +#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9 /* global functions */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0fc351c..7c38e44 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -165,6 +165,7 @@ static void set_subsystem( const char *subsystem, DLLSPEC *spec ) if (!strcmp( str, "native" )) spec->subsystem = IMAGE_SUBSYSTEM_NATIVE; else if (!strcmp( str, "windows" )) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; else if (!strcmp( str, "console" )) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; + else if (!strcmp( str, "wince" )) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_CE_GUI; else if (!strcmp( str, "win16" )) spec->type = SPEC_WIN16; else fatal_error( "Invalid subsystem name '%s'\n", subsystem ); if (major) @@ -258,7 +259,7 @@ static const char usage_str[] = " -o, --output=NAME Set the output file name (default: stdout)\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" " --save-temps Do not delete the generated intermediate files\n" -" --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" +" --subsystem=SUBSYS Set the subsystem (one of native, windows, console, wince)\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2dcd3c0..479bb1f 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -203,7 +203,10 @@ for a command line executable, for a graphical executable, .br .B native -for a native-mode dll. +for a native-mode dll, +.br +.B wince +for a ce dll. .br The entry point of a command line executable is a normal C \fBmain\fR function. A \fBwmain\fR function can be used instead if you need the

1 0

André Hentschel : msi: Downgrade an error.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 384b95533d0617da72366630546557b2ddc906dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=384b95533d0617da723666305… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 8 20:16:19 2010 +0100 msi: Downgrade an error. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 57759f6..35ab30a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1743,7 +1743,7 @@ static UINT msi_dialog_maskedit_control( msi_dialog *dialog, MSIRECORD *rec ) font = msi_dialog_get_style( font_mask, &mask ); if( !mask ) { - ERR("mask template is empty\n"); + WARN("mask template is empty\n"); goto end; }

1 0

Vincent Povirk : d3dx9_36: Don' t check the image format in D3DXLoadSurfaceFromFileInMemory.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 31682b3dbe2fb7549d19ce3f08a949cf77b84d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31682b3dbe2fb7549d19ce3f0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 8 12:57:45 2010 -0600 d3dx9_36: Don't check the image format in D3DXLoadSurfaceFromFileInMemory. If the format is not supported, D3DXGetImageInfoFromFileInMemory will fail. --- dlls/d3dx9_36/surface.c | 152 +++++++++++++++++++++------------------------- 1 files changed, 69 insertions(+), 83 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 221e5f7..afd0402 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -314,6 +314,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, D3DXIMAGE_INFO imginfo; HRESULT hr; + IWICImagingFactory *factory; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *bitmapframe; + IWICStream *stream; + + const PixelFormatDesc *formatdesc; + WICRect wicrect; + RECT rect; + TRACE("(%p, %p, %p, %p, %d, %p, %d, %x, %p)\n", pDestSurface, pDestPalette, pDestRect, pSrcData, SrcDataSize, pSrcRect, dwFilter, Colorkey, pSrcInfo); @@ -325,109 +334,86 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, if (FAILED(hr)) return hr; - switch (imginfo.ImageFileFormat) - { - case D3DXIFF_BMP: - case D3DXIFF_PNG: - case D3DXIFF_JPG: - { - IWICImagingFactory *factory; - IWICBitmapDecoder *decoder; - IWICBitmapFrameDecode *bitmapframe; - IWICStream *stream; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - const PixelFormatDesc *formatdesc; - WICRect wicrect; - RECT rect; + if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) + goto cleanup_err; - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + if (FAILED(IWICImagingFactory_CreateStream(factory, &stream))) + { + IWICImagingFactory_Release(factory); + goto cleanup_err; + } - if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) - goto cleanup_err; + IWICStream_InitializeFromMemory(stream, (BYTE*)pSrcData, SrcDataSize); - if (FAILED(IWICImagingFactory_CreateStream(factory, &stream))) - { - IWICImagingFactory_Release(factory); - goto cleanup_err; - } + hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IWICStream_InitializeFromMemory(stream, (BYTE*)pSrcData, SrcDataSize); + IStream_Release(stream); + IWICImagingFactory_Release(factory); - hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); + if (FAILED(hr)) + goto cleanup_err; - IStream_Release(stream); - IWICImagingFactory_Release(factory); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &bitmapframe); - if (FAILED(hr)) - goto cleanup_err; + if (FAILED(hr)) + goto cleanup_bmp; - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &bitmapframe); + if (pSrcRect) + { + wicrect.X = pSrcRect->left; + wicrect.Y = pSrcRect->top; + wicrect.Width = pSrcRect->right - pSrcRect->left; + wicrect.Height = pSrcRect->bottom - pSrcRect->top; + } + else + { + wicrect.X = 0; + wicrect.Y = 0; + wicrect.Width = imginfo.Width; + wicrect.Height = imginfo.Height; + } - if (FAILED(hr)) - goto cleanup_bmp; + SetRect(&rect, 0, 0, wicrect.Width, wicrect.Height); - if (pSrcRect) - { - wicrect.X = pSrcRect->left; - wicrect.Y = pSrcRect->top; - wicrect.Width = pSrcRect->right - pSrcRect->left; - wicrect.Height = pSrcRect->bottom - pSrcRect->top; - } - else - { - wicrect.X = 0; - wicrect.Y = 0; - wicrect.Width = imginfo.Width; - wicrect.Height = imginfo.Height; - } + formatdesc = get_format_info(imginfo.Format); - SetRect(&rect, 0, 0, wicrect.Width, wicrect.Height); + if (formatdesc->format == D3DFMT_UNKNOWN) + { + FIXME("Unsupported pixel format\n"); + hr = D3DXERR_INVALIDDATA; + } + else + { + BYTE *buffer; + DWORD pitch; - formatdesc = get_format_info(imginfo.Format); + pitch = formatdesc->bytes_per_pixel * wicrect.Width; + buffer = HeapAlloc(GetProcessHeap(), 0, pitch * wicrect.Height); - if (formatdesc->format == D3DFMT_UNKNOWN) - { - FIXME("Unsupported pixel format\n"); - hr = D3DXERR_INVALIDDATA; - } - else - { - BYTE *buffer; - DWORD pitch; - - pitch = formatdesc->bytes_per_pixel * wicrect.Width; - buffer = HeapAlloc(GetProcessHeap(), 0, pitch * wicrect.Height); - - hr = IWICBitmapFrameDecode_CopyPixels(bitmapframe, &wicrect, pitch, - pitch * wicrect.Height, buffer); - - if (SUCCEEDED(hr)) - { - hr = D3DXLoadSurfaceFromMemory(pDestSurface, pDestPalette, pDestRect, - buffer, imginfo.Format, pitch, - NULL, &rect, dwFilter, Colorkey); - } + hr = IWICBitmapFrameDecode_CopyPixels(bitmapframe, &wicrect, pitch, + pitch * wicrect.Height, buffer); - HeapFree(GetProcessHeap(), 0, buffer); - } + if (SUCCEEDED(hr)) + { + hr = D3DXLoadSurfaceFromMemory(pDestSurface, pDestPalette, pDestRect, + buffer, imginfo.Format, pitch, + NULL, &rect, dwFilter, Colorkey); + } + + HeapFree(GetProcessHeap(), 0, buffer); + } cleanup_bmp: - IWICBitmapFrameDecode_Release(bitmapframe); - IWICBitmapDecoder_Release(decoder); + IWICBitmapFrameDecode_Release(bitmapframe); + IWICBitmapDecoder_Release(decoder); cleanup_err: - CoUninitialize(); + CoUninitialize(); - if (FAILED(hr)) - return D3DXERR_INVALIDDATA; - - break; - } - - default: - FIXME("Unsupported image file format\n"); - return E_NOTIMPL; - } + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; if (pSrcInfo) *pSrcInfo = imginfo;

1 0

Vincent Povirk : d3dx9_36: Fix an error path in D3DXLoadSurfaceFromFileInMemory.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 1d0f126d913dcbb7b623dcc16b5d9c67cd30fa50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0f126d913dcbb7b623dcc16… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 8 13:01:11 2010 -0600 d3dx9_36: Fix an error path in D3DXLoadSurfaceFromFileInMemory. If GetFrame fails, bitmapframe was not created and should not be released. --- dlls/d3dx9_36/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index afd0402..e4d1802 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -405,8 +405,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, HeapFree(GetProcessHeap(), 0, buffer); } -cleanup_bmp: IWICBitmapFrameDecode_Release(bitmapframe); + +cleanup_bmp: IWICBitmapDecoder_Release(decoder); cleanup_err:

1 0