wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Nikolay Sivov : shell32/tests: Fix a test crash on Win9x.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: ef7abf10870c10eed7bf6fff86cdd3313f61d384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7abf10870c10eed7bf6fff8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 02:41:26 2010 +0300 shell32/tests: Fix a test crash on Win9x. --- dlls/shell32/tests/shlview.c | 144 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 131 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 59716d5..dc60a49 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -86,13 +86,134 @@ static HWND subclass_listview(HWND hwnd) return listview; } +/* dummy IDataObject implementation */ typedef struct { + const IDataObjectVtbl *lpVtbl; + LONG ref; +} IDataObjectImpl; + +static const IDataObjectVtbl IDataObjectImpl_Vtbl; + +IDataObject* IDataObjectImpl_Construct(void) +{ + IDataObjectImpl *obj; + + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + obj->lpVtbl = &IDataObjectImpl_Vtbl; + obj->ref = 1; + + return (IDataObject*)obj; +} + +static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, void **ppvObj) +{ + IDataObjectImpl *This = (IDataObjectImpl *)iface; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataObject)) + { + *ppvObj = This; + } + + if(*ppvObj) + { + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI IDataObjectImpl_AddRef(IDataObject * iface) +{ + IDataObjectImpl *This = (IDataObjectImpl *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI IDataObjectImpl_Release(IDataObject * iface) +{ + IDataObjectImpl *This = (IDataObjectImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + return 0; + } + return ref; +} + +static HRESULT WINAPI IDataObjectImpl_GetData(IDataObject *iface, FORMATETC *pformat, STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_GetDataHere(IDataObject *iface, FORMATETC *pformat, STGMEDIUM *pmedium) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_QueryGetData(IDataObject *iface, FORMATETC *pformat) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_GetCanonicalFormatEtc( + IDataObject *iface, FORMATETC *pformatIn, FORMATETC *pformatOut) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_SetData( + IDataObject *iface, FORMATETC *pformat, STGMEDIUM *pmedium, BOOL release) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_EnumFormatEtc( + IDataObject *iface, DWORD direction, IEnumFORMATETC **ppenumFormatEtc) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_DAdvise( + IDataObject *iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pSink, DWORD *pConnection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_DUnadvise(IDataObject *iface, DWORD connection) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObjectImpl_EnumDAdvise(IDataObject *iface, IEnumSTATDATA **ppenumAdvise) +{ + return E_NOTIMPL; +} + +static const IDataObjectVtbl IDataObjectImpl_Vtbl = +{ + IDataObjectImpl_QueryInterface, + IDataObjectImpl_AddRef, + IDataObjectImpl_Release, + IDataObjectImpl_GetData, + IDataObjectImpl_GetDataHere, + IDataObjectImpl_QueryGetData, + IDataObjectImpl_GetCanonicalFormatEtc, + IDataObjectImpl_SetData, + IDataObjectImpl_EnumFormatEtc, + IDataObjectImpl_DAdvise, + IDataObjectImpl_DUnadvise, + IDataObjectImpl_EnumDAdvise +}; +/* dummy IShellBrowser implementation */ +typedef struct { const IShellBrowserVtbl *lpVtbl; LONG ref; } IShellBrowserImpl; -/* dummy IShellBrowser implementation */ static const IShellBrowserVtbl IShellBrowserImpl_Vtbl; IShellBrowser* IShellBrowserImpl_Construct(void) @@ -114,22 +235,16 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IOleWindow)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellBrowser)) + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IOleWindow) || + IsEqualIID(riid, &IID_IShellBrowser)) { *ppvObj = This; } if(*ppvObj) { - IUnknown_AddRef( (IShellBrowser*) *ppvObj); + IUnknown_AddRef(iface); return S_OK; } @@ -556,6 +671,7 @@ static void test_IShellFolderView(void) IShellFolderView *folderview; IShellFolder *desktop; IShellView *view; + IDataObject *obj; UINT i; HRESULT hr; @@ -575,8 +691,10 @@ static void test_IShellFolderView(void) } /* ::MoveIcons */ - hr = IShellFolderView_MoveIcons(folderview, NULL); - ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + obj = IDataObjectImpl_Construct(); + hr = IShellFolderView_MoveIcons(folderview, obj); + ok(hr == E_NOTIMPL || broken(hr == S_OK) /* W98 */, "got (0x%08x)\n", hr); + IDataObject_Release(obj); /* ::SetRedraw without list created */ hr = IShellFolderView_SetRedraw(folderview, TRUE);

1 0

