September 2012 - Wine-Commits

Qian Hong : gdi32: Fixed family and face name on non English locale.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 245308597ffbe1243169211ced5e6ffbcc55c1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=245308597ffbe1243169211ce… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Sep 7 18:41:02 2012 +0800 gdi32: Fixed family and face name on non English locale. --- dlls/gdi32/freetype.c | 10 +++++++--- dlls/gdi32/tests/font.c | 31 +++++++++++++++++-------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index feca48a..20d6f9e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1552,7 +1552,7 @@ static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BO *english = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (!*english) *english = towstr( CP_ACP, ft_face->family_name ); - *name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID() ); + *name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, GetSystemDefaultLCID() ); if (!*name) { *name = *english; @@ -1715,7 +1715,9 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; face->StyleName = towstr( CP_ACP, ft_face->style_name ); - face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); + if (!face->FullName) + face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (file) { face->file = strdupA( file ); @@ -6553,7 +6555,9 @@ 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 ); + face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); + if (!face_nameW) + 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)); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 10e015e..26d88ae 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2784,7 +2784,7 @@ end: #define TT_NAME_ID_UNIQUE_ID 3 #define TT_NAME_ID_FULL_NAME 4 -static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_T out_size) +static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_T out_size, LCID language_id) { struct sfnt_name_header { @@ -2841,7 +2841,7 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_ { if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT || GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS || - GET_BE_WORD(entry[i].language_id) != TT_MS_LANGID_ENGLISH_UNITED_STATES || + GET_BE_WORD(entry[i].language_id) != language_id || GET_BE_WORD(entry[i].name_id) != name_id) { continue; @@ -4035,7 +4035,7 @@ static void test_fullname(void) of = SelectObject(hdc, hfont); bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, sizeof(bufW)); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, sizeof(bufW), TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "face full name could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, sizeof(bufW), NULL, FALSE); ok(!lstrcmpA(bufA, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], bufA); @@ -4057,13 +4057,6 @@ static void test_fullname2_helper(const char *Family) int i; DWORD otm_size, ret, buf_size; OUTLINETEXTMETRICA *otm; - LCID lcid = GetSystemDefaultLangID(); - - if (lcid != TT_MS_LANGID_ENGLISH_UNITED_STATES) - { - skip("Skip test: LCID = %d\n", lcid); - return; - } hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4111,7 +4104,12 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized name found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } ok(ret, "FAMILY (family name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA); @@ -4120,7 +4118,12 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized name found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } ok(ret, "FULL_NAME (face name) could not be read\n"); 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); @@ -4129,7 +4132,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "SUBFAMILY (style name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", FaceName, bufA); @@ -4138,7 +4141,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); 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;

1 0

