May 2013 - Wine-commits - list.winehq.org

Matěj Laitl : gdi32: More specific error messages in osmesa opengl initialization.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 84c07af48ec940aec111e4d7105be951281b76f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c07af48ec940aec111e4d71… Author: Matěj Laitl <matej(a)laitl.cz> Date: Wed May 29 17:33:22 2013 +0200 gdi32: More specific error messages in osmesa opengl initialization. --- dlls/gdi32/dibdrv/opengl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 778fb0b..67cab00 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -115,15 +115,15 @@ static BOOL init_opengl(void) for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) { - if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( osmesa_handle, opengl_func_names[i], NULL, 0 ))) + if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( osmesa_handle, opengl_func_names[i], buffer, sizeof(buffer) ))) { - ERR( "%s not found in %s, disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA ); + ERR( "%s not found in %s (%s), disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA, buffer ); goto failed; } } -#define LOAD_FUNCPTR(f) do if (!(p##f = (void *)wine_dlsym( osmesa_handle, #f, NULL, 0 ))) \ +#define LOAD_FUNCPTR(f) do if (!(p##f = (void *)wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ { \ - ERR( "%s not found in %s, disabling.\n", #f, SONAME_LIBOSMESA ); \ + ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ goto failed; \ } while(0)

1 0

