March 2012 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Don't use ITypeInfo for InvokeEx(DISPATCH_PROPERTYPUT ) implementation.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: ba1d4d71d8d89dd19d9a0d83b676f36036299423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1d4d71d8d89dd19d9a0d83b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:46:55 2012 +0100 mshtml: Don't use ITypeInfo for InvokeEx(DISPATCH_PROPERTYPUT) implementation. --- dlls/mshtml/dispex.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 88f10c3..29628eb 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -810,6 +810,54 @@ static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS * return S_OK; } +static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS *dp) +{ + VARIANT *v, tmpv; + IUnknown *iface; + HRESULT hres; + + if(dp->cArgs != 1 || (dp->cNamedArgs == 1 && *dp->rgdispidNamedArgs != DISPID_PROPERTYPUT) + || dp->cNamedArgs > 1) { + FIXME("invalid args\n"); + return E_INVALIDARG; + } + + if(!func->put_vtbl_off) { + FIXME("No setter\n"); + return E_FAIL; + } + + v = dp->rgvarg; + if(func->prop_vt != VT_VARIANT && V_VT(v) != func->prop_vt) { + V_VT(&tmpv) = VT_EMPTY; + VariantChangeType(&tmpv, v, 0, func->prop_vt); + if(FAILED(hres)) + return hres; + v = &tmpv; + } + + hres = IUnknown_QueryInterface(This->outer, tid_ids[func->tid], (void**)&iface); + if(SUCCEEDED(hres)) { + switch(func->prop_vt) { +#define CASE_VT(vt,type,access) \ + case vt: \ + hres = ((HRESULT (WINAPI*)(IUnknown*,type))((void**)iface->lpVtbl)[func->put_vtbl_off])(iface,access(v)); \ + break + BUILTIN_TYPES_SWITCH; +#undef CASE_VT + default: + FIXME("Unimplemented vt %d\n", func->prop_vt); + hres = E_NOTIMPL; + } + + IUnknown_Release(iface); + } + + if(v == &tmpv) + VariantClear(v); + return hres; +} + static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -831,6 +879,11 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD return function_invoke(This, func, flags, dp, res, ei); switch(flags) { + case DISPATCH_PROPERTYPUT: + if(res) + V_VT(res) = VT_EMPTY; + hres = builtin_propput(This, func, dp); + break; case DISPATCH_PROPERTYGET: hres = builtin_propget(This, func, dp, res); break;

1 0

Jacek Caban : mshtml: Use caller for argument convertion in builtin_propput if available.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 4ae7d364dda2cc1c403f44e6039816f6f3cb90b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae7d364dda2cc1c403f44e60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:47:10 2012 +0100 mshtml: Use caller for argument convertion in builtin_propput if available. --- dlls/mshtml/dispex.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 29628eb..7eff5c6 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -771,6 +771,25 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID CASE_VT(VT_UNKNOWN, IUnknown*, V_UNKNOWN); \ CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH) +static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) +{ + V_VT(dst) = VT_EMPTY; + + if(caller) { + IVariantChangeType *change_type = NULL; + HRESULT hres; + + hres = IServiceProvider_QueryService(caller, &SID_VariantConversion, &IID_IVariantChangeType, (void**)&change_type); + if(SUCCEEDED(hres)) { + hres = IVariantChangeType_ChangeType(change_type, dst, src, LOCALE_NEUTRAL, vt); + IVariantChangeType_Release(change_type); + return hres; + } + } + + return VariantChangeType(dst, src, 0, vt); +} + static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS *dp, VARIANT *res) { IUnknown *iface; @@ -810,7 +829,7 @@ static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS * return S_OK; } -static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS *dp) +static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS *dp, IServiceProvider *caller) { VARIANT *v, tmpv; IUnknown *iface; @@ -829,8 +848,7 @@ static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS * v = dp->rgvarg; if(func->prop_vt != VT_VARIANT && V_VT(v) != func->prop_vt) { - V_VT(&tmpv) = VT_EMPTY; - VariantChangeType(&tmpv, v, 0, func->prop_vt); + hres = change_type(&tmpv, v, func->prop_vt, caller); if(FAILED(hres)) return hres; v = &tmpv; @@ -882,7 +900,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD case DISPATCH_PROPERTYPUT: if(res) V_VT(res) = VT_EMPTY; - hres = builtin_propput(This, func, dp); + hres = builtin_propput(This, func, dp, caller); break; case DISPATCH_PROPERTYGET: hres = builtin_propget(This, func, dp, res);

1 0

Jacek Caban : mshtml: Added property value conversion type tests.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 68b76ed0282a74a773e92d2a9315f13eabf2c146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b76ed0282a74a773e92d2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:47:24 2012 +0100 mshtml: Added property value conversion type tests. --- dlls/mshtml/tests/script.c | 133 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 125 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index d1a4d4a..43c66c6 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -129,6 +129,8 @@ DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatch_data); DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller_secmgr); DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller); DEFINE_EXPECT(external_success); +DEFINE_EXPECT(QS_VariantConversion); +DEFINE_EXPECT(ChangeType); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -270,6 +272,88 @@ static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { static IPropertyNotifySink PropertyNotifySink = { &PropertyNotifySinkVtbl }; +static HRESULT WINAPI VariantChangeType_QueryInterface(IVariantChangeType *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI VariantChangeType_AddRef(IVariantChangeType *iface) +{ + return 2; +} + +static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) +{ + return 1; +} + +static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) +{ + CHECK_EXPECT(ChangeType); + + ok(dst != NULL, "dst = NULL\n"); + ok(V_VT(dst) == VT_EMPTY, "V_VT(dst) = %d\n", V_VT(dst)); + ok(src != NULL, "src = NULL\n"); + ok(V_VT(src) == VT_I4, "V_VT(src) = %d\n", V_VT(src)); + ok(V_I4(src) == 0xf0f0f0, "V_I4(src) = %x\n", V_I4(src)); + ok(lcid == LOCALE_NEUTRAL, "lcid = %d\n", lcid); + ok(vt == VT_BSTR, "vt = %d\n", vt); + + V_VT(dst) = VT_BSTR; + V_BSTR(dst) = a2bstr("red"); + return S_OK; +} + +static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { + VariantChangeType_QueryInterface, + VariantChangeType_AddRef, + VariantChangeType_Release, + VariantChangeType_ChangeType +}; + +static IVariantChangeType VChangeType = { &VariantChangeTypeVtbl }; + +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(guidService, &SID_VariantConversion)) { + CHECK_EXPECT(QS_VariantConversion); + ok(IsEqualGUID(riid, &IID_IVariantChangeType), "uenxpected riid %s\n", debugstr_guid(riid)); + *ppv = &VChangeType; + return S_OK; + } + + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider caller_sp = { &ServiceProviderVtbl }; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1761,13 +1845,13 @@ static HRESULT WINAPI ActiveScriptParse_AddScriptlet(IActiveScriptParse *iface, return E_NOTIMPL; } -static HRESULT dispex_propput(IDispatchEx *obj, DISPID id, DWORD flags, VARIANT *var) +static HRESULT dispex_propput(IDispatchEx *obj, DISPID id, DWORD flags, VARIANT *var, IServiceProvider *caller_sp) { DISPID propput_arg = DISPID_PROPERTYPUT; DISPPARAMS dp = {var, &propput_arg, 1, 1}; EXCEPINFO ei = {0}; - return IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT|flags, &dp, NULL, &ei, NULL); + return IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT|flags, &dp, NULL, &ei, caller_sp); } static void test_func(IDispatchEx *obj) @@ -1815,7 +1899,7 @@ static void test_func(IDispatchEx *obj) V_VT(&var) = VT_I4; V_I4(&var) = 100; - hres = dispex_propput(obj, id, 0, &var); + hres = dispex_propput(obj, id, 0, &var, NULL); ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); IDispatchEx_Release(dispex); @@ -1834,7 +1918,7 @@ static void test_nextdispid(IDispatchEx *dispex) SysFreeString(name); V_VT(&var) = VT_EMPTY; - hres = dispex_propput(dispex, dyn_id, 0, &var); + hres = dispex_propput(dispex, dyn_id, 0, &var, NULL); ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); while(last_id != dyn_id) { @@ -1887,6 +1971,37 @@ static void test_global_id(void) VariantClear(&var); } +static void test_arg_conv(IHTMLWindow2 *window) +{ + IHTMLDocument2 *doc; + IDispatchEx *dispex; + IHTMLElement *elem; + VARIANT v; + HRESULT hres; + + hres = IHTMLWindow2_get_document(window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + hres = IHTMLDocument2_get_body(doc, &elem); + IHTMLDocument2_Release(doc); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + SET_EXPECT(QS_VariantConversion); + SET_EXPECT(ChangeType); + V_VT(&v) = VT_I4; + V_I4(&v) = 0xf0f0f0; + hres = dispex_propput(dispex, DISPID_IHTMLBODYELEMENT_BACKGROUND, 0, &v, &caller_sp); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + CHECK_CALLED(QS_VariantConversion); + CHECK_CALLED(ChangeType); + + IDispatchEx_Release(dispex); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -1943,7 +2058,7 @@ static void test_script_run(void) V_VT(&var) = VT_I4; V_I4(&var) = 100; - hres = dispex_propput(document, id, 0, &var); + hres = dispex_propput(document, id, 0, &var, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); tmp = SysAllocString(testW); @@ -1964,7 +2079,7 @@ static void test_script_run(void) V_VT(&var) = VT_I4; V_I4(&var) = 200; - hres = dispex_propput(document, id, DISPATCH_PROPERTYPUTREF, &var); + hres = dispex_propput(document, id, DISPATCH_PROPERTYPUTREF, &var, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); VariantInit(&var); @@ -1994,7 +2109,7 @@ static void test_script_run(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; - dispex_propput(document, id, 0,&var); + dispex_propput(document, id, 0, &var, NULL); VariantInit(&var); memset(&dp, 0, sizeof(dp)); @@ -2047,7 +2162,6 @@ static void test_script_run(void) ok(hres == S_OK, "Could not get IHTMLWindow2 iface: %08x\n", hres); hres = IHTMLWindow2_get_navigator(window, &navigator); - IHTMLWindow2_Release(window); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); hres = IOmNavigator_QueryInterface(navigator, &IID_IDispatchEx, (void**)&dispex); @@ -2057,6 +2171,9 @@ static void test_script_run(void) test_func(dispex); test_nextdispid(dispex); + test_arg_conv(window); + IHTMLWindow2_Release(window); + tmp = a2bstr("test"); hres = IDispatchEx_DeleteMemberByName(dispex, tmp, fdexNameCaseSensitive); ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres);

1 0

Hans Leidekker : msi: Fix deleting services on installation.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: c98bf1b57b795e97161c8960e1964eafde1816ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98bf1b57b795e97161c8960e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 13 12:51:26 2012 +0100 msi: Fix deleting services on installation. Based on a patch by Berhard Loos. --- dlls/msi/action.c | 19 ++++++--------- dlls/msi/tests/action.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 87fc906..16e2186 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5913,28 +5913,25 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR component; LPWSTR name = NULL, display_name = NULL; DWORD event, len; SC_HANDLE scm = NULL, service = NULL; - event = MSI_RecordGetInteger( rec, 3 ); - if (!(event & msidbServiceControlEventDelete)) - return ERROR_SUCCESS; - - component = MSI_RecordGetString(rec, 6); - comp = msi_get_loaded_component(package, component); + comp = msi_get_loaded_component( package, MSI_RecordGetString(rec, 6) ); if (!comp) return ERROR_SUCCESS; + event = MSI_RecordGetInteger( rec, 3 ); + deformat_string( package, MSI_RecordGetString(rec, 2), &name ); + comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_ABSENT) + if (!(comp->Action == INSTALLSTATE_LOCAL && (event & msidbServiceControlEventDelete)) && + !(comp->Action == INSTALLSTATE_ABSENT && (event & msidbServiceControlEventUninstallDelete))) { - TRACE("component not scheduled for removal %s\n", debugstr_w(component)); + TRACE("service %s not scheduled for removal\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; } - - deformat_string( package, MSI_RecordGetString(rec, 2), &name ); stop_service( name ); scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 3743e50..2b482df 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -73,7 +73,8 @@ static const char component_dat[] = "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" "component\t\tMSITESTDIR\t0\t1\tfile\n" - "service_comp\t\tMSITESTDIR\t0\t1\tservice_file"; + "service_comp\t{935A0A91-22A3-4F87-BCA8-928FFDFE2353}\tMSITESTDIR\t0\t\tservice_file\n" + "service_comp2\t{3F7B04A4-9521-4649-BDC9-0C8722740A49}\tMSITESTDIR\t0\t\tservice_file2"; static const char directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -109,7 +110,8 @@ static const char feature_comp_dat[] = "Three\tThree\n" "Two\tTwo\n" "feature\tcomponent\n" - "service_feature\tservice_comp\n"; + "service_feature\tservice_comp\n" + "service_feature\tservice_comp2"; static const char file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" @@ -121,7 +123,8 @@ static const char file_dat[] = "three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n" "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n" "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" - "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; + "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t6\n" + "service_file2\tservice_comp2\tservice2.exe\t100\t\t\t8192\t7"; static const char install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -149,7 +152,7 @@ static const char media_dat[] = "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" "1\t3\t\t\tDISK1\t\n" - "2\t5\t\tmsitest.cab\tDISK2\t\n"; + "2\t7\t\tmsitest.cab\tDISK2\t\n"; static const char property_dat[] = "Property\tValue\n" @@ -172,7 +175,9 @@ static const char property_dat[] = "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" + "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" + "SERVDISP2\tTestServiceDisp2\n" "MSIFASTINSTALL\t1\n"; static const char environment_dat[] = @@ -211,13 +216,15 @@ static const char service_install_dat[] = "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" - "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription"; + "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" + "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; static const char service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" "ServiceControl\tServiceControl\n" - "ServiceControl\tTestService\t8\t\t0\tservice_comp"; + "ServiceControl\tTestService3\t8\t\t0\tservice_comp\n" + "ServiceControl2\tTestService3\t128\t\t0\tservice_comp2"; static const char sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" @@ -254,11 +261,13 @@ static const char sds_install_exec_seq_dat[] = "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" - "DeleteServices\tInstalled\t5000\n" + "StopServices\t\t5000\n" + "DeleteServices\t\t5050\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" - "InstallServices\tNOT Installed\t5400\n" + "InstallServices\t\t5400\n" + "StartServices\t\t5450\n" "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" @@ -2181,6 +2190,7 @@ static void create_test_files(void) create_file("msitest\\filename", 100); create_file("msitest\\service.exe", 100); + create_file("msitest\\service2.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -2208,6 +2218,7 @@ static void delete_test_files(void) DeleteFileA("msitest\\first\\two.txt"); DeleteFileA("msitest\\one.txt"); DeleteFileA("msitest\\service.exe"); + DeleteFileA("msitest\\service2.exe"); DeleteFileA("msitest\\filename"); RemoveDirectoryA("msitest\\second"); RemoveDirectoryA("msitest\\first"); @@ -4706,6 +4717,7 @@ static void test_envvar(void) delete_pf("msitest\\filename", TRUE); delete_pf("msitest\\one.txt", TRUE); delete_pf("msitest\\service.exe", TRUE); + delete_pf("msitest\\service2.exe", TRUE); delete_pf("msitest", FALSE); error: @@ -4830,6 +4842,7 @@ static void test_start_services(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); delete_test_files(); @@ -4853,6 +4866,8 @@ static void test_start_services(void) static void test_delete_services(void) { UINT r; + SC_HANDLE manager, service; + DWORD error; if (is_process_limited()) { @@ -4860,6 +4875,18 @@ static void test_delete_services(void) return; } + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager %u\n", GetLastError()); + if (!manager) return; + + service = CreateServiceA(manager, "TestService3", "TestService3", + SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, "C:\\doesnt_exist.exe", NULL, NULL, NULL, NULL, NULL); + ok(service != NULL, "can't create service %u\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(manager); + if (!service) goto error; + create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); @@ -4873,6 +4900,16 @@ static void test_delete_services(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) goto error; + + service = OpenServiceA(manager, "TestService3", GENERIC_ALL); + error = GetLastError(); + ok(service == NULL, "TestService3 not deleted\n"); + ok(error == ERROR_SERVICE_DOES_NOT_EXIST, "wrong error %u\n", error); + CloseServiceHandle(manager); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -4887,6 +4924,7 @@ static void test_delete_services(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: @@ -4928,6 +4966,7 @@ static void test_self_registration(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: @@ -5034,6 +5073,7 @@ static void test_validate_product_id(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0

Kusanagi Kouichi : gdi32: Move font signature of font link from Face to SYSTEM_LINKS.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: d696d5fee8864ddcfe240a188416573b84c2be3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d696d5fee8864ddcfe240a188… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:02 2012 +0900 gdi32: Move font signature of font link from Face to SYSTEM_LINKS. --- dlls/gdi32/freetype.c | 125 +++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d696d5fee8864ddcfe240…

1 0

Kusanagi Kouichi : gdi32: Add a helper function to create a full name from a family name and a style name .
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: fc03398cd50a338739dc2bc815d09091a535cf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc03398cd50a338739dc2bc81… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:08 2012 +0900 gdi32: Add a helper function to create a full name from a family name and a style name. --- dlls/gdi32/freetype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c6bfe8d..9a4a6b6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4626,6 +4626,15 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, free_font(font); } +static void create_full_name(WCHAR *full_name, const WCHAR *family_name, const WCHAR *style_name) +{ + static const WCHAR spaceW[] = { ' ', 0 }; + + strcpyW(full_name, family_name); + strcatW(full_name, spaceW); + strcatW(full_name, style_name); +} + static BOOL family_matches(Family *family, const LOGFONTW *lf) { struct list *face_elem_ptr; @@ -4634,7 +4643,6 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) LIST_FOR_EACH(face_elem_ptr, &family->faces) { - static const WCHAR spaceW[] = { ' ',0 }; WCHAR full_family_name[LF_FULLFACESIZE]; Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); @@ -4645,9 +4653,7 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) continue; } - strcpyW(full_family_name, family->FamilyName); - strcatW(full_family_name, spaceW); - strcatW(full_family_name, face->StyleName); + create_full_name(full_family_name, family->FamilyName, face->StyleName); if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; } @@ -4656,7 +4662,6 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) static BOOL face_matches(Face *face, const LOGFONTW *lf) { - static const WCHAR spaceW[] = { ' ',0 }; WCHAR full_family_name[LF_FULLFACESIZE]; if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; @@ -4668,9 +4673,7 @@ static BOOL face_matches(Face *face, const LOGFONTW *lf) return FALSE; } - strcpyW(full_family_name, face->family->FamilyName); - strcatW(full_family_name, spaceW); - strcatW(full_family_name, face->StyleName); + create_full_name(full_family_name, face->family->FamilyName, face->StyleName); return !strcmpiW(lf->lfFaceName, full_family_name); }

