December 2008 - Wine-commits

Paul Vriens : gdi32/tests: Fix some test failures on Win9x.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: ed4444dae595df8819db8f40e7f410a88bcf7e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4444dae595df8819db8f40e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 11 17:36:46 2008 +0100 gdi32/tests: Fix some test failures on Win9x. --- dlls/gdi32/tests/bitmap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7094f85..76547d3 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -339,7 +339,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER /* test various buffer sizes for GetObject */ ret = GetObject(hbm, 0, NULL); - ok(ret == sizeof(bm), "wrong size %d\n", ret); + ok(ret == sizeof(bm) || broken(ret == sizeof(DIBSECTION) /* Win9x */), "wrong size %d\n", ret); ret = GetObject(hbm, sizeof(*dsa) * 2, dsa); ok(ret == sizeof(*dsa) || broken(ret == sizeof(*dsa) * 2 /* Win9x */), "wrong size %d\n", ret); @@ -367,7 +367,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER memset(&ds, 0xAA, sizeof(ds)); ret = GetObject(hbm, sizeof(ds) - 4, &ds); - ok(ret == sizeof(ds.dsBm), "wrong size %d\n", ret); + ok(ret == sizeof(ds.dsBm) || broken(ret == (sizeof(ds) - 4) /* Win9x */), "wrong size %d\n", ret); ok(ds.dsBm.bmWidth == bmih->biWidth, "%u != %u\n", ds.dsBmih.biWidth, bmih->biWidth); ok(ds.dsBm.bmHeight == bmih->biHeight, "%u != %u\n", ds.dsBmih.biHeight, bmih->biHeight); ok(ds.dsBm.bmBits == bits, "%p != %p\n", ds.dsBm.bmBits, bits); @@ -376,7 +376,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ret == 0, "%d != 0\n", ret); ret = GetObject(hbm, 1, &ds); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == 1 /* Win9x */), "%d != 0\n", ret); } #define test_color_todo(got, exp, txt, todo) \ @@ -2150,7 +2150,7 @@ void test_GdiAlphaBlend() if (!pGdiAlphaBlend) { - skip("GdiAlphaBlend() is not implemented\n"); + win_skip("GdiAlphaBlend() is not implemented\n"); return; }

1 0

Juan Lang : crypt32: Add tests for CryptQueryObject.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 351ebcae25bffaa519a5c0eea9a7c94ebefae5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=351ebcae25bffaa519a5c0eea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 15:21:13 2008 -0800 crypt32: Add tests for CryptQueryObject. --- dlls/crypt32/tests/Makefile.in | 1 + dlls/crypt32/tests/object.c | 229 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=351ebcae25bffaa519a5c…

1 0

Juan Lang : crypt32: Validate input arguments to CryptQueryObject.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 2b384cb0e9f0b0ffd1e55d1a5106a41ad19fbff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b384cb0e9f0b0ffd1e55d1a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 15:21:47 2008 -0800 crypt32: Validate input arguments to CryptQueryObject. --- dlls/crypt32/object.c | 13 +++++++++++++ dlls/crypt32/tests/object.c | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 825dad5..f6e0c84 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -492,6 +492,19 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, dwExpectedFormatTypeFlags, dwFlags, pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, phMsg, ppvContext); + if (dwObjectType != CERT_QUERY_OBJECT_BLOB && + dwObjectType != CERT_QUERY_OBJECT_FILE) + { + WARN("unsupported type %d\n", dwObjectType); + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!pvObject) + { + WARN("missing required argument\n"); + SetLastError(E_INVALIDARG); + return FALSE; + } if (dwExpectedContentTypeFlags & unimplementedTypes) WARN("unimplemented for types %08x\n", dwExpectedContentTypeFlags & unimplementedTypes); diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 6782cb0..23f3597 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -130,13 +130,11 @@ static void test_query_object(void) SetLastError(0xdeadbeef); ret = CryptQueryObject(0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); /* Test with a simple cert */

1 0

