December 2012 - Wine-commits

Christian Costa : d3drm: Load object only if it is top level and requested or if it is part of another object .
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 6595cdd41fb2f9e26a607683558791bbd3bb5e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6595cdd41fb2f9e26a6076835… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Dec 12 09:36:37 2012 +0100 d3drm: Load object only if it is top level and requested or if it is part of another object. --- dlls/d3drm/d3drm.c | 130 ++++++++++++++++++++++++++++------------------------ 1 files changed, 70 insertions(+), 60 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7261eb2..2fe4fce 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1272,6 +1272,8 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI TRACE("Found object type whose GUID = %s\n", debugstr_guid(guid)); + /* Load object only if it is top level and requested or if it is part of another object */ + if (IsEqualGUID(guid, &TID_D3DRMMesh)) { TRACE("Found TID_D3DRMMesh\n"); @@ -1285,30 +1287,34 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI break; } - if (requested) + if (requested || parent_frame) { - LPDIRECT3DRMMESHBUILDER3 meshbuilder; + IDirect3DRMMeshBuilder3 *meshbuilder; - TRACE("Load mesh data and notify application\n"); + TRACE("Load mesh data\n"); hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) { - LPDIRECT3DRMOBJECT object = NULL; - - hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); + hr = load_mesh_data(meshbuilder, data_object); if (SUCCEEDED(hr)) { - hr = load_mesh_data(meshbuilder, data_object); - if (SUCCEEDED(hr)) + /* Only top level objects are notified */ + if (!parent_frame) { - /* Only top level objects are notified */ - if (parent_frame) - IDirect3DRMFrame3_AddVisual(parent_frame, (IUnknown*)meshbuilder); - else + IDirect3DRMObject *object; + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } + } + else + { + IDirect3DRMFrame3_AddVisual(parent_frame, (IUnknown*)meshbuilder); } - IDirect3DRMObject_Release(object); } IDirect3DRMMeshBuilder3_Release(meshbuilder); } @@ -1330,68 +1336,69 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI break; } - if (requested) + if (requested || parent_frame) { - LPDIRECT3DRMFRAME3 frame; + IDirect3DRMFrame3 *frame; - TRACE("Load frame data and notify application\n"); + TRACE("Load frame data\n"); hr = IDirect3DRM3_CreateFrame(iface, parent_frame, &frame); if (SUCCEEDED(hr)) { - LPDIRECT3DRMOBJECT object; + IDirectXFileObject *child; - hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); - if (SUCCEEDED(hr)) + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(data_object, &child))) { - LPDIRECTXFILEOBJECT child; + IDirectXFileData *data; + IDirectXFileDataReference *reference; + IDirectXFileBinary *binary; - while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(data_object, &child))) + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); + if (SUCCEEDED(hr)) { - LPDIRECTXFILEDATA data; - LPDIRECTXFILEDATAREFERENCE reference; - LPDIRECTXFILEBINARY binary; - - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); - if (SUCCEEDED(hr)) - { - FIXME("Binary Object not supported yet\n"); - IDirectXFileBinary_Release(binary); - continue; - } - - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); - if (SUCCEEDED(hr)) - { - TRACE("Found Data Object\n"); - hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); - IDirectXFileData_Release(data); - continue; - } - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); - if (SUCCEEDED(hr)) - { - TRACE("Found Data Object Reference\n"); - IDirectXFileDataReference_Resolve(reference, &data); - hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); - IDirectXFileData_Release(data); - IDirectXFileDataReference_Release(reference); - continue; - } + FIXME("Binary Object not supported yet\n"); + IDirectXFileBinary_Release(binary); + continue; } - if (hr != DXFILEERR_NOMOREOBJECTS) + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); + if (SUCCEEDED(hr)) { - IDirect3DRMObject_Release(object); - IDirect3DRMFrame3_Release(frame); - goto end; + TRACE("Found Data Object\n"); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + continue; } - hr = S_OK; + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + if (SUCCEEDED(hr)) + { + TRACE("Found Data Object Reference\n"); + IDirectXFileDataReference_Resolve(reference, &data); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + IDirectXFileDataReference_Release(reference); + continue; + } + } - /* Only top level objects are notified */ - if (!parent_frame) + if (hr != DXFILEERR_NOMOREOBJECTS) + { + IDirect3DRMFrame3_Release(frame); + goto end; + } + hr = S_OK; + + /* Only top level objects are notified */ + if (!parent_frame) + { + IDirect3DRMObject *object; + + hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { LoadProc(object, GUIDs[i], ArgLP); - IDirect3DRMObject_Release(object); + IDirect3DRMObject_Release(object); + } } IDirect3DRMFrame3_Release(frame); } @@ -1402,12 +1409,15 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI } else if (IsEqualGUID(guid, &TID_D3DRMMaterial)) { - TRACE("Found TID_D3DRMMaterial => Will be taken into account when a mesh will reference it\n"); + TRACE("Found TID_D3DRMMaterial\n"); + + /* Cannot be requested so nothing to do */ } else if (IsEqualGUID(guid, &TID_D3DRMFrameTransformMatrix)) { TRACE("Found TID_D3DRMFrameTransformMatrix\n"); + /* Cannot be requested */ if (parent_frame) { D3DRMMATRIX4D matrix;

1 0

Jacek Caban : jscript: Throw an error if return statement is in eval code.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: b568d88815d717503b8b4a2042666ce3b0abf9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b568d88815d717503b8b4a204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:04 2012 +0100 jscript: Throw an error if return statement is in eval code. --- dlls/jscript/compile.c | 8 +++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 + po/ar.po | 46 ++++++++++++++++++++++++-------------------- po/bg.po | 46 ++++++++++++++++++++++++-------------------- po/ca.po | 46 ++++++++++++++++++++++++-------------------- po/cs.po | 46 ++++++++++++++++++++++++-------------------- po/da.po | 46 ++++++++++++++++++++++++-------------------- po/de.po | 46 ++++++++++++++++++++++++-------------------- po/el.po | 46 ++++++++++++++++++++++++-------------------- po/en.po | 46 ++++++++++++++++++++++++-------------------- po/en_US.po | 46 ++++++++++++++++++++++++-------------------- po/eo.po | 46 ++++++++++++++++++++++++-------------------- po/es.po | 46 ++++++++++++++++++++++++-------------------- po/fa.po | 46 ++++++++++++++++++++++++-------------------- po/fi.po | 46 ++++++++++++++++++++++++-------------------- po/fr.po | 46 ++++++++++++++++++++++++-------------------- po/he.po | 46 ++++++++++++++++++++++++-------------------- po/hi.po | 46 ++++++++++++++++++++++++-------------------- po/hu.po | 46 ++++++++++++++++++++++++-------------------- po/it.po | 46 ++++++++++++++++++++++++-------------------- po/ja.po | 46 ++++++++++++++++++++++++-------------------- po/ko.po | 46 ++++++++++++++++++++++++-------------------- po/lt.po | 46 ++++++++++++++++++++++++-------------------- po/ml.po | 46 ++++++++++++++++++++++++-------------------- po/nb_NO.po | 46 ++++++++++++++++++++++++-------------------- po/nl.po | 46 ++++++++++++++++++++++++-------------------- po/or.po | 46 ++++++++++++++++++++++++-------------------- po/pa.po | 46 ++++++++++++++++++++++++-------------------- po/pl.po | 46 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 46 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 46 ++++++++++++++++++++++++-------------------- po/rm.po | 46 ++++++++++++++++++++++++-------------------- po/ro.po | 46 ++++++++++++++++++++++++-------------------- po/ru.po | 46 ++++++++++++++++++++++++-------------------- po/sk.po | 46 ++++++++++++++++++++++++-------------------- po/sl.po | 46 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 46 ++++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 46 ++++++++++++++++++++++++-------------------- po/sv.po | 46 ++++++++++++++++++++++++-------------------- po/te.po | 46 ++++++++++++++++++++++++-------------------- po/th.po | 46 ++++++++++++++++++++++++-------------------- po/tr.po | 46 ++++++++++++++++++++++++-------------------- po/uk.po | 46 ++++++++++++++++++++++++-------------------- po/wa.po | 46 ++++++++++++++++++++++++-------------------- po/wine.pot | 46 ++++++++++++++++++++++++-------------------- po/zh_CN.po | 46 ++++++++++++++++++++++++-------------------- po/zh_TW.po | 46 ++++++++++++++++++++++++-------------------- 50 files changed, 1138 insertions(+), 945 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b568d88815d717503b8b4…

1 0

Jacek Caban : jscript: Added support for SCRIPTTEXT_ISEXPRESSION.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 5e4a16819ef3e29757d54a536e436cdb18981fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4a16819ef3e29757d54a536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:17 2012 +0100 jscript: Added support for SCRIPTTEXT_ISEXPRESSION. --- dlls/jscript/jscript.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 16deac4..f7032bb 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -766,10 +766,34 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, FALSE, This->is_encode, &code); + hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, + This->is_encode, &code); if(FAILED(hres)) return hres; + if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { + exec_ctx_t *exec_ctx; + + hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, TRUE, &exec_ctx); + if(SUCCEEDED(hres)) { + jsval_t r; + + IActiveScriptSite_OnEnterScript(This->site); + + clear_ei(This->ctx); + hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); + if(SUCCEEDED(hres)) { + hres = jsval_to_variant(r, pvarResult); + jsval_release(r); + } + exec_release(exec_ctx); + + IActiveScriptSite_OnLeaveScript(This->site); + } + + return hres; + } + if(!is_started(This->ctx)) { if(This->queue_tail) This->queue_tail = This->queue_tail->next = code;

1 0

Jacek Caban : jscript: Added SCRIPTTEXT_ISEXPRESSION tests.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 2c41c4c1cb1da024e5dbf2786066d221e1dbb81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c41c4c1cb1da024e5dbf2786… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:39 2012 +0100 jscript: Added SCRIPTTEXT_ISEXPRESSION tests. --- dlls/jscript/tests/run.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 3c5422c..58cf874 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -141,7 +141,7 @@ static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; static const CHAR test_valA[] = "testVal"; static const WCHAR emptyW[] = {0}; -static BOOL strict_dispid_check; +static BOOL strict_dispid_check, testing_expr; static const char *test_name = "(null)"; static IDispatch *script_disp; static int invoke_version; @@ -652,7 +652,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(!pvarRes, "pvarRes != NULL\n"); + if(!testing_expr) + ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); return S_OK; @@ -1695,6 +1696,82 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } +static HRESULT parse_script_expr(const char *expr, VARIANT *res) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + engine = create_script(); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScript_AddNamedItem(engine, test_valW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + CHECK_CALLED(GetItemInfo_testVal); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + str = a2bstr(expr); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, res, NULL); + SysFreeString(str); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + + return hres; +} + +static void test_script_exprs(void) +{ + VARIANT v; + HRESULT hres; + + testing_expr = TRUE; + + hres = parse_script_expr("true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + hres = parse_script_expr("false, true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = parse_script_expr("reportSuccess(); true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + hres = parse_script_expr("if(false) true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + hres = parse_script_expr("return testPropGet", &v); + ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + + hres = parse_script_expr("reportSuccess(); return true", &v); + ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + + testing_expr = FALSE; +} + static BOOL run_tests(void) { HRESULT hres; @@ -1892,6 +1969,8 @@ static BOOL run_tests(void) hres = parse_htmlscript_a("var a=1;\nif(a\n-->0) a=5;\n"); ok(hres != S_OK, "ParseScriptText have not failed\n"); + test_script_exprs(); + parse_script_with_error_a( "?", 0x800a03ea, 0, 0,

1 0

Jacek Caban : atl: Added locking to AtlModuleAddCreateWndData.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 55b0de217321fd3baab12156a19fe035a1c926a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b0de217321fd3baab12156a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:55:58 2012 +0100 atl: Added locking to AtlModuleAddCreateWndData. --- dlls/atl/atl_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 8f8cd76..d7c4dae 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -428,8 +428,11 @@ void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData pData->m_pThis = pvObject; pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); pData->m_pNext = pM->m_pCreateWndList; pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); } /***********************************************************************

1 0

Jacek Caban : atl100: Added AtlWinModuleAddCreateWndData implementation ( based on AtlModuleAddCreateWndData).
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 147dbf63cdf9f3731ba1c0d30efc57a300bb559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=147dbf63cdf9f3731ba1c0d30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:56:11 2012 +0100 atl100: Added AtlWinModuleAddCreateWndData implementation (based on AtlModuleAddCreateWndData). --- dlls/atl100/atl.c | 16 ++++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 7e273b7..bbea756 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -288,6 +288,22 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, } /*********************************************************************** + * AtlWinModuleAddCreateWndData [atl100.43] + */ +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData *pData, void *pvObject) +{ + TRACE("(%p, %p, %p)\n", pM, pData, pvObject); + + pData->m_pThis = pvObject; + pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); + pData->m_pNext = pM->m_pCreateWndList; + pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index ec8a858..2204187 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -26,7 +26,7 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stub AtlWinModuleAddCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) 44 stub AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA diff --git a/include/atlbase.h b/include/atlbase.h index ce62474..140a227 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -160,6 +160,13 @@ typedef struct _ATL_MODULEW_TAG _ATL_TERMFUNC_ELEM* m_pTermFuncs; } _ATL_MODULEW; +typedef struct +{ + void *m_aT; + int m_nSize; + int m_nAllocSize; +} CSimpleArray; + typedef struct _ATL_MODULE70 { UINT cbSize; @@ -168,10 +175,20 @@ typedef struct _ATL_MODULE70 CComCriticalSection m_csStaticDataInitAndTypeInfo; } _ATL_MODULE70; +typedef struct _ATL_WIN_MODULE70 +{ + UINT cbSize; + CComCriticalSection m_csWindowCreate; + _AtlCreateWndData *m_pCreateWndList; + CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; +} _ATL_WIN_MODULE70; + #if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE; +typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; #else typedef _ATL_MODULEW _ATL_MODULE; +typedef _ATL_MODULEW _ATL_WIN_MODULE; #endif typedef struct _ATL_INTMAP_ENTRY_TAG @@ -195,6 +212,7 @@ HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);