Dmitry Timoshkov : ole32: Add a couple more defaulthandler tests.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 748c3ea9c9b3ddf9baceccc190e366f10b4349f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748c3ea9c9b3ddf9baceccc19… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 30 17:30:12 2013 +0900 ole32: Add a couple more defaulthandler tests. --- dlls/ole32/tests/defaulthandler.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 0196e51..67fc5e8 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -171,7 +171,7 @@ static ULONG WINAPI test_class_Release(IUnknown *iface) return 1; } -static IUnknownVtbl test_class_vtbl = { +static const IUnknownVtbl test_class_vtbl = { test_class_QueryInterface, test_class_AddRef, test_class_Release, @@ -231,7 +231,7 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) return E_NOTIMPL; } -static IClassFactoryVtbl ClassFactoryVtbl = { +static const IClassFactoryVtbl ClassFactoryVtbl = { ClassFactory_QueryInterface, ClassFactory_AddRef, ClassFactory_Release, @@ -247,6 +247,8 @@ static void test_default_handler_run(void) IUnknown *unk; IRunnableObject *ro; + IOleObject *oleobj; + IPersistStorage *persist; DWORD class_reg; HRESULT hres; @@ -281,6 +283,14 @@ static void test_default_handler_run(void) hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); + ok(hres == S_OK, "QueryInterface(IID_IPersistStorage) failed: %x\n", hres); + IPersistStorage_Release(persist); + IOleObject_Release(oleobj); + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); IUnknown_Release(unk); @@ -288,11 +298,23 @@ static void test_default_handler_run(void) SET_EXPECT(CF_QueryInterface_ClassFactory); SET_EXPECT(CF_CreateInstance); hres = IRunnableObject_Run(ro, NULL); - todo_wine ok(hres == S_OK, "Run failed: %x\n", hres); +todo_wine + ok(hres == S_OK, "Run failed: %x\n", hres); CHECK_CALLED(CF_QueryInterface_ClassFactory); CHECK_CALLED(CF_CreateInstance); IRunnableObject_Release(ro); + SET_EXPECT(CF_QueryInterface_ClassFactory); + SET_EXPECT(CF_CreateInstance); + hres = CoCreateInstance(&test_server_clsid, NULL, CLSCTX_LOCAL_SERVER, + &IID_IOleObject, (void**)&oleobj); +todo_wine + ok(hres == REGDB_E_CLASSNOTREG, "expected REGDB_E_CLASSNOTREG, got %x\n", hres); +todo_wine + CHECK_NOT_CALLED(CF_QueryInterface_ClassFactory); +todo_wine + CHECK_NOT_CALLED(CF_CreateInstance); + SET_EXPECT(CF_QueryInterface_IMarshal); CoRevokeClassObject(class_reg); todo_wine CHECK_CALLED(CF_QueryInterface_IMarshal);

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a shader_addline() call.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 49dbf2464fdcb478f7fb593de2baec91a9d5bb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dbf2464fdcb478f7fb593de… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 30 19:08:31 2013 +0200 wined3d: Add a trailing '\n' to a shader_addline() call. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8316e83..fb96463 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4977,7 +4977,7 @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_ shader_addline(buffer, "r = reflect(normalize(ec_pos.xyz), normal);\n"); shader_addline(buffer, "m = 2.0 * length(vec3(r.x, r.y, r.z + 1.0));\n"); shader_addline(buffer, "gl_TexCoord[%u] = gl_TextureMatrix[%u]" - " * vec4(r.x / m + 0.5, r.y / m + 0.5, 0.0, 1.0);", i, i); + " * vec4(r.x / m + 0.5, r.y / m + 0.5, 0.0, 1.0);\n", i, i); break; default:

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetFuncAndParamNames.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 90e72d2d49f2a2c5a6d62fc30aa57efe8ad559fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e72d2d49f2a2c5a6d62fc30… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 29 14:59:09 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetFuncAndParamNames. --- dlls/oleaut32/tests/typelib.c | 7 +++++++ dlls/oleaut32/typelib.c | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0bc1854..1919ea8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3250,6 +3250,13 @@ static void test_SetFuncAndParamNames(void) hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 2, propW, 1); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ICreateTypeInfo_AddFuncDesc(cti, 3, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* getter name again */ + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 3, propW, 1); + ok(hr == TYPE_E_AMBIGUOUSNAME, "got 0x%08x\n", hr); + ICreateTypeInfo_Release(cti); ICreateTypeLib2_Release(ctl); DeleteFileA(filenameA); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 922e9ab..50a955e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8840,8 +8840,45 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames(ICreateTypeInfo2 * UINT index, LPOLESTR *names, UINT numNames) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %p %u - stub\n", This, index, names, numNames); - return E_NOTIMPL; + TLBFuncDesc *func_desc = &This->funcdescs[index]; + int i; + + TRACE("%p %u %p %u\n", This, index, names, numNames); + + if (!names) + return E_INVALIDARG; + + if (index >= This->TypeAttr.cFuncs || numNames == 0) + return TYPE_E_ELEMENTNOTFOUND; + + if (func_desc->funcdesc.invkind & (INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF)){ + if(numNames > func_desc->funcdesc.cParams) + return TYPE_E_ELEMENTNOTFOUND; + } else + if(numNames > func_desc->funcdesc.cParams + 1) + return TYPE_E_ELEMENTNOTFOUND; + + for(i = 0; i < This->TypeAttr.cFuncs; ++i) { + TLBFuncDesc *iter = &This->funcdescs[i]; + if (iter->Name && !strcmpW(iter->Name, *names)) { + if (iter->funcdesc.invkind & (INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF | INVOKE_PROPERTYGET) && + func_desc->funcdesc.invkind & (INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF | INVOKE_PROPERTYGET) && + func_desc->funcdesc.invkind != iter->funcdesc.invkind) + continue; + return TYPE_E_AMBIGUOUSNAME; + } + } + + SysFreeString(func_desc->Name); + func_desc->Name = SysAllocString(*names); + + for (i = 1; i < numNames; ++i) { + TLBParDesc *par_desc = func_desc->pParamDesc + i - 1; + SysFreeString(par_desc->Name); + par_desc->Name = SysAllocString(*(names + i)); + } + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetImplTypeFlags.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 92b9304ae40a9eac3362d644f1d6694e6ba66ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b9304ae40a9eac3362d644f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 29 14:59:42 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetImplTypeFlags. --- dlls/oleaut32/typelib.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 50a955e..f903882 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8796,8 +8796,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeFlags(ICreateTypeInfo2 *ifac UINT index, INT implTypeFlags) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %x - stub\n", This, index, implTypeFlags); - return E_NOTIMPL; + TLBImplType *impl_type = &This->impltypes[index]; + + TRACE("%p %u %x\n", This, index, implTypeFlags); + + if (This->TypeAttr.typekind != TKIND_COCLASS) + return TYPE_E_BADMODULEKIND; + + if (index >= This->TypeAttr.cImplTypes) + return TYPE_E_ELEMENTNOTFOUND; + + impl_type->implflags = implTypeFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetCustData.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 02a2a6d936a8eefe9c3699616f21cc0daf401f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a2a6d936a8eefe9c3699616… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 29 15:00:01 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetCustData. --- dlls/oleaut32/typelib.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f903882..7fa395a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1739,6 +1739,40 @@ static TLBImplType *TLBImplType_Alloc(UINT n) return ret; } +static HRESULT TLB_set_custdata(struct list *custdata_list, REFGUID guid, VARIANT *var) +{ + TLBCustData *cust_data; + + switch(V_VT(var)){ + case VT_I4: + case VT_R4: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + case VT_BSTR: + break; + default: + return DISP_E_BADVARTYPE; + } + + cust_data = TLB_get_custdata_by_guid(custdata_list, guid); + + if (!cust_data) { + cust_data = heap_alloc(sizeof(TLBCustData)); + if (!cust_data) + return E_OUTOFMEMORY; + + cust_data->guid = *guid; + VariantInit(&cust_data->data); + + list_add_tail(custdata_list, &cust_data->entry); + }else + VariantClear(&cust_data->data); + + return VariantCopy(&cust_data->data, var); +} + /********************************************************************** * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) @@ -9031,8 +9065,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData(ICreateTypeInfo2 *iface, REFGUID guid, VARIANT *varVal) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %s %p - stub\n", This, debugstr_guid(guid), varVal); - return E_NOTIMPL; + + TRACE("%p %s %p\n", This, debugstr_guid(guid), varVal); + + if (!guid || !varVal) + return E_INVALIDARG; + + return TLB_set_custdata(&This->custdata_list, guid, varVal); } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::LayOut.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: d8b98efb4f458b004c41532bf652ae8583056a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b98efb4f458b004c41532bf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 29 15:00:33 2013 -0500 oleaut32: Implement ICreateTypeInfo::LayOut. --- dlls/oleaut32/typelib.c | 142 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 134 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7fa395a..2711aac 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1119,6 +1119,7 @@ typedef struct tagITypeInfoImpl ICreateTypeInfo2 ICreateTypeInfo2_iface; LONG ref; BOOL not_attached_to_typelib; + BOOL needs_layout; TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ int index; /* index in this typelib; */ @@ -5608,6 +5609,9 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, if (!ppFuncDesc) return E_INVALIDARG; + if (This->needs_layout) + ICreateTypeInfo2_LayOut(&This->ICreateTypeInfo2_iface); + if (This->TypeAttr.typekind == TKIND_DISPATCH) hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc, NULL, @@ -5702,6 +5706,9 @@ static HRESULT WINAPI ITypeInfo_fnGetVarDesc( ITypeInfo2 *iface, UINT index, if(index >= This->TypeAttr.cVars) return TYPE_E_ELEMENTNOTFOUND; + if (This->needs_layout) + ICreateTypeInfo2_LayOut(&This->ICreateTypeInfo2_iface); + return TLB_AllocAndInitVarDesc(&pVDesc->vardesc, ppVarDesc); } @@ -7175,12 +7182,6 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeInfo_AddRef(*ppTInfo); result = S_OK; - } - else if (This->hreftype == hRefType) - { - *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; - ITypeInfo_AddRef(*ppTInfo); - result = S_OK; } else if ((hRefType & DISPATCH_HREF_MASK) && (This->TypeAttr.typekind == TKIND_DISPATCH)) { @@ -8457,6 +8458,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, UINT typeFlags) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); + WORD old_flags; + HRESULT hres; TRACE("%p %x\n", This, typeFlags); @@ -8482,8 +8485,15 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, return hres; } + old_flags = This->TypeAttr.wTypeFlags; This->TypeAttr.wTypeFlags = typeFlags; + hres = ICreateTypeInfo2_LayOut(iface); + if (FAILED(hres)) { + This->TypeAttr.wTypeFlags = old_flags; + return hres; + } + return S_OK; } @@ -8753,6 +8763,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, ++This->TypeAttr.cFuncs; + This->needs_layout = TRUE; + return S_OK; } @@ -8761,6 +8773,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBImplType *impl_type; + HRESULT hres; TRACE("%p %u %d\n", This, index, refType); @@ -8823,6 +8836,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, if((refType & (~0x3)) == (This->pTypeLib->dispatch_href & (~0x3))) This->TypeAttr.wTypeFlags |= TYPEFLAG_FDISPATCHABLE; + hres = ICreateTypeInfo2_LayOut(iface); + if (FAILED(hres)) + return hres; + return S_OK; } @@ -9017,8 +9034,117 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface, static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p - stub\n", This); - return E_NOTIMPL; + ITypeInfo *tinfo; + TLBFuncDesc *func_desc; + UINT user_vft = 0, i, depth = 0; + HRESULT hres = S_OK; + + TRACE("%p\n", This); + + This->needs_layout = FALSE; + + hres = ICreateTypeInfo2_QueryInterface(iface, &IID_ITypeInfo, (LPVOID*)&tinfo); + if (FAILED(hres)) + return hres; + + if (This->TypeAttr.typekind == TKIND_INTERFACE) { + ITypeInfo *inh; + TYPEATTR *attr; + HREFTYPE inh_href; + + hres = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &inh_href); + + if (SUCCEEDED(hres)) { + hres = ITypeInfo_GetRefTypeInfo(tinfo, inh_href, &inh); + + if (SUCCEEDED(hres)) { + hres = ITypeInfo_GetTypeAttr(inh, &attr); + if (FAILED(hres)) { + ITypeInfo_Release(inh); + ITypeInfo_Release(tinfo); + return hres; + } + This->TypeAttr.cbSizeVft = attr->cbSizeVft * 4 / sizeof(void*); + ITypeInfo_ReleaseTypeAttr(inh, attr); + + do{ + ++depth; + hres = ITypeInfo_GetRefTypeOfImplType(inh, 0, &inh_href); + if(SUCCEEDED(hres)){ + ITypeInfo *next; + hres = ITypeInfo_GetRefTypeInfo(inh, inh_href, &next); + if(SUCCEEDED(hres)){ + ITypeInfo_Release(inh); + inh = next; + } + } + }while(SUCCEEDED(hres)); + hres = S_OK; + + ITypeInfo_Release(inh); + } else if (hres == TYPE_E_ELEMENTNOTFOUND) { + This->TypeAttr.cbSizeVft = 0; + hres = S_OK; + } else { + ITypeInfo_Release(tinfo); + return hres; + } + } else if (hres == TYPE_E_ELEMENTNOTFOUND) { + This->TypeAttr.cbSizeVft = 0; + hres = S_OK; + } else { + ITypeInfo_Release(tinfo); + return hres; + } + } else if (This->TypeAttr.typekind == TKIND_DISPATCH) + This->TypeAttr.cbSizeVft = 7 * sizeof(void*); + else + This->TypeAttr.cbSizeVft = 0; + + func_desc = This->funcdescs; + i = 0; + while (i < This->TypeAttr.cFuncs) { + if (!(func_desc->funcdesc.oVft & 0x1)) + func_desc->funcdesc.oVft = This->TypeAttr.cbSizeVft; + + if ((func_desc->funcdesc.oVft & 0xFFFC) > user_vft) + user_vft = func_desc->funcdesc.oVft & 0xFFFC; + + This->TypeAttr.cbSizeVft += sizeof(void*); + + if (func_desc->funcdesc.memid == MEMBERID_NIL) { + TLBFuncDesc *iter; + UINT j = 0; + BOOL reset = FALSE; + + func_desc->funcdesc.memid = 0x60000000 + (depth << 16) + i; + + iter = This->funcdescs; + while (j < This->TypeAttr.cFuncs) { + if (iter != func_desc && iter->funcdesc.memid == func_desc->funcdesc.memid) { + if (!reset) { + func_desc->funcdesc.memid = 0x60000000 + (depth << 16) + This->TypeAttr.cFuncs; + reset = TRUE; + } else + ++func_desc->funcdesc.memid; + iter = This->funcdescs; + j = 0; + } else { + ++iter; + ++j; + } + } + } + + ++func_desc; + ++i; + } + + if (user_vft > This->TypeAttr.cbSizeVft) + This->TypeAttr.cbSizeVft = user_vft + sizeof(void*); + + ITypeInfo_Release(tinfo); + return hres; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface,