Alexandre Julliard : setupapi: Don't include msvcrt headers.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: a537aadd147d11bdfa4a6f557ae32539898eee4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a537aadd147d11bdfa4a6f557… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 22:27:59 2008 +0100 setupapi: Don't include msvcrt headers. --- dlls/setupapi/setupcab.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index a3427d3..f01c3d5 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -37,12 +37,31 @@ #include "setupapi_private.h" #include "fdi.h" #include "wine/unicode.h" - -#include "msvcrt/fcntl.h" -#include "msvcrt/share.h" - #include "wine/debug.h" +/* from msvcrt */ +#define _O_RDONLY 0 +#define _O_WRONLY 1 +#define _O_RDWR 2 +#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) +#define _O_APPEND 0x0008 +#define _O_RANDOM 0x0010 +#define _O_SEQUENTIAL 0x0020 +#define _O_TEMPORARY 0x0040 +#define _O_NOINHERIT 0x0080 +#define _O_CREAT 0x0100 +#define _O_TRUNC 0x0200 +#define _O_EXCL 0x0400 +#define _O_SHORT_LIVED 0x1000 +#define _O_TEXT 0x4000 +#define _O_BINARY 0x8000 + +#define _SH_COMPAT 0x00 +#define _SH_DENYRW 0x10 +#define _SH_DENYWR 0x20 +#define _SH_DENYRD 0x30 +#define _SH_DENYNO 0x40 + OSVERSIONINFOW OsVersionInfo; static HINSTANCE CABINET_hInstance = 0;

1 0