Hans Leidekker : iphlpapi: Add partial support for UDP_TABLE_OWNER_MODULE in GetExtendedUdpTable.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: bc8876f9ce24beda5dba4a4413543f163fa154bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8876f9ce24beda5dba4a441… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 7 13:35:48 2012 +0200 iphlpapi: Add partial support for UDP_TABLE_OWNER_MODULE in GetExtendedUdpTable. --- dlls/iphlpapi/iphlpapi_main.c | 6 +++++- dlls/iphlpapi/ipstats.c | 15 +++++++++++---- include/udpmib.h | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a9ab1e0..f3568b8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1935,11 +1935,15 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; if (ulAf != AF_INET || - (TableClass != UDP_TABLE_BASIC && TableClass != UDP_TABLE_OWNER_PID)) + (TableClass != UDP_TABLE_BASIC && TableClass != UDP_TABLE_OWNER_PID && + TableClass != UDP_TABLE_OWNER_MODULE)) { FIXME("ulAf = %u, TableClass = %u not supported\n", ulAf, TableClass); return ERROR_NOT_SUPPORTED; } + if (TableClass == UDP_TABLE_OWNER_MODULE) + FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); + if ((ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) return ret; diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 18307d5..7c64b41 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1837,6 +1837,12 @@ static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD if (row_size) *row_size = sizeof(MIB_UDPROW_OWNER_PID); break; } + case UDP_TABLE_OWNER_MODULE: + { + table_size = FIELD_OFFSET(MIB_UDPTABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_UDPROW_OWNER_MODULE); + break; + } default: ERR("unhandled class %u\n", class); return 0; @@ -1846,7 +1852,7 @@ static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD static MIB_UDPTABLE *append_udp_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, MIB_UDPTABLE *table, DWORD *count, - const MIB_UDPROW_OWNER_PID *row, DWORD row_size ) + const MIB_UDPROW_OWNER_MODULE *row, DWORD row_size ) { if (table->dwNumEntries >= *count) { @@ -1881,7 +1887,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE DWORD *size ) { MIB_UDPTABLE *table; - MIB_UDPROW_OWNER_PID row; + MIB_UDPROW_OWNER_MODULE row; DWORD ret = NO_ERROR, count = 16, table_size, row_size; if (!(table_size = get_udp_table_sizes( class, count, &row_size ))) @@ -1904,7 +1910,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE unsigned int dummy, num_entries = 0; int inode; - if (class == UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); + if (class == UDP_TABLE_OWNER_PID || class == UDP_TABLE_OWNER_MODULE) + map = get_pid_map( &num_entries ); /* skip header line */ ptr = fgets( buf, sizeof(buf), fp ); @@ -1914,7 +1921,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 4) continue; row.dwLocalPort = htons( row.dwLocalPort ); - if (class == UDP_TABLE_OWNER_PID) + if (class == UDP_TABLE_OWNER_PID || class == UDP_TABLE_OWNER_MODULE) row.dwOwningPid = find_owning_pid( map, num_entries, inode ); if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; diff --git a/include/udpmib.h b/include/udpmib.h index c2d507f..6b3f51c 100644 --- a/include/udpmib.h +++ b/include/udpmib.h @@ -48,6 +48,29 @@ typedef struct _MIB_UDPTABLE_OWNER_PID MIB_UDPROW_OWNER_PID table[1]; } MIB_UDPTABLE_OWNER_PID, *PMIB_UDPTABLE_OWNER_PID; +typedef struct _MIB_UDPROW_OWNER_MODULE +{ + DWORD dwLocalAddr; + DWORD dwLocalPort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + __C89_NAMELESS union + { + __C89_NAMELESS struct + { + int SpecificPortBind:1; + } __C89_NAMELESSSTRUCTNAME; + int dwFlags; + } __C89_NAMELESSUNIONNAME; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_UDPROW_OWNER_MODULE, *PMIB_UDPROW_OWNER_MODULE; + +typedef struct _MIB_UDPTABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_UDPROW_OWNER_MODULE table[1]; +} MIB_UDPTABLE_OWNER_MODULE, *PMIB_UDPTABLE_OWNER_MODULE; + /* UDP statistics */ typedef struct _MIB_UDPSTATS

1 0

Jacek Caban : vbscript: Use separated IDispatchEx implementation for script dispatch.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 8121f73273d475a9b5961763a66d398fa6640aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8121f73273d475a9b5961763a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 15:09:34 2012 +0200 vbscript: Use separated IDispatchEx implementation for script dispatch. --- dlls/vbscript/global.c | 3 +- dlls/vbscript/vbdisp.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 5 +- dlls/vbscript/vbscript.h | 10 ++- 4 files changed, 195 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 55c1acc..3c28e96 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1825,8 +1825,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - ctx->script_desc.ctx = ctx; - hres = create_vbdisp(&ctx->script_desc, &ctx->script_obj); + hres = create_script_disp(ctx, &ctx->script_obj); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index f6e3f11..b7945d8 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -565,6 +565,188 @@ HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **re return S_OK; } +static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) +{ + return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); +} + +static HRESULT WINAPI ScriptDisp_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IDispatchEx_iface; + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = &This->IDispatchEx_iface; + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = &This->IDispatchEx_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptDisp_AddRef(IDispatchEx *iface) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + assert(!This->ctx); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI ScriptDisp_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, + DISPID *rgDispId) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + return DISP_E_UNKNOWNNAME; +} + +static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return DISP_E_MEMBERNOTFOUND; +} + +static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%x)\n", This, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptDisp_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) +{ + ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + FIXME("(%p)->(%p)\n", This, ppunk); + return E_NOTIMPL; +} + +static IDispatchExVtbl ScriptDispVtbl = { + ScriptDisp_QueryInterface, + ScriptDisp_AddRef, + ScriptDisp_Release, + ScriptDisp_GetTypeInfoCount, + ScriptDisp_GetTypeInfo, + ScriptDisp_GetIDsOfNames, + ScriptDisp_Invoke, + ScriptDisp_GetDispID, + ScriptDisp_InvokeEx, + ScriptDisp_DeleteMemberByName, + ScriptDisp_DeleteMemberByDispID, + ScriptDisp_GetMemberProperties, + ScriptDisp_GetMemberName, + ScriptDisp_GetNextDispID, + ScriptDisp_GetNameSpaceParent +}; + +HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) +{ + ScriptDisp *script_disp; + + script_disp = heap_alloc(sizeof(*script_disp)); + if(!script_disp) + return E_OUTOFMEMORY; + + script_disp->IDispatchEx_iface.lpVtbl = &ScriptDispVtbl; + script_disp->ref = 1; + script_disp->ctx = ctx; + + *ret = script_disp; + return S_OK; +} + void collect_objects(script_ctx_t *ctx) { vbdisp_t *iter, *iter2; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 095e3ae..05132a6 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -165,8 +165,11 @@ static void release_script(script_ctx_t *ctx) } if(ctx->script_obj) { - IDispatchEx_Release(&ctx->script_obj->IDispatchEx_iface); + ScriptDisp *script_obj = ctx->script_obj; + ctx->script_obj = NULL; + script_obj->ctx = NULL; + IDispatchEx_Release(&script_obj->IDispatchEx_iface); } vbsheap_free(&ctx->heap); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 8a316ab..306cfed 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -116,6 +116,12 @@ struct _vbdisp_t { VARIANT props[1]; }; +typedef struct { + IDispatchEx IDispatchEx_iface; + LONG ref; + script_ctx_t *ctx; +} ScriptDisp; + HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; @@ -123,6 +129,7 @@ HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; +HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN; static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -150,8 +157,7 @@ struct _script_ctx_t { IDispatch *host_global; - class_desc_t script_desc; - vbdisp_t *script_obj; + ScriptDisp *script_obj; class_desc_t global_desc; vbdisp_t *global_obj;

