September 2012 - Wine-commits

Qian Hong : gdi32: Read otmpFaceName from TT_NAME_ID_FULL_NAME.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: abc8f2c6c270a8f6bce8c5c1f0fc5b5773dad4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc8f2c6c270a8f6bce8c5c1f… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Sep 7 18:40:12 2012 +0800 gdi32: Read otmpFaceName from TT_NAME_ID_FULL_NAME. --- dlls/gdi32/freetype.c | 89 ++++++++++++++++------------------------------ dlls/gdi32/tests/font.c | 5 +-- 2 files changed, 32 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8222a18..9d3d4c4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2624,13 +2624,12 @@ static void update_reg_entries(void) { HKEY winnt_key = 0, win9x_key = 0, external_key = 0; LPWSTR valueW; - DWORD len, len_fam; + DWORD len; Family *family; Face *face; struct list *family_elem_ptr, *face_elem_ptr; WCHAR *file; static const WCHAR TrueType[] = {' ','(','T','r','u','e','T','y','p','e',')','\0'}; - static const WCHAR spaceW[] = {' ', '\0'}; char *path; if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, @@ -2655,20 +2654,22 @@ static void update_reg_entries(void) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - len_fam = strlenW(family->FamilyName) + sizeof(TrueType) / sizeof(WCHAR) + 1; LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(!face->external) continue; - len = len_fam; - if (!(face->ntmFlags & NTM_REGULAR)) - len = len_fam + strlenW(face->StyleName) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, family->FamilyName); - if(len != len_fam) { - strcatW(valueW, spaceW); - strcatW(valueW, face->StyleName); + + if(face->FullName) + { + len = strlenW(face->FullName) + sizeof(TrueType) / sizeof(WCHAR) + 1; + valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strcpyW(valueW, face->FullName); + } + else + { + len = strlenW(family->FamilyName) + sizeof(TrueType) / sizeof(WCHAR) + 1; + valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strcpyW(valueW, family->FamilyName); } - strcatW(valueW, TrueType); file = wine_get_dos_file_name(face->file); if(file) @@ -5078,7 +5079,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName), LF_FACESIZE); lstrcpynW(pelf->elfFullName, - (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFullName), + (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFaceName), LF_FULLFACESIZE); lstrcpynW(pelf->elfStyle, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpStyleName), @@ -5138,15 +5139,6 @@ 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) { const struct list *face_list, *face_elem_ptr; @@ -5156,18 +5148,9 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) 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); - if (strlenW(family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) - { - FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", - debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); - continue; - } - - create_full_name(full_family_name, family->FamilyName, face->StyleName); - if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; + if (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)) return TRUE; } return FALSE; @@ -5175,19 +5158,9 @@ static BOOL family_matches(Family *family, 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, family_name)) return TRUE; - if (strlenW(family_name) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) - { - FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", - debugstr_w(family_name), debugstr_w(face->StyleName)); - return FALSE; - } - - create_full_name(full_family_name, family_name, face->StyleName); - return !strcmpiW(lf->lfFaceName, full_family_name); + return (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)); } static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, @@ -5216,7 +5189,10 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha if (family != face->family) { strcpyW(elf.elfLogFont.lfFaceName, family->FamilyName); - create_full_name(elf.elfFullName, family->FamilyName, face->StyleName); + if (face->FullName) + strcpyW(elf.elfFullName, face->FullName); + else + strcpyW(elf.elfFullName, family->FamilyName); } 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), @@ -6552,12 +6528,12 @@ static BOOL get_outline_text_metrics(GdiFont *font) { BOOL ret = FALSE; FT_Face ft_face = font->ft_face; - UINT needed, lenfam, lensty; + UINT needed, lenfam, lensty, lenface; TT_OS2 *pOS2; TT_HoriHeader *pHori; TT_Postscript *pPost; FT_Fixed x_scale, y_scale; - WCHAR *family_nameW, *style_nameW; + WCHAR *family_nameW, *style_nameW, *face_nameW; static const WCHAR spaceW[] = {' ', '\0'}; char *cp; INT ascent, descent; @@ -6578,17 +6554,18 @@ static BOOL get_outline_text_metrics(GdiFont *font) MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, style_nameW, lensty/sizeof(WCHAR)); + face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!face_nameW) + face_nameW = strdupW(font->name); + lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR); + /* These names should be read from the TT name table */ /* length of otmpFamilyName */ needed += lenfam; /* length of otmpFaceName */ - if ((ft_face->style_flags & (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD)) == 0) { - needed += lenfam; /* just the family name */ - } else { - needed += lenfam + lensty; /* family + " " + style */ - } + needed += lenface; /* length of otmpStyleName */ needed += lensty; @@ -6837,13 +6814,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) strcpyW((WCHAR*)cp, style_nameW); cp += lensty; font->potm->otmpFaceName = (LPSTR)(cp - (char*)font->potm); - strcpyW((WCHAR*)cp, family_nameW); - if (ft_face->style_flags & (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD)) { - strcatW((WCHAR*)cp, spaceW); - strcatW((WCHAR*)cp, style_nameW); - cp += lenfam + lensty; - } else - cp += lenfam; + strcpyW((WCHAR*)cp, face_nameW); + cp += lenface; font->potm->otmpFullName = (LPSTR)(cp - (char*)font->potm); strcpyW((WCHAR*)cp, family_nameW); strcatW((WCHAR*)cp, spaceW); @@ -6853,6 +6825,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) end: HeapFree(GetProcessHeap(), 0, style_nameW); HeapFree(GetProcessHeap(), 0, family_nameW); + HeapFree(GetProcessHeap(), 0, face_nameW); return ret; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d5126a0..4a1532a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4125,10 +4125,7 @@ static void test_fullname2_helper(const char *Family) WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; - if(!lstrcmpA(FaceName, "Lucida Sans Regular")) - todo_wine ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); - else - ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); + ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); bufW[0] = 0; bufA[0] = 0;

