February 2016 - Wine-commits

Piotr Caban : msvcp110: Add _Pad implementation.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 289daa665d0cb5afae5f2ce1744fa8eae6db6e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289daa665d0cb5afae5f2ce17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:18 2016 +0100 msvcp110: Add _Pad implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 61 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c911867..fa4ff7b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -892,8 +892,14 @@ extern const vtable_ptr MSVCP__Pad_vtable; DEFINE_THISCALL_WRAPPER(_Pad_ctor, 4) _Pad* __thiscall _Pad_ctor(_Pad *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + this->vtable = &MSVCP__Pad_vtable; + _Cnd_init(&this->cnd); + _Mtx_init(&this->mtx, 0); + this->launched = FALSE; + _Mtx_lock(&this->mtx); + return this; } /* ??4_Pad(a)std@@QAEAAV01(a)ABV01@@Z */ @@ -901,8 +907,12 @@ _Pad* __thiscall _Pad_ctor(_Pad *this) DEFINE_THISCALL_WRAPPER(_Pad_op_assign, 8) _Pad* __thiscall _Pad_op_assign(_Pad *this, const _Pad *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + + this->cnd = copy->cnd; + this->mtx = copy->mtx; + this->launched = copy->launched; + return this; } /* ??0_Pad(a)std@@QAE(a)ABV01@@Z */ @@ -910,8 +920,10 @@ _Pad* __thiscall _Pad_op_assign(_Pad *this, const _Pad *copy) DEFINE_THISCALL_WRAPPER(_Pad_copy_ctor, 8) _Pad* __thiscall _Pad_copy_ctor(_Pad *this, const _Pad *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + + this->vtable = &MSVCP__Pad_vtable; + return _Pad_op_assign(this, copy); } /* ??1_Pad(a)std@@QAE(a)XZ */ @@ -919,7 +931,25 @@ _Pad* __thiscall _Pad_copy_ctor(_Pad *this, const _Pad *copy) DEFINE_THISCALL_WRAPPER(_Pad_dtor, 4) void __thiscall _Pad_dtor(_Pad *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + _Mtx_unlock(&this->mtx); + _Mtx_destroy(&this->mtx); + _Cnd_destroy(&this->cnd); +} + +DEFINE_THISCALL_WRAPPER(_Pad__Go, 4) +#define call__Pad__Go(this) CALL_VTBL_FUNC(this, 0, unsigned int, (_Pad*), (this)) +unsigned int __thiscall _Pad__Go(_Pad *this) +{ + ERR("(%p) should not be called\n", this); + return 0; +} + +static DWORD WINAPI launch_thread_proc(void *arg) +{ + _Pad *this = arg; + return call__Pad__Go(this); } /* ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z */ @@ -927,7 +957,10 @@ void __thiscall _Pad_dtor(_Pad *this) DEFINE_THISCALL_WRAPPER(_Pad__Launch, 8) void __thiscall _Pad__Launch(_Pad *this, _Thrd_t *thr) { - FIXME("(%p %p) stub\n", this, thr); + TRACE("(%p %p)\n", this, thr); + + _Thrd_start(thr, launch_thread_proc, this); + _Cnd_wait(&this->cnd, &this->mtx); } /* ?_Release(a)_Pad@std@@QAEXXZ */ @@ -935,14 +968,12 @@ void __thiscall _Pad__Launch(_Pad *this, _Thrd_t *thr) DEFINE_THISCALL_WRAPPER(_Pad__Release, 4) void __thiscall _Pad__Release(_Pad *this) { - FIXME("(%p) stub\n", this); -} + TRACE("(%p)\n", this); -DEFINE_THISCALL_WRAPPER(_Pad__Go, 4) -unsigned int __thiscall _Pad__Go(_Pad *this) -{ - ERR("(%p) should not be called\n", this); - return 0; + _Mtx_lock(&this->mtx); + this->launched = TRUE; + _Cnd_signal(&this->cnd); + _Mtx_unlock(&this->mtx); } #endif

1 0

