November 2012 - Wine-Commits

Nikolay Sivov : msxml3: No need to keep a reference to a temporarily used stream.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 5aa1754b7eae26f238a060862021fa7b8df6a8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa1754b7eae26f238a060862… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 23:32:57 2012 -0500 msxml3: No need to keep a reference to a temporarily used stream. --- dlls/msxml3/domdoc.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c3144ce..52b41a7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -132,9 +132,6 @@ struct domdoc bsc_t *bsc; HRESULT error; - /* IPersistStream */ - IStream *stream; - /* IObjectWithSite*/ IUnknown *site; @@ -722,34 +719,31 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) { DWORD read, written, len; xmlDocPtr xmldoc = NULL; + IStream *hstream; HGLOBAL hglobal; BYTE buf[4096]; HRESULT hr; char *ptr; - if (doc->stream) - { - IStream_Release(doc->stream); - doc->stream = NULL; - } - - hr = CreateStreamOnHGlobal(NULL, TRUE, &doc->stream); + hstream = NULL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &hstream); if (FAILED(hr)) return hr; do { ISequentialStream_Read(stream, buf, sizeof(buf), &read); - hr = IStream_Write(doc->stream, buf, read, &written); + hr = IStream_Write(hstream, buf, read, &written); } while(SUCCEEDED(hr) && written != 0 && read != 0); if (FAILED(hr)) { ERR("failed to copy stream 0x%08x\n", hr); + IStream_Release(hstream); return hr; } - hr = GetHGlobalFromStream(doc->stream, &hglobal); + hr = GetHGlobalFromStream(hstream, &hglobal); if (FAILED(hr)) return hr; @@ -922,8 +916,6 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) if (This->site) IUnknown_Release( This->site ); destroy_xmlnode(&This->node); - if (This->stream) - IStream_Release(This->stream); for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); @@ -3493,7 +3485,6 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->resolving = 0; doc->properties = properties_from_xmlDocPtr(xmldoc); doc->error = S_OK; - doc->stream = NULL; doc->site = NULL; doc->safeopt = 0; doc->bsc = NULL;

1 0