1 0

Qian Hong : gdi32: Read otmpFullName from TT_NAME_ID_UNIQUE_ID.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: 733aca30f4976a858d4e7a36628922f1eb898197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733aca30f4976a858d4e7a366… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Sep 7 18:40:34 2012 +0800 gdi32: Read otmpFullName from TT_NAME_ID_UNIQUE_ID. --- dlls/gdi32/freetype.c | 24 +++++++++++++++++------- dlls/gdi32/tests/font.c | 2 +- dlls/wineps.drv/download.c | 4 ++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9d3d4c4..feca48a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6528,13 +6528,12 @@ static BOOL get_outline_text_metrics(GdiFont *font) { BOOL ret = FALSE; FT_Face ft_face = font->ft_face; - UINT needed, lenfam, lensty, lenface; + UINT needed, lenfam, lensty, lenface, lenfull; TT_OS2 *pOS2; TT_HoriHeader *pHori; TT_Postscript *pPost; FT_Fixed x_scale, y_scale; - WCHAR *family_nameW, *style_nameW, *face_nameW; - static const WCHAR spaceW[] = {' ', '\0'}; + WCHAR *family_nameW, *style_nameW, *face_nameW, *full_nameW; char *cp; INT ascent, descent; @@ -6556,9 +6555,21 @@ static BOOL get_outline_text_metrics(GdiFont *font) face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (!face_nameW) + { + FIXME("failed to read face_nameW for font %s!\n", wine_dbgstr_w(font->name)); face_nameW = strdupW(font->name); + } lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR); + full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!full_nameW) + { + WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; + FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w(font->name)); + full_nameW = strdupW(fake_nameW); + } + lenfull = (strlenW(full_nameW) + 1) * sizeof(WCHAR); + /* These names should be read from the TT name table */ /* length of otmpFamilyName */ @@ -6571,7 +6582,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) needed += lensty; /* length of otmpFullName */ - needed += lenfam + lensty; + needed += lenfull; x_scale = ft_face->size->metrics.x_scale; @@ -6817,15 +6828,14 @@ static BOOL get_outline_text_metrics(GdiFont *font) strcpyW((WCHAR*)cp, face_nameW); cp += lenface; font->potm->otmpFullName = (LPSTR)(cp - (char*)font->potm); - strcpyW((WCHAR*)cp, family_nameW); - strcatW((WCHAR*)cp, spaceW); - strcatW((WCHAR*)cp, style_nameW); + strcpyW((WCHAR*)cp, full_nameW); ret = TRUE; end: HeapFree(GetProcessHeap(), 0, style_nameW); HeapFree(GetProcessHeap(), 0, family_nameW); HeapFree(GetProcessHeap(), 0, face_nameW); + HeapFree(GetProcessHeap(), 0, full_nameW); return ret; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4a1532a..10e015e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4142,7 +4142,7 @@ static void test_fullname2_helper(const char *Family) ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont); diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 6b87172..fbd868c 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -118,9 +118,9 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str } } - len = strlen((char*)potm + (ptrdiff_t)potm->otmpFullName) + 1; + len = strlen((char*)potm + (ptrdiff_t)potm->otmpFaceName) + 1; *str = HeapAlloc(GetProcessHeap(),0,len); - strcpy(*str, (char*)potm + (ptrdiff_t)potm->otmpFullName); + strcpy(*str, (char*)potm + (ptrdiff_t)potm->otmpFaceName); p = *str; while((p = strchr(p, ' ')))