Piotr Caban : msvcp120/tests: Added _Pad class tests.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 00210255acfe13df1c5d51f5a4dc15b962d57877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00210255acfe13df1c5d51f5a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:28 2016 +0100 msvcp120/tests: Added _Pad class tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 205 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 204 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 682b4d1..c310b89 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -24,6 +24,54 @@ #include "wine/test.h" #include "winbase.h" +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + static inline float __port_infinity(void) { static const unsigned __inf_bytes = 0x7f800000; @@ -170,7 +218,30 @@ static _Thrd_t __cdecl i386_Thrd_current(void) #endif /* mtx */ -typedef void *_Mtx_t; +typedef struct cs_queue +{ + struct cs_queue *next; + BOOL free; + int unknown; +} cs_queue; + +typedef struct +{ + ULONG_PTR unk_thread_id; + cs_queue unk_active; + void *unknown[2]; + cs_queue *head; + void *tail; +} critical_section; + +typedef struct +{ + DWORD flags; + critical_section cs; + DWORD thread_id; + DWORD count; +} *_Mtx_t; + static int (__cdecl *p__Mtx_init)(_Mtx_t*, int); static void (__cdecl *p__Mtx_destroy)(_Mtx_t*); static int (__cdecl *p__Mtx_lock)(_Mtx_t*); @@ -186,6 +257,23 @@ static int (__cdecl *p__Cnd_timedwait)(_Cnd_t*, _Mtx_t*, const xtime*); static int (__cdecl *p__Cnd_broadcast)(_Cnd_t*); static int (__cdecl *p__Cnd_signal)(_Cnd_t*); +/* _Pad */ +typedef void (*vtable_ptr)(void); + +typedef struct +{ + const vtable_ptr *vtable; + _Cnd_t cnd; + _Mtx_t mtx; + MSVCP_bool launched; +} _Pad; + +static _Pad* (__thiscall *p__Pad_ctor)(_Pad*); +static _Pad* (__thiscall *p__Pad_copy_ctor)(_Pad*, const _Pad*); +static void (__thiscall *p__Pad_dtor)(_Pad*); +static _Pad* (__thiscall *p__Pad_op_assign)(_Pad*, const _Pad*); +static void (__thiscall *p__Pad__Launch)(_Pad*, _Thrd_t*); +static void (__thiscall *p__Pad__Release)(_Pad*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -282,6 +370,18 @@ static BOOL init(void) "?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z"); SET(p__Thrd_current, "_Thrd_current"); + SET(p__Pad_ctor, + "??0_Pad(a)std@@QEAA(a)XZ"); + SET(p__Pad_copy_ctor, + "??0_Pad(a)std@@QEAA(a)AEBV01@@Z"); + SET(p__Pad_dtor, + "??1_Pad(a)std@@QEAA(a)XZ"); + SET(p__Pad_op_assign, + "??4_Pad(a)std@@QEAAAEAV01(a)AEBV01@@Z"); + SET(p__Pad__Launch, + "?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z"); + SET(p__Pad__Release, + "?_Release(a)_Pad@std@@QEAAXXZ"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -347,9 +447,33 @@ static BOOL init(void) SET(p_i386_Thrd_current, "_Thrd_current"); p__Thrd_current = i386_Thrd_current; + SET(p__Pad_ctor, + "??0_Pad(a)std@@QAE(a)XZ"); + SET(p__Pad_copy_ctor, + "??0_Pad(a)std@@QAE(a)ABV01@@Z"); + SET(p__Pad_dtor, + "??1_Pad(a)std@@QAE(a)XZ"); + SET(p__Pad_op_assign, + "??4_Pad(a)std@@QAEAAV01(a)ABV01@@Z"); + SET(p__Pad__Launch, + "?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z"); + SET(p__Pad__Release, + "?_Release(a)_Pad@std@@QAEXXZ"); #else SET(p__Thrd_current, "_Thrd_current"); + SET(p__Pad_ctor, + "??0_Pad(a)std@@QAA(a)XZ"); + SET(p__Pad_copy_ctor, + "??0_Pad(a)std@@QAA(a)ABV01@@Z"); + SET(p__Pad_dtor, + "??1_Pad(a)std@@QAA(a)XZ"); + SET(p__Pad_op_assign, + "??4_Pad(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(p__Pad__Launch, + "?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z"); + SET(p__Pad__Release, + "?_Release(a)_Pad@std@@QAAXXZ"); #endif } SET(p__Thrd_equal, @@ -389,6 +513,8 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); p__setmbcp = (void*)GetProcAddress(msvcr, "_setmbcp"); p_isleadbyte = (void*)GetProcAddress(msvcr, "isleadbyte"); + + init_thiscall_thunk(); return TRUE; } @@ -1805,6 +1931,82 @@ static void test_vbtable_size_exports(void) } } +HANDLE _Pad__Launch_returned; +_Pad pad; +#ifdef __i386__ +/* TODO: this should be a __thiscall function */ +static unsigned int __stdcall vtbl_func__Go(void) +#else +static unsigned int __cdecl vtbl_func__Go(_Pad *this) +#endif +{ + DWORD ret; + + ret = WaitForSingleObject(_Pad__Launch_returned, 100); + ok(ret == WAIT_TIMEOUT, "WiatForSingleObject returned %x\n", ret); + ok(!pad.mtx->count, "pad.mtx.count = %d\n", pad.mtx->count); + ok(!pad.launched, "pad.launched = %x\n", pad.launched); + call_func1(p__Pad__Release, &pad); + ok(pad.launched, "pad.launched = %x\n", pad.launched); + ret = WaitForSingleObject(_Pad__Launch_returned, 100); + ok(ret == WAIT_OBJECT_0, "WiatForSingleObject returned %x\n", ret); + ok(pad.mtx->count == 1, "pad.mtx.count = %d\n", pad.mtx->count); + return 0; +} + +static void test__Pad(void) +{ + _Pad pad_copy; + _Thrd_t thrd; + vtable_ptr pfunc = (vtable_ptr)&vtbl_func__Go; + + _Pad__Launch_returned = CreateEventW(NULL, FALSE, FALSE, NULL); + + pad.vtable = (void*)1; + pad.cnd = (void*)2; + pad.mtx = (void*)3; + pad.launched = TRUE; + memset(&pad_copy, 0, sizeof(pad_copy)); + call_func2(p__Pad_copy_ctor, &pad_copy, &pad); + ok(pad_copy.vtable != (void*)1, "pad_copy.vtable was not set\n"); + ok(pad_copy.cnd == (void*)2, "pad_copy.cnd = %p\n", pad_copy.cnd); + ok(pad_copy.mtx == (void*)3, "pad_copy.mtx = %p\n", pad_copy.mtx); + ok(pad_copy.launched, "pad_copy.launched = %x\n", pad_copy.launched); + + memset(&pad_copy, 0xde, sizeof(pad_copy)); + pad_copy.vtable = (void*)4; + pad_copy.cnd = (void*)5; + pad_copy.mtx = (void*)6; + pad_copy.launched = FALSE; + call_func2(p__Pad_op_assign, &pad_copy, &pad); + ok(pad_copy.vtable == (void*)4, "pad_copy.vtable was set\n"); + ok(pad_copy.cnd == (void*)2, "pad_copy.cnd = %p\n", pad_copy.cnd); + ok(pad_copy.mtx == (void*)3, "pad_copy.mtx = %p\n", pad_copy.mtx); + ok(pad_copy.launched, "pad_copy.launched = %x\n", pad_copy.launched); + + call_func1(p__Pad_ctor, &pad); + call_func2(p__Pad_copy_ctor, &pad_copy, &pad); + ok(pad.vtable == pad_copy.vtable, "pad.vtable = %p, pad_copy.vtable = %p\n", pad.vtable, pad_copy.vtable); + ok(pad.cnd == pad_copy.cnd, "pad.cnd = %p, pad_copy.cnd = %p\n", pad.cnd, pad_copy.cnd); + ok(pad.mtx == pad_copy.mtx, "pad.mtx = %p, pad_copy.mtx = %p\n", pad.mtx, pad_copy.mtx); + ok(pad.launched == pad_copy.launched, "pad.launched = %x, pad_copy.launched = %x\n", pad.launched, pad_copy.launched); + call_func1(p__Pad_dtor, &pad); + /* call_func1(p__Pad_dtor, &pad_copy); - copy constructor is broken, this causes a crash */ + + memset(&pad, 0xfe, sizeof(pad)); + call_func1(p__Pad_ctor, &pad); + ok(!pad.launched, "pad.launched = %x\n", pad.launched); + ok(pad.mtx->count == 1, "pad.mtx.count = %d\n", pad.mtx->count); + + pad.vtable = &pfunc; + call_func2(p__Pad__Launch, &pad, &thrd); + SetEvent(_Pad__Launch_returned); + ok(!p__Thrd_join(thrd, NULL), "_Thrd_join failed\n"); + + call_func1(p__Pad_dtor, &pad); + CloseHandle(_Pad__Launch_returned); +} + START_TEST(msvcp120) { if(!init()) return; @@ -1835,6 +2037,7 @@ START_TEST(msvcp120) test_thrd(); test_cnd(); + test__Pad(); test_vbtable_size_exports();