1 0

Alexandre Julliard : winex11: Get the current pixel format from the drawable structure in wglMakeCurrent .
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 11013af0a1a7f9c7d4854c376f8a3b46f955f1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11013af0a1a7f9c7d4854c376… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 15:53:00 2012 +0200 winex11: Get the current pixel format from the drawable structure in wglMakeCurrent. --- dlls/winex11.drv/opengl.c | 57 +++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 97055ae..a6fb974 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1662,8 +1662,9 @@ static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) */ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) { - BOOL ret; - struct x11drv_escape_get_drawable escape; + BOOL ret = FALSE; + HWND hwnd; + struct gl_drawable *gl; TRACE("(%p,%p)\n", hdc, ctx); @@ -1674,51 +1675,41 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) return TRUE; } - escape.code = X11DRV_GET_DRAWABLE; - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, - sizeof(escape), (LPSTR)&escape )) - return FALSE; + hwnd = WindowFromDC( hdc ); + EnterCriticalSection( &context_section ); - if (!escape.pixel_format) - { - WARN("Trying to use an invalid drawable\n"); - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (ctx->fmt - pixel_formats != escape.pixel_format - 1) - { - WARN( "mismatched pixel format hdc %p %u ctx %p\n", hdc, escape.pixel_format, ctx ); - SetLastError( ERROR_INVALID_PIXEL_FORMAT ); - return FALSE; - } - else + if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl ) || + !XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) { + if (ctx->fmt != gl->format) + { + WARN( "mismatched pixel format hdc %p %p ctx %p %p\n", hdc, gl->format, ctx, ctx->fmt ); + SetLastError( ERROR_INVALID_PIXEL_FORMAT ); + goto done; + } + if (TRACE_ON(wgl)) { - int vis_id; - pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &vis_id); describeContext(ctx); - TRACE("hdc %p drawable %lx fmt %u vis %x ctx %p\n", hdc, - escape.gl_drawable, escape.pixel_format, vis_id, ctx->ctx); + TRACE("hdc %p drawable %lx fmt %p ctx %p\n", hdc, gl->drawable, gl->format, ctx->ctx ); } - ret = pglXMakeCurrent(gdi_display, escape.gl_drawable, ctx->ctx); - + ret = pglXMakeCurrent(gdi_display, gl->drawable, ctx->ctx); if (ret) { NtCurrentTeb()->glContext = ctx; - - EnterCriticalSection( &context_section ); ctx->has_been_current = TRUE; ctx->hdc = hdc; - ctx->drawables[0] = escape.gl_drawable; - ctx->drawables[1] = escape.gl_drawable; + ctx->drawables[0] = gl->drawable; + ctx->drawables[1] = gl->drawable; ctx->refresh_drawables = FALSE; - LeaveCriticalSection( &context_section ); + goto done; } - else - SetLastError(ERROR_INVALID_HANDLE); } - TRACE(" returning %s\n", (ret ? "True" : "False")); + SetLastError( ERROR_INVALID_HANDLE ); + +done: + LeaveCriticalSection( &context_section ); + TRACE( "%p,%p returning %d\n", hdc, ctx, ret ); return ret; }