1 0

Frédéric Delanoy : include: Assorted spelling fixes.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 1d004dda19424d8c4a77b7b0b3a5ce8bd4d40fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d004dda19424d8c4a77b7b0b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 11 22:16:38 2012 +0100 include: Assorted spelling fixes. --- include/atlbase.h | 2 +- include/imm.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/atlbase.h b/include/atlbase.h index 4aeabe9..ce62474 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -23,7 +23,7 @@ #include <atliface.h> -/* Wine extention: we (ab)use _ATL_VER to handle truct layout differences between ATL versions. */ +/* Wine extension: we (ab)use _ATL_VER to handle struct layout differences between ATL versions. */ #define _ATL_VER_30 0x0300 #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 diff --git a/include/imm.h b/include/imm.h index eff9887..d035072 100644 --- a/include/imm.h +++ b/include/imm.h @@ -194,7 +194,7 @@ typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); #define IME_KHOTKEY_SHAPE_TOGGLE 0x50 #define IME_KHOTKEY_HANJACONVERT 0x51 #define IME_KHOTKEY_ENGLISH 0x52 -/* Windows for Tranditional Chinese Edition hot key ID from 0x70 - 0x8F */ +/* Windows for Traditional Chinese Edition hot key ID from 0x70 - 0x8F */ #define IME_THOTKEY_IME_NONIME_TOGGLE 0x70 #define IME_THOTKEY_SHAPE_TOGGLE 0x71 #define IME_THOTKEY_SYMBOL_TOGGLE 0x72 @@ -469,7 +469,7 @@ typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); /* * type of soft keyboard - * for Windows Tranditional Chinese Edition + * for Windows Traditional Chinese Edition */ #define SOFTKEYBOARD_TYPE_T1 0x0001 /* for Windows Simplified Chinese Edition */