1 0

Piotr Caban : msvcp120/tests: Run _Unlink tests inside temp directory.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 0301c09d3e52d29f97553992e7f5b517984102e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0301c09d3e52d29f97553992e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:35 2016 +0100 msvcp120/tests: Run _Unlink tests inside temp directory. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index c310b89..915f58a 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1614,6 +1614,7 @@ static void test_tr2_sys__Symlink(void) static void test_tr2_sys__Unlink(void) { + char temp_path[MAX_PATH], current_path[MAX_PATH]; int ret, i; HANDLE file; LARGE_INTEGER file_size; @@ -1631,6 +1632,10 @@ static void test_tr2_sys__Unlink(void) { NULL, ERROR_PATH_NOT_FOUND, FALSE } }; + GetCurrentDirectoryA(MAX_PATH, current_path); + GetTempPathA(MAX_PATH, temp_path); + ok(SetCurrentDirectoryA(temp_path), "SetCurrentDirectoryA to temp_path failed\n"); + ret = p_tr2_sys__Make_dir("tr2_test_dir"); ok(ret == 1, "tr2_sys__Make_dir(): expect 1 got %d\n", ret); file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); @@ -1664,6 +1669,8 @@ static void test_tr2_sys__Unlink(void) ok(!DeleteFileA("tr2_test_dir/f1_symlink"), "expect tr2_test_dir/f1_symlink not to exist\n"); ret = p_tr2_sys__Remove_dir("tr2_test_dir"); ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); + + ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); } static int __cdecl thrd_thread(void *arg)