1 0

Henri Verbeet : ddraw: Replace the various BOOLs in struct ddraw with a flags field.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: b886d06737f5b8d6b83b1029bdd8befad60a1509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b886d06737f5b8d6b83b1029b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 10:05:32 2013 +0200 ddraw: Replace the various BOOLs in struct ddraw with a flags field. --- dlls/ddraw/ddraw.c | 18 +++++++++--------- dlls/ddraw/ddraw_private.h | 8 +++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b2b637e..7eda266 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -392,7 +392,7 @@ void ddraw_destroy_swapchain(struct ddraw *ddraw) } } - ddraw->d3d_initialized = FALSE; + ddraw->flags &= ~DDRAW_D3D_INITIALIZED; } else { @@ -586,11 +586,11 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ - ddraw->d3d_initialized = TRUE; + ddraw->flags |= DDRAW_D3D_INITIALIZED; hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); if (FAILED(hr)) { - ddraw->d3d_initialized = FALSE; + ddraw->flags &= ~DDRAW_D3D_INITIALIZED; return hr; } @@ -1025,7 +1025,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW /* TODO: Lose the primary surface. */ if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { - ddraw->restore_mode = TRUE; + ddraw->flags |= DDRAW_RESTORE_MODE; restore_mode = TRUE; } @@ -1088,7 +1088,7 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) wined3d_mutex_lock(); - if (!ddraw->restore_mode) + if (!(ddraw->flags & DDRAW_RESTORE_MODE)) { wined3d_mutex_unlock(); return DD_OK; @@ -1102,7 +1102,7 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &original_mode))) { - ddraw->restore_mode = FALSE; + ddraw->flags &= ~DDRAW_RESTORE_MODE; restore_mode = FALSE; } @@ -1687,7 +1687,7 @@ static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid) TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - if (ddraw->initialized) + if (ddraw->flags & DDRAW_INITIALIZED) return DDERR_ALREADYINITIALIZED; /* FIXME: To properly take the GUID into account we should call @@ -1695,7 +1695,7 @@ static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid) if (guid) FIXME("Ignoring guid %s.\n", debugstr_guid(guid)); - ddraw->initialized = TRUE; + ddraw->flags |= DDRAW_INITIALIZED; return DD_OK; } @@ -4473,7 +4473,7 @@ static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) TRACE("iface %p!\n", iface); wined3d_mutex_lock(); - if (ddraw->d3d_initialized) + if (ddraw->flags & DDRAW_D3D_INITIALIZED) wined3d_device_evict_managed_resources(ddraw->wined3d_device); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 25985bd..6b4fedc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -56,6 +56,10 @@ struct FvfToDecl struct wined3d_vertex_declaration *decl; }; +#define DDRAW_INITIALIZED 0x00000001 +#define DDRAW_D3D_INITIALIZED 0x00000002 +#define DDRAW_RESTORE_MODE 0x00000004 + struct ddraw { /* Interfaces */ @@ -71,12 +75,10 @@ struct ddraw /* See comment in IDirectDraw::AddRef */ LONG ref7, ref4, ref2, ref3, ref1, numIfaces; - BOOL initialized; struct wined3d *wined3d; struct wined3d_device *wined3d_device; - BOOL d3d_initialized; - BOOL restore_mode; + DWORD flags; struct ddraw_surface *primary; RECT primary_lock;