1 0

Kusanagi Kouichi : gdi32: Add a helper function to get face list from family.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 4bb0e2d076bcf535df3dbab4dafca24a78f44855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb0e2d076bcf535df3dbab4d… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:15 2012 +0900 gdi32: Add a helper function to get face list from family. --- dlls/gdi32/freetype.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9a4a6b6..a4d369a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1989,6 +1989,11 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) return NULL; } +static const struct list *get_face_list_from_family(const Family *family) +{ + return &family->faces; +} + static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value; @@ -2023,6 +2028,7 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) memset(&font_link->fs, 0, sizeof font_link->fs); for (i = 0; values[i] != NULL; i++) { + const struct list *face_list; CHILD_FONT *child_font; value = values[i]; @@ -2036,7 +2042,8 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) continue; file = NULL; /* Use first extant filename for this Family */ - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (!face->file) continue; @@ -3902,7 +3909,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) GdiFont *ret; Face *face, *best, *best_bitmap; Family *family, *last_resort_family; - struct list *family_elem_ptr, *face_elem_ptr; + const struct list *family_elem_ptr, *face_list, *face_elem_ptr; INT height, width = 0; unsigned int score = 0, new_score; signed int diff = 0, newdiff; @@ -4034,7 +4041,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) (psub && !strcmpiW(family->FamilyName, psub->to.name))) { font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!(face->scalable || can_use_bitmap)) continue; @@ -4052,7 +4060,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) /* Search by full face name. */ LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->FullName && !strcmpiW(face->FullName, FaceName) && (face->scalable || can_use_bitmap)) @@ -4127,7 +4136,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) family = LIST_ENTRY(family_elem_ptr, Family, entry); if(!strcmpiW(family->FamilyName, lf.lfFaceName)) { font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!(face->scalable || can_use_bitmap)) continue; @@ -4143,7 +4153,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->vertical == want_vertical && (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || @@ -4164,7 +4175,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->scalable && face->vertical == want_vertical) { csi.fs.fsCsb[0] = 0; @@ -4194,7 +4206,8 @@ found: face = best = best_bitmap = NULL; font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || (font_link != NULL && csi.fs.fsCsb[0] & font_link->fs.fsCsb[0]) || @@ -4637,11 +4650,12 @@ static void create_full_name(WCHAR *full_name, const WCHAR *family_name, const W static BOOL family_matches(Family *family, const LOGFONTW *lf) { - struct list *face_elem_ptr; + const struct list *face_list, *face_elem_ptr; if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; - LIST_FOR_EACH(face_elem_ptr, &family->faces) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { WCHAR full_family_name[LF_FULLFACESIZE]; Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); @@ -4720,7 +4734,7 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, { Family *family; Face *face; - struct list *family_elem_ptr, *face_elem_ptr; + const struct list *family_elem_ptr, *face_list, *face_elem_ptr; LOGFONTW lf; struct enum_charset_list enum_charsets; @@ -4753,7 +4767,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); if(family_matches(family, plf)) { - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!face_matches(face, plf)) continue; if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; @@ -4763,7 +4778,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, } else { LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - face_elem_ptr = list_head(&family->faces); + face_list = get_face_list_from_family(family); + face_elem_ptr = list_head(face_list); face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; }

1 0

Kusanagi Kouichi : gdi32: Simplify font replacement loading.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: eab02574929df3a5a6e6dcdb26d4d9a629618e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab02574929df3a5a6e6dcdb2… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:20 2012 +0900 gdi32: Simplify font replacement loading. --- dlls/gdi32/freetype.c | 54 +++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a4d369a..32a6442 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -281,6 +281,7 @@ typedef struct tagFamily { const WCHAR *FamilyName; const WCHAR *EnglishName; struct list faces; + struct list *replacement; } Family; typedef struct { @@ -1323,6 +1324,7 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) family->FamilyName = strdupW(family_name); family->EnglishName = english_family; list_init(&family->faces); + family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); if(english_family) @@ -1540,6 +1542,7 @@ static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, family->FamilyName = strdupW(localised_family ? localised_family : english_family); family->EnglishName = localised_family ? strdupW(english_family) : NULL; list_init(&family->faces); + family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); if(localised_family) { @@ -1900,20 +1903,18 @@ static void LoadReplaceList(void) if(!find_family_from_any_name(value)) { - /* Find the old family and hence all of the font files - in that family */ - const Family * const family = find_family_from_any_name(data); + Family * const family = find_family_from_any_name(data); if (family != NULL) { - const struct list *face_elem_ptr; - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - const Face * const face = LIST_ENTRY(face_elem_ptr, Face, entry); - TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), - debugstr_w(face->StyleName), familyA); - /* Now add a new entry with the new family name */ - AddFontToList(face->file, face->font_data_ptr, face->font_data_size, - familyA, family->FamilyName, - ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + Family * const new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); + if (new_family != NULL) + { + TRACE("mapping %s to %s\n", debugstr_w(data), debugstr_w(value)); + new_family->FamilyName = strdupW(value); + new_family->EnglishName = NULL; + list_init(&new_family->faces); + new_family->replacement = &family->faces; + list_add_tail(&font_list, &new_family->entry); } } else @@ -1991,7 +1992,10 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) static const struct list *get_face_list_from_family(const Family *family) { - return &family->faces; + if (!list_empty(&family->faces)) + return &family->faces; + else + return family->replacement; } static void populate_system_links(const WCHAR *name, const WCHAR *const *values) @@ -4674,24 +4678,24 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) return FALSE; } -static BOOL face_matches(Face *face, const LOGFONTW *lf) +static BOOL face_matches(const WCHAR *family_name, Face *face, const LOGFONTW *lf) { WCHAR full_family_name[LF_FULLFACESIZE]; - if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; + if (!strcmpiW(lf->lfFaceName, family_name)) return TRUE; - if (strlenW(face->family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + if (strlenW(family_name) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) { FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", - debugstr_w(face->family->FamilyName), debugstr_w(face->StyleName)); + debugstr_w(family_name), debugstr_w(face->StyleName)); return FALSE; } - create_full_name(full_family_name, face->family->FamilyName, face->StyleName); + create_full_name(full_family_name, family_name, face->StyleName); return !strcmpiW(lf->lfFaceName, full_family_name); } -static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, +static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, FONTENUMPROCW proc, LPARAM lparam) { ENUMLOGFONTEXW elf; @@ -4713,6 +4717,12 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, if (!elf.elfScript[0]) FIXME("Unknown elfscript for bit %d\n", ffs(list->element[i].mask) - 1); } + /* Font Replacement */ + if (family != face->family) + { + strcpyW(elf.elfLogFont.lfFaceName, family->FamilyName); + create_full_name(elf.elfFullName, family->FamilyName, face->StyleName); + } TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), @@ -4770,8 +4780,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, face_list = get_face_list_from_family(family); LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!face_matches(face, plf)) continue; - if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; + if (!face_matches(family->FamilyName, face, plf)) continue; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } } } @@ -4781,7 +4791,7 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, face_list = get_face_list_from_family(family); face_elem_ptr = list_head(face_list); face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } } LeaveCriticalSection( &freetype_cs );

1 0

Kusanagi Kouichi : gdi32: Remove unused parameters and code, and a useless wrapper function.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: d77104b93d87a7169966f17b4bb977a60a527e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77104b93d87a7169966f17b4… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:27 2012 +0900 gdi32: Remove unused parameters and code, and a useless wrapper function. --- dlls/gdi32/freetype.c | 77 ++++++++++++++----------------------------------- 1 files changed, 22 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d77104b93d87a7169966f…

1 0

André Hentschel : ddraw: Fix a typo.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: b9c1e5ad321f0d612682de6a463fc47be64557e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c1e5ad321f0d612682de6a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 21:03:11 2012 +0100 ddraw: Fix a typo. --- dlls/ddraw/light.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 4eeebd4..2d6a462 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirect3DLightImpl_SetLight(IDirect3DLight *iface, D3DLIGH return DDERR_INVALIDPARAMS; if ( lpLight->dltType == D3DLIGHT_PARALLELPOINT ) - FIXME("D3DLIGHT_PARALLELPOINT no supported\n"); + FIXME("D3DLIGHT_PARALLELPOINT not supported\n"); /* Translate D3DLIGH2 structure to D3DLIGHT7 */ light7->dltType = lpLight->dltType;

1 0