August 2010 - Wine-Commits - list.winehq.org

Igor Paliychuk : jscript: Ukrainian translation update.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 3656f3fcc423039430791a28e443b9ead85ae332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3656f3fcc423039430791a28e… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Wed Aug 18 19:23:38 2010 +0300 jscript: Ukrainian translation update. --- dlls/jscript/jscript_Uk.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Uk.rc b/dlls/jscript/jscript_Uk.rc index 6f0913a..fe756e2 100644 --- a/dlls/jscript/jscript_Uk.rc +++ b/dlls/jscript/jscript_Uk.rc @@ -30,6 +30,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Невірний виклик процедури або аргумент" IDS_CREATE_OBJ_ERROR "Сервер автоматизації не може створити об'єкт" IDS_NO_PROPERTY "Об'єкт не підтримує цю властивість чи метод" + IDS_UNSUPPORTED_ACTION "Об'єкт не підтримує цю дію" IDS_ARG_NOT_OPT "Відсутній обов'язковий аргумент" IDS_SYNTAX_ERROR "Синтаксична помилка" IDS_SEMICOLON "Очікується ';'"

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_CreateUri.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 4eff8ce517a11d2bdb8215f48f52f0023ae3f593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eff8ce517a11d2bdb8215f48… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Aug 12 20:27:56 2010 -0400 urlmon/tests: Added tests for IUriBuilder_CreateUri. --- dlls/urlmon/tests/uri.c | 343 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 21 +++ 2 files changed, 364 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4eff8ce517a11d2bdb821…

1 0