1 0

Alexandre Julliard : winex11: Get the current pixel format from the drawable structure in wglCreateContextAttribsARB .
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: d52c2de7dad0a5f0f9cbcc5115360028f390d4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52c2de7dad0a5f0f9cbcc511… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 16:19:06 2012 +0200 winex11: Get the current pixel format from the drawable structure in wglCreateContextAttribsARB. --- dlls/winex11.drv/opengl.c | 93 +++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index dccee22..97055ae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1880,90 +1880,77 @@ static void wglFlush(void) static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *hShareContext, const int* attribList ) { - struct x11drv_escape_get_drawable escape; - struct wgl_context *ret; - const struct wgl_pixel_format *fmt; + struct wgl_context *ret = NULL; + struct gl_drawable *gl; + HWND hwnd = WindowFromDC( hdc ); TRACE("(%p %p %p)\n", hdc, hShareContext, attribList); - escape.code = X11DRV_GET_DRAWABLE; - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, - sizeof(escape), (LPSTR)&escape )) - return 0; - - fmt = get_pixel_format(gdi_display, escape.pixel_format, TRUE /* Offscreen */); - /* wglCreateContextAttribsARB supports ALL pixel formats, so also offscreen ones. - * If this fails something is very wrong on the system. */ - if(!fmt) - { - ERR("Cannot get FB Config for iPixelFormat %d, expect problems!\n", escape.pixel_format); - SetLastError(ERROR_INVALID_PIXEL_FORMAT); - return NULL; - } - - if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) return 0; - - ret->hdc = hdc; - ret->fmt = fmt; - ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ - ret->gl3_context = TRUE; + EnterCriticalSection( &context_section ); - ret->numAttribs = 0; - if(attribList) + if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl ) || + !XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) { - int *pAttribList = (int*)attribList; - int *pContextAttribList = &ret->attribList[0]; - /* attribList consists of pairs {token, value] terminated with 0 */ - while(pAttribList[0] != 0) + if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) goto done; + ret->hdc = hdc; + ret->fmt = gl->format; + ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ + ret->gl3_context = TRUE; + ret->numAttribs = 0; + if (attribList) { - TRACE("%#x %#x\n", pAttribList[0], pAttribList[1]); - switch(pAttribList[0]) + int *pContextAttribList = &ret->attribList[0]; + /* attribList consists of pairs {token, value] terminated with 0 */ + while(attribList[0] != 0) { + TRACE("%#x %#x\n", attribList[0], attribList[1]); + switch(attribList[0]) + { case WGL_CONTEXT_MAJOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; - pContextAttribList[1] = pAttribList[1]; + pContextAttribList[1] = attribList[1]; break; case WGL_CONTEXT_MINOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MINOR_VERSION_ARB; - pContextAttribList[1] = pAttribList[1]; + pContextAttribList[1] = attribList[1]; break; case WGL_CONTEXT_LAYER_PLANE_ARB: break; case WGL_CONTEXT_FLAGS_ARB: pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; - pContextAttribList[1] = pAttribList[1]; + pContextAttribList[1] = attribList[1]; break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; - pContextAttribList[1] = pAttribList[1]; + pContextAttribList[1] = attribList[1]; break; default: - ERR("Unhandled attribList pair: %#x %#x\n", pAttribList[0], pAttribList[1]); + ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); + } + ret->numAttribs++; + attribList += 2; + pContextAttribList += 2; } - - ret->numAttribs++; - pAttribList += 2; - pContextAttribList += 2; } - } - - X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); - ret->ctx = create_glxcontext(gdi_display, ret, NULL); - XSync(gdi_display, False); - if(X11DRV_check_error() || !ret->ctx) - { + X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); + ret->ctx = create_glxcontext(gdi_display, ret, NULL); + XSync(gdi_display, False); + if (!X11DRV_check_error() && ret->ctx) + { + list_add_head( &context_list, &ret->entry ); + goto done; + } /* In the future we should convert the GLX error to a win32 one here if needed */ ERR("Context creation failed\n"); HeapFree( GetProcessHeap(), 0, ret ); - return NULL; + ret = NULL; } + else SetLastError( ERROR_INVALID_PIXEL_FORMAT ); - EnterCriticalSection( &context_section ); - list_add_head( &context_list, &ret->entry ); +done: LeaveCriticalSection( &context_section ); - - TRACE(" creating context %p\n", ret); + TRACE( "%p -> %p\n", hdc, ret ); return ret; }