1 0

Alexandre Julliard : libport: Mark internal functions and data tables as hidden.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 34174e2ca8cb61150d3d880400d8231a39d38307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34174e2ca8cb61150d3d88040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:36:41 2016 +0900 libport: Mark internal functions and data tables as hidden. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 4 ++-- libs/port/fold.c | 4 ++-- libs/port/mbtowc.c | 2 +- libs/port/utf8.c | 2 +- libs/port/wctomb.c | 2 +- tools/make_unicode | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/port/compose.c b/libs/port/compose.c index da49b44..8903d32 100644 --- a/libs/port/compose.c +++ b/libs/port/compose.c @@ -392,7 +392,7 @@ static inline int binary_search( WCHAR ch, int low, int high ) return -1; } -WCHAR wine_compose( const WCHAR *str ) +WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str ) { int pos, idx = 1, start = 0, count = 70; for (;;) diff --git a/libs/port/decompose.c b/libs/port/decompose.c index 3e4a28b..34e83ec 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -747,7 +747,7 @@ static const WCHAR table[4704] = 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf, 0x0000, 0x0000 }; -unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) { const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); unsigned int res; diff --git a/libs/port/digitmap.c b/libs/port/digitmap.c index e6b398d..c200497 100644 --- a/libs/port/digitmap.c +++ b/libs/port/digitmap.c @@ -4,7 +4,7 @@ #include "wine/unicode.h" -const WCHAR wine_digitmap[5933] = +const WCHAR DECLSPEC_HIDDEN wine_digitmap[5933] = { /* index */ 0x01d0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x028a, 0x0384, @@ -786,7 +786,7 @@ const WCHAR wine_digitmap[5933] = 0x0000, 0x0000 }; -const WCHAR wine_compatmap[1497] = +const WCHAR DECLSPEC_HIDDEN wine_compatmap[1497] = { /* index */ 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, diff --git a/libs/port/fold.c b/libs/port/fold.c index 87a4a41..738469c 100644 --- a/libs/port/fold.c +++ b/libs/port/fold.c @@ -22,13 +22,13 @@ static inline WCHAR to_unicode_digit( WCHAR ch ) { - extern const WCHAR wine_digitmap[]; + extern const WCHAR wine_digitmap[] DECLSPEC_HIDDEN; return ch + wine_digitmap[wine_digitmap[ch >> 8] + (ch & 0xff)]; } static inline WCHAR to_unicode_native( WCHAR ch ) { - extern const WCHAR wine_compatmap[]; + extern const WCHAR wine_compatmap[] DECLSPEC_HIDDEN; return ch + wine_compatmap[wine_compatmap[ch >> 8] + (ch & 0xff)]; } diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 9a4bc23..fd7764e 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ); +extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ diff --git a/libs/port/utf8.c b/libs/port/utf8.c index 5943dda..f47561e 100644 --- a/libs/port/utf8.c +++ b/libs/port/utf8.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern WCHAR wine_compose( const WCHAR *str ); +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ static const char utf8_length[128] = diff --git a/libs/port/wctomb.c b/libs/port/wctomb.c index e7f35e5..65e4aa0 100644 --- a/libs/port/wctomb.c +++ b/libs/port/wctomb.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern WCHAR wine_compose( const WCHAR *str ); +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; /****************************************************************/ /* sbcs support */ diff --git a/tools/make_unicode b/tools/make_unicode index 19c6cb1..3a8d610 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1599,9 +1599,9 @@ sub dump_digit_folding($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - DUMP_CASE_TABLE( "wine_digitmap", @digitmap_table ); + DUMP_CASE_TABLE( "DECLSPEC_HIDDEN wine_digitmap", @digitmap_table ); print OUTPUT "\n"; - DUMP_CASE_TABLE( "wine_compatmap", @compatmap_table ); + DUMP_CASE_TABLE( "DECLSPEC_HIDDEN wine_compatmap", @compatmap_table ); close OUTPUT; save_file($filename); } @@ -2113,7 +2113,7 @@ static inline int binary_search( WCHAR ch, int low, int high ) return -1; } -WCHAR wine_compose( const WCHAR *str ) +WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str ) { int pos, idx = 1, start = 0, count = $count; for (;;) @@ -2218,7 +2218,7 @@ sub dump_decompose_table($) printf OUTPUT "\n};\n\n"; print OUTPUT <<"EOF"; -unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) { const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); unsigned int res;