Henri Verbeet : ddraw: Add a separate function for clipper initialization.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 4b84c5e5b7df80bd08915208e798eebc873cd2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b84c5e5b7df80bd08915208e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:25 2010 +0200 ddraw: Add a separate function for clipper initialization. --- dlls/ddraw/clipper.c | 16 +++++++++++++++- dlls/ddraw/ddraw.c | 12 +++++++----- dlls/ddraw/ddraw_private.h | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 25e71fa..a7ec624 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -283,7 +283,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_IsClipListChanged( /***************************************************************************** * The VTable *****************************************************************************/ -const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl = +static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl = { IDirectDrawClipperImpl_QueryInterface, IDirectDrawClipperImpl_AddRef, @@ -295,3 +295,17 @@ const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl = IDirectDrawClipperImpl_SetClipList, IDirectDrawClipperImpl_SetHwnd }; + +HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) +{ + clipper->lpVtbl = &ddraw_clipper_vtbl; + clipper->ref = 1; + clipper->wineD3DClipper = pWineDirect3DCreateClipper((IUnknown *)clipper); + if (!clipper->wineD3DClipper) + { + WARN("Failed to create wined3d clipper.\n"); + return E_OUTOFMEMORY; + } + + return DD_OK; +} diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df79f0e..20f31ee 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3840,6 +3840,8 @@ DirectDrawCreateClipper(DWORD Flags, IUnknown *UnkOuter) { IDirectDrawClipperImpl* object; + HRESULT hr; + TRACE("(%08x,%p,%p)\n", Flags, Clipper, UnkOuter); EnterCriticalSection(&ddraw_cs); @@ -3863,16 +3865,16 @@ DirectDrawCreateClipper(DWORD Flags, return E_OUTOFMEMORY; } - object->lpVtbl = &IDirectDrawClipper_Vtbl; - object->ref = 1; - object->wineD3DClipper = pWineDirect3DCreateClipper((IUnknown *) object); - if(!object->wineD3DClipper) + hr = ddraw_clipper_init(object); + if (FAILED(hr)) { + WARN("Failed to initialize clipper, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); LeaveCriticalSection(&ddraw_cs); - return E_OUTOFMEMORY; + return hr; } + TRACE("Created clipper %p.\n", object); *Clipper = (IDirectDrawClipper *) object; LeaveCriticalSection(&ddraw_cs); return DD_OK; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 40f3bfd..6341f3f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -462,7 +462,7 @@ struct IDirectDrawClipperImpl BOOL initialized; }; -extern const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl DECLSPEC_HIDDEN; +HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) DECLSPEC_HIDDEN; typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper DECLSPEC_HIDDEN;

1 0

Thomas Mullaly : urlmon/tests: Added a few tests for CreateIUriBuilder.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 516aac903aff360406e96c4a006b733a0cef7883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516aac903aff360406e96c4a0… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Aug 10 22:37:33 2010 -0400 urlmon/tests: Added a few tests for CreateIUriBuilder. --- dlls/urlmon/tests/uri.c | 50 +++++++++++++++++++++++++++++++++++++--------- dlls/urlmon/uri.c | 13 +++++++++++- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 88f89db..78ddf72 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -18,16 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * IUri testing framework goals: - * - Test invalid args - * - invalid flags - * - invalid args (IUri, uri string) - * - Test parsing for components when no canonicalization occurs - * - Test parsing for components when canonicalization occurs. - * - More tests... - */ - #include <wine/test.h> #include <stdarg.h> #include <stddef.h> @@ -44,6 +34,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_PTR, IUri**); +static HRESULT (WINAPI *pCreateIUriBuilder)(IUri*, DWORD, DWORD_PTR, IUriBuilder**); static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; @@ -3756,6 +3747,11 @@ static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { return ret; } +static inline ULONG get_refcnt(IUri *uri) { + IUri_AddRef(uri); + return IUri_Release(uri); +} + /* * Simple tests to make sure the CreateUri function handles invalid flag combinations * correctly. @@ -4884,12 +4880,43 @@ static void test_CreateUriWithFragment(void) { } } +static void test_CreateIUriBuilder(void) { + HRESULT hr; + IUriBuilder *builder = NULL; + IUri *uri; + + hr = pCreateIUriBuilder(NULL, 0, 0, NULL); + ok(hr == E_POINTER, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x\n", + hr, E_POINTER); + + /* CreateIUriBuilder increases the ref count of the IUri it receives. */ + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ULONG cur_count, orig_count; + + orig_count = get_refcnt(uri); + hr = pCreateIUriBuilder(uri, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + ok(builder != NULL, "Error: Expecting builder not to be NULL\n"); + + cur_count = get_refcnt(uri); + ok(cur_count == orig_count+1, "Error: Expected the ref count to be %u, but was %u instead.\n", orig_count+1, cur_count); + + if(builder) IUriBuilder_Release(builder); + cur_count = get_refcnt(uri); + ok(cur_count == orig_count, "Error: Expected the ref count to be %u, but was %u instead.\n", orig_count, cur_count); + } + if(uri) IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; hurlmon = GetModuleHandle("urlmon.dll"); pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); pCreateUriWithFragment = (void*) GetProcAddress(hurlmon, "CreateUriWithFragment"); + pCreateIUriBuilder = (void*) GetProcAddress(hurlmon, "CreateIUriBuilder"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -4937,4 +4964,7 @@ START_TEST(uri) { trace("test CreateUriWithFragment...\n"); test_CreateUriWithFragment(); + + trace("test CreateIUriBuilder...\n"); + test_CreateIUriBuilder(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e977426..31de387 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -75,6 +75,8 @@ typedef struct { typedef struct { const IUriBuilderVtbl *lpIUriBuilderVtbl; LONG ref; + + IUri *uri; } UriBuilder; typedef struct { @@ -4080,8 +4082,10 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->uri) IUri_Release(This->uri); heap_free(This); + } return ref; } @@ -4300,6 +4304,9 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve TRACE("(%p %x %x %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + if(!ppIUriBuilder) + return E_POINTER; + ret = heap_alloc(sizeof(UriBuilder)); if(!ret) return E_OUTOFMEMORY; @@ -4307,6 +4314,10 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve ret->lpIUriBuilderVtbl = &UriBuilderVtbl; ret->ref = 1; + ret->uri = pIUri; + if(pIUri) + IUri_AddRef(pIUri); + *ppIUriBuilder = URIBUILDER(ret); return S_OK; }

1 0

Henri Verbeet : ddraw: Add a separate function for parent initialization.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 759fd517aa98b0ef8f7a73b06ac74eb77e687f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=759fd517aa98b0ef8f7a73b06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:24 2010 +0200 ddraw: Add a separate function for parent initialization. --- dlls/ddraw/ddraw.c | 7 +++---- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/parent.c | 8 +++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7d97a91..df79f0e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4701,8 +4701,8 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, LeaveCriticalSection(&ddraw_cs); return DDERR_OUTOFMEMORY; } - index_buffer_parent->lpVtbl = &IParent_Vtbl; - index_buffer_parent->ref = 1; + + ddraw_parent_init(index_buffer_parent); /* Create an Index Buffer. WineD3D needs one for Drawing indexed primitives * Create a (hopefully) long enough buffer, and copy the indices into it @@ -5928,8 +5928,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return DDERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &IParent_Vtbl; - object->ref = 1; + ddraw_parent_init(object); hr = IWineD3DDevice_CreateSwapChain(This->wineD3DDevice, present_parameters, swapchain, (IUnknown *)object, This->ImplType); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 81d2fd3..40f3bfd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -315,7 +315,7 @@ struct IParentImpl }; -extern const IParentVtbl IParent_Vtbl DECLSPEC_HIDDEN; +void ddraw_parent_init(IParentImpl *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DDevice implementation diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c index 2d8f519..705d587 100644 --- a/dlls/ddraw/parent.c +++ b/dlls/ddraw/parent.c @@ -121,9 +121,15 @@ static ULONG WINAPI IParentImpl_Release(IParent *iface) /***************************************************************************** * The VTable *****************************************************************************/ -const IParentVtbl IParent_Vtbl = +static const struct IParentVtbl ddraw_parent_vtbl = { IParentImpl_QueryInterface, IParentImpl_AddRef, IParentImpl_Release, }; + +void ddraw_parent_init(IParentImpl *parent) +{ + parent->lpVtbl = &ddraw_parent_vtbl; + parent->ref = 1; +}

1 0

Andrew Eikum : oleaut32: Implement ITypeInfo2::GetCustData.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 9d3e2f1b517594c85361c9916ba31a243a0a96cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3e2f1b517594c85361c9916… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:52 2010 -0500 oleaut32: Implement ITypeInfo2::GetCustData. --- dlls/oleaut32/tests/typelib.c | 36 ++++++++++++++----- dlls/oleaut32/typelib2.c | 77 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9843327..0c7e9ab 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1076,10 +1076,12 @@ static void test_CreateTypeLib(void) { static OLECHAR prop1W[] = {'P','r','o','p','1',0}; static OLECHAR param1W[] = {'p','a','r','a','m','1',0}; static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; + static OLECHAR asdfW[] = {'A','s','d','f',0}; static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; static OLECHAR *propname[] = {prop1W, param1W}; static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; + static const GUID bogusguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x71}}; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; @@ -1444,15 +1446,12 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); hres = ITypeInfo2_GetCustData(ti2, NULL, NULL); - todo_wine ok(hres == E_INVALIDARG, "got %08x\n", hres); hres = ITypeInfo2_GetCustData(ti2, &custguid, NULL); - todo_wine ok(hres == E_INVALIDARG, "got %08x\n", hres); hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); - todo_wine ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo2_SetCustData(createti2, NULL, NULL); @@ -1474,12 +1473,9 @@ static void test_CreateTypeLib(void) { V_VT(&cust_data) = VT_EMPTY; hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); - todo_wine ok(hres == S_OK, "got %08x\n", hres); - todo_wine ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); - todo_wine ok(V_I4(&cust_data) == 0xdeadbeef, "got 0x%08x\n", V_I4(&cust_data)); V_VT(&cust_data) = VT_UI4; @@ -1492,14 +1488,36 @@ static void test_CreateTypeLib(void) { V_VT(&cust_data) = VT_EMPTY; hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); - todo_wine ok(hres == S_OK, "got %08x\n", hres); - todo_wine ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); - todo_wine ok(V_I4(&cust_data) == 12345678, "got 0x%08x\n", V_I4(&cust_data)); + V_VT(&cust_data) = VT_BSTR; + V_BSTR(&cust_data) = SysAllocString(asdfW); + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + SysFreeString(V_BSTR(&cust_data)); + V_I4(&cust_data) = 0; + V_VT(&cust_data) = VT_EMPTY; + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + ok(V_VT(&cust_data) == VT_BSTR, "got %d\n", V_VT(&cust_data)); + ok(!lstrcmpW(V_BSTR(&cust_data), asdfW), "got %s\n", wine_dbgstr_w(V_BSTR(&cust_data))); + SysFreeString(V_BSTR(&cust_data)); + + V_VT(&cust_data) = VT_UI4; + V_UI4(&cust_data) = 17; + + hres = ITypeInfo2_GetCustData(ti2, &bogusguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + ok(V_VT(&cust_data) == VT_EMPTY, "got: %d\n", V_VT(&cust_data)); + ITypeInfo2_Release(ti2); ICreateTypeInfo2_Release(createti2); ICreateTypeInfo_Release(createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8009a68..d1b48ff 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -951,6 +951,64 @@ static int ctl2_find_custdata( } /**************************************************************************** + * ctl2_decode_variant + * + * Decodes a variant + * + * RETURNS + * + * Success: S_OK + * Failure: Error code from winerror.h + */ +static HRESULT ctl2_decode_variant( + ICreateTypeLib2Impl *This, /* [I] The typelib that contains the variant */ + int data_offs, /* [I] Offset within the data array, or the encoded value itself */ + VARIANT *value) /* [O] Decoded value */ +{ + char *encoded_data; + VARTYPE type; + + if (data_offs & 0x80000000) { + /* data_offs contains the encoded value */ + V_VT(value) = (data_offs & ~0x80000000) >> 26; + V_UI4(value) = data_offs & ~0xFF000000; + return S_OK; + } + + encoded_data = &This->typelib_segment_data[MSFT_SEG_CUSTDATA][data_offs]; + type = *encoded_data; + + switch(type) { + case VT_I4: + case VT_R4: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + case VT_PTR: { + V_VT(value) = type; + V_UI4(value) = *(unsigned*)(encoded_data + 2); + return S_OK; + } + case VT_BSTR: { + unsigned len, i; + + len = *(unsigned*)(encoded_data + 2); + + V_VT(value) = type; + V_BSTR(value) = SysAllocStringByteLen(NULL, len * sizeof(OLECHAR)); + for (i = 0; i < len; ++i) + V_BSTR(value)[i] = *(encoded_data + 6 + i); + + return S_OK; + } + default: + FIXME("Don't yet have decoder for this VARTYPE: %u\n", type); + return E_NOTIMPL; + } +} + +/**************************************************************************** * ctl2_set_custdata * * Adds a custom data element to an object in a type library. @@ -3610,8 +3668,23 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( REFGUID guid, /* [I] The GUID under which the custom data is stored. */ VARIANT* pVarVal) /* [O] The custom data. */ { - FIXME("(%p,%s,%p), stub!\n", iface, debugstr_guid(guid), pVarVal); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface); + MSFT_CDGuid *cdentry; + int offset; + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(guid), pVarVal); + + if (!guid || !pVarVal) + return E_INVALIDARG; + + VariantClear(pVarVal); + + offset = ctl2_find_custdata(This->typelib, guid, This->typeinfo->oCustData); + if (offset == -1) + return S_OK; + + cdentry = (MSFT_CDGuid *)&This->typelib->typelib_segment_data[MSFT_SEG_CUSTDATAGUID][offset]; + return ctl2_decode_variant(This->typelib, cdentry->DataOffset, pVarVal); } /******************************************************************************

1 0

Henri Verbeet : ddraw: Merge gamma.c into surface.c.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 3eba8b5d22870b86d9fb371bec65dcb9e504e5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eba8b5d22870b86d9fb371be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:18 2010 +0200 ddraw: Merge gamma.c into surface.c. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/gamma.c | 220 ------------------------------------------------ dlls/ddraw/surface.c | 120 ++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3eba8b5d22870b86d9fb3…

1 0

Andrew Eikum : oleaut32: Overwrite previous CustData segment.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: a8dbeb1e60098d78c6875e7dcb023d5c97c27d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8dbeb1e60098d78c6875e7dc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:22 2010 -0500 oleaut32: Overwrite previous CustData segment. This eliminates the diff between Wine's and Windows XP's generated TLB files. --- dlls/oleaut32/typelib2.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b2c086b..cc8c7a2 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -921,6 +921,26 @@ static HRESULT ctl2_encode_variant( } } +static int ctl2_find_custdata( + ICreateTypeLib2Impl *This, + REFGUID guid, + int offset) +{ + while (offset != -1) { + MSFT_CDGuid *cdentry = + (MSFT_CDGuid *)&This->typelib_segment_data[MSFT_SEG_CUSTDATAGUID][offset]; + MSFT_GuidEntry *guidentry = + (MSFT_GuidEntry *)&This->typelib_segment_data[MSFT_SEG_GUID][cdentry->GuidOffset]; + + if (IsEqualGUID(guidentry, guid)) + return offset; + + offset = cdentry->next; + } + + return -1; +} + /**************************************************************************** * ctl2_set_custdata * @@ -943,6 +963,7 @@ static HRESULT ctl2_set_custdata( int guidoffset; int custoffset; int *custdata; + BOOL new_segment = FALSE; switch(V_VT(pVarVal)) { @@ -971,14 +992,21 @@ static HRESULT ctl2_set_custdata( if (status) return status; - custoffset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATAGUID, 12, 0); - if (custoffset == -1) return E_OUTOFMEMORY; + custoffset = ctl2_find_custdata(This, guid, *offset); + if (custoffset == -1) { + custoffset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATAGUID, 12, 0); + if (custoffset == -1) + return E_OUTOFMEMORY; + new_segment = TRUE; + } custdata = (int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATAGUID][custoffset]; custdata[0] = guidoffset; custdata[1] = dataoffset; - custdata[2] = *offset; - *offset = custoffset; + if (new_segment) { + custdata[2] = *offset; + *offset = custoffset; + } return S_OK; }

1 0

Andrew Eikum : oleaut32: Ensure that CyclicList nodes have a type.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: 9c53c8e7b38db657232dfac728fc5b8504571db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c53c8e7b38db657232dfac72… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:37 2010 -0500 oleaut32: Ensure that CyclicList nodes have a type. Some code checks against the type of a CyclicList node, so we should make sure that it's always initialized. --- dlls/oleaut32/typelib2.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index cc8c7a2..8009a68 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -118,15 +118,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(typelib2); /*================== Implementation Structures ===================================*/ /* Used for storing cyclic list. Tail address is kept */ -enum tagCyclicListElementType { +typedef enum tagCyclicListElementType { + CyclicListSentinel, CyclicListFunc, CyclicListVar -}; +} CyclicListElementType; typedef struct tagCyclicList { struct tagCyclicList *next; int indice; int name; - enum tagCyclicListElementType type; + CyclicListElementType type; union { int val; @@ -218,6 +219,14 @@ static inline ICreateTypeInfo2Impl *impl_from_ITypeInfo2( ITypeInfo2 *iface ) static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface); +static CyclicList *alloc_cyclic_list_item(CyclicListElementType type) +{ + CyclicList *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CyclicList)); + if (!ret) + return NULL; + ret->type = type; + return ret; +} /*================== Internal functions ===================================*/ @@ -1793,19 +1802,18 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( } if (!This->typedata) { - This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + This->typedata = alloc_cyclic_list_item(CyclicListSentinel); if(!This->typedata) return E_OUTOFMEMORY; This->typedata->next = This->typedata; - This->typedata->u.val = 0; if(This->dual) This->dual->typedata = This->typedata; } /* allocate type data space for us */ - insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + insert = alloc_cyclic_list_item(CyclicListFunc); if(!insert) return E_OUTOFMEMORY; insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); @@ -1861,7 +1869,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* update the index data */ insert->indice = pFuncDesc->memid; insert->name = -1; - insert->type = CyclicListFunc; /* insert type data to list */ if(index == This->typeinfo->cElement) { @@ -2076,19 +2083,18 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( } if (!This->typedata) { - This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + This->typedata = alloc_cyclic_list_item(CyclicListSentinel); if(!This->typedata) return E_OUTOFMEMORY; This->typedata->next = This->typedata; - This->typedata->u.val = 0; if(This->dual) This->dual->typedata = This->typedata; } /* allocate type data space for us */ - insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + insert = alloc_cyclic_list_item(CyclicListVar); if(!insert) return E_OUTOFMEMORY; insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[5])); @@ -2115,7 +2121,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* update the index data */ insert->indice = 0x40000000 + index; insert->name = -1; - insert->type = CyclicListVar; /* figure out type widths and whatnot */ ctl2_encode_typedesc(This->typelib, &pVarDesc->elemdescVar.tdesc,

1 0

Henri Verbeet : ddraw: Add a separate function for material initialization.
by Alexandre Julliard Aug. 19, 2010

Aug. 19, 2010

Module: wine Branch: master Commit: bf26c2c869ef49a69dd192fed58b8f393b69a5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf26c2c869ef49a69dd192fed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:22 2010 +0200 ddraw: Add a separate function for material initialization. --- dlls/ddraw/ddraw.c | 6 +----- dlls/ddraw/ddraw_private.h | 6 +----- dlls/ddraw/material.c | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 28af7d0..7541671 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4432,11 +4432,7 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DMaterial3_Vtbl; - object->IDirect3DMaterial2_vtbl = &IDirect3DMaterial2_Vtbl; - object->IDirect3DMaterial_vtbl = &IDirect3DMaterial_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); + d3d_material_init(object, ddraw_from_d3d3(iface)); TRACE("Created material %p.\n", object); *material = (IDirect3DMaterial3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f7ea61d..6ea61fe 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -548,13 +548,9 @@ struct IDirect3DMaterialImpl DWORD Handle; }; -/* VTables in various versions */ -extern const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl DECLSPEC_HIDDEN; -extern const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl DECLSPEC_HIDDEN; -extern const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void material_activate(IDirect3DMaterialImpl* This) DECLSPEC_HIDDEN; +void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DViewport - Wraps to D3D7 diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 68da7ff..10f4ab5 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -448,7 +448,7 @@ void material_activate(IDirect3DMaterialImpl* This) IDirect3DDevice7_SetMaterial((IDirect3DDevice7 *)This->active_device, &d3d7mat); } -const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl = +static const struct IDirect3DMaterial3Vtbl d3d_material3_vtbl = { /*** IUnknown Methods ***/ IDirect3DMaterialImpl_QueryInterface, @@ -460,7 +460,7 @@ const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl = IDirect3DMaterialImpl_GetHandle, }; -const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl = +static const struct IDirect3DMaterial2Vtbl d3d_material2_vtbl = { /*** IUnknown Methods ***/ Thunk_IDirect3DMaterialImpl_2_QueryInterface, @@ -472,7 +472,7 @@ const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl = Thunk_IDirect3DMaterialImpl_2_GetHandle, }; -const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl = +static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = { /*** IUnknown Methods ***/ Thunk_IDirect3DMaterialImpl_1_QueryInterface, @@ -486,3 +486,12 @@ const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl = IDirect3DMaterialImpl_Reserve, IDirect3DMaterialImpl_Unreserve }; + +void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) +{ + material->lpVtbl = &d3d_material3_vtbl; + material->IDirect3DMaterial2_vtbl = &d3d_material2_vtbl; + material->IDirect3DMaterial_vtbl = &d3d_material1_vtbl; + material->ref = 1; + material->ddraw = ddraw; +}

1 0