1 0

Jacek Caban : vbscript: Added IActiveScriptParseProcedure2:: ParseProcedureText tests.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 76b1a7e016e93eaa9f06b9a018728353da5bfd7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b1a7e016e93eaa9f06b9a01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:46 2012 +0200 vbscript: Added IActiveScriptParseProcedure2::ParseProcedureText tests. --- dlls/vbscript/tests/run.c | 162 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 141 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d77c6cb..6a2b72a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -33,6 +33,8 @@ #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_64_ParseProcedureText #else @@ -40,6 +42,8 @@ #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_32_ParseProcedureText #endif @@ -106,6 +110,7 @@ DEFINE_EXPECT(Next); #define DISPID_COLLOBJ_RESET 3000 static const WCHAR testW[] = {'t','e','s','t',0}; +static const WCHAR emptyW[] = {0}; static BOOL strict_dispid_check, is_english; static const char *test_name = "(null)"; @@ -130,6 +135,18 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(buf, stra); } +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static const char *vt2a(VARIANT *v) { if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { @@ -186,6 +203,38 @@ static BOOL is_lang_english(void) return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } +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) +{ + 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 void test_disp(IDispatch *disp) { DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id, defvalget_id; @@ -378,18 +427,6 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) ok_(__FILE__,line)(grfdex == expect, "grfdex = %x, expected %x\n", grfdex, expect); } -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static IDispatchEx enumDisp; static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) @@ -1240,29 +1277,24 @@ static IActiveScript *create_script(void) return script; } -static HRESULT parse_script(DWORD flags, BSTR script_str) +static IActiveScript *create_and_init_script(DWORD flags) { IActiveScriptParse *parser; IActiveScript *engine; - IDispatch *script_disp; - LONG ref; HRESULT hres; engine = create_script(); if(!engine) - return S_OK; + return NULL; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); - if (FAILED(hres)) - { - IActiveScript_Release(engine); - return hres; - } hres = IActiveScriptParse_InitNew(parser); ok(hres == S_OK, "InitNew failed: %08x\n", hres); + IActiveScriptParse_Release(parser); + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); @@ -1273,6 +1305,41 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + return engine; +} + +static void close_script(IActiveScript *script) +{ + ULONG ref; + HRESULT hres; + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + ref = IActiveScript_Release(script); + ok(!ref, "ref=%u\n", ref); +} + +static HRESULT parse_script(DWORD flags, BSTR script_str) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + IDispatch *script_disp; + LONG ref; + HRESULT hres; + + engine = create_and_init_script(flags); + if(!engine) + return S_OK; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(engine); + return hres; + } + hres = IActiveScript_GetScriptDispatch(engine, NULL, &script_disp); ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); ok(script_disp != NULL, "script_disp == NULL\n"); @@ -1308,6 +1375,58 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, const char *src) +{ + IDispatchEx *dispex; + IDispatch *disp; + BSTR str; + HRESULT hres; + + static const WCHAR delimiterW[] = {'\"',0}; + + str = a2bstr(src); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, emptyW, NULL, NULL, delimiterW, 0, 0, + SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); + SysFreeString(str); + ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); + ok(disp != NULL, "disp = NULL\n"); + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + return dispex; +} + + +static void test_procedures(void) +{ + IActiveScriptParseProcedure2 *parse_proc; + DISPPARAMS dp = {NULL}; + IActiveScript *script; + IDispatchEx *proc; + EXCEPINFO ei = {0}; + VARIANT v; + HRESULT hres; + + script = create_and_init_script(0); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); + ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + + proc = parse_procedure(parse_proc, "dim x\nif true then x=false"); + + V_VT(&v) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(proc, DISPID_VALUE, 0, DISPATCH_METHOD, &dp, &v, &ei, &caller_sp); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + IDispatchEx_Release(proc); + + IActiveScriptParseProcedure2_Release(parse_proc); + + close_script(script); +} + static void test_gc(void) { IActiveScriptParse *parser; @@ -1609,6 +1728,7 @@ static void run_tests(void) run_from_res("lang.vbs"); run_from_res("api.vbs"); + test_procedures(); test_gc(); }

