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

Jacek Caban : mshtml: Handle aborts synchronously in nsChannelBSC_stop_binding.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: af08c97bf98da4d729564ea08260fd9027023b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af08c97bf98da4d729564ea08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:18:12 2011 +0200 mshtml: Handle aborts synchronously in nsChannelBSC_stop_binding. --- dlls/mshtml/navigate.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bdb95a7..9e45025 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1376,12 +1376,14 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(FAILED(result)) - handle_navigation_error(This, result); - else if(This->window) { - result = async_stop_request(This); - if(SUCCEEDED(result)) - return S_OK; + if(result != E_ABORT) { + if(FAILED(result)) + handle_navigation_error(This, result); + else if(This->window) { + result = async_stop_request(This); + if(SUCCEEDED(result)) + return S_OK; + } } on_stop_nsrequest(This, result);

1 0

Jacek Caban : mshtml: Pass E_ABORT as binding results of bindings without IBinding in abort_document_bindings .
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: b9bfc10199ba3ae121f9257397b4df2e6f35197e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bfc10199ba3ae121f925739… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:18:23 2011 +0200 mshtml: Pass E_ABORT as binding results of bindings without IBinding in abort_document_bindings. --- dlls/mshtml/navigate.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9e45025..2d45f09 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1649,6 +1649,8 @@ void abort_document_bindings(HTMLDocumentNode *doc) BSCallback *iter, *next; LIST_FOR_EACH_ENTRY_SAFE(iter, next, &doc->bindings, BSCallback, entry) { + TRACE("Aborting %p\n", iter); + if(iter->doc) remove_target_tasks(iter->doc->basedoc.task_magic); @@ -1657,7 +1659,7 @@ void abort_document_bindings(HTMLDocumentNode *doc) else { list_remove(&iter->entry); list_init(&iter->entry); - iter->vtbl->stop_binding(iter, S_OK); + iter->vtbl->stop_binding(iter, E_ABORT); } iter->doc = NULL;

1 0

Andrew Eikum : mmdevapi: IMMDeviceEnumerator:: GetDevice should fail on unknown device ids.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 91b684325f85c5d3f1c7bc10459066a71caa3629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b684325f85c5d3f1c7bc104… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 13 11:33:59 2011 -0500 mmdevapi: IMMDeviceEnumerator::GetDevice should fail on unknown device ids. --- dlls/mmdevapi/devenum.c | 17 ++++++++--------- dlls/mmdevapi/tests/mmdevenum.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1e8ffe0..d2a4620 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -932,6 +932,9 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA DWORD i=0; IMMDevice *dev = NULL; + if(!name || !device) + return E_POINTER; + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), device); for (i = 0; i < MMDevice_count; ++i) { @@ -942,18 +945,14 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA if (str && !lstrcmpW(str, name)) { CoTaskMemFree(str); - break; + IUnknown_AddRef(dev); + *device = dev; + return S_OK; } CoTaskMemFree(str); } - if (dev) - { - IUnknown_AddRef(dev); - *device = dev; - return S_OK; - } - WARN("Could not find device %s\n", debugstr_w(name)); - return E_NOTFOUND; + TRACE("Could not find device %s\n", debugstr_w(name)); + return E_INVALIDARG; } static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index a0898b3..ff70177 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -98,9 +98,17 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) WCHAR *id = NULL; if (IMMDevice_GetId(dev, &id) == S_OK) { + IMMDevice *dev2; + temp[sizeof(temp)-1] = 0; WideCharToMultiByte(CP_ACP, 0, id, -1, temp, sizeof(temp)-1, NULL, NULL); trace("Device found: %s\n", temp); + + hr = IMMDeviceEnumerator_GetDevice(mme, id, &dev2); + ok(hr == S_OK, "GetDevice failed: %08x\n", hr); + + IMMDevice_Release(dev2); + CoTaskMemFree(id); } } @@ -113,11 +121,14 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) /* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { + static const WCHAR not_a_deviceW[] = {'n','o','t','a','d','e','v','i','c','e',0}; + HRESULT hr; IUnknown *unk = NULL; IMMDeviceEnumerator *mme, *mme2; ULONG ref; IMMDeviceCollection *col; + IMMDevice *dev; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -152,6 +163,15 @@ START_TEST(mmdevenum) ok(!unk, "Unk not reset to null after invalid QI\n"); ok(hr == E_NOINTERFACE, "Invalid hr %08x returned on IID_NULL\n", hr); + hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, NULL); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + + hr = IMMDeviceEnumerator_GetDevice(mme, NULL, &dev); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + + hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, &dev); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + col = (void*)(LONG_PTR)0x12345678; hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, 0xffff, DEVICE_STATEMASK_ALL, &col); ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08x\n", hr);

1 0

Igor Paliychuk : msvcrt: _CxxThrowException is stdcall, not cdecl.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 521604ffce8f87a90aee48652b9b0a48141f8f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=521604ffce8f87a90aee48652… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Sat May 14 11:40:16 2011 +0300 msvcrt: _CxxThrowException is stdcall, not cdecl. --- dlls/msvcp90/exception.c | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cppexcept.c | 2 +- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index cef4980..e6b1692 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -58,7 +58,7 @@ typedef struct __cxx_exception_type const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d65877..a6cfaa3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -337,7 +337,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index f728300..98f9ebd 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -108,7 +108,7 @@ @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 47a2c17..f5a60bc 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -102,7 +102,7 @@ @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e0b11bc..c9f62f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -148,7 +148,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b2a620c..5f09767 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -145,7 +145,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index a07d544..18e5aa0 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -471,7 +471,7 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type ) +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index a46f222..705364b 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -140,7 +140,7 @@ typedef struct __cxx_exception_type const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8957e42..3b36d77 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -137,7 +137,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ cdecl _CxxThrowException(long long) +@ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2907102..b98cd05 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -790,7 +790,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f9a6956..4815e2f 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -864,7 +864,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index f598742..ff83f8e 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -116,7 +116,7 @@ @ stub _CrtSetReportFile @ cdecl _CrtSetReportHook(ptr) @ cdecl _CrtSetReportMode(long long) -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths

1 0

Alexandre Julliard : Wine release 1.3.20
by Alexandre Julliard 13 May '11

13 May '11

Module: website Branch: master Commit: 59c94b4d468a65cb43b5fd9d42e91894cf17063d URL: http://source.winehq.org/git/website.git/?a=commit;h=59c94b4d468a65cb43b5fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 20:32:42 2011 +0200 Wine release 1.3.20 --- news/en/2011051301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011051301.xml b/news/en/2011051301.xml new file mode 100644 index 0000000..fd52487 --- /dev/null +++ b/news/en/2011051301.xml @@ -0,0 +1,18 @@ +<news> +<date>May 13, 2011</date> +<title>Wine 1.3.20 Released</title> +<body> + The Wine development release 1.3.20 is now available. + <a href="{$root}/announce/1.3.20">What's new</a> in this release: +<ul> + <li>Option to clip the mouse inside fullscreen windows.</li> + <li>Support for persistent HTTP connections.</li> + <li>Initial implementation of the XML writer.</li> + <li>Support for drawing rectangles in the DIB engine.</li> + <li>Volume control in MMDevAPI.</li> + <li>More MSVC runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : comctl32/tests: Initialize subitem index.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 64cd12d74055def084d4ac51273e67bf182997ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cd12d74055def084d4ac512… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 21:56:48 2011 +0400 comctl32/tests: Initialize subitem index. --- dlls/comctl32/tests/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3cfacaf..949b214 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4733,6 +4733,8 @@ static void test_LVM_SETITEMTEXT(void) /* index out of bounds */ item.pszText = testA; item.cchTextMax = 0; /* ignored */ + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 1, (LPARAM)&item); expect(FALSE, ret);

