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

Piotr Caban : msvcp90: Added allocator<char> 64-bit exports.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 2a866928c9834dbc94b506225b58276a4198d937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a866928c9834dbc94b506225… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 10:36:10 2010 +0200 msvcp90: Added allocator<char> 64-bit exports. --- dlls/msvcp90/memory.c | 19 +++++++++++++++---- dlls/msvcp90/msvcp90.spec | 22 +++++++++++----------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 14e6ea0..6c0c50a 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); /* ?address@?$allocator(a)D@std@@QBEPADAAD(a)Z */ +/* ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_address, 8) char* __stdcall MSVCP_allocator_char_address(void *this, char *ptr) { @@ -36,6 +37,7 @@ char* __stdcall MSVCP_allocator_char_address(void *this, char *ptr) } /* ?address@?$allocator(a)D@std@@QBEPBDABD(a)Z */ +/* ?address@?$allocator(a)D@std@@QEBAPEBDAEBD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_const_address, 8) const char* __stdcall MSVCP_allocator_char_const_address(void *this, const char *ptr) { @@ -43,6 +45,7 @@ const char* __stdcall MSVCP_allocator_char_const_address(void *this, const char } /* ??0?$allocator(a)D@std@@QAE(a)XZ */ +/* ??0?$allocator(a)D@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_ctor, 4) void* __stdcall MSVCP_allocator_char_ctor(void *this) { @@ -50,6 +53,7 @@ void* __stdcall MSVCP_allocator_char_ctor(void *this) } /* ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z */ +/* ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_copy_ctor, 8) void* __stdcall MSVCP_allocator_char_copy_ctor(void *this, void *copy) { @@ -57,6 +61,7 @@ void* __stdcall MSVCP_allocator_char_copy_ctor(void *this, void *copy) } /* ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8); void* __stdcall MSVCP_allocator_char_assign(void *this, void *assign) { @@ -64,29 +69,33 @@ void* __stdcall MSVCP_allocator_char_assign(void *this, void *assign) } /* ?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z */ +/* ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12); -void __stdcall MSVCP_allocator_char_deallocate(void *this, char *ptr, unsigned int size) +void __stdcall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t size) { MSVCRT_operator_delete(ptr); } /* ?allocate@?$allocator(a)D@std@@QAEPADI(a)Z */ +/* ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8); -char* __stdcall MSVCP_allocator_char_allocate(void *this, unsigned int count) +char* __stdcall MSVCP_allocator_char_allocate(void *this, size_t count) { return MSVCRT_operator_new(sizeof(char[count])); } /* ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z */ +/* ?allocate@?$allocator(a)D@std@@QEAAPEAD_KPEBX(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12); char* __stdcall MSVCP_allocator_char_allocate_hint(void *this, - unsigned int count, const void *hint) + size_t count, const void *hint) { /* Native ignores hint */ return MSVCP_allocator_char_allocate(this, count); } /* ?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z */ +/* ?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12); void __stdcall MSVCP_allocator_char_construct(void *this, char *ptr, const char *val) { @@ -94,14 +103,16 @@ void __stdcall MSVCP_allocator_char_construct(void *this, char *ptr, const char } /* ?destroy@?$allocator(a)D@std@@QAEXPAD(a)Z */ +/* ?destroy@?$allocator(a)D@std@@QEAAXPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8); void __stdcall MSVCP_allocator_char_destroy(void *this, char *ptr) { } /* ?max_size@?$allocator(a)D@std@@QBEIXZ */ +/* ?max_size@?$allocator(a)D@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4); -unsigned int __stdcall MSVCP_allocator_char_max_size(void *this) +size_t __stdcall MSVCP_allocator_char_max_size(void *this) { return UINT_MAX/sizeof(char); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 34d19f1..34c9061 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -531,9 +531,9 @@ @ stub -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z @ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_copy_ctor -@ stub -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z +@ cdecl -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor @ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)D@std@@QAE(a)XZ() __thiscall_MSVCP_allocator_char_ctor -@ stub -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)XZ +@ cdecl -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)XZ(ptr) MSVCP_allocator_char_ctor @ stub -arch=win32 ??0?$allocator(a)G@std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0?$allocator(a)G@std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0?$allocator(a)G@std@@QAE(a)XZ @@ -1373,7 +1373,7 @@ @ stub -arch=win32 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z @ cdecl -arch=win32 -i386 -norelay ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_assign -@ stub -arch=win64 ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z +@ cdecl -arch=win64 ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ stub -arch=win32 ??4?$allocator(a)G@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4?$allocator(a)G@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4?$allocator(a)X@std@@QAEAAV01(a)ABV01@@Z @@ -2891,9 +2891,9 @@ @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEA_W_K_J(a)Z @ stub ?_Xweak(a)tr1@std@@YAXXZ @ cdecl -arch=win32 -i386 -norelay ?address@?$allocator(a)D@std@@QBEPADAAD(a)Z(ptr) __thiscall_MSVCP_allocator_char_address -@ stub -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z +@ cdecl -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z(ptr ptr) MSVCP_allocator_char_address @ cdecl -arch=win32 -i386 -norelay ?address@?$allocator(a)D@std@@QBEPBDABD(a)Z(ptr) __thiscall_MSVCP_allocator_char_const_address -@ stub -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEBDAEBD(a)Z +@ cdecl -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEBDAEBD(a)Z(ptr ptr) MSVCP_allocator_char_const_address @ stub -arch=win32 ?address@?$allocator(a)G@std@@QBEPAGAAG(a)Z @ stub -arch=win64 ?address@?$allocator(a)G@std@@QEBAPEAGAEAG(a)Z @ stub -arch=win32 ?address@?$allocator(a)G@std@@QBEPBGABG(a)Z @@ -2903,9 +2903,9 @@ @ stub -arch=win32 ?address@?$allocator(a)_W@std@@QBEPB_WAB_W(a)Z @ stub -arch=win64 ?address@?$allocator(a)_W@std@@QEBAPEB_WAEB_W(a)Z @ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator(a)D@std@@QAEPADI(a)Z(long) __thiscall_MSVCP_allocator_char_allocate -@ stub -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z +@ cdecl -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z(ptr long) MSVCP_allocator_char_allocate @ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z(long ptr) __thiscall_MSVCP_allocator_char_allocate_hint -@ stub -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_KPEBX(a)Z +@ cdecl -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_KPEBX(a)Z(ptr long ptr) MSVCP_allocator_char_allocate_hint @ stub -arch=win32 ?allocate@?$allocator(a)G@std@@QAEPAGI(a)Z @ stub -arch=win64 ?allocate@?$allocator(a)G@std@@QEAAPEAG_K(a)Z @ stub -arch=win32 ?allocate@?$allocator(a)G@std@@QAEPAGIPBX(a)Z @@ -3163,7 +3163,7 @@ @ stub -arch=win32 ?compare@?$collate(a)_W@std@@QBEHPB_W000(a)Z @ stub -arch=win64 ?compare@?$collate(a)_W@std@@QEBAHPEB_W000(a)Z @ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z(ptr ptr) __thiscall_MSVCP_allocator_char_construct -@ stub -arch=win64 ?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z +@ cdecl -arch=win64 ?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z(ptr ptr ptr) MSVCP_allocator_char_construct @ stub -arch=win32 ?construct@?$allocator(a)G@std@@QAEXPAGABG(a)Z @ stub -arch=win64 ?construct@?$allocator(a)G@std@@QEAAXPEAGAEBG(a)Z @ stub -arch=win32 ?construct@?$allocator(a)_W@std@@QAEXPA_WAB_W(a)Z @@ -3211,7 +3211,7 @@ @ stub -arch=win32 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=win64 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AW4dateorder(a)time_base@2(a)XZ @ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z(ptr long) __thiscall_MSVCP_allocator_char_deallocate -@ stub -arch=win64 ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z +@ cdecl -arch=win64 ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z(ptr ptr long) MSVCP_allocator_char_deallocate @ stub -arch=win32 ?deallocate@?$allocator(a)G@std@@QAEXPAGI(a)Z @ stub -arch=win64 ?deallocate@?$allocator(a)G@std@@QEAAXPEAG_K(a)Z @ stub -arch=win32 ?deallocate@?$allocator(a)_W@std@@QAEXPA_WI(a)Z @@ -3245,7 +3245,7 @@ @ stub ?denorm_min@?$numeric_limits(a)_N@std@@SA_NXZ @ stub ?denorm_min@?$numeric_limits(a)_W@std@@SA_WXZ @ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator(a)D@std@@QAEXPAD(a)Z(ptr) __thiscall_MSVCP_allocator_char_destroy -@ stub -arch=win64 ?destroy@?$allocator(a)D@std@@QEAAXPEAD(a)Z +@ cdecl -arch=win64 ?destroy@?$allocator(a)D@std@@QEAAXPEAD(a)Z(ptr ptr) MSVCP_allocator_char_destroy @ stub -arch=win32 ?destroy@?$allocator(a)G@std@@QAEXPAG(a)Z @ stub -arch=win64 ?destroy@?$allocator(a)G@std@@QEAAXPEAG(a)Z @ stub -arch=win32 ?destroy@?$allocator(a)_W@std@@QAEXPA_W(a)Z @@ -4510,7 +4510,7 @@ @ stub -arch=win32 ?max_length(a)codecvt_base@std@@QBEHXZ @ stub -arch=win64 ?max_length(a)codecvt_base@std@@QEBAHXZ @ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator(a)D@std@@QBEIXZ() __thiscall_MSVCP_allocator_char_max_size -@ stub -arch=win64 ?max_size@?$allocator(a)D@std@@QEBA_KXZ +@ cdecl -arch=win64 ?max_size@?$allocator(a)D@std@@QEBA_KXZ(ptr) MSVCP_allocator_char_max_size @ stub -arch=win32 ?max_size@?$allocator(a)G@std@@QBEIXZ @ stub -arch=win64 ?max_size@?$allocator(a)G@std@@QEBA_KXZ @ stub -arch=win32 ?max_size@?$allocator(a)_W@std@@QBEIXZ

1 0

Frédéric Delanoy : ipconfig: Add French translation.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 5131ce467166dc34ac4996ed6468668fd3d97633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5131ce467166dc34ac4996ed6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 17 19:39:45 2010 +0200 ipconfig: Add French translation. --- programs/ipconfig/Fr.rc | 47 +++++++++++++++++++++++++++++++++++++++++ programs/ipconfig/Makefile.in | 4 ++- 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/Fr.rc b/programs/ipconfig/Fr.rc new file mode 100644 index 0000000..af3b557 --- /dev/null +++ b/programs/ipconfig/Fr.rc @@ -0,0 +1,47 @@ +/* + * IP configuration utility (French resources) + * + * Copyright 2010 Frédéric Delanoy + * + * 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 "ipconfig.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Usage : ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Erreur : les paramètres de ligne de commande spécifiés sont inconnus ou invalides\n" + STRING_ADAPTER_FRIENDLY, "Adaptateur %s %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Inconnu" + STRING_CONN_DNS_SUFFIX, "Suffixe DNS propre à la connexion" + STRING_IP_ADDRESS, "Adresse IP" + STRING_HOSTNAME, "Nom d'hôte" + STRING_NODE_TYPE, "Type de nœud" + STRING_BROADCAST, "Diffusion" + STRING_PEER_TO_PEER, "Pair à pair" + STRING_MIXED, "Mixte" + STRING_HYBRID, "Hybride" + STRING_IP_ROUTING, "Routage IP activé" + STRING_DESCRIPTION, "Description" + STRING_PHYS_ADDR, "Adresse physique" + STRING_DHCP_ENABLED, "DHCP activé" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index cd0c2dc..461d32d 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -9,6 +9,8 @@ IMPORTS = iphlpapi ws2_32 user32 C_SRCS = ipconfig.c -RC_SRCS = En.rc +RC_SRCS = \ + En.rc \ + Fr.rc @MAKE_PROG_RULES@

1 0

Piotr Caban : msvcp90: Add exception throwing function.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: c83d56628a7a9d22074bbd23a2e61b29d152d98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83d56628a7a9d22074bbd23a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 10:36:40 2010 +0200 msvcp90: Add exception throwing function. --- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/exception.c | 170 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 17 ++++ dlls/msvcp90/msvcp90_main.c | 1 + 4 files changed, 189 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index 5331c45..4581c65 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -8,6 +8,7 @@ MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt C_SRCS = \ + exception.c \ memory.c \ msvcp90_main.c \ string.c diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c new file mode 100644 index 0000000..1988be2 --- /dev/null +++ b/dlls/msvcp90/exception.c @@ -0,0 +1,170 @@ +/* + * Copyright 2010 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 "config.h" + +#include <stdarg.h> + +#include "msvcp90.h" + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); + +/* dlls/msvcrt/cppexcept.h */ +typedef struct __type_info +{ + const vtable_ptr *vtable; + char *name; /* Unmangled name, allocated lazily */ + char mangled[32]; /* Variable length, but we declare it large enough for static RTTI */ +} type_info; + +typedef void (*cxx_copy_ctor)(void); + +/* offsets for computing the this pointer */ +typedef struct +{ + int this_offset; /* offset of base class this pointer from start of object */ + int vbase_descr; /* offset of virtual base class descriptor */ + int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ +} this_ptr_offsets; + +/* complete information about a C++ type */ +typedef struct __cxx_type_info +{ + UINT flags; /* flags (see CLASS_* flags below) */ + const type_info *type_info; /* C++ type info */ + this_ptr_offsets offsets; /* offsets for computing the this pointer */ + unsigned int size; /* object size */ + cxx_copy_ctor copy_ctor; /* copy constructor */ +} cxx_type_info; +#define CLASS_IS_SIMPLE_TYPE 1 +#define CLASS_HAS_VIRTUAL_BASE_CLASS 4 + +/* table of C++ types that apply for a given object */ +typedef struct __cxx_type_info_table +{ + UINT count; /* number of types */ + const cxx_type_info *info[3]; /* variable length, we declare it large enough for static RTTI */ +} cxx_type_info_table; + +/* type information for an exception object */ +typedef struct __cxx_exception_type +{ + UINT flags; /* TYPE_FLAG flags */ + void (*destructor)(void);/* exception object destructor */ + void* /*cxx_exc_custom_handler*/ custom_handler; /* custom handler for this exception */ + 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*); + +/* exception class data */ +static type_info exception_type_info = { + NULL, /* set by set_exception_vtable */ + NULL, + ".?AVexception(a)std@@" +}; + +DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) +exception* __stdcall MSVCP_exception_ctor(exception *this, const char **name) +{ + TRACE("(%p %s)\n", this, *name); + + this->vtable = exception_type_info.vtable; + if(*name) { + unsigned int name_len = strlen(*name) + 1; + this->name = malloc(name_len); + memcpy(this->name, *name, name_len); + this->do_free = TRUE; + } else { + this->name = NULL; + this->do_free = FALSE; + } + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_exception_copy_ctor,8) +exception* __stdcall MSVCP_exception_copy_ctor(exception *this, const exception *rhs) +{ + TRACE("(%p,%p)\n", this, rhs); + + if(!rhs->do_free) { + this->vtable = exception_type_info.vtable; + this->name = rhs->name; + this->do_free = FALSE; + } else + MSVCP_exception_ctor(this, (const char**)&rhs->name); + TRACE("name = %s\n", this->name); + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_exception_dtor,4) +void __stdcall MSVCP_exception_dtor(exception *this) +{ + TRACE("(%p)\n", this); + this->vtable = exception_type_info.vtable; + if(this->do_free) + free(this->name); +} + +static const cxx_type_info exception_cxx_type_info = { + 0, + &exception_type_info, + { 0, -1, 0 }, + sizeof(exception), + (cxx_copy_ctor)THISCALL(MSVCP_exception_dtor) +}; + +static const cxx_type_info_table exception_cxx_type_table = { + 1, + { + &exception_cxx_type_info, + NULL, + NULL + } +}; + +static const cxx_exception_type exception_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_exception_copy_ctor), + NULL, + &exception_cxx_type_table +}; + +void set_exception_vtable(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + exception_type_info.vtable = (void*)GetProcAddress(hmod, "??_7exception@@6B@"); +} + +/* Internal: throws selected exception */ +void throw_exception(exception_type et, const char *str) +{ + const char *addr = str; + + switch(et) { + case EXCEPTION: { + exception e; + MSVCP_exception_ctor(&e, &addr); + _CxxThrowException(&e, &exception_cxx_type); + return; + } + } +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index c70f1c9..f27958b 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -17,6 +17,7 @@ */ #include "stdlib.h" +#include "windef.h" typedef unsigned char MSVCP_BOOL; @@ -43,3 +44,19 @@ extern void (__cdecl *MSVCRT_operator_delete)(void*); #define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ #endif /* __i386__ */ + +/* exception object */ +typedef void (*vtable_ptr)(void); +typedef struct __exception +{ + const vtable_ptr *vtable; + char *name; /* Name of this exception, always a new copy for each object */ + int do_free; /* Whether to free 'name' in our dtor */ +} exception; + +/* Internal: throws selected exception */ +typedef enum __exception_type { + EXCEPTION +} exception_type; +void throw_exception(exception_type, const char *); +void set_exception_vtable(void); diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index dd542fc..9555d48 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -56,6 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); + set_exception_vtable(); break; case DLL_PROCESS_DETACH: break;