1 0

Jacek Caban : mshtml: Added VBScript as event attribute tests.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 1cd527924f5814dc7fd1cb89de983b50ad570719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd527924f5814dc7fd1cb89d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:59:23 2012 +0200 mshtml: Added VBScript as event attribute tests. --- dlls/mshtml/tests/vbtest.html | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index 9addc93..7b8cebc 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -26,9 +26,6 @@ Sub runTest() End Sub </script> </script> -<body> -<script> -runTest() -</script> +<body onload="If true then runTest()"> </body> </html>

1 0

Hans Leidekker : wbemprox: Correctly report the number of logical processors.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: b11cfb7b216a20bd9c3adf9640bb5e93fc5f2a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11cfb7b216a20bd9c3adf964… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 6 14:03:24 2012 +0200 wbemprox: Correctly report the number of logical processors. --- dlls/wbemprox/builtin.c | 54 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e3a5e6d..4c82425 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -23,6 +23,8 @@ #include "config.h" #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wbemcli.h" @@ -259,7 +261,7 @@ static const struct column col_processor[] = { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_maxclockspeedW, CIM_UINT32 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_numlogicalprocessorsW, CIM_UINT32 }, + { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_service[] = @@ -400,7 +402,7 @@ struct record_processor const WCHAR *manufacturer; UINT32 maxclockspeed; const WCHAR *name; - UINT32 numberoflogicalprocessors; + UINT32 num_logical_processors; const WCHAR *processor_id; }; struct record_service @@ -475,6 +477,32 @@ static UINT get_processor_count(void) return info.NumberOfProcessors; } +static UINT get_logical_processor_count(void) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *info; + UINT i, j, count = 0; + NTSTATUS status; + ULONG len; + + status = NtQuerySystemInformation( SystemLogicalProcessorInformation, NULL, 0, &len ); + if (status != STATUS_INFO_LENGTH_MISMATCH) return get_processor_count(); + + if (!(info = heap_alloc( len ))) return get_processor_count(); + status = NtQuerySystemInformation( SystemLogicalProcessorInformation, info, len, &len ); + if (status != STATUS_SUCCESS) + { + heap_free( info ); + return get_processor_count(); + } + for (i = 0; i < len / sizeof(*info); i++) + { + if (info[i].Relationship != RelationProcessorCore) continue; + for (j = 0; j < sizeof(ULONG_PTR); j++) if (info[i].ProcessorMask & (1 << j)) count++; + } + heap_free( info ); + return count; +} + static UINT64 get_total_physical_memory(void) { MEMORYSTATUSEX status; @@ -495,8 +523,8 @@ static void fill_compsys( struct table *table ) rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; - rec->num_logical_processors = get_processor_count(); - rec->num_processors = rec->num_logical_processors; + rec->num_logical_processors = get_logical_processor_count(); + rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); TRACE("created 1 row\n"); @@ -758,7 +786,7 @@ static void fill_processor( struct table *table ) static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; - UINT i, offset = 0, count = get_processor_count(), cpuMhz; + UINT i, offset = 0, num_logical_processors, count = get_processor_count(), cpuMhz; PROCESSOR_POWER_INFORMATION ppi; if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; @@ -772,17 +800,19 @@ static void fill_processor( struct table *table ) else cpuMhz = 1000000; + num_logical_processors = get_logical_processor_count() / count; + for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); - rec->cpu_status = 1; /* CPU Enabled */ + rec->cpu_status = 1; /* CPU Enabled */ sprintfW( device_id, fmtW, i ); - rec->device_id = heap_strdupW( device_id ); - rec->manufacturer = heap_strdupW( manufacturer ); - rec->maxclockspeed = cpuMhz; - rec->name = heap_strdupW( name ); - rec->numberoflogicalprocessors = count; - rec->processor_id = heap_strdupW( processor_id ); + rec->device_id = heap_strdupW( device_id ); + rec->manufacturer = heap_strdupW( manufacturer ); + rec->maxclockspeed = cpuMhz; + rec->name = heap_strdupW( name ); + rec->num_logical_processors = num_logical_processors; + rec->processor_id = heap_strdupW( processor_id ); offset += sizeof(*rec); }