1 0

Charles Davis : d3d10core/tests: Silence absolute value warnings (Clang).
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 65999e26b20b201a9780b145459266bc78b8fcbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=65999e26b20b201a9780b1454… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 19 15:50:34 2016 -0700 d3d10core/tests: Silence absolute value warnings (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e2c1683..60b243a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -71,16 +71,16 @@ static BOOL compare_float(float f, float g, unsigned int ulps) static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; return TRUE; }

1 0

Paul Gofman : wined3d: Bind default sampler object when setting sampler state with no texture.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 749d5a577b5c09f57ad062777f33be802e1373dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=749d5a577b5c09f57ad062777… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Feb 20 17:00:55 2016 +0300 wined3d: Bind default sampler object when setting sampler state with no texture. When sampler state was applied and no stage texture was present in state, no glBindSampler was issued for the stage after dummy texture was bound, and previously bound sampler was still active. This could result in undefined behaviour, especially if previously bound sampler was a shadow sample (this caused warnings from Nvidia driver). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 58d2fed..3e08907 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3627,6 +3627,11 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state else { context_bind_texture(context, GL_NONE, 0); + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + GL_EXTCALL(glBindSampler(mapped_stage, 0)); + checkGLcall("glBindSampler"); + } } }

1 0

Stefan Dösinger : wined3d: Retrieve FBO attachments from GL in context_check_fbo_status.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: f11f6f681e923f9d47a0f7d0151e02cd750cd150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11f6f681e923f9d47a0f7d01… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:29:56 2016 +0000 wined3d: Retrieve FBO attachments from GL in context_check_fbo_status. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 115 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 29 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 123 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 442516a..3668195 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -243,6 +243,95 @@ static void context_attach_surface_fbo(struct wined3d_context *context, } } +static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, GLenum target, + GLenum attachment) +{ + GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; + + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &name); + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &type); + + if (type == GL_RENDERBUFFER) + { + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, name); + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &width); + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &height); + if (gl_info->limits.samples > 1) + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, &samples); + else + samples = 1; + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_INTERNAL_FORMAT, &fmt); + FIXME(" %s: renderbuffer %d, %dx%d, %d samples, format %#x.\n", + debug_fboattachment(attachment), name, width, height, samples, fmt); + } + else if (type == GL_TEXTURE) + { + const char *tex_type_str; + + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL, &level); + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE, &face); + + if (face) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &old_texture); + + glBindTexture(GL_TEXTURE_CUBE_MAP, name); + glGetTexLevelParameteriv(face, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + glGetTexLevelParameteriv(face, level, GL_TEXTURE_WIDTH, &width); + glGetTexLevelParameteriv(face, level, GL_TEXTURE_HEIGHT, &height); + + tex_target = GL_TEXTURE_CUBE_MAP; + tex_type_str = "cube"; + } + else + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_texture); + while (gl_info->gl_ops.gl.p_glGetError()); + + glBindTexture(GL_TEXTURE_2D, name); + if (!gl_info->gl_ops.gl.p_glGetError()) + { + tex_target = GL_TEXTURE_2D; + tex_type_str = "2d"; + } + else + { + glBindTexture(GL_TEXTURE_2D, old_texture); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_texture); + + glBindTexture(GL_TEXTURE_RECTANGLE_ARB, name); + if (gl_info->gl_ops.gl.p_glGetError()) + { + glBindTexture(GL_TEXTURE_RECTANGLE_ARB, old_texture); + FIXME("Cannot find type of texture %d.\n", name); + return; + } + tex_target = GL_TEXTURE_RECTANGLE_ARB; + tex_type_str = "rectangle"; + } + + glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); + glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + } + + FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), + tex_type_str, name, width, height, fmt); + + glBindTexture(tex_target, old_texture); + } + else if (type == GL_NONE) + { + FIXME("\t%s: NONE.\n", debug_fboattachment(attachment)); + } + else + ERR("\t%s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type); +} + /* Context activation is done by the caller. */ void context_check_fbo_status(const struct wined3d_context *context, GLenum target) { @@ -258,7 +347,6 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ } else { - const struct wined3d_surface *attachment; unsigned int i; FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); @@ -269,29 +357,12 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ return; } - FIXME("\tColor Location %s (%#x).\n", wined3d_debug_location(context->current_fbo->color_location), - context->current_fbo->color_location); - FIXME("\tDepth Stencil Location %s (%#x).\n", wined3d_debug_location(context->current_fbo->ds_location), - context->current_fbo->ds_location); + context_dump_fbo_attachment(gl_info, target, GL_DEPTH_ATTACHMENT); + context_dump_fbo_attachment(gl_info, target, GL_STENCIL_ATTACHMENT); - /* Dump the FBO attachments */ for (i = 0; i < gl_info->limits.buffers; ++i) - { - attachment = context->current_fbo->render_targets[i]; - if (attachment) - { - FIXME("\tColor attachment %d: (%p) %s %ux%u %u samples.\n", - i, attachment, debug_d3dformat(attachment->resource.format->id), - attachment->pow2Width, attachment->pow2Height, attachment->resource.multisample_type); - } - } - attachment = context->current_fbo->depth_stencil; - if (attachment) - { - FIXME("\tDepth attachment: (%p) %s %ux%u %u samples.\n", - attachment, debug_d3dformat(attachment->resource.format->id), - attachment->pow2Width, attachment->pow2Height, attachment->resource.multisample_type); - } + context_dump_fbo_attachment(gl_info, target, GL_COLOR_ATTACHMENT0 + i); + checkGLcall("Dump FBO attachments"); } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 734b265..4e33f86 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3948,6 +3948,35 @@ const char *debug_d3dpool(enum wined3d_pool pool) } } +const char *debug_fboattachment(GLenum attachment) +{ + switch(attachment) + { +#define WINED3D_TO_STR(x) case x: return #x + WINED3D_TO_STR(GL_COLOR_ATTACHMENT0); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT1); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT2); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT3); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT4); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT5); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT6); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT7); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT8); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT9); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT10); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT11); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT12); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT13); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT14); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT15); + WINED3D_TO_STR(GL_DEPTH_ATTACHMENT); + WINED3D_TO_STR(GL_STENCIL_ATTACHMENT); +#undef WINED3D_TO_STR + default: + return wine_dbg_sprintf("Unknown FBO attachment %#x", attachment); + } +} + const char *debug_fbostatus(GLenum status) { switch(status) { #define FBOSTATUS_TO_STR(u) case u: return #u diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e3d779..324fabd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2969,6 +2969,7 @@ const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_t const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN; const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN; const char *debug_d3dpool(enum wined3d_pool pool) DECLSPEC_HIDDEN; +const char *debug_fboattachment(GLenum attachment) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Implement WsGetNamespaceFromPrefix.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 3609e3f47f04ec01dc874f1188f9f94a7c051d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3609e3f47f04ec01dc874f118… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:55 2016 +0100 webservices: Implement WsGetNamespaceFromPrefix. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 61 +++++++++++++ dlls/webservices/tests/reader.c | 179 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 + 4 files changed, 243 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3609e3f47f04ec01dc874…

1 0

Charles Davis : winecoreaudio.drv: Don' t print 32-bit values as long integers (Clang).
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 4a00695db677efd7856e7ab59360d18a95555057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a00695db677efd7856e7ab59… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 22 16:23:42 2016 -0700 winecoreaudio.drv: Don't print 32-bit values as long integers (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a00695db677efd7856e7…

1 0

Sebastian Lackner : ntdll/tests: Allow broken SpinCount for some Win 8+ systems.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: dcf914857c1e29b64a31a67685b123a09db1bae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf914857c1e29b64a31a6768… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 23 15:14:00 2016 +0100 ntdll/tests: Allow broken SpinCount for some Win 8+ systems. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 1b17a7e..fc0d4b4 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2075,8 +2075,9 @@ static void test_RtlInitializeCriticalSectionEx(void) "expected DebugInfo != NULL and DebugInfo != ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); - ok(cs.LockSemaphore == 0, "expected LockSemaphore == 0, got %p\n", cs.LockSemaphore); - ok(cs.SpinCount == 0, "expected SpinCount == 0, got %ld\n", cs.SpinCount); + ok(cs.LockSemaphore == NULL, "expected LockSemaphore == NULL, got %p\n", cs.LockSemaphore); + ok(cs.SpinCount == 0 || broken(cs.SpinCount != 0) /* >= Win 8 */, + "expected SpinCount == 0, got %ld\n", cs.SpinCount); RtlDeleteCriticalSection(&cs); memset(&cs, 0x11, sizeof(cs)); @@ -2085,7 +2086,7 @@ static void test_RtlInitializeCriticalSectionEx(void) ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); - ok(cs.LockSemaphore == 0, "expected LockSemaphore == 0, got %p\n", cs.LockSemaphore); + ok(cs.LockSemaphore == NULL, "expected LockSemaphore == NULL, got %p\n", cs.LockSemaphore); ok(cs.SpinCount == 0 || broken(cs.SpinCount != 0) /* >= Win 8 */, "expected SpinCount == 0, got %ld\n", cs.SpinCount); RtlDeleteCriticalSection(&cs);

1 0