1 0

Michael Stefaniuc : comctl32/tests: Get rid of a temp buffer.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: ab55448069d34804572823381315fe47a098e765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab55448069d34804572823381… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 11 22:18:15 2012 +0100 comctl32/tests: Get rid of a temp buffer. --- dlls/comctl32/tests/imagelist.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 98b84a6..f2da3c2 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -782,22 +782,21 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment) { HDC hdc; - char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; - BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + BITMAPINFO bmi; HBITMAP hbmp, hbmp_old; HBRUSH hbrush; RECT rc = { 0, 0, cx, cy }; hdc = CreateCompatibleDC(0); - memset(bmi, 0, sizeof(*bmi)); - bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); - bmi->bmiHeader.biHeight = cx; - bmi->bmiHeader.biWidth = cy; - bmi->bmiHeader.biBitCount = 24; - bmi->bmiHeader.biPlanes = 1; - bmi->bmiHeader.biCompression = BI_RGB; - hbmp = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = cx; + bmi.bmiHeader.biWidth = cy; + bmi.bmiHeader.biBitCount = 24; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + hbmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); hbmp_old = SelectObject(hdc, hbmp);

1 0

Henri Verbeet : ddraw: Avoid LPD3DDEVICEDESC.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 725ec0323e691e7baca9427aa4bc00524440d1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725ec0323e691e7baca9427aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:28 2012 +0100 ddraw: Avoid LPD3DDEVICEDESC. --- include/d3d.h | 6 +++--- include/d3dcaps.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 46fb2d6..811474c 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -937,7 +937,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d, GUID *guid, D3DDEVICEDESC *desc) PURE; - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; @@ -1026,7 +1026,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice2 methods ***/ - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; @@ -1146,7 +1146,7 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice3 methods ***/ - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; diff --git a/include/d3dcaps.h b/include/d3dcaps.h index 6474518..d8d4b88 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -347,7 +347,8 @@ typedef struct _D3DDeviceDesc7 { #define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010 #define D3DVTXPCAPS_LOCALVIEWER 0x00000020 -typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(LPGUID lpGuid,LPSTR lpDeviceDescription,LPSTR lpDeviceName,LPD3DDEVICEDESC,LPD3DDEVICEDESC,LPVOID); +typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(GUID *guid, char *description, char *name, + D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc, void *ctx); typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID); #define D3DFDS_COLORMODEL 0x00000001

1 0

Henri Verbeet : ddraw: Avoid LPD3DDEVICEDESC7.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 99dcfdf0cea1af0a9c605c8b9ea8126189c3a182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99dcfdf0cea1af0a9c605c8b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:29 2012 +0100 ddraw: Avoid LPD3DDEVICEDESC7. --- dlls/ddraw/tests/d3d.c | 9 ++++++--- include/d3d.h | 2 +- include/d3dcaps.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 6f4416c..b170b29 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -624,7 +624,8 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS return DDENUMRET_OK; } -static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesCallbackTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ETest *d3d7et = Context; if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DRGBDevice)) @@ -641,7 +642,8 @@ static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR De return DDENUMRET_OK; } -static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesCancelTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ECancelTest *d3d7et = Context; @@ -650,7 +652,8 @@ static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR Devi return d3d7et->desired_ret; } -static HRESULT WINAPI enumDevicesLifetimeTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesLifetimeTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ELifetimeTest *ctx = Context; diff --git a/include/d3d.h b/include/d3d.h index 811474c..f74cd19 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1295,7 +1295,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice7 methods ***/ - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC7 lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC7 *desc) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; diff --git a/include/d3dcaps.h b/include/d3dcaps.h index d8d4b88..bde09e8 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -349,7 +349,7 @@ typedef struct _D3DDeviceDesc7 { typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(GUID *guid, char *description, char *name, D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc, void *ctx); -typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID); +typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(char *description, char *name, D3DDEVICEDESC7 *desc, void *ctx); #define D3DFDS_COLORMODEL 0x00000001 #define D3DFDS_GUID 0x00000002

1 0