wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Piotr Caban : msvcp90/tests: Added allocator<char> tests.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 51a55fc9e2a59a4f702ceb9528f84abdbc2e2648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a55fc9e2a59a4f702ceb952… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 10:36:29 2010 +0200 msvcp90/tests: Added allocator<char> tests. --- dlls/msvcp90/tests/misc.c | 168 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index a3f7401..d052225 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -34,6 +34,22 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); +#ifdef __i386__ +static char* (WINAPI *p_char_address)(char*); +static void* (WINAPI *p_char_ctor)(void); +static void (WINAPI *p_char_deallocate)(char*, size_t); +static char* (WINAPI *p_char_allocate)(size_t); +static void (WINAPI *p_char_construct)(char*, const char*); +static size_t (WINAPI *p_char_max_size)(void); +#else +static char* (__cdecl *p_char_address)(void*, char*); +static void* (__cdecl *p_char_ctor)(void*); +static void (__cdecl *p_char_deallocate)(void*, char*, size_t); +static char* (__cdecl *p_char_allocate)(void*, size_t); +static void (__cdecl *p_char_construct)(void*, char*, const char*); +static size_t (__cdecl *p_char_max_size)(void*); +#endif + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -47,6 +63,105 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, invalid_parameter++; } +/* Emulate a __thiscall */ +#ifdef __i386__ +#ifdef _MSC_VER +static inline void* do_call_func1(void *func, void *_this) +{ + volatile void* retval = 0; + __asm + { + push ecx + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} + +static inline void* do_call_func2(void *func, void *_this, const void *arg) +{ + volatile void* retval = 0; + __asm + { + push ecx + push arg + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} + +static inline void* do_call_func3(void *func, void *_this, + const void *arg1, const void *arg2) +{ + volatile void* retval = 0; + __asm + { + push ecx + push arg1 + push arg2 + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} +#else +static void* do_call_func1(void *func, void *_this) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "call *%2" + : "=a" (ret), "=c" (dummy) + : "g" (func), "1" (_this) + : "edx", "memory" + ); + return ret; +} + +static void* do_call_func2(void *func, void *_this, const void *arg) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "pushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg), "1" (_this) + : "edx", "memory" + ); + return ret; +} + +static void* do_call_func3(void *func, void *_this, + const void *arg1, const void *arg2) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "pushl %4\n\tpushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg1), "r" (arg2), "1" (_this) + : "edx", "memory" + ); + return ret; +} +#endif + +#define call_func1(func,_this) do_call_func1(func,_this) +#define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)a) +#define call_func3(func,_this,a,b) do_call_func3(func,_this,(const void*)a,(const void*)b) + +#else + +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) +#define call_func3(func,_this,a,b) func(_this,a,b) + +#endif /* __i386__ */ + static BOOL init(void) { HMODULE msvcr = LoadLibraryA("msvcr90.dll"); @@ -74,6 +189,13 @@ static BOOL init(void) p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NAEBG0@Z"); p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z"); + + p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator@D@std@@QEBAPEADAEAD@Z"); + p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator@D@std@@QEAA@XZ"); + p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z"); + p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator@D@std@@QEAAPEAD_K@Z"); + p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z"); + p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator@D@std@@QEBA_KXZ"); } else { p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); @@ -84,6 +206,13 @@ static BOOL init(void) p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NABG0@Z"); p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z"); + + p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator@D@std@@QBEPADAAD@Z"); + p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator@D@std@@QAE@XZ"); + p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator@D@std@@QAEXPADI@Z"); + p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator@D@std@@QAEPADI@Z"); + p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator@D@std@@QAEXPADABD@Z"); + p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator@D@std@@QBEIXZ"); } return TRUE; @@ -199,6 +328,43 @@ static void test_Copy_s(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } +static void test_allocator_char(void) +{ + void *allocator = (void*)0xdeadbeef; + char *ptr; + char val; + unsigned int size; + + if(!p_char_address || !p_char_ctor || !p_char_deallocate || !p_char_allocate + || !p_char_construct || !p_char_max_size) { + win_skip("allocator<char> class not available\n"); + return; + } + + allocator = call_func1(p_char_ctor, allocator); + ok(allocator == (void*)0xdeadbeef, "allocator = %p\n", allocator); + + ptr = call_func2(p_char_address, NULL, (void*)0xdeadbeef); + ok(ptr == (void*)0xdeadbeef, "incorrect address (%p)\n", ptr); + + ptr = NULL; + ptr = call_func2(p_char_allocate, allocator, 10); + ok(ptr != NULL, "Memory allocation failed\n"); + + ptr[0] = ptr[1] = '#'; + val = 'a'; + call_func3(p_char_construct, allocator, ptr, &val); + val = 'b'; + call_func3(p_char_construct, allocator, (ptr+1), &val); + ok(ptr[0] == 'a', "ptr[0] = %c\n", ptr[0]); + ok(ptr[1] == 'b', "ptr[1] = %c\n", ptr[1]); + + call_func3(p_char_deallocate, allocator, ptr, -1); + + size = (unsigned int)call_func1(p_char_max_size, allocator); + ok(size == (unsigned int)0xffffffff, "size = %x\n", size); +} + START_TEST(misc) { if(!init()) @@ -208,5 +374,7 @@ START_TEST(misc) test_equal(); test_Copy_s(); + test_allocator_char(); + ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

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