Piotr Caban : msvcp100: Added _Container_base12 class tests.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 642e9a1eda90f8011eb1f5d841874ab79c1cd718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=642e9a1eda90f8011eb1f5d84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:33:35 2012 +0000 msvcp100: Added _Container_base12 class tests. --- dlls/msvcp100/tests/Makefile.in | 1 + dlls/msvcp100/tests/misc.c | 194 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/tests/Makefile.in b/dlls/msvcp100/tests/Makefile.in index fe92d54..2bf01e0 100644 --- a/dlls/msvcp100/tests/Makefile.in +++ b/dlls/msvcp100/tests/Makefile.in @@ -4,6 +4,7 @@ MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ + misc.c \ string.c @MAKE_TEST_RULES@ diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c new file mode 100644 index 0000000..89933d0 --- /dev/null +++ b/dlls/msvcp100/tests/misc.c @@ -0,0 +1,194 @@ +/* + * Copyright 2012 Piotr Caban for CodeWeavers + * + * 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 + */ + +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +struct __Container_proxy; + +typedef struct { + struct __Container_proxy *proxy; +} _Container_base12; + +typedef struct __Iterator_base12 { + struct __Container_proxy *proxy; + struct __Iterator_base12 *next; +} _Iterator_base12; + +typedef struct __Container_proxy { + const _Container_base12 *cont; + _Iterator_base12 *head; +} _Container_proxy; + +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +static _Container_base12* (__thiscall *p__Container_base12_copy_ctor)(_Container_base12*, _Container_base12*); +static _Container_base12* (__thiscall *p__Container_base12_ctor)(_Container_base12*); +static void (__thiscall *p__Container_base12__Orphan_all)(_Container_base12*); +static void (__thiscall *p__Container_base12_dtor)(_Container_base12*); +static _Iterator_base12** (__thiscall *p__Container_base12__Getpfirst)(_Container_base12*); +static void (__thiscall *p__Container_base12__Swap_all)(_Container_base12*, _Container_base12*); + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + if(!msvcp) { + win_skip("msvcp100.dll not installed\n"); + return FALSE; + } + + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QEAA(a)XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QEAAXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QEAA(a)XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z"); + }else { + SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QAE(a)ABU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAE(a)XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QAEXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QAE(a)XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z"); + } + + init_thiscall_thunk(); + return TRUE; +} + +static void test__Container_base12(void) +{ + _Container_base12 c1, c2; + _Iterator_base12 i1, i2, **pi; + _Container_proxy p1, p2; + + call_func1(p__Container_base12_ctor, &c1); + ok(c1.proxy == NULL, "c1.proxy != NULL\n"); + + p1.cont = NULL; + p1.head = NULL; + c1.proxy = &p1; + call_func2(p__Container_base12_copy_ctor, &c2, &c1); + ok(c1.proxy == &p1, "c1.proxy = %p, expected %p\n", c1.proxy, &p1); + ok(c2.proxy == NULL, "c2.proxy != NULL\n"); + + p1.head = &i1; + i1.proxy = &p1; + i1.next = &i2; + i2.proxy = &p1; + i2.next = NULL; + pi = call_func1(p__Container_base12__Getpfirst, &c1); + ok(pi == &p1.head, "pi = %p, expected %p\n", pi, &p1.head); + pi = call_func1(p__Container_base12__Getpfirst, &c2); + ok(pi == NULL, "pi != NULL\n"); + + p1.cont = &c1; + call_func1(p__Container_base12_dtor, &c1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(i1.proxy == &p1, "i1.proxy = %p, expected %p\n", i1.proxy, &p1); + ok(i1.next == &i2, "i1.next = %p, expected %p\n", i1.next, &i2); + ok(i2.proxy == &p1, "i2.proxy = %p, expected %p\n", i2.proxy, &p1); + ok(i2.next == NULL, "i2.next != NULL\n"); + + call_func1(p__Container_base12__Orphan_all, &c1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(i1.proxy == &p1, "i1.proxy = %p, expected %p\n", i1.proxy, &p1); + ok(i1.next == &i2, "i1.next = %p, expected %p\n", i1.next, &i2); + ok(i2.proxy == &p1, "i2.proxy = %p, expected %p\n", i2.proxy, &p1); + ok(i2.next == NULL, "i2.next != NULL\n"); + + c2.proxy = NULL; + call_func2(p__Container_base12__Swap_all, &c1, &c2); + ok(c1.proxy == NULL, "c1.proxy != NULL\n"); + ok(c2.proxy == &p1, "c2.proxy = %p, expected %p\n", c2.proxy, &p2); + ok(p1.cont == &c2, "p1.cont = %p, expected %p\n", p1.cont, &c2); + + c1.proxy = &p2; + p2.cont = (void*)0xdeadbeef; + p2.head = (void*)0xdeadbeef; + p1.head = &i1; + call_func2(p__Container_base12__Swap_all, &c1, &c2); + ok(c1.proxy == &p1, "c1.proxt = %p, expected %p\n", c1.proxy, &p1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(c2.proxy == &p2, "c2.proxy = %p, expected %p\n", c2.proxy, &p2); + ok(p2.cont == &c2, "p2.cont = %p, expected %p\n", p2.cont, &c2); + ok(p2.head == (void*)0xdeadbeef, "p2.head = %p, expected 0xdeadbeef\n", p2.head); +} + +START_TEST(misc) +{ + if(!init()) + return; + + test__Container_base12(); +}

1 0

Piotr Caban : msvcp100: Added _Container_base12 class implementation.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: de8fe962c1e9c4a985741316486a38f4c8336271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8fe962c1e9c4a9857413164… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:33:03 2012 +0000 msvcp100: Added _Container_base12 class implementation. --- dlls/msvcp100/misc.c | 84 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 28 +++++++------- 2 files changed, 98 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 13183bb..55a19ee 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -28,6 +28,22 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +struct __Container_proxy; + +typedef struct { + struct __Container_proxy *proxy; +} _Container_base12; + +typedef struct __Iterator_base12 { + struct __Container_proxy *proxy; + struct __Iterator_base12 *next; +} _Iterator_base12; + +typedef struct __Container_proxy { + const _Container_base12 *cont; + _Iterator_base12 *head; +} _Container_proxy; + /* ??0_Mutex(a)std@@QAE(a)XZ */ /* ??0_Mutex(a)std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) @@ -259,3 +275,71 @@ void* __thiscall Container_base0_op_assign(void *this, const void *that) { return this; } + +/* ??0_Container_base12(a)std@@QAE(a)ABU01@@Z */ +/* ??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z */ +DEFINE_THISCALL_WRAPPER(_Container_base12_copy_ctor, 8) +_Container_base12* __thiscall _Container_base12_copy_ctor( + _Container_base12 *this, _Container_base12 *that) +{ + this->proxy = NULL; + return this; +} + +/* ??0_Container_base12(a)std@@QAE(a)XZ */ +/* ??0_Container_base12(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_ctor, 4) +_Container_base12* __thiscall _Container_base12_ctor(_Container_base12 *this) +{ + this->proxy = NULL; + return this; +} + +/* ??1_Container_base12(a)std@@QAE(a)XZ */ +/* ??1_Container_base12(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_dtor, 4) +void __thiscall _Container_base12_dtor(_Container_base12 *this) +{ +} + +/* ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z */ +/* ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_op_assign, 8) +_Container_base12* __thiscall _Container_base12_op_assign( + _Container_base12 *this, const _Container_base12 *that) +{ + return this; +} + +/* ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ */ +/* ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Getpfirst, 4) +_Iterator_base12** __thiscall _Container_base12__Getpfirst(_Container_base12 *this) +{ + return this->proxy ? &this->proxy->head : NULL; +} + +/* ?_Orphan_all(a)_Container_base12@std@@QAEXXZ */ +/* ?_Orphan_all(a)_Container_base12@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Orphan_all, 4) +void __thiscall _Container_base12__Orphan_all(_Container_base12 *this) +{ +} + +/* ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z */ +/* ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Swap_all, 8) +void __thiscall _Container_base12__Swap_all( + _Container_base12 *this, _Container_base12 *that) +{ + _Container_proxy *tmp; + + tmp = this->proxy; + this->proxy = that->proxy; + that->proxy = tmp; + + if(this->proxy) + this->proxy->cont = this; + if(that->proxy) + that->proxy->cont = that; +} diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 4ed384e..e4ac191 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -176,10 +176,10 @@ @ stub -arch=win64 ??0_Concurrent_queue_base_v4(a)details@Concurrency@@IEAA(a)_K@Z @ stub -arch=win32 ??0_Concurrent_queue_iterator_base_v4(a)details@Concurrency@@IAE(a)ABV_Concurrent_queue_base_v4@12@@Z @ stub -arch=win64 ??0_Concurrent_queue_iterator_base_v4(a)details@Concurrency@@IEAA(a)AEBV_Concurrent_queue_base_v4@12@@Z -@ stub -arch=win32 ??0_Container_base12(a)std@@QAE(a)ABU01@@Z -@ stub -arch=win64 ??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z -@ stub -arch=win32 ??0_Container_base12(a)std@@QAE(a)XZ -@ stub -arch=win64 ??0_Container_base12(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??0_Container_base12(a)std@@QAE(a)ABU01@@Z(ptr ptr) _Container_base12_copy_ctor +@ cdecl -arch=win64 ??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z(ptr ptr) _Container_base12_copy_ctor +@ thiscall -arch=win32 ??0_Container_base12(a)std@@QAE(a)XZ(ptr) _Container_base12_ctor +@ cdecl -arch=win64 ??0_Container_base12(a)std@@QEAA(a)XZ(ptr) _Container_base12_ctor @ stub -arch=win32 ??0_Init_locks(a)std@@QAE(a)XZ @ stub -arch=win64 ??0_Init_locks(a)std@@QEAA(a)XZ @ thiscall -arch=win32 ??0_Locimp(a)locale@std@@AAE(a)ABV012@@Z(ptr ptr) locale__Locimp_copy_ctor @@ -306,8 +306,8 @@ @ stub -arch=win64 ??1_Concurrent_queue_iterator_base_v4(a)details@Concurrency@@IEAA(a)XZ @ stub -arch=win32 ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ @ stub -arch=win64 ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ -@ stub -arch=win32 ??1_Container_base12(a)std@@QAE(a)XZ -@ stub -arch=win64 ??1_Container_base12(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??1_Container_base12(a)std@@QAE(a)XZ(ptr) _Container_base12_dtor +@ cdecl -arch=win64 ??1_Container_base12(a)std@@QEAA(a)XZ(ptr) _Container_base12_dtor @ stub -arch=win32 ??1_Init_locks(a)std@@QAE(a)XZ @ stub -arch=win64 ??1_Init_locks(a)std@@QEAA(a)XZ @ thiscall -arch=win32 ??1_Locimp(a)locale@std@@MAE(a)XZ(ptr) locale__Locimp_dtor @@ -402,8 +402,8 @@ @ cdecl -arch=win64 ??4Init(a)ios_base@std@@QEAAAEAV012(a)AEBV012@@Z(ptr ptr) ios_base_Init_op_assign @ thiscall -arch=win32 ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) Container_base0_op_assign @ cdecl -arch=win64 ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z(ptr ptr) Container_base0_op_assign -@ stub -arch=win32 ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z -@ stub -arch=win64 ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@Z +@ thiscall -arch=win32 ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) _Container_base12_op_assign +@ cdecl -arch=win64 ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@Z(ptr ptr) _Container_base12_op_assign @ stub -arch=win32 ??4_Init_locks(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4_Init_locks(a)std@@QEAAAEAV01(a)AEBV01@@Z @ thiscall -arch=win32 ??4_Num_base(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) std_Num_base_op_assign @@ -897,8 +897,8 @@ @ cdecl -arch=win64 ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getmonths @ stub -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ @ stub -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ -@ stub -arch=win32 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ -@ stub -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ +@ thiscall -arch=win32 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst +@ cdecl -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst @ thiscall -arch=win32 ?_Getptr(a)_Timevec@std@@QBEPAXXZ(ptr) _Timevec__Getptr @ cdecl -arch=win64 ?_Getptr(a)_Timevec@std@@QEBAPEAXXZ(ptr) _Timevec__Getptr @ thiscall -arch=win32 ?_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ(ptr ptr) _Locinfo__Gettnames @@ -1125,8 +1125,8 @@ @ cdecl ?_Nomemory(a)std@@YAXXZ() _Nomemory @ thiscall -arch=win32 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all -@ stub -arch=win32 ?_Orphan_all(a)_Container_base12@std@@QAEXXZ -@ stub -arch=win64 ?_Orphan_all(a)_Container_base12@std@@QEAAXXZ +@ thiscall -arch=win32 ?_Orphan_all(a)_Container_base12@std@@QAEXXZ(ptr) _Container_base12__Orphan_all +@ cdecl -arch=win64 ?_Orphan_all(a)_Container_base12@std@@QEAAXXZ(ptr) _Container_base12__Orphan_all @ thiscall -arch=win32 ?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_ostream_char__Osfx @ cdecl -arch=win64 ?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_ostream_char__Osfx @ thiscall -arch=win32 ?_Osfx@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ(ptr) basic_ostream_wchar__Osfx @@ -1204,8 +1204,8 @@ @ cdecl -arch=win64 ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z(ptr) locale__Setgloballocale @ thiscall -arch=win32 ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ cdecl -arch=win64 ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) Container_base0_Swap_all -@ stub -arch=win32 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z -@ stub -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z +@ thiscall -arch=win32 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) _Container_base12__Swap_all +@ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ thiscall -arch=win32 ?_Tidy@?$_Yarn(a)D@std@@AAEXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=win64 ?_Tidy@?$_Yarn(a)D@std@@AEAAXXZ(ptr) _Yarn_char__Tidy

1 0

Piotr Caban : msvcp60: Export locale classes destructors.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: a704d2a40c3a55543f767f7abe70b546430379af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a704d2a40c3a55543f767f7ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:31:42 2012 +0000 msvcp60: Export locale classes destructors. --- dlls/msvcp60/locale.c | 96 ++++++++++++++++++++++---------------------- dlls/msvcp60/msvcp60.spec | 48 +++++++++++----------- 2 files changed, 72 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a704d2a40c3a55543f767…

1 0

Piotr Caban : msvcp100: Added basic_ostream::ends implementation.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: c15d625b5cdbc486471546eff78c2b4e78480764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15d625b5cdbc486471546eff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:30:52 2012 +0000 msvcp100: Added basic_ostream::ends implementation. --- dlls/msvcp100/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 12 ++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 608e9f5..1c55319 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -4498,6 +4498,16 @@ basic_ostream_char* __thiscall basic_ostream_char_print_bool(basic_ostream_char return this; } +/* ?ends(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z */ +/* ?ends(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z */ +basic_ostream_char* __cdecl basic_ostream_char_ends(basic_ostream_char *ostr) +{ + TRACE("(%p)\n", ostr); + + basic_ostream_char_put(ostr, 0); + return ostr; +} + /* ?endl(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z */ /* ?endl(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z */ basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) @@ -5314,6 +5324,18 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_bool(basic_ostream_wch basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } +/* ?ends(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z */ +/* ?ends(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z */ +/* ?ends(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z */ +/* ?ends(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z */ +basic_ostream_wchar* __cdecl basic_ostream_wchar_ends(basic_ostream_wchar *ostr) +{ + TRACE("(%p)\n", ostr); + + basic_ostream_wchar_put(ostr, 0); + return ostr; +} + /* ?endl(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z */ /* ?endl(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z */ /* ?endl(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z */ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 85e6107..0603fd4 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1630,12 +1630,12 @@ @ cdecl -arch=win64 ?endl(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_endl @ cdecl -arch=win32 ?endl(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z(ptr) basic_ostream_wchar_endl @ cdecl -arch=win64 ?endl(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_endl -@ stub -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z +@ cdecl -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z(ptr) basic_ostream_char_ends +@ cdecl -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_char_ends +@ cdecl -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_ends @ thiscall -arch=win32 ?eof(a)ios_base@std@@QBE_NXZ(ptr) ios_base_eof @ cdecl -arch=win64 ?eof(a)ios_base@std@@QEBA_NXZ(ptr) ios_base_eof @ thiscall -arch=win32 ?epptr@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEPADXZ(ptr) basic_streambuf_char_epptr

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPATCHMESH.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: acfdb0b02f0ec6839937327e4b55944062e3bf37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfdb0b02f0ec6839937327e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:39 2012 +0100 d3dx9: Avoid LPD3DXPATCHMESH. --- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 975f1df..62fa6c0 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -86,7 +86,7 @@ typedef struct _D3DXMESHDATA { LPD3DXMESH pMesh; LPD3DXPMESH pPMesh; - LPD3DXPATCHMESH pPatchMesh; + ID3DXPatchMesh *pPatchMesh; } DUMMYUNIONNAME; } D3DXMESHDATA, *LPD3DXMESHDATA; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 2283f4e..3a26b54 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -492,7 +492,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown) STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; STDMETHOD(GetTessSize)(THIS_ FLOAT tess_level, DWORD adaptive, DWORD* num_triangles, DWORD* num_vertices) PURE; STDMETHOD(GenerateAdjacency)(THIS_ FLOAT tolerance) PURE; - STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPD3DXPATCHMESH *clone_mesh) PURE; + STDMETHOD(CloneMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration, ID3DXPatchMesh **clone_mesh) PURE; STDMETHOD(Optimize)(THIS_ DWORD flags) PURE; STDMETHOD(SetDisplaceParam)(THIS_ struct IDirect3DBaseTexture9 *texture, D3DTEXTUREFILTERTYPE min_filter, D3DTEXTUREFILTERTYPE mag_filter, D3DTEXTUREFILTERTYPE mip_filter, D3DTEXTUREADDRESS wrap, @@ -801,7 +801,8 @@ HRESULT WINAPI D3DXUVAtlasCreate(LPD3DXMESH, UINT, FLOAT, UINT, UINT, FLOAT, DWO HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *, UINT, UINT, FLOAT, DWORD, CONST DWORD *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXBUFFER); HRESULT WINAPI D3DXUVAtlasPartition(LPD3DXMESH, UINT, FLOAT, DWORD, CONST DWORD *, CONST DWORD *, CONST FLOAT *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXMESH *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, FLOAT *, UINT *); HRESULT WINAPI D3DXValidMesh(LPD3DXMESH, CONST DWORD *, LPD3DXBUFFER *); -HRESULT WINAPI D3DXValidPatchMesh(LPD3DXPATCHMESH, DWORD *, DWORD *, LPD3DXBUFFER *); +HRESULT WINAPI D3DXValidPatchMesh(ID3DXPatchMesh *mesh, DWORD *degenerate_vertex_count, + DWORD *degenerate_patch_count, ID3DXBuffer **errors); HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH, DWORD, CONST D3DXWELDEPSILONS *, CONST DWORD *, DWORD *, DWORD *, LPD3DXBUFFER *); #ifdef __cplusplus

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPRTCOMPBUFFER.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 4159758c9786264313c26c55e22123a31d5c2065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4159758c9786264313c26c55e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:37 2012 +0100 d3dx9: Avoid LPD3DXPRTCOMPBUFFER. --- include/d3dx9mesh.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index a5fc6cc..586aa63 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -708,7 +708,8 @@ HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_ struct IDirect3DDevice9 *device, struct ID3DXPatchMesh **mesh); HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); -HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); +HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE quality, UINT cluster_count, UINT pca_count, + LPD3DXSHPRTSIMCB cb, void *ctx, ID3DXPRTBuffer *input, ID3DXPRTCompBuffer **buffer); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, float gutter_size, ID3DXTextureGutterHelper **gh); HRESULT WINAPI D3DXCreatePRTEngine(ID3DXMesh *mesh, DWORD *adjacency, BOOL extract_uv, @@ -739,8 +740,8 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *file_data, DWORD fl HRESULT WINAPI D3DXLoadPRTBufferFromFileA(LPCSTR, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXLoadPRTBufferFromFileW(LPCWSTR, LPD3DXPRTBUFFER *); #define D3DXLoadPRTBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTBufferFromFile) -HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(LPCSTR, LPD3DXPRTCOMPBUFFER *); -HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER *); +HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(const char *filename, ID3DXPRTCompBuffer **buffer); +HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(const WCHAR *filename, ID3DXPRTCompBuffer **buffer); #define D3DXLoadPRTCompBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTCompBufferFromFile) HRESULT WINAPI D3DXSaveMeshToXA(LPCSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD); HRESULT WINAPI D3DXSaveMeshToXW(LPCWSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD); @@ -748,8 +749,8 @@ HRESULT WINAPI D3DXSaveMeshToXW(LPCWSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMA HRESULT WINAPI D3DXSavePRTBufferToFileA(LPCSTR, LPD3DXPRTBUFFER); HRESULT WINAPI D3DXSavePRTBufferToFileW(LPCWSTR, LPD3DXPRTBUFFER); #define D3DXSavePRTBufferToFile WINELIB_NAME_AW(D3DXSavePRTBufferToFile) -HRESULT WINAPI D3DXSavePRTCompBufferToFileA(LPCSTR, LPD3DXPRTCOMPBUFFER); -HRESULT WINAPI D3DXSavePRTCompBufferToFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER); +HRESULT WINAPI D3DXSavePRTCompBufferToFileA(const char *filename, ID3DXPRTCompBuffer *buffer); +HRESULT WINAPI D3DXSavePRTCompBufferToFileW(const WCHAR *filename, ID3DXPRTCompBuffer *buffer); #define D3DXSavePRTCompBufferToFile WINELIB_NAME_AW(D3DXSavePRTCompBufferToFile) UINT WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx);

1 0

Andrew Talbot : msvcp100: Remove superfluous semicolons.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 2808433a7a7eb1fb5f7cc05948fe3d3bf0da96f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2808433a7a7eb1fb5f7cc0594… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:31 2012 +0000 msvcp100: Remove superfluous semicolons. --- dlls/msvcp100/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index 6482463..3701fb4 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -132,7 +132,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* bad_alloc class data */ typedef exception bad_alloc; @@ -189,7 +189,7 @@ const char* __thiscall MSVCP_what_exception(exception * this) } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct _logic_error { @@ -256,7 +256,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error(a)std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -281,7 +281,7 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error(a)std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -306,7 +306,7 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range(a)std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -331,7 +331,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument(a)std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef struct { @@ -398,7 +398,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error(a)std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* failure class data */ typedef runtime_error failure; @@ -445,7 +445,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_DrawIndexedInstanced().
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 7f62678c16495c3dc213444668cdd11af09fb939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f62678c16495c3dc21344466… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:41 2012 +0100 d3d10core: Implement d3d10_device_DrawIndexedInstanced(). --- dlls/d3d10core/device.c | 10 ++++++++-- dlls/wined3d/device.c | 22 +++++++++++++++------- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 39 ++++++++++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_gl.h | 4 ++++ dlls/wined3d/wined3d_private.h | 9 ++------- include/wine/wined3d.h | 2 ++ 9 files changed, 63 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f62678c16495c3dc2134…

1 0

Henri Verbeet : wined3d: Properly handle scalar destinations in shader_glsl_conditional_move().
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: eefe6346a9640bd42147281472d800f075720cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefe6346a9640bd4214728147… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:40 2012 +0100 wined3d: Properly handle scalar destinations in shader_glsl_conditional_move(). In particular, we modify dst.write_mask in the code further down in order to mask out unused channels, but the writemask is ignored for scalar registers. Since all that code is redundant anyway for scalar destinations, we can just reuse the special case for scalar src0. --- 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 a5df3c3..85c8437 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2878,7 +2878,7 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction break; } - if (shader_is_scalar(&ins->src[0].reg)) + if (shader_is_scalar(&ins->dst[0].reg) || shader_is_scalar(&ins->src[0].reg)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param);

1 0