1 0

Matteo Bruni : d3dcompiler_34: Stub dll.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 66d44999b86a087a78bd032e483cd51f4737092f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d44999b86a087a78bd032e4… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Jul 29 01:47:13 2010 +0200 d3dcompiler_34: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_34/Makefile.in | 12 ++++++++ dlls/d3dcompiler_34/d3dcompiler_34.spec | 10 ++++++ dlls/d3dcompiler_34/d3dcompiler_34_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_34/version.rc | 27 +++++++++++++++++ 6 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bffc15d..d5bfb14 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_34 enable_d3dcompiler_34 wine_fn_config_dll d3dcompiler_35 enable_d3dcompiler_35 wine_fn_config_dll d3dcompiler_36 enable_d3dcompiler_36 wine_fn_config_dll d3dcompiler_37 enable_d3dcompiler_37 diff --git a/configure.ac b/configure.ac index dd4168a..d3df549 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_34) WINE_CONFIG_DLL(d3dcompiler_35) WINE_CONFIG_DLL(d3dcompiler_36) WINE_CONFIG_DLL(d3dcompiler_37) diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in new file mode 100644 index 0000000..62e755b --- /dev/null +++ b/dlls/d3dcompiler_34/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_34.dll + +C_SRCS = \ + d3dcompiler_34_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_34/d3dcompiler_34.spec b/dlls/d3dcompiler_34/d3dcompiler_34.spec new file mode 100644 index 0000000..5e20e1a --- /dev/null +++ b/dlls/d3dcompiler_34/d3dcompiler_34.spec @@ -0,0 +1,10 @@ +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_34/d3dcompiler_34_main.c b/dlls/d3dcompiler_34/d3dcompiler_34_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_34/d3dcompiler_34_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_34/version.rc b/dlls/d3dcompiler_34/version.rc new file mode 100644 index 0000000..8e89a96 --- /dev/null +++ b/dlls/d3dcompiler_34/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_1.dll" +#define WINE_FILEVERSION 9,19,949,46 +#define WINE_FILEVERSION_STR "9.19.949.0046" +#define WINE_PRODUCTVERSION 9,19,949,46 +#define WINE_PRODUCTVERSION_STR "9.19.949.0046" + +#include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3dcompiler_36: Stub dll.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 458eb08a30ef92bbe1643fb2bf5dd79782350d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=458eb08a30ef92bbe1643fb2b… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 16:37:28 2010 +0200 d3dcompiler_36: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_36/Makefile.in | 12 ++++++++ dlls/d3dcompiler_36/d3dcompiler_36.spec | 10 ++++++ dlls/d3dcompiler_36/d3dcompiler_36_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_36/version.rc | 27 +++++++++++++++++ 6 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 844dde5..985c84a 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_36 enable_d3dcompiler_36 wine_fn_config_dll d3dcompiler_37 enable_d3dcompiler_37 wine_fn_config_dll d3dcompiler_38 enable_d3dcompiler_38 wine_fn_config_dll d3dcompiler_39 enable_d3dcompiler_39 diff --git a/configure.ac b/configure.ac index 982e6f6..a1a4e1d 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_36) WINE_CONFIG_DLL(d3dcompiler_37) WINE_CONFIG_DLL(d3dcompiler_38) WINE_CONFIG_DLL(d3dcompiler_39) diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in new file mode 100644 index 0000000..9fd595c --- /dev/null +++ b/dlls/d3dcompiler_36/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_36.dll + +C_SRCS = \ + d3dcompiler_36_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_36/d3dcompiler_36.spec b/dlls/d3dcompiler_36/d3dcompiler_36.spec new file mode 100644 index 0000000..5e20e1a --- /dev/null +++ b/dlls/d3dcompiler_36/d3dcompiler_36.spec @@ -0,0 +1,10 @@ +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_36/d3dcompiler_36_main.c b/dlls/d3dcompiler_36/d3dcompiler_36_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_36/d3dcompiler_36_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_36/version.rc b/dlls/d3dcompiler_36/version.rc new file mode 100644 index 0000000..db0b23e --- /dev/null +++ b/dlls/d3dcompiler_36/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_36.dll" +#define WINE_FILEVERSION 9,19,949,2111 +#define WINE_FILEVERSION_STR "9.19.949.2111" +#define WINE_PRODUCTVERSION 9,19,949,2111 +#define WINE_PRODUCTVERSION_STR "9.19.949.2111" + +#include "wine/wine_common_ver.rc"

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: aaf285c15d9055d5872beb98ea5b7cd8a48867b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf285c15d9055d5872beb98e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 17 23:24:55 2010 +0100 crypt32: Constify some variables. --- dlls/crypt32/msg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 825b6da..886b724 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -145,7 +145,7 @@ static BOOL WINAPI CRYPT_EncodeContentLength(DWORD dwCertEncodingType, return ret; } -static BOOL CRYPT_EncodeDataContentInfoHeader(CDataEncodeMsg *msg, +static BOOL CRYPT_EncodeDataContentInfoHeader(const CDataEncodeMsg *msg, CRYPT_DATA_BLOB *header) { BOOL ret; @@ -623,7 +623,7 @@ typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS PCERT_BLOB rgAttrCertEncoded; } CMSG_SIGNED_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNED_ENCODE_INFO_WITH_CMS; -static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) +static BOOL CRYPT_IsValidSigner(const CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) { if (signer->cbSize != sizeof(CMSG_SIGNER_ENCODE_INFO) && signer->cbSize != sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS)) @@ -720,7 +720,7 @@ static BOOL CRYPT_ConstructBlob(CRYPT_DATA_BLOB *out, const CRYPT_DATA_BLOB *in) } static BOOL CRYPT_ConstructBlobArray(DWORD *outCBlobs, - PCRYPT_DATA_BLOB *outPBlobs, DWORD cBlobs, const PCRYPT_DATA_BLOB pBlobs) + PCRYPT_DATA_BLOB *outPBlobs, DWORD cBlobs, const CRYPT_DATA_BLOB *pBlobs) { BOOL ret = TRUE; @@ -1647,7 +1647,7 @@ static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, } static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, - CRYPT_DER_BLOB *blob) + const CRYPT_DER_BLOB *blob) { BOOL ret; CRYPT_SIGNED_INFO *signedInfo; @@ -1666,7 +1666,7 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, * It doesn't just use msg's type, to allow a recursive call from an implicitly * typed message once the outer content info has been decoded. */ -static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, +static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, const CRYPT_DER_BLOB *blob, DWORD type) { BOOL ret;

1 0

Matteo Bruni : d3dcompiler_33: Stub dll.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 0ac336ff5d2cdf4b90feaeeaee0f982276886c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac336ff5d2cdf4b90feaeeae… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Jul 29 01:53:54 2010 +0200 d3dcompiler_33: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_33/Makefile.in | 12 ++++++++ dlls/d3dcompiler_33/d3dcompiler_33.spec | 10 ++++++ dlls/d3dcompiler_33/d3dcompiler_33_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_33/version.rc | 27 +++++++++++++++++ 6 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d5bfb14..e26dbf1 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_33 enable_d3dcompiler_33 wine_fn_config_dll d3dcompiler_34 enable_d3dcompiler_34 wine_fn_config_dll d3dcompiler_35 enable_d3dcompiler_35 wine_fn_config_dll d3dcompiler_36 enable_d3dcompiler_36 diff --git a/configure.ac b/configure.ac index d3df549..a5d7b25 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_33) WINE_CONFIG_DLL(d3dcompiler_34) WINE_CONFIG_DLL(d3dcompiler_35) WINE_CONFIG_DLL(d3dcompiler_36) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in new file mode 100644 index 0000000..2674dd8 --- /dev/null +++ b/dlls/d3dcompiler_33/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_33.dll + +C_SRCS = \ + d3dcompiler_33_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_33/d3dcompiler_33.spec b/dlls/d3dcompiler_33/d3dcompiler_33.spec new file mode 100644 index 0000000..5e20e1a --- /dev/null +++ b/dlls/d3dcompiler_33/d3dcompiler_33.spec @@ -0,0 +1,10 @@ +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_33/d3dcompiler_33_main.c b/dlls/d3dcompiler_33/d3dcompiler_33_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_33/d3dcompiler_33_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_33/version.rc b/dlls/d3dcompiler_33/version.rc new file mode 100644 index 0000000..11d0618 --- /dev/null +++ b/dlls/d3dcompiler_33/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_1.dll" +#define WINE_FILEVERSION 9,18,904,15 +#define WINE_FILEVERSION_STR "9.18.904.0015" +#define WINE_PRODUCTVERSION 9,18,904,15 +#define WINE_PRODUCTVERSION_STR "9.18.904.0015" + +#include "wine/wine_common_ver.rc"