18 Aug '10

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@D@std@@QBEPADAAD@Z */ +/* ?address@?$allocator@D@std@@QEBAPEADAEAD@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@D@std@@QBEPBDABD@Z */ +/* ?address@?$allocator@D@std@@QEBAPEBDAEBD@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@D@std@@QAE@XZ */ +/* ??0?$allocator@D@std@@QEAA@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@D@std@@QAE@ABV01@@Z */ +/* ??0?$allocator@D@std@@QEAA@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@D@std@@QAEAAV01@ABV01@@Z */ +/* ??4?$allocator@D@std@@QEAAAEAV01@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@D@std@@QAEXPADI@Z */ +/* ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@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@D@std@@QAEPADI@Z */ +/* ?allocate@?$allocator@D@std@@QEAAPEAD_K@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@D@std@@QAEPADIPBX@Z */ +/* ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@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@D@std@@QAEXPADABD@Z */ +/* ?construct@?$allocator@D@std@@QEAAXPEADAEBD@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@D@std@@QAEXPAD@Z */ +/* ?destroy@?$allocator@D@std@@QEAAXPEAD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8); void __stdcall MSVCP_allocator_char_destroy(void *this, char *ptr) { } /* ?max_size@?$allocator@D@std@@QBEIXZ */ +/* ?max_size@?$allocator@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@_WV?$allocator@_W@std@@@std@@QAE@ABV01@@Z @ stub -arch=win64 ??0?$_String_val@_WV?$allocator@_W@std@@@std@@QEAA@AEBV01@@Z @ cdecl -arch=win32 -i386 -norelay ??0?$allocator@D@std@@QAE@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_copy_ctor -@ stub -arch=win64 ??0?$allocator@D@std@@QEAA@AEBV01@@Z +@ cdecl -arch=win64 ??0?$allocator@D@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor @ cdecl -arch=win32 -i386 -norelay ??0?$allocator@D@std@@QAE@XZ() __thiscall_MSVCP_allocator_char_ctor -@ stub -arch=win64 ??0?$allocator@D@std@@QEAA@XZ +@ cdecl -arch=win64 ??0?$allocator@D@std@@QEAA@XZ(ptr) MSVCP_allocator_char_ctor @ stub -arch=win32 ??0?$allocator@G@std@@QAE@ABV01@@Z @ stub -arch=win64 ??0?$allocator@G@std@@QEAA@AEBV01@@Z @ stub -arch=win32 ??0?$allocator@G@std@@QAE@XZ @@ -1373,7 +1373,7 @@ @ stub -arch=win32 ??4?$_String_val@_WV?$allocator@_W@std@@@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4?$_String_val@_WV?$allocator@_W@std@@@std@@QEAAAEAV01@AEBV01@@Z @ cdecl -arch=win32 -i386 -norelay ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_assign -@ stub -arch=win64 ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z +@ cdecl -arch=win64 ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ stub -arch=win32 ??4?$allocator@G@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4?$allocator@G@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z @@ -2891,9 +2891,9 @@ @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEA_W_K_J@Z @ stub ?_Xweak@tr1@std@@YAXXZ @ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@D@std@@QBEPADAAD@Z(ptr) __thiscall_MSVCP_allocator_char_address -@ stub -arch=win64 ?address@?$allocator@D@std@@QEBAPEADAEAD@Z +@ cdecl -arch=win64 ?address@?$allocator@D@std@@QEBAPEADAEAD@Z(ptr ptr) MSVCP_allocator_char_address @ cdecl -arch=win32 -i386 -norelay ?address@?$allocator@D@std@@QBEPBDABD@Z(ptr) __thiscall_MSVCP_allocator_char_const_address -@ stub -arch=win64 ?address@?$allocator@D@std@@QEBAPEBDAEBD@Z +@ cdecl -arch=win64 ?address@?$allocator@D@std@@QEBAPEBDAEBD@Z(ptr ptr) MSVCP_allocator_char_const_address @ stub -arch=win32 ?address@?$allocator@G@std@@QBEPAGAAG@Z @ stub -arch=win64 ?address@?$allocator@G@std@@QEBAPEAGAEAG@Z @ stub -arch=win32 ?address@?$allocator@G@std@@QBEPBGABG@Z @@ -2903,9 +2903,9 @@ @ stub -arch=win32 ?address@?$allocator@_W@std@@QBEPB_WAB_W@Z @ stub -arch=win64 ?address@?$allocator@_W@std@@QEBAPEB_WAEB_W@Z @ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@D@std@@QAEPADI@Z(long) __thiscall_MSVCP_allocator_char_allocate -@ stub -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z +@ cdecl -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z(ptr long) MSVCP_allocator_char_allocate @ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator@D@std@@QAEPADIPBX@Z(long ptr) __thiscall_MSVCP_allocator_char_allocate_hint -@ stub -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z +@ cdecl -arch=win64 ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z(ptr long ptr) MSVCP_allocator_char_allocate_hint @ stub -arch=win32 ?allocate@?$allocator@G@std@@QAEPAGI@Z @ stub -arch=win64 ?allocate@?$allocator@G@std@@QEAAPEAG_K@Z @ stub -arch=win32 ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z @@ -3163,7 +3163,7 @@ @ stub -arch=win32 ?compare@?$collate@_W@std@@QBEHPB_W000@Z @ stub -arch=win64 ?compare@?$collate@_W@std@@QEBAHPEB_W000@Z @ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator@D@std@@QAEXPADABD@Z(ptr ptr) __thiscall_MSVCP_allocator_char_construct -@ stub -arch=win64 ?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z +@ cdecl -arch=win64 ?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z(ptr ptr ptr) MSVCP_allocator_char_construct @ stub -arch=win32 ?construct@?$allocator@G@std@@QAEXPAGABG@Z @ stub -arch=win64 ?construct@?$allocator@G@std@@QEAAXPEAGAEBG@Z @ stub -arch=win32 ?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z @@ -3211,7 +3211,7 @@ @ stub -arch=win32 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ @ stub -arch=win64 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ @ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator@D@std@@QAEXPADI@Z(ptr long) __thiscall_MSVCP_allocator_char_deallocate -@ stub -arch=win64 ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z +@ cdecl -arch=win64 ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z(ptr ptr long) MSVCP_allocator_char_deallocate @ stub -arch=win32 ?deallocate@?$allocator@G@std@@QAEXPAGI@Z @ stub -arch=win64 ?deallocate@?$allocator@G@std@@QEAAXPEAG_K@Z @ stub -arch=win32 ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z @@ -3245,7 +3245,7 @@ @ stub ?denorm_min@?$numeric_limits@_N@std@@SA_NXZ @ stub ?denorm_min@?$numeric_limits@_W@std@@SA_WXZ @ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator@D@std@@QAEXPAD@Z(ptr) __thiscall_MSVCP_allocator_char_destroy -@ stub -arch=win64 ?destroy@?$allocator@D@std@@QEAAXPEAD@Z +@ cdecl -arch=win64 ?destroy@?$allocator@D@std@@QEAAXPEAD@Z(ptr ptr) MSVCP_allocator_char_destroy @ stub -arch=win32 ?destroy@?$allocator@G@std@@QAEXPAG@Z @ stub -arch=win64 ?destroy@?$allocator@G@std@@QEAAXPEAG@Z @ stub -arch=win32 ?destroy@?$allocator@_W@std@@QAEXPA_W@Z @@ -4510,7 +4510,7 @@ @ stub -arch=win32 ?max_length@codecvt_base@std@@QBEHXZ @ stub -arch=win64 ?max_length@codecvt_base@std@@QEBAHXZ @ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator@D@std@@QBEIXZ() __thiscall_MSVCP_allocator_char_max_size -@ stub -arch=win64 ?max_size@?$allocator@D@std@@QEBA_KXZ +@ cdecl -arch=win64 ?max_size@?$allocator@D@std@@QEBA_KXZ(ptr) MSVCP_allocator_char_max_size @ stub -arch=win32 ?max_size@?$allocator@G@std@@QBEIXZ @ stub -arch=win64 ?max_size@?$allocator@G@std@@QEBA_KXZ @ stub -arch=win32 ?max_size@?$allocator@_W@std@@QBEIXZ

1 0

Austin English : kernel32: Add stub for SetFileValidData.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 7cd7851ca149101183ee90ea3b69e1ad7d55591a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd7851ca149101183ee90ea3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 18 00:17:39 2010 -0700 kernel32: Add stub for SetFileValidData. --- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index edec6b0..dadaea6 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1001,6 +1001,16 @@ error: } /*********************************************************************** + * SetFileValidData (KERNEL32.@) + */ +BOOL WINAPI SetFileValidData( HANDLE hFile, LONGLONG ValidDataLength ) +{ + FIXME("stub: %p, %s\n", hFile, wine_dbgstr_longlong(ValidDataLength)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetFileTime (KERNEL32.@) */ BOOL WINAPI GetFileTime( HANDLE hFile, FILETIME *lpCreationTime, diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e7ae774..601644f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1030,7 +1030,7 @@ # @ stub SetFileShortNameA # @ stub SetFileShortNameW @ stdcall SetFileTime(long ptr ptr ptr) -# @ stub SetFileValidData +@ stdcall SetFileValidData(ptr double) # @ stub SetFirmwareEnvironmentVariableA # @ stub SetFirmwareEnvironmentVariableW @ stdcall SetHandleContext(long long)

1 0

Matteo Bruni : d3dcompiler_33: Stub dll.
by Alexandre Julliard 18 Aug '10

18 Aug '10

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 + +@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

Matteo Bruni : d3dcompiler_34: Stub dll.
by Alexandre Julliard 18 Aug '10

18 Aug '10

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 + +@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_35: Stub dll.
by Alexandre Julliard 18 Aug '10

18 Aug '10

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 + +@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

Matteo Bruni : d3dcompiler_36: Stub dll.
by Alexandre Julliard 18 Aug '10

18 Aug '10

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 + +@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 18 Aug '10

18 Aug '10

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

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

18 Aug '10

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 18 Aug '10

18 Aug '10

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

← Newer
1
...
50
51
52
53
54
55
56
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010