1 0

Alexandre Julliard : winex11: Get the current pixel format from the drawable structure in wglGetPixelFormat .
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: bf5e1b6a05e631846b9ba7fff2edc36213884bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5e1b6a05e631846b9ba7fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 15:31:05 2012 +0200 winex11: Get the current pixel format from the drawable structure in wglGetPixelFormat. --- dlls/winex11.drv/opengl.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d5d3ca9..a31c5ef 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1509,26 +1509,22 @@ static int glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, */ static int glxdrv_wglGetPixelFormat( HDC hdc ) { - struct x11drv_escape_get_drawable escape; - - TRACE( "(%p)\n", hdc ); + HWND hwnd = WindowFromDC( hdc ); + struct gl_drawable *gl; + int ret = 0; - escape.code = X11DRV_GET_DRAWABLE; - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, - sizeof(escape), (LPSTR)&escape )) - return 0; + EnterCriticalSection( &context_section ); + if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl ) || + !XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) + ret = gl->pixel_format; + LeaveCriticalSection( &context_section ); - if (!is_valid_pixel_format( escape.pixel_format )) return 0; /* not set yet */ + /* Offscreen formats can't be used with traditional WGL calls. + * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ + if (ret && !is_onscreen_pixel_format( ret )) ret = 1; - if (!is_onscreen_pixel_format( escape.pixel_format )) - { - /* Offscreen formats can't be used with traditional WGL calls. - * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ - TRACE("Returning iPixelFormat=1 for offscreen format: %d\n", escape.pixel_format); - return 1; - } - TRACE("(%p): returns %d\n", hdc, escape.pixel_format); - return escape.pixel_format; + TRACE( "%p -> %d\n", hdc, ret ); + return ret; } /***********************************************************************

1 0

Alexandre Julliard : winex11: Get the current pixel format from the drawable structure for wglSetPixelFormat .
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: ecc8559fe800df985b37afd6b1f2347c246e4039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc8559fe800df985b37afd6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 15:06:19 2012 +0200 winex11: Get the current pixel format from the drawable structure for wglSetPixelFormat. --- dlls/winex11.drv/opengl.c | 46 +++++++++++++++++++------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 84651c0..00642ce 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1533,25 +1533,16 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) */ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) { - struct x11drv_escape_get_drawable escape; const struct wgl_pixel_format *fmt; - int value; - HWND hwnd; + int value, prev = 0; + struct gl_drawable *gl; + HWND hwnd = WindowFromDC( hdc ); TRACE("(%p,%d,%p)\n", hdc, iPixelFormat, ppfd); - escape.code = X11DRV_GET_DRAWABLE; - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, - sizeof(escape), (LPSTR)&escape )) - return 0; - - if (escape.pixel_format) /* cannot change it if already set */ - return (escape.pixel_format == iPixelFormat); - - /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ - if (escape.drawable == root_window) + if (!hwnd || hwnd == GetDesktopWindow()) { - ERR("Invalid operation on root_window\n"); + WARN( "not a proper window DC %p/%p\n", hdc, hwnd ); return FALSE; } @@ -1563,21 +1554,24 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM } pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + if (!(value & GLX_WINDOW_BIT)) + { + WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat); + return FALSE; + } - hwnd = WindowFromDC( hdc ); - if(hwnd) { - if(!(value&GLX_WINDOW_BIT)) { - WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat); - return FALSE; - } + EnterCriticalSection( &context_section ); + if (!XFindContext( gdi_display, (XID)hwnd, gl_drawable_context, (char **)&gl )) + prev = gl->pixel_format; + LeaveCriticalSection( &context_section ); - if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0)) { - ERR("Couldn't set format of the window, returning failure\n"); - return FALSE; - } - /* physDev->current_pf will be set by the DCE update */ + if (prev) return prev == iPixelFormat; /* cannot change it if already set */ + + if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0)) { + ERR("Couldn't set format of the window, returning failure\n"); + return FALSE; } - else FIXME("called on a non-window object?\n"); + /* physDev->current_pf will be set by the DCE update */ if (TRACE_ON(wgl)) { int gl_test = 0;

1 0

Jacek Caban : vbscript: Added ScriptDisp::GetDispID implementation.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 40001df45db90b70710b9fec7fad419322301ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40001df45db90b70710b9fec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 15:09:59 2012 +0200 vbscript: Added ScriptDisp::GetDispID implementation. --- dlls/vbscript/vbdisp.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 7 ++++ 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index b7945d8..4f473e2 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -565,6 +565,44 @@ HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **re return S_OK; } +struct _ident_map_t { + const WCHAR *name; + BOOL is_var; + union { + dynamic_var_t *var; + function_t *func; + } u; +}; + +static inline DISPID ident_to_id(ScriptDisp *This, ident_map_t *ident) +{ + return (ident-This->ident_map)+1; +} + +static ident_map_t *add_ident(ScriptDisp *This, const WCHAR *name) +{ + ident_map_t *ret; + + if(!This->ident_map_size) { + This->ident_map = heap_alloc(4 * sizeof(*This->ident_map)); + if(!This->ident_map) + return NULL; + This->ident_map_size = 4; + }else if(This->ident_map_cnt == This->ident_map_size) { + ident_map_t *new_map; + + new_map = heap_realloc(This->ident_map, 2*This->ident_map_size*sizeof(*new_map)); + if(!new_map) + return NULL; + This->ident_map = new_map; + This->ident_map_size *= 2; + } + + ret = This->ident_map + This->ident_map_cnt++; + ret->name = name; + return ret; +} + static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); @@ -612,6 +650,7 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) if(!ref) { assert(!This->ctx); + heap_free(This->ident_map); heap_free(This); } @@ -659,7 +698,49 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + dynamic_var_t *var; + ident_map_t *ident; + function_t *func; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + if(!This->ctx) + return E_UNEXPECTED; + + for(ident = This->ident_map; ident < This->ident_map+This->ident_map_cnt; ident++) { + if(!strcmpiW(ident->name, bstrName)) { + *pid = ident_to_id(This, ident); + return S_OK; + } + } + + for(var = This->ctx->global_vars; var; var = var->next) { + if(!strcmpiW(var->name, bstrName)) { + ident = add_ident(This, var->name); + if(!ident) + return E_OUTOFMEMORY; + + ident->is_var = TRUE; + ident->u.var = var; + *pid = ident_to_id(This, ident); + return S_OK; + } + } + + for(func = This->ctx->global_funcs; func; func = func->next) { + if(!strcmpiW(func->name, bstrName)) { + ident = add_ident(This, func->name); + if(!ident) + return E_OUTOFMEMORY; + + ident->is_var = FALSE; + ident->u.func = func; + *pid = ident_to_id(This, ident); + return S_OK; + } + } + + *pid = -1; return DISP_E_UNKNOWNNAME; } @@ -735,7 +816,7 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) { ScriptDisp *script_disp; - script_disp = heap_alloc(sizeof(*script_disp)); + script_disp = heap_alloc_zero(sizeof(*script_disp)); if(!script_disp) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 306cfed..77cf0e7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -116,9 +116,16 @@ struct _vbdisp_t { VARIANT props[1]; }; +typedef struct _ident_map_t ident_map_t; + typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; + + ident_map_t *ident_map; + unsigned ident_map_cnt; + unsigned ident_map_size; + script_ctx_t *ctx; } ScriptDisp;