1 0

Hans Leidekker : wbemprox: Add a function to retrieve the maximum processor clock speed.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: e2bd61b45d512229c200d91ce7afbefe790a37c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bd61b45d512229c200d91ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 6 14:03:38 2012 +0200 wbemprox: Add a function to retrieve the maximum processor clock speed. --- dlls/wbemprox/builtin.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4c82425..c2271c0 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -780,14 +780,19 @@ static void get_processor_name( WCHAR *name ) regs_to_str( regs, 16, name + 32 ); } } +static UINT get_processor_maxclockspeed( void ) +{ + PROCESSOR_POWER_INFORMATION info; + if (!NtPowerInformation( ProcessorInformation, NULL, 0, &info, sizeof(info) )) return info.MaxMhz; + return 1000000; +} static void fill_processor( struct table *table ) { static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; - UINT i, offset = 0, num_logical_processors, count = get_processor_count(), cpuMhz; - PROCESSOR_POWER_INFORMATION ppi; + UINT i, offset = 0, maxclockspeed, num_logical_processors, count = get_processor_count(); if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; @@ -795,11 +800,7 @@ static void fill_processor( struct table *table ) get_processor_manufacturer( manufacturer ); get_processor_name( name ); - if(!NtPowerInformation(ProcessorInformation, NULL, 0, &ppi, sizeof(ppi))) - cpuMhz = ppi.MaxMhz; - else - cpuMhz = 1000000; - + maxclockspeed = get_processor_maxclockspeed(); num_logical_processors = get_logical_processor_count() / count; for (i = 0; i < count; i++) @@ -809,7 +810,7 @@ static void fill_processor( struct table *table ) sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); rec->manufacturer = heap_strdupW( manufacturer ); - rec->maxclockspeed = cpuMhz; + rec->maxclockspeed = maxclockspeed; rec->name = heap_strdupW( name ); rec->num_logical_processors = num_logical_processors; rec->processor_id = heap_strdupW( processor_id );

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::SpawnInstance.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: d25450c80b0986a714480762cc1c3a427d14137f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25450c80b0986a714480762c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 6 14:03:50 2012 +0200 wbemprox: Implement IWbemClassObject::SpawnInstance. --- dlls/wbemprox/class.c | 56 ++++++++++++++++++++++++++++++++++--- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/wbemprox_private.h | 18 +++++++++++- 3 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index c0a8cd9..cc37b57 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -125,7 +125,7 @@ static HRESULT WINAPI enum_class_object_Next( *puReturned = 0; if (ec->index + uCount > view->count) return WBEM_S_FALSE; - hr = create_class_object( view->table->name, iface, ec->index, apObjects ); + hr = create_class_object( view->table->name, iface, ec->index, NULL, apObjects ); if (hr != S_OK) return hr; ec->index++; @@ -212,6 +212,40 @@ HRESULT EnumWbemClassObject_create( return S_OK; } +static struct record *create_record( const struct column *columns, UINT num_cols ) +{ + UINT i; + struct record *record; + + if (!(record = heap_alloc( sizeof(struct record) ))) return NULL; + if (!(record->fields = heap_alloc( num_cols * sizeof(struct field) ))) + { + heap_free( record ); + return NULL; + } + for (i = 0; i < num_cols; i++) + { + record->fields[i].type = columns[i].type; + record->fields[i].u.ival = 0; + } + record->count = num_cols; + return record; +} + +static void destroy_record( struct record *record ) +{ + UINT i; + + if (!record) return; + for (i = 0; i < record->count; i++) + { + if (record->fields[i].type == CIM_STRING || record->fields[i].type == CIM_DATETIME) + heap_free( record->fields[i].u.sval ); + } + heap_free( record->fields ); + heap_free( record ); +} + struct class_object { IWbemClassObject IWbemClassObject_iface; @@ -221,6 +255,7 @@ struct class_object UINT index; UINT index_method; UINT index_property; + struct record *record; /* uncommitted instance */ }; static inline struct class_object *impl_from_IWbemClassObject( @@ -245,6 +280,7 @@ static ULONG WINAPI class_object_Release( { TRACE("destroying %p\n", co); if (co->iter) IEnumWbemClassObject_Release( co->iter ); + destroy_record( co->record ); heap_free( co->name ); heap_free( co ); } @@ -495,8 +531,17 @@ static HRESULT WINAPI class_object_SpawnInstance( LONG lFlags, IWbemClassObject **ppNewInstance ) { - FIXME("%p, %08x, %p\n", iface, lFlags, ppNewInstance); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + struct record *record; + + TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance); + + if (!(record = create_record( view->table->columns, view->table->num_cols ))) + return E_OUTOFMEMORY; + + return create_class_object( co->name, NULL, 0, record, ppNewInstance ); } static HRESULT WINAPI class_object_CompareTo( @@ -833,8 +878,8 @@ static const IWbemClassObjectVtbl class_object_vtbl = class_object_GetMethodOrigin }; -HRESULT create_class_object( - const WCHAR *name, IEnumWbemClassObject *iter, UINT index, IWbemClassObject **obj ) +HRESULT create_class_object( const WCHAR *name, IEnumWbemClassObject *iter, UINT index, + struct record *record, IWbemClassObject **obj ) { struct class_object *co; @@ -855,6 +900,7 @@ HRESULT create_class_object( co->index = index; co->index_method = 0; co->index_property = 0; + co->record = record; if (iter) IEnumWbemClassObject_AddRef( iter ); *obj = &co->IWbemClassObject_iface; diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index abd31c5..bf367c7 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -334,7 +334,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = create_class_object( path->class, iter, 0, obj ); + hr = create_class_object( path->class, iter, 0, NULL, obj ); IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 69b04e7..e1f4d45 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -66,6 +66,22 @@ struct property const struct property *next; }; +struct field +{ + UINT type; + union + { + LONGLONG ival; + WCHAR *sval; + } u; +}; + +struct record +{ + UINT count; + struct field *fields; +}; + enum operator { OP_EQ = 1, @@ -157,7 +173,7 @@ const WCHAR *get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, - IWbemClassObject **) DECLSPEC_HIDDEN; + struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Hans Leidekker : wbemprox: Add support for uncommitted instances in IWbemClassObject::Put.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 0d28920804e714a577a7b3a150066e58dc35bde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d28920804e714a577a7b3a15… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 6 14:04:03 2012 +0200 wbemprox: Add support for uncommitted instances in IWbemClassObject::Put. --- dlls/wbemprox/class.c | 40 ++++++++++++++++++++++++++++++++++++- dlls/wbemprox/query.c | 2 +- dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index cc37b57..1ec1f51 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -335,6 +335,34 @@ static HRESULT WINAPI class_object_Get( return get_propval( view, co->index, wszName, pVal, pType, plFlavor ); } +static HRESULT record_set_value( struct record *record, UINT index, VARIANT *var ) +{ + LONGLONG val; + CIMTYPE type; + HRESULT hr; + + if ((hr = variant_to_longlong( var, &val, &type )) != S_OK) return hr; + if (type != record->fields[index].type) return WBEM_E_TYPE_MISMATCH; + + switch (type) + { + case CIM_STRING: + case CIM_DATETIME: + record->fields[index].u.sval = (WCHAR *)(INT_PTR)val; + return S_OK; + case CIM_SINT16: + case CIM_UINT16: + case CIM_SINT32: + case CIM_UINT32: + record->fields[index].u.ival = val; + return S_OK; + default: + FIXME("unhandled type %u\n", type); + break; + } + return WBEM_E_INVALID_PARAMETER; +} + static HRESULT WINAPI class_object_Put( IWbemClassObject *iface, LPCWSTR wszName, @@ -344,11 +372,19 @@ static HRESULT WINAPI class_object_Put( { struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; TRACE("%p, %s, %08x, %p, %u\n", iface, debugstr_w(wszName), lFlags, pVal, Type); - return put_propval( view, co->index, wszName, pVal, Type ); + if (co->record) + { + struct table *table = get_table( co->name ); + UINT index; + HRESULT hr; + + if ((hr = get_column_index( table, wszName, &index )) != S_OK) return hr; + return record_set_value( co->record, index, pVal ); + } + return put_propval( ec->query->view, co->index, wszName, pVal, Type ); } static HRESULT WINAPI class_object_Delete( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index d2b0e76..3525be9 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -648,7 +648,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR return S_OK; } -static HRESULT variant_to_longlong( VARIANT *var, LONGLONG *val, CIMTYPE *type ) +HRESULT variant_to_longlong( VARIANT *var, LONGLONG *val, CIMTYPE *type ) { if (!var) { diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index e1f4d45..2467a76 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -165,6 +165,7 @@ HRESULT set_value( const struct table *, UINT, UINT, LONGLONG, CIMTYPE ) DECLSPE HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN; +HRESULT variant_to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; const WCHAR *get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Support IClientSecurity on class objects.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 61a8a247cfc56daddd5fa868d5cabdd126053d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a8a247cfc56daddd5fa868d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 6 14:04:14 2012 +0200 wbemprox: Support IClientSecurity on class objects. --- dlls/wbemprox/class.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 1ec1f51..5a70e9d 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -301,6 +301,11 @@ static HRESULT WINAPI class_object_QueryInterface( { *ppvObject = co; } + else if (IsEqualGUID( riid, &IID_IClientSecurity )) + { + *ppvObject = &client_security; + return S_OK; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid));

1 0

Marcus Meissner : msi: Move free after last usage (Coverity).
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: b9550ad35239db39e2d4cf3411a381319cf652c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9550ad35239db39e2d4cf341… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Sep 6 15:19:48 2012 +0200 msi: Move free after last usage (Coverity). --- dlls/msi/table.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dd25fbb..93b0268 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2328,12 +2328,15 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string r = IStorage_OpenStream( stg, encname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); - msi_free( encname ); if ( r != ERROR_SUCCESS ) + { + msi_free( encname ); return NULL; + } MSI_RecordSetStream( rec, i+1, stm ); TRACE(" field %d [%s]\n", i+1, debugstr_w(encname)); + msi_free( encname ); } else if( columns[i].type & MSITYPE_STRING ) {

1 0