Alexandre Julliard : msvcrt: Don't include msvcrt headers, instead duplicate the definitions in msvcrt.h.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 7a6c6747a90c8a105b8f3ecd868e99da822b9f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6c6747a90c8a105b8f3ecd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 22:28:26 2008 +0100 msvcrt: Don't include msvcrt headers, instead duplicate the definitions in msvcrt.h. --- dlls/msvcrt/except.c | 19 +++++++++---------- dlls/msvcrt/locale.c | 1 - dlls/msvcrt/main.c | 1 - dlls/msvcrt/mbcs.c | 1 - dlls/msvcrt/msvcrt.h | 32 ++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/headers.c | 11 +++++++++++ 6 files changed, 52 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index adcd18c..6a6fed3 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -33,7 +33,6 @@ #include "msvcrt.h" #include "excpt.h" #include "wincon.h" -#include "msvcrt/float.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); @@ -433,13 +432,13 @@ static const struct NTSTATUS status; int signal; } float_exception_map[] = { - { EXCEPTION_FLT_DENORMAL_OPERAND, _FPE_DENORMAL }, - { EXCEPTION_FLT_DIVIDE_BY_ZERO, _FPE_ZERODIVIDE }, - { EXCEPTION_FLT_INEXACT_RESULT, _FPE_INEXACT }, - { EXCEPTION_FLT_INVALID_OPERATION, _FPE_INVALID }, - { EXCEPTION_FLT_OVERFLOW, _FPE_OVERFLOW }, - { EXCEPTION_FLT_STACK_CHECK, _FPE_STACKOVERFLOW }, - { EXCEPTION_FLT_UNDERFLOW, _FPE_UNDERFLOW }, + { EXCEPTION_FLT_DENORMAL_OPERAND, MSVCRT__FPE_DENORMAL }, + { EXCEPTION_FLT_DIVIDE_BY_ZERO, MSVCRT__FPE_ZERODIVIDE }, + { EXCEPTION_FLT_INEXACT_RESULT, MSVCRT__FPE_INEXACT }, + { EXCEPTION_FLT_INVALID_OPERATION, MSVCRT__FPE_INVALID }, + { EXCEPTION_FLT_OVERFLOW, MSVCRT__FPE_OVERFLOW }, + { EXCEPTION_FLT_STACK_CHECK, MSVCRT__FPE_STACKOVERFLOW }, + { EXCEPTION_FLT_UNDERFLOW, MSVCRT__FPE_UNDERFLOW }, }; static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) @@ -479,7 +478,7 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) if (handler != MSVCRT_SIG_IGN) { unsigned int i; - int float_signal = _FPE_INVALID; + int float_signal = MSVCRT__FPE_INVALID; sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL; for (i = 0; i < sizeof(float_exception_map) / @@ -581,7 +580,7 @@ int CDECL MSVCRT_raise(int sig) { sighandlers[sig] = MSVCRT_SIG_DFL; if (sig == MSVCRT_SIGFPE) - ((float_handler)handler)(sig, _FPE_EXPLICITGEN); + ((float_handler)handler)(sig, MSVCRT__FPE_EXPLICITGEN); else handler(sig); } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 350e057..1d27eaf 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -32,7 +32,6 @@ #include "msvcrt.h" #include "mtdll.h" -#include "msvcrt/mbctype.h" #include "wine/debug.h" diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index c807209..598c2a4 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "msvcrt.h" -#include "msvcrt/mbctype.h" #include "wine/debug.h" diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c99d167..22cfea0 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -26,7 +26,6 @@ #include "msvcrt.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "msvcrt/mbctype.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 97d60d6..0fadac4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -598,6 +598,36 @@ typedef void (*MSVCRT___sighandler_t)(int); #define MSVCRT_SIG_IGN ((MSVCRT___sighandler_t)1) #define MSVCRT_SIG_ERR ((MSVCRT___sighandler_t)-1) +#define MSVCRT__FPE_INVALID 0x81 +#define MSVCRT__FPE_DENORMAL 0x82 +#define MSVCRT__FPE_ZERODIVIDE 0x83 +#define MSVCRT__FPE_OVERFLOW 0x84 +#define MSVCRT__FPE_UNDERFLOW 0x85 +#define MSVCRT__FPE_INEXACT 0x86 +#define MSVCRT__FPE_UNEMULATED 0x87 +#define MSVCRT__FPE_SQRTNEG 0x88 +#define MSVCRT__FPE_STACKOVERFLOW 0x8a +#define MSVCRT__FPE_STACKUNDERFLOW 0x8b +#define MSVCRT__FPE_EXPLICITGEN 0x8c + +#define _MS 0x01 +#define _MP 0x02 +#define _M1 0x04 +#define _M2 0x08 + +#define _SBUP 0x10 +#define _SBLOW 0x20 + +#define _MBC_SINGLE 0 +#define _MBC_LEAD 1 +#define _MBC_TRAIL 2 +#define _MBC_ILLEGAL -1 + +#define _MB_CP_SBCS 0 +#define _MB_CP_OEM -2 +#define _MB_CP_ANSI -3 +#define _MB_CP_LOCALE -4 + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); @@ -637,6 +667,7 @@ int __cdecl MSVCRT_raise(int sig); #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int); int __cdecl _getch(void); +int __cdecl _ismbblead(unsigned int); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); MSVCRT_intptr_t __cdecl _spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* const *); @@ -657,6 +688,7 @@ MSVCRT_wchar_t* __cdecl _wcsdup(const MSVCRT_wchar_t*); MSVCRT_wchar_t*** __cdecl __p__wenviron(void); char* __cdecl _strdate(char* date); char* __cdecl _strtime(char* date); +int __cdecl _setmbcp(int); void __cdecl _ftime(struct MSVCRT__timeb *buf); int __cdecl MSVCRT__close(int); int __cdecl MSVCRT__dup(int); diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index d7c7cd7..c9e9570 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -462,6 +462,17 @@ static void test_defines(void) CHECK_DEF(SIGBREAK); CHECK_DEF(SIGABRT); CHECK_DEF(NSIG); + CHECK_DEF(_FPE_INVALID); + CHECK_DEF(_FPE_DENORMAL); + CHECK_DEF(_FPE_ZERODIVIDE); + CHECK_DEF(_FPE_OVERFLOW); + CHECK_DEF(_FPE_UNDERFLOW); + CHECK_DEF(_FPE_INEXACT); + CHECK_DEF(_FPE_UNEMULATED); + CHECK_DEF(_FPE_SQRTNEG); + CHECK_DEF(_FPE_STACKOVERFLOW); + CHECK_DEF(_FPE_STACKUNDERFLOW); + CHECK_DEF(_FPE_EXPLICITGEN); #ifdef __i386__ CHECK_DEF(_EM_INVALID); CHECK_DEF(_EM_DENORMAL);

1 0