1 0

Alexandre Julliard : Release 1.3.20.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 6f5e5ec98b1c9b4f930655e38a8d5ba86a5beac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5e5ec98b1c9b4f930655e38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 20:23:04 2011 +0200 Release 1.3.20. --- ANNOUNCE | 1012 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 536 insertions(+), 496 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f5e5ec98b1c9b4f93065…

1 0

Tag wine-1.3.20 : Alexandre Julliard : Release 1.3.20
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: refs/tags/wine-1.3.20 Tag: 5cdfdfd6a3f004825ab38ee1b0d06cd2a7508781 URL: http://source.winehq.org/git/wine.git/?a=tag;h=5cdfdfd6a3f004825ab38ee1b0d0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 20:23:06 2011 +0200 Release 1.3.20

1 0

Juan Lang : wininet: Handle invalid HTTP time of "0".
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: d797e5fc7e9fc7710d6c925a386847698c641a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d797e5fc7e9fc7710d6c925a3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 13 06:47:49 2011 -0700 wininet: Handle invalid HTTP time of "0". --- dlls/wininet/http.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 19c7e76..c6542a8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4255,9 +4255,15 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) */ static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) { + static const WCHAR zero[] = { '0',0 }; BOOL ret; - if (strchrW(value, ',')) + if (!strcmpW(value, zero)) + { + ft->dwLowDateTime = ft->dwHighDateTime = 0; + ret = TRUE; + } + else if (strchrW(value, ',')) ret = HTTP_ParseRfc1123Date(value, ft); else {

1 0

Rico Schüller : d3dx9: Improve get_parameter_by_name() .
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: ae2c6a164fab7323ea4a8b61f48078b2beed1f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2c6a164fab7323ea4a8b61f… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 13 11:35:27 2011 +0200 d3dx9: Improve get_parameter_by_name(). --- dlls/d3dx9_36/effect.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d8877c0..9de5517 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -112,8 +112,7 @@ struct ID3DXEffectCompilerImpl static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl *base, struct d3dx_parameter *parameter, LPCSTR name); -static struct d3dx_parameter *get_parameter_annotation_by_name(struct ID3DXBaseEffectImpl *base, - struct d3dx_parameter *parameter, LPCSTR name); +static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name); static inline void read_dword(const char **ptr, DWORD *d) { @@ -527,14 +526,13 @@ static inline BOOL get_bool(void *data) return (*(DWORD *)data) ? TRUE : FALSE; } -static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffectImpl *base, - struct d3dx_parameter *parameter, LPCSTR name) +static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT element; struct d3dx_parameter *temp_parameter; LPCSTR part; - TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); + TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); if (!name || !*name) return parameter; @@ -548,10 +546,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffe switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(base, temp_parameter, part); + return get_parameter_annotation_by_name(temp_parameter, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -567,14 +565,13 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffe return NULL; } -static struct d3dx_parameter *get_parameter_annotation_by_name(struct ID3DXBaseEffectImpl *base, - struct d3dx_parameter *parameter, LPCSTR name) +static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT i, length; struct d3dx_parameter *temp_parameter; LPCSTR part; - TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); + TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); if (!name || !*name) return parameter; @@ -595,10 +592,10 @@ static struct d3dx_parameter *get_parameter_annotation_by_name(struct ID3DXBaseE switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(NULL, temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -651,13 +648,13 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl * switch (*part++) { case '.': - return get_parameter_by_name(base, temp_parameter, part); + return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(base, temp_parameter, part); + return get_parameter_annotation_by_name(temp_parameter, part); case '[': - return get_parameter_element_by_name(base, temp_parameter, part); + return get_parameter_element_by_name(temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part);

1 0