Jeremy Newman : rewrite the PNG fix to only load the script if the browser is actually IE6
by Jeremy Newman 24 Mar '10

24 Mar '10

Module: website Branch: master Commit: ed59b0c8d91988b59a73428d78e6ebd1d164b813 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed59b0c8d91988b59a7342… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 10:43:37 2010 -0500 rewrite the PNG fix to only load the script if the browser is actually IE6 --- utils.js | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/utils.js b/utils.js index 0ad1248..90e6ecb 100644 --- a/utils.js +++ b/utils.js @@ -2,22 +2,18 @@ Misc JavaScipt for WineHQ */ -// include a file from js scripts dir -function include_dom (script_filename) { - var html_doc = document.getElementsByTagName('head').item(0); - var js = document.createElement('script'); - js.setAttribute('language', 'javascript'); - js.setAttribute('type', 'text/javascript'); - js.setAttribute('src', web_root + "/" + script_filename); - html_doc.appendChild(js); - return false; -} - -// load and execute jquery IE6 PNG fix -include_dom("jquery.pngfix.js"); -jQuery(function($) { - $("img[@src$=png]").pngfix(); /* all img tags with .png extension */ - $("#tabs li").pngfix(); /* top tabs li backgrounds */ +// global document operations +$(document).ready(function() +{ + // fix PNG images for IE6 + if ($.browser.msie && $.browser.version == "6.0") + { + $.getScript("jquery.pngfix.js",function() + { + $("img[@src$=png]").pngfix(); /* all img tags with .png extension */ + $("#tabs li").pngfix(); /* top tabs li backgrounds */ + }); + } }); // done

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.41
by Jeremy Newman 23 Mar '10

23 Mar '10

Module: website Branch: master Commit: cf3467f5cec17cf57eab1d8cf7aa92bac13507c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=cf3467f5cec17cf57eab1d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Mar 19 20:50:00 2010 +0100 Polish translation for release 1.1.41 --- news/pl/2010031901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/pl/2010031901.xml b/news/pl/2010031901.xml new file mode 100644 index 0000000..a47260a --- /dev/null +++ b/news/pl/2010031901.xml @@ -0,0 +1,19 @@ +<news> +<date>Marzec 19, 2010</date> +<title>Wydano Wine 1.1.41</title> +<body> + Wydanie rozwojowe Wine 1.1.41 jest już dostępne. + <a href="{$root}/announce/1.1.41">Co nowego</a> w tym wydaniu: +<ul> + <li>Szeroka gama ulepszeń w Direct3D.</li> + <li>Wsparcie dla algorytmów SHA-256, SHA-384, i SHA-512.</li> + <li>Liczne poprawki w MSHTML.</li> + <li>Wsparcie dla dekodowania mp3 na Mac OS X.</li> + <li>Rozmaite ulepszenia w widl.</li> + <li>Więcej poprawek w typelib.</li> + <li>Ulepszenia w magazynach OLE.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.41.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Damjan Jovanovic : ntoskrnl.exe: Implement IoCompleteRequest.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 3c6c2fe8df071f82efd8a50ebf6272a260f97c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6c2fe8df071f82efd8a50eb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Mar 23 17:52:49 2010 +0200 ntoskrnl.exe: Implement IoCompleteRequest. --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3513b01..7a5af73 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -789,14 +789,9 @@ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_o /*********************************************************************** - * IofCompleteRequest (NTOSKRNL.EXE.@) + * IoCompleteRequest (NTOSKRNL.EXE.@) */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( IofCompleteRequest ) -void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) -#else -void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) -#endif +VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) { IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; @@ -853,6 +848,21 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) /*********************************************************************** + * IofCompleteRequest (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( IofCompleteRequest ) +void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#else +void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#endif +{ + TRACE( "%p %u\n", irp, priority_boost ); + IoCompleteRequest( irp, priority_boost ); +} + + +/*********************************************************************** * InterlockedCompareExchange (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL3_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0cbbbc6..993de77 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -333,7 +333,7 @@ @ stub IoCheckQuerySetVolumeInformation @ stub IoCheckQuotaBufferValidity @ stub IoCheckShareAccess -@ stub IoCompleteRequest +@ stdcall IoCompleteRequest(ptr long) @ stub IoConnectInterrupt @ stub IoCreateController @ stdcall IoCreateDevice(ptr long ptr long long long ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 72c6e85..95a27a8 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1047,6 +1047,7 @@ void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); +VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*);

1 0