Alexandre Julliard : include: Add the msvcrt/crtdefs. h header and include it where needed.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 33fa6c2e25437590d849e11eee7967d4b9f35fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33fa6c2e25437590d849e11ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 22:37:34 2008 +0100 include: Add the msvcrt/crtdefs.h header and include it where needed. --- include/Makefile.in | 1 + include/msvcrt/conio.h | 5 +- include/msvcrt/crtdbg.h | 5 +- include/msvcrt/crtdefs.h | 133 ++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/ctype.h | 18 +----- include/msvcrt/direct.h | 33 +---------- include/msvcrt/dos.h | 5 +- include/msvcrt/eh.h | 5 +- include/msvcrt/errno.h | 5 +- include/msvcrt/fcntl.h | 5 +- include/msvcrt/float.h | 5 +- include/msvcrt/io.h | 29 +--------- include/msvcrt/limits.h | 2 + include/msvcrt/locale.h | 10 +--- include/msvcrt/malloc.h | 26 +-------- include/msvcrt/math.h | 5 +- include/msvcrt/mbctype.h | 5 +- include/msvcrt/mbstring.h | 26 +-------- include/msvcrt/memory.h | 24 +-------- include/msvcrt/process.h | 30 +---------- include/msvcrt/search.h | 25 +-------- include/msvcrt/setjmp.h | 5 +- include/msvcrt/signal.h | 5 +- include/msvcrt/stddef.h | 58 +------------------- include/msvcrt/stdio.h | 39 +------------ include/msvcrt/stdlib.h | 34 +----------- include/msvcrt/string.h | 31 +---------- include/msvcrt/sys/stat.h | 18 +----- include/msvcrt/sys/timeb.h | 10 +--- include/msvcrt/sys/types.h | 25 +-------- include/msvcrt/sys/utime.h | 17 +----- include/msvcrt/time.h | 38 +------------ include/msvcrt/wchar.h | 52 +---------------- include/msvcrt/wctype.h | 18 +----- 34 files changed, 192 insertions(+), 560 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33fa6c2e25437590d849e…

1 0

Alexandre Julliard : msvcrt: Use intptr_t or size_t instead of long where appropriate.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: d8ab5a14aac6d8f9dc493225e352a45784970003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ab5a14aac6d8f9dc493225e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 21:01:38 2008 +0100 msvcrt: Use intptr_t or size_t instead of long where appropriate. --- dlls/msvcrt/dir.c | 26 +++++++++++++------------- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/heap.c | 20 ++++++++++---------- dlls/msvcrt/msvcrt.h | 8 ++++---- dlls/msvcrt/time.c | 2 +- include/msvcrt/io.h | 22 +++++++++++----------- 6 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8ab5a14aac6d8f9dc493…

1 0