1 0

Henri Verbeet : ddraw: Handle the "DirectDrawRenderer" registry key in wined3d.
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: e4816996c3efbfd778f2747f65167a0efdb18b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4816996c3efbfd778f2747f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 10:05:33 2013 +0200 ddraw: Handle the "DirectDrawRenderer" registry key in wined3d. --- dlls/ddraw/ddraw.c | 35 ++++++++++++----------- dlls/ddraw/ddraw_private.h | 8 +---- dlls/ddraw/device.c | 2 +- dlls/ddraw/main.c | 61 ++------------------------------------- dlls/wined3d/wined3d_main.c | 10 ++++++ dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 35 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4816996c3efbfd778f27…

1 0

Henri Verbeet : wined3d: Rename "fogmode" to "wined3d_ffp_ps_fog_mode".
by Alexandre Julliard 30 May '13

30 May '13

Module: wine Branch: master Commit: 8352d45da51e78b01ed13c1ea8820b2bf9f76706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8352d45da51e78b01ed13c1ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 10:05:34 2013 +0200 wined3d: Rename "fogmode" to "wined3d_ffp_ps_fog_mode". This is mostly for consistency with wined3d_ffp_vs_fog_mode. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++++++---------- dlls/wined3d/glsl_shader.c | 10 +++++----- dlls/wined3d/shader.c | 18 +++++++++--------- dlls/wined3d/utils.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 20 +++++++++++--------- 5 files changed, 45 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 405a123..c2c9be2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3662,16 +3662,17 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, if (reg_maps->shader_version.major < 3) { - switch(args->super.fog) { - case FOG_OFF: + switch (args->super.fog) + { + case WINED3D_FFP_PS_FOG_OFF: break; - case FOG_LINEAR: + case WINED3D_FFP_PS_FOG_LINEAR: shader_addline(buffer, "OPTION ARB_fog_linear;\n"); break; - case FOG_EXP: + case WINED3D_FFP_PS_FOG_EXP: shader_addline(buffer, "OPTION ARB_fog_exp;\n"); break; - case FOG_EXP2: + case WINED3D_FFP_PS_FOG_EXP2: shader_addline(buffer, "OPTION ARB_fog_exp2;\n"); break; } @@ -6208,11 +6209,12 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "!!ARBfp1.0\n"); - switch(settings->fog) { - case FOG_OFF: break; - case FOG_LINEAR: shader_addline(&buffer, "OPTION ARB_fog_linear;\n"); break; - case FOG_EXP: shader_addline(&buffer, "OPTION ARB_fog_exp;\n"); break; - case FOG_EXP2: shader_addline(&buffer, "OPTION ARB_fog_exp2;\n"); break; + switch (settings->fog) + { + case WINED3D_FFP_PS_FOG_OFF: break; + case WINED3D_FFP_PS_FOG_LINEAR: shader_addline(&buffer, "OPTION ARB_fog_linear;\n"); break; + case WINED3D_FFP_PS_FOG_EXP: shader_addline(&buffer, "OPTION ARB_fog_exp;\n"); break; + case WINED3D_FFP_PS_FOG_EXP2: shader_addline(&buffer, "OPTION ARB_fog_exp2;\n"); break; default: FIXME("Unexpected fog setting %d\n", settings->fog); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e85b57e..8316e83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4420,24 +4420,24 @@ static void shader_glsl_generate_srgb_write_correction(struct wined3d_shader_buf shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); } -static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, enum fogmode mode) +static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, enum wined3d_ffp_ps_fog_mode mode) { switch (mode) { - case FOG_OFF: + case WINED3D_FFP_PS_FOG_OFF: return; - case FOG_LINEAR: + case WINED3D_FFP_PS_FOG_LINEAR: /* Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start) */ shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start);\n"); break; - case FOG_EXP: + case WINED3D_FFP_PS_FOG_EXP: /* Fog = e^-(gl_Fog.density * gl_FogFragCoord) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); break; - case FOG_EXP2: + case WINED3D_FFP_PS_FOG_EXP2: /* Fog = e^-((gl_Fog.density * gl_FogFragCoord)^2) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); break; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 26fd65b..987c72e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2154,7 +2154,7 @@ void find_ps_compile_args(const struct wined3d_state *state, args->vp_mode = vertexshader; else args->vp_mode = fixedfunction; - args->fog = FOG_OFF; + args->fog = WINED3D_FFP_PS_FOG_OFF; } else { @@ -2166,27 +2166,27 @@ void find_ps_compile_args(const struct wined3d_state *state, case WINED3D_FOG_NONE: if (device->stream_info.position_transformed || use_vs(state)) { - args->fog = FOG_LINEAR; + args->fog = WINED3D_FFP_PS_FOG_LINEAR; break; } switch (state->render_states[WINED3D_RS_FOGVERTEXMODE]) { case WINED3D_FOG_NONE: /* Fall through. */ - case WINED3D_FOG_LINEAR: args->fog = FOG_LINEAR; break; - case WINED3D_FOG_EXP: args->fog = FOG_EXP; break; - case WINED3D_FOG_EXP2: args->fog = FOG_EXP2; break; + case WINED3D_FOG_LINEAR: args->fog = WINED3D_FFP_PS_FOG_LINEAR; break; + case WINED3D_FOG_EXP: args->fog = WINED3D_FFP_PS_FOG_EXP; break; + case WINED3D_FOG_EXP2: args->fog = WINED3D_FFP_PS_FOG_EXP2; break; } break; - case WINED3D_FOG_LINEAR: args->fog = FOG_LINEAR; break; - case WINED3D_FOG_EXP: args->fog = FOG_EXP; break; - case WINED3D_FOG_EXP2: args->fog = FOG_EXP2; break; + case WINED3D_FOG_LINEAR: args->fog = WINED3D_FFP_PS_FOG_LINEAR; break; + case WINED3D_FOG_EXP: args->fog = WINED3D_FFP_PS_FOG_EXP; break; + case WINED3D_FOG_EXP2: args->fog = WINED3D_FFP_PS_FOG_EXP2; break; } } else { - args->fog = FOG_OFF; + args->fog = WINED3D_FFP_PS_FOG_OFF; } } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0442957..8f27e61 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3307,13 +3307,13 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d if (!state->render_states[WINED3D_RS_FOGENABLE]) { - settings->fog = FOG_OFF; + settings->fog = WINED3D_FFP_PS_FOG_OFF; } else if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE) { if (use_vs(state) || state->vertex_declaration->position_transformed) { - settings->fog = FOG_LINEAR; + settings->fog = WINED3D_FFP_PS_FOG_LINEAR; } else { @@ -3321,13 +3321,13 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d { case WINED3D_FOG_NONE: case WINED3D_FOG_LINEAR: - settings->fog = FOG_LINEAR; + settings->fog = WINED3D_FFP_PS_FOG_LINEAR; break; case WINED3D_FOG_EXP: - settings->fog = FOG_EXP; + settings->fog = WINED3D_FFP_PS_FOG_EXP; break; case WINED3D_FOG_EXP2: - settings->fog = FOG_EXP2; + settings->fog = WINED3D_FFP_PS_FOG_EXP2; break; } } @@ -3337,13 +3337,13 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d switch (state->render_states[WINED3D_RS_FOGTABLEMODE]) { case WINED3D_FOG_LINEAR: - settings->fog = FOG_LINEAR; + settings->fog = WINED3D_FFP_PS_FOG_LINEAR; break; case WINED3D_FOG_EXP: - settings->fog = FOG_EXP; + settings->fog = WINED3D_FFP_PS_FOG_EXP; break; case WINED3D_FOG_EXP2: - settings->fog = FOG_EXP2; + settings->fog = WINED3D_FFP_PS_FOG_EXP2; break; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbaa12d..84adc27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -734,11 +734,12 @@ enum vertexprocessing_mode { #define WINED3D_CONST_NUM_UNUSED ~0U -enum fogmode { - FOG_OFF, - FOG_LINEAR, - FOG_EXP, - FOG_EXP2 +enum wined3d_ffp_ps_fog_mode +{ + WINED3D_FFP_PS_FOG_OFF, + WINED3D_FFP_PS_FOG_LINEAR, + WINED3D_FFP_PS_FOG_EXP, + WINED3D_FFP_PS_FOG_EXP2, }; /* Stateblock dependent parameters which have to be hardcoded @@ -764,7 +765,7 @@ enum wined3d_shader_tex_types struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; enum vertexprocessing_mode vp_mode; - enum fogmode fog; + enum wined3d_ffp_ps_fog_mode fog; WORD tex_transform; /* ps 1.0-1.3, 4 textures */ WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ WORD srgb_correction; @@ -1672,9 +1673,10 @@ struct texture_stage_op unsigned padding : 10; }; -struct ffp_frag_settings { - struct texture_stage_op op[MAX_TEXTURES]; - enum fogmode fog; +struct ffp_frag_settings +{ + struct texture_stage_op op[MAX_TEXTURES]; + enum wined3d_ffp_ps_fog_mode fog; /* Use shorts instead of chars to get dword alignment */ unsigned short sRGB_write; unsigned short emul_clipplanes;

1 0