1 0

Austin Lund : comctl32/tests: Do not perform comparison of dates if GetDateFormat fails.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: c3f9a4c362f91d04ef6ef4f8b9d5df69431c81b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f9a4c362f91d04ef6ef4f8b… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Aug 18 12:27:38 2010 +1000 comctl32/tests: Do not perform comparison of dates if GetDateFormat fails. --- dlls/comctl32/tests/datetime.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index a97ab34..83f8e03 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -673,10 +673,15 @@ static void test_wm_set_get_text(void) buff[0] = 0; ret = SendMessage(hWnd, WM_GETTEXT, sizeof(buff), (LPARAM)buff); - ok(strcmp(buff, a_str) != 0, "Expected text not to change, got %s\n", buff); - - GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); - ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + ok(strcmp(buff, a_str) != 0, "Expected text to change, got %s\n", buff); + ok(ret != 0, "Expected non-zero return value\n"); + + SetLastError(0xdeadbeef); + ret = GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); + if (ret == 0) + skip("GetDateFormat failed, returned %ld, error %d\n", ret, GetLastError()); + else + ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); DestroyWindow(hWnd); }

1 0

Austin Lund : advapi32/tests: Add more error reporting for ReportEvent tests.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: ffb680569a0d716c324f729ce0af00d9eb75d1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb680569a0d716c324f729ce… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Aug 18 11:22:49 2010 +1000 advapi32/tests: Add more error reporting for ReportEvent tests. --- dlls/advapi32/tests/eventlog.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index ff3f658..88a02c7 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -826,21 +826,24 @@ static void test_readwrite(void) ret = ReportEvent(handle, read_write[i].evt_type, read_write[i].evt_cat, read_write[i].evt_id, run_sidtests ? user : NULL, read_write[i].evt_numstrings, 0, read_write[i].evt_strings, NULL); + ok(ret, "Expected ReportEvent success : %d\n", GetLastError()); count = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected success\n"); + ok(ret, "Expected GetNumberOfEventLogRecords success : %d\n", GetLastError()); ok(count == (i + 1), "Expected %d records, got %d\n", i + 1, count); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); - ok(ret, "Expected success\n"); + ok(ret, "Expected GetOldestEventLogRecord success : %d\n", GetLastError()); ok(oldest == 1 || (oldest > 1 && oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */ "Expected oldest to be 1 or higher, got %d\n", oldest); if (oldest > 1 && oldest != 0xdeadbeef) on_vista = TRUE; + SetLastError(0xdeadbeef); if (i % 2) ret = CloseEventLog(handle); else