Alexandre Julliard : msvcrt: Use iob_func instead of p__iob on non-x86.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 4305e6d1195a46361d900e54f8aa0d0383321446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4305e6d1195a46361d900e54f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 21:13:20 2008 +0100 msvcrt: Use iob_func instead of p__iob on non-x86. --- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/main.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- include/msvcrt/stdio.h | 9 +++++++-- 9 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7fb298e..968e8b5 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -135,7 +135,7 @@ @ cdecl __p__environ() msvcrt.__p__environ @ cdecl __p__fileinfo() msvcrt.__p__fileinfo @ cdecl __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap @ cdecl __p__mbctype() msvcrt.__p__mbctype @ cdecl __p__osver() msvcrt.__p__osver diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 866cd65..888f90c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -451,9 +451,9 @@ static void msvcrt_int_to_base32(int num, char *str) } /********************************************************************* - * __p__iob(MSVCRT.@) + * __iob_func(MSVCRT.@) */ -MSVCRT_FILE * CDECL __p__iob(void) +MSVCRT_FILE * CDECL MSVCRT___iob_func(void) { return &MSVCRT__iob[0]; } diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 598c2a4..96ad792 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -67,10 +67,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { thread_data_t *tls; - TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%ld)\n", + TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%u)\n", hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved, GetCurrentProcessId(), GetCurrentThreadId(), - (long)msvcrt_tls_index); + msvcrt_tls_index); switch (fdwReason) { diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 92bd115..2b2934e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -650,7 +650,7 @@ char* __cdecl MSVCRT_getenv(const char*); char* __cdecl MSVCRT_setlocale(int,const char*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); -MSVCRT_FILE* __cdecl MSVCRT__p__iob(void); +MSVCRT_FILE* __cdecl MSVCRT__iob_func(void); MSVCRT_time_t __cdecl MSVCRT_mktime(struct MSVCRT_tm *t); struct MSVCRT_tm* __cdecl MSVCRT_localtime(const MSVCRT_time_t* secs); struct MSVCRT_tm* __cdecl MSVCRT_gmtime(const MSVCRT_time_t* secs); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3104069..78ad88c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -97,7 +97,7 @@ @ stub __get_app_type @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv -@ cdecl __iob_func() __p__iob +@ cdecl __iob_func() MSVCRT___iob_func @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf @@ -121,7 +121,7 @@ @ cdecl __p__environ() @ stub __p__fileinfo #() @ cdecl __p__fmode() -@ cdecl __p__iob() +@ cdecl -arch=i386 __p__iob() MSVCRT___iob_func @ stub __p__mbcasemap #() @ cdecl __p__mbctype() @ cdecl __p__osver() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 339cb1c..d7a0b55 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -483,7 +483,7 @@ @ cdecl __p__daylight() msvcrt.__p__daylight @ cdecl __p__environ() msvcrt.__p__environ @ cdecl __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl __p__mbctype() msvcrt.__p__mbctype @ cdecl __p__osver() msvcrt.__p__osver @ cdecl __p__pctype() msvcrt.__p__pctype diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e46b157..ff14676 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -532,7 +532,7 @@ @ cdecl __p__dstbias() msvcrt.__p__dstbias @ cdecl __p__environ() msvcrt.__p__environ @ cdecl __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl __p__mbctype() msvcrt.__p__mbctype @ cdecl __p__osver() msvcrt.__p__osver @ cdecl __p__pctype() msvcrt.__p__pctype diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index ec1a4b7..d058922 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -136,7 +136,7 @@ @ cdecl __p__environ() msvcrt.__p__environ @ cdecl __p__fileinfo() msvcrt.__p__fileinfo @ cdecl __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap @ cdecl __p__mbctype() msvcrt.__p__mbctype @ cdecl __p__osver() msvcrt.__p__osver diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 6a5ab65..36087a3 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -81,8 +81,13 @@ extern "C" { #endif #ifndef _STDIO_DEFINED -FILE* __p__iob(void); -#define _iob (__p__iob()) +# ifdef _WIN64 /* __p__iob is not exported in Win64 */ +FILE* __iob_func(void); +# define _iob (__iob_func()) +# else +FILE* __p__iob(void); +# define _iob (__p__iob()) +# endif /* _WIN64 */ #endif /* _STDIO_DEFINED */ #define stdin (_iob+STDIN_FILENO)

1 0

Alexandre Julliard : msvcrt/tests: Load __mb_cur_max and _mbctype dynamically since they may not be available to link against .
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 82bd6f1e100745e36b394379a143548e7d90a931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bd6f1e100745e36b394379a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 22:53:36 2008 +0100 msvcrt/tests: Load __mb_cur_max and _mbctype dynamically since they may not be available to link against. --- dlls/msvcrt/tests/string.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5247515..fdd2580 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -51,6 +51,8 @@ static int (*pstrcpy_s)(char *dst, size_t len, const char *src); static int (*pstrcat_s)(char *dst, size_t len, const char *src); static int (*p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (*p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); +static int *p__mb_cur_max; +static unsigned char *p_mbctype; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -111,14 +113,14 @@ static void test_codepage(int cp) ok(_setmbcp(cp) == 0, "Couldn't set mbcp\n"); - prev = _mbctype[0]; + prev = p_mbctype[0]; printf("static int result_cp_%d_mbctype[] = { ", cp); for (i = 1; i < 257; i++) { - if (_mbctype[i] != prev) + if (p_mbctype[i] != prev) { printf("0x%x,%d, ", prev, count); - prev = _mbctype[i]; + prev = p_mbctype[i]; count = 1; } else @@ -160,11 +162,11 @@ void test_cp_table(int cp, int *result, int *todo) } if (i == *todo + 1) { - todo_wine ok(_mbctype[i] == curr, "CP%d: Mismatch in ctype for character %d - %d instead of %d\n", cp, i-1, _mbctype[i], curr); + todo_wine ok(p_mbctype[i] == curr, "CP%d: Mismatch in ctype for character %d - %d instead of %d\n", cp, i-1, p_mbctype[i], curr); todo++; } else - ok(_mbctype[i] == curr, "CP%d: Mismatch in ctype for character %d - %d instead of %d\n", cp, i-1, _mbctype[i], curr); + ok(p_mbctype[i] == curr, "CP%d: Mismatch in ctype for character %d - %d instead of %d\n", cp, i-1, p_mbctype[i], curr); count--; } } @@ -176,7 +178,7 @@ void test_cp_table(int cp, int *result, int *todo) static void test_mbcp(void) { - int mb_orig_max = __mb_cur_max; + int mb_orig_max = *p__mb_cur_max; int curr_mbcp = _getmbcp(); unsigned char *mbstring = (unsigned char *)"\xb0\xb1\xb2 \xb3\xb4 \xb5"; /* incorrect string */ unsigned char *mbstring2 = (unsigned char *)"\xb0\xb1\xb2\xb3Q\xb4\xb5"; /* correct string */ @@ -190,17 +192,17 @@ static void test_mbcp(void) * between versions of Windows. Also Windows 9x seems to ignore the codepage and always uses * CP1252 (or the ACP?) so we test only a few ASCII characters */ _setmbcp(1252); - expect_eq(_mbctype[10], 0, char, "%x"); - expect_eq(_mbctype[50], 0, char, "%x"); - expect_eq(_mbctype[66], _SBUP, char, "%x"); - expect_eq(_mbctype[100], _SBLOW, char, "%x"); - expect_eq(_mbctype[128], 0, char, "%x"); + expect_eq(p_mbctype[10], 0, char, "%x"); + expect_eq(p_mbctype[50], 0, char, "%x"); + expect_eq(p_mbctype[66], _SBUP, char, "%x"); + expect_eq(p_mbctype[100], _SBLOW, char, "%x"); + expect_eq(p_mbctype[128], 0, char, "%x"); _setmbcp(1250); - expect_eq(_mbctype[10], 0, char, "%x"); - expect_eq(_mbctype[50], 0, char, "%x"); - expect_eq(_mbctype[66], _SBUP, char, "%x"); - expect_eq(_mbctype[100], _SBLOW, char, "%x"); - expect_eq(_mbctype[128], 0, char, "%x"); + expect_eq(p_mbctype[10], 0, char, "%x"); + expect_eq(p_mbctype[50], 0, char, "%x"); + expect_eq(p_mbctype[66], _SBUP, char, "%x"); + expect_eq(p_mbctype[100], _SBLOW, char, "%x"); + expect_eq(p_mbctype[128], 0, char, "%x"); /* double byte code pages */ test_codepage_todo(932, todo_cp_932); @@ -209,7 +211,7 @@ static void test_mbcp(void) test_codepage(950); _setmbcp(936); - ok(__mb_cur_max == mb_orig_max, "__mb_cur_max shouldn't be updated (is %d != %d)\n", __mb_cur_max, mb_orig_max); + ok(*p__mb_cur_max == mb_orig_max, "__mb_cur_max shouldn't be updated (is %d != %d)\n", *p__mb_cur_max, mb_orig_max); ok(_ismbblead('\354'), "\354 should be a lead byte\n"); ok(_ismbblead(' ') == FALSE, "' ' should not be a lead byte\n"); ok(_ismbblead(0x1234b0), "0x1234b0 should not be a lead byte\n"); @@ -346,7 +348,7 @@ static void test_mbcp(void) * we hope the current locale to be SBCS because setlocale(LC_ALL, ".1252") seems not to work yet * (as of Wine 0.9.43) */ - if (__mb_cur_max == 1) + if (*p__mb_cur_max == 1) { expect_eq(mblen((char *)mbstring, 3), 1, int, "%x"); expect_eq(_mbstrlen((char *)mbstring2), 7, int, "%d"); @@ -619,6 +621,8 @@ START_TEST(string) ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); SET(pmemcpy,"memcpy"); SET(pmemcmp,"memcmp"); + SET(p_mbctype,"_mbctype"); + SET(p__mb_cur_max,"__mb_cur_max"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" );

1 0

Alexandre Julliard : msvcrt: Avoid truncated relocations on 64-bit.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 1e8290ded32583ba8872c22408f3a2588f5ecd17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8290ded32583ba8872c2240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 00:05:07 2008 +0100 msvcrt: Avoid truncated relocations on 64-bit. --- dlls/msvcrt/cpp.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index a8687e3..6bc6d3d 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -624,6 +624,22 @@ void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int fl /* vtables */ +#ifdef _WIN64 + +#define __ASM_VTABLE(name,funcs) \ + __asm__(".data\n" \ + "\t.align 8\n" \ + "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ + "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ + __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ + "\t.quad " THISCALL_NAME(MSVCRT_ ## name ## _vector_dtor) "\n" \ + funcs "\n\t.text"); + +#define __ASM_EXCEPTION_VTABLE(name) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCRT_what_exception) ) + +#else + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ "\t.align 4\n" \ @@ -636,6 +652,8 @@ void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int fl #define __ASM_EXCEPTION_VTABLE(name) \ __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ) +#endif /* _WIN64 */ + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif

1 0