1 0

Piotr Caban : msvcrt: Fixed RTTI structure on 64-bit systems.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 8060752c09fd8794986f9fe3114513d78a36f903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8060752c09fd8794986f9fe31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 7 11:01:17 2012 +0200 msvcrt: Fixed RTTI structure on 64-bit systems. --- dlls/msvcrt/cpp.c | 128 +++++++++++++++++--------------------------------- dlls/msvcrt/cxx.h | 114 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 1 + 4 files changed, 156 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8060752c09fd8794986f9…

1 0

James Eder : kernel32: Remove outdated comment.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 10ff9b4f13a42e292e3f775ef58aa356c41382ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ff9b4f13a42e292e3f775ef… Author: James Eder <jimportal(a)gmail.com> Date: Thu Sep 6 09:23:15 2012 -0600 kernel32: Remove outdated comment. --- dlls/kernel32/cpu.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 0860362..333e402 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -99,12 +99,6 @@ BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency) * * RETURNS * Nothing. - * - * NOTES - * On the first call it creates cached values, so it doesn't have to determine - * them repeatedly. On Linux, the "/proc/cpuinfo" special file is used. - * - * It also creates a cached flag array for IsProcessorFeaturePresent(). */ VOID WINAPI GetSystemInfo( LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */)

1 0