1 0

Matteo Bruni : d3dcompiler_35: Stub dll.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 8ea758387cede3bb057ae2db70b7305375887b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea758387cede3bb057ae2db7… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 16:44:37 2010 +0200 d3dcompiler_35: Stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_35/Makefile.in | 12 ++++++++ dlls/d3dcompiler_35/d3dcompiler_35.spec | 10 ++++++ dlls/d3dcompiler_35/d3dcompiler_35_main.c | 44 +++++++++++++++++++++++++++++ dlls/d3dcompiler_35/version.rc | 27 +++++++++++++++++ 6 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 985c84a..bffc15d 100755 --- a/configure +++ b/configure @@ -14453,6 +14453,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_35 enable_d3dcompiler_35 wine_fn_config_dll d3dcompiler_36 enable_d3dcompiler_36 wine_fn_config_dll d3dcompiler_37 enable_d3dcompiler_37 wine_fn_config_dll d3dcompiler_38 enable_d3dcompiler_38 diff --git a/configure.ac b/configure.ac index a1a4e1d..dd4168a 100644 --- a/configure.ac +++ b/configure.ac @@ -2292,6 +2292,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_35) WINE_CONFIG_DLL(d3dcompiler_36) WINE_CONFIG_DLL(d3dcompiler_37) WINE_CONFIG_DLL(d3dcompiler_38) diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in new file mode 100644 index 0000000..aaa2bb5 --- /dev/null +++ b/dlls/d3dcompiler_35/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_35.dll + +C_SRCS = \ + d3dcompiler_35_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_35/d3dcompiler_35.spec b/dlls/d3dcompiler_35/d3dcompiler_35.spec new file mode 100644 index 0000000..5e20e1a --- /dev/null +++ b/dlls/d3dcompiler_35/d3dcompiler_35.spec @@ -0,0 +1,10 @@ +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_35/d3dcompiler_35_main.c b/dlls/d3dcompiler_35/d3dcompiler_35_main.c new file mode 100644 index 0000000..c4745ee --- /dev/null +++ b/dlls/d3dcompiler_35/d3dcompiler_35_main.c @@ -0,0 +1,44 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_35/version.rc b/dlls/d3dcompiler_35/version.rc new file mode 100644 index 0000000..306d2d6 --- /dev/null +++ b/dlls/d3dcompiler_35/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Matteo Bruni 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_35.dll" +#define WINE_FILEVERSION 9,19,949,1104 +#define WINE_FILEVERSION_STR "9.19.949.1104" +#define WINE_PRODUCTVERSION 9,19,949,1104 +#define WINE_PRODUCTVERSION_STR "9.19.949.1104" + +#include "wine/wine_common_ver.rc"

1 0