Hans Leidekker : dnsapi: _res is per-thread in glibc.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: c058490b69f8b801ca5bc179101933a7717ed559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c058490b69f8b801ca5bc1791… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 16:12:11 2010 +0100 dnsapi: _res is per-thread in glibc. This mirrors Dan Kegel's fix for iphlpapi. --- dlls/dnsapi/query.c | 8 ++------ dlls/iphlpapi/iphlpapi_main.c | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 75e2e33..6014465 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -65,16 +65,12 @@ static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; #define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) #define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) -static int resolver_initialised; - /* call res_init() just once because of a bug in Mac OS X 10.4 */ +/* call once per thread on systems that have per-thread _res */ static void initialise_resolver( void ) { - if (!resolver_initialised) - { + if ((_res.options & RES_INIT) == 0) res_init(); - resolver_initialised = 1; - } } static const char *dns_section_to_str( ns_sect section ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8600849..af97390 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -69,7 +69,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ -/* FIXME: should do same fix in dnsapi (or use dnsapi here?) */ static void initialise_resolver(void) { if ((_res.options & RES_INIT) == 0)

1 0

Hans Leidekker : dnsapi: Add a version resource.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: af68ef68ce26a35b392195f95fba05902302dbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=af68ef68ce26a35b392195f95… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 16:11:44 2010 +0100 dnsapi: Add a version resource. --- dlls/dnsapi/Makefile.in | 3 +++ dlls/dnsapi/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 594db95..61ffe8b 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -15,4 +15,7 @@ C_SRCS = \ query.c \ record.c +RC_SRCS = \ + version.rc + @MAKE_DLL_RULES@ diff --git a/dlls/dnsapi/version.rc b/dlls/dnsapi/version.rc new file mode 100644 index 0000000..9f2715f --- /dev/null +++ b/dlls/dnsapi/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dnsapi" +#define WINE_FILENAME_STR "dnsapi.dll" +#define WINE_FILEVERSION_MAJOR 5 +#define WINE_FILEVERSION_MINOR 2 +#define WINE_FILEVERSION_BUILD 3790 +#define WINE_FILEVERSION_PLATFORMID 4318 + +#include "wine/wine_common_ver.rc"

1 0

Andrew Nguyen : dxdiagn: Successfully copy to destination variants with an invalid type in IDxDiagContainer ::GetProp.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5f1764c629f6cd5094a989472e1db05ec699a789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1764c629f6cd5094a989472… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Mar 23 09:23:50 2010 -0500 dxdiagn: Successfully copy to destination variants with an invalid type in IDxDiagContainer::GetProp. GetProp now simply unconditionally clears the destination variant if VariantClear fails. --- dlls/dxdiagn/container.c | 9 ++++++--- dlls/dxdiagn/tests/Makefile.in | 2 +- dlls/dxdiagn/tests/container.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index db1a336..8585f7d 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -221,9 +221,12 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS p = This->properties; while (NULL != p) { - if (0 == lstrcmpW(p->vName, pwszPropName)) { - VariantCopy(pvarProp, &p->v); - return S_OK; + if (0 == lstrcmpW(p->vName, pwszPropName)) { + HRESULT hr = VariantClear(pvarProp); + if (hr == DISP_E_ARRAYISLOCKED || hr == DISP_E_BADVARTYPE) + VariantInit(pvarProp); + + return VariantCopy(pvarProp, &p->v); } p = p->next; } diff --git a/dlls/dxdiagn/tests/Makefile.in b/dlls/dxdiagn/tests/Makefile.in index 69f45fd..db75a4e 100644 --- a/dlls/dxdiagn/tests/Makefile.in +++ b/dlls/dxdiagn/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = dxdiagn.dll -IMPORTS = ole32 kernel32 +IMPORTS = oleaut32 ole32 kernel32 C_SRCS = \ container.c \ diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 214e7dd..6787c70 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -535,6 +535,8 @@ static void test_GetProp(void) IDxDiagContainer *child = NULL; DWORD count, index; VARIANT var; + SAFEARRAY *sa; + SAFEARRAYBOUND bound; static const WCHAR emptyW[] = {0}; static const WCHAR testW[] = {'t','e','s','t',0}; @@ -612,6 +614,41 @@ static void test_GetProp(void) ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + VariantInit(&var); + hr = IDxDiagContainer_GetProp(child, property, &var); + ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr); + ok(V_VT(&var) != VT_EMPTY, "Expected the variant to be modified, got %d\n", V_VT(&var)); + + /* Since the documentation for IDxDiagContainer::GetProp claims that the + * function reports return values from VariantCopy, try to exercise failure + * paths in handling the destination variant. */ + + /* Try an invalid variant type. */ + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, property, &var); + ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr); + ok(V_VT(&var) != 0xdead, "Expected the variant to be modified, got %d\n", V_VT(&var)); + + /* Try passing a variant with a locked SAFEARRAY. */ + bound.cElements = 1; + bound.lLbound = 0; + sa = SafeArrayCreate(VT_UI1, 1, &bound); + ok(sa != NULL, "Expected SafeArrayCreate to return a valid pointer\n"); + + V_VT(&var) = (VT_ARRAY | VT_UI1); + V_ARRAY(&var) = sa; + + hr = SafeArrayLock(sa); + ok(hr == S_OK, "Expected SafeArrayLock to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetProp(child, property, &var); + ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr); + ok(V_VT(&var) != (VT_ARRAY | VT_UI1), "Expected the variant to be modified\n"); + + hr = SafeArrayUnlock(sa); + ok(hr == S_OK, "Expected SafeArrayUnlock to return S_OK, got 0x%08x\n", hr); + hr = SafeArrayDestroy(sa); + ok(hr == S_OK, "Expected SafeArrayDestroy to return S_OK, got 0x%08x\n", hr); IDxDiagContainer_Release(child); cleanup:

1 0

Rob Shearman : widl: Check whether an expression is a constant one before assuming it is a toplevel conformance when writing conformance or variance descriptors .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 0d88ba9e01330b158343559d184074e39231f05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d88ba9e01330b158343559d1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:34:03 2010 +0000 widl: Check whether an expression is a constant one before assuming it is a toplevel conformance when writing conformance or variance descriptors. --- tools/widl/typegen.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 30d6727..bf7c662 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -985,16 +985,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, return 4; } - if (!structure) - { - /* Top-level conformance calculations are done inline. */ - print_file (file, 2, "0x%x,\t/* Corr desc: parameter */\n", - RPC_FC_TOP_LEVEL_CONFORMANCE); - print_file (file, 2, "0x0,\n"); - print_file (file, 2, "NdrFcShort(0x0),\n"); - return 4; - } - if (expr->is_const) { if (expr->cval > UCHAR_MAX * (USHRT_MAX + 1) + USHRT_MAX) @@ -1010,6 +1000,16 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, return 4; } + if (!structure) + { + /* Top-level conformance calculations are done inline. */ + print_file (file, 2, "0x%x,\t/* Corr desc: parameter */\n", + RPC_FC_TOP_LEVEL_CONFORMANCE); + print_file (file, 2, "0x0,\n"); + print_file (file, 2, "NdrFcShort(0x0),\n"); + return 4; + } + if (is_ptr(type) || (is_array(type) && type_array_is_decl_as_ptr(type))) { conftype = RPC_FC_POINTER_CONFORMANCE;

1 0

Rob Shearman : widl: Make use of string_of_type in write_conf_or_var_desc.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: c65d16e9d5857c25a3916b80ad414026e81deff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65d16e9d5857c25a3916b80a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:59 2010 +0000 widl: Make use of string_of_type in write_conf_or_var_desc. This allows the code to not have to track the operator type twice. --- tools/widl/typegen.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2433b8b..30d6727 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -123,6 +123,41 @@ static const char *string_of_type(unsigned char type) case RPC_FC_C_WSTRING: return "FC_C_WSTRING"; case RPC_FC_CSTRING: return "FC_CSTRING"; case RPC_FC_WSTRING: return "FC_WSTRING"; + case RPC_FC_BYTE_COUNT_POINTER: return "FC_BYTE_COUNT_POINTER"; + case RPC_FC_TRANSMIT_AS: return "FC_TRANSMIT_AS"; + case RPC_FC_REPRESENT_AS: return "FC_REPRESENT_AS"; + case RPC_FC_IP: return "FC_IP"; + case RPC_FC_BIND_CONTEXT: return "FC_BIND_CONTEXT"; + case RPC_FC_BIND_GENERIC: return "FC_BIND_GENERIC"; + case RPC_FC_BIND_PRIMITIVE: return "FC_BIND_PRIMITIVE"; + case RPC_FC_AUTO_HANDLE: return "FC_AUTO_HANDLE"; + case RPC_FC_CALLBACK_HANDLE: return "FC_CALLBACK_HANDLE"; + case RPC_FC_STRUCTPAD1: return "FC_STRUCTPAD1"; + case RPC_FC_STRUCTPAD2: return "FC_STRUCTPAD2"; + case RPC_FC_STRUCTPAD3: return "FC_STRUCTPAD3"; + case RPC_FC_STRUCTPAD4: return "FC_STRUCTPAD4"; + case RPC_FC_STRUCTPAD5: return "FC_STRUCTPAD5"; + case RPC_FC_STRUCTPAD6: return "FC_STRUCTPAD6"; + case RPC_FC_STRUCTPAD7: return "FC_STRUCTPAD7"; + case RPC_FC_STRING_SIZED: return "FC_STRING_SIZED"; + case RPC_FC_NO_REPEAT: return "FC_NO_REPEAT"; + case RPC_FC_FIXED_REPEAT: return "FC_FIXED_REPEAT"; + case RPC_FC_VARIABLE_REPEAT: return "FC_VARIABLE_REPEAT"; + case RPC_FC_FIXED_OFFSET: return "FC_FIXED_OFFSET"; + case RPC_FC_VARIABLE_OFFSET: return "FC_VARIABLE_OFFSET"; + case RPC_FC_PP: return "FC_PP"; + case RPC_FC_EMBEDDED_COMPLEX: return "FC_EMBEDDED_COMPLEX"; + case RPC_FC_DEREFERENCE: return "FC_DEREFERENCE"; + case RPC_FC_DIV_2: return "FC_DIV_2"; + case RPC_FC_MULT_2: return "FC_MULT_2"; + case RPC_FC_ADD_1: return "FC_ADD_1"; + case RPC_FC_SUB_1: return "FC_SUB_1"; + case RPC_FC_CALLBACK: return "FC_CALLBACK"; + case RPC_FC_CONSTANT_IID: return "FC_CONSTANT_IID"; + case RPC_FC_END: return "FC_END"; + case RPC_FC_PAD: return "FC_PAD"; + case RPC_FC_USER_MARSHAL: return "FC_USER_MARSHAL"; + case RPC_FC_RANGE: return "FC_RANGE"; case RPC_FC_INT3264: return "FC_INT3264"; case RPC_FC_UINT3264: return "FC_UINT3264"; default: @@ -942,7 +977,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, unsigned char operator_type = 0; unsigned char conftype = RPC_FC_NORMAL_CONFORMANCE; const char *conftype_string = ""; - const char *operator_string = "no operators"; const expr_t *subexpr; if (!expr) @@ -988,14 +1022,12 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, case EXPR_PPTR: subexpr = subexpr->ref; operator_type = RPC_FC_DEREFERENCE; - operator_string = "FC_DEREFERENCE"; break; case EXPR_DIV: if (subexpr->u.ext->is_const && (subexpr->u.ext->cval == 2)) { subexpr = subexpr->ref; operator_type = RPC_FC_DIV_2; - operator_string = "FC_DIV_2"; } break; case EXPR_MUL: @@ -1003,7 +1035,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, { subexpr = subexpr->ref; operator_type = RPC_FC_MULT_2; - operator_string = "FC_MULT_2"; } break; case EXPR_SUB: @@ -1011,7 +1042,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, { subexpr = subexpr->ref; operator_type = RPC_FC_SUB_1; - operator_string = "FC_SUB_1"; } break; case EXPR_ADD: @@ -1019,7 +1049,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, { subexpr = subexpr->ref; operator_type = RPC_FC_ADD_1; - operator_string = "FC_ADD_1"; } break; default: @@ -1105,7 +1134,8 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, print_file(file, 2, "0x%x, /* Corr desc: %s%s */\n", conftype | param_type, conftype_string, string_of_type(param_type)); - print_file(file, 2, "0x%x, /* %s */\n", operator_type, operator_string); + print_file(file, 2, "0x%x, /* %s */\n", operator_type, + operator_type ? string_of_type(operator_type) : "no operators"); print_file(file, 2, "NdrFcShort(0x%hx),\t/* offset = %d */\n", offset, offset); }

1 0

Rob Shearman : widl: Remove the current_func variable.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5e0030b4cb4c06e926effa5cdb68f8f2fa295fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0030b4cb4c06e926effa5cd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:55 2010 +0000 widl: Remove the current_func variable. It's only set, never read from. --- tools/widl/typegen.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 771cd2a..2433b8b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -46,7 +46,6 @@ /* value to add on to round size up to a multiple of alignment */ #define ROUNDING(size, alignment) (((alignment) - 1) - (((size) + ((alignment) - 1)) & ((alignment) - 1))) -static const var_t *current_func; static const type_t *current_structure; static const type_t *current_iface; @@ -2916,7 +2915,6 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, file); } - current_func = func; if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) update_tfsoff(

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010