diff --git a/configure b/configure index ed41bb5c27e6a63e96e8aed631423c5787d20e36..60dc4ab95fc9cdeeae3c6dc1edb5646e43ef6526 100755 --- a/configure +++ b/configure @@ -14377,8 +14377,8 @@ wine_fn_config_test dlls/mstask/tests mstask_test wine_fn_config_dll msvcirt enable_msvcirt wine_fn_config_dll msvcr70 enable_msvcr70 msvcr70 wine_fn_config_dll msvcr71 enable_msvcr71 msvcr71 -wine_fn_config_dll msvcr80 enable_msvcr80 msvcr80 -wine_fn_config_dll msvcr90 enable_msvcr90 msvcr90 +wine_fn_config_dll msvcr80 enable_msvcr80 +wine_fn_config_dll msvcr90 enable_msvcr90 wine_fn_config_test dlls/msvcr90/tests msvcr90_test wine_fn_config_dll msvcrt enable_msvcrt msvcrt wine_fn_config_test dlls/msvcrt/tests msvcrt_test diff --git a/configure.ac b/configure.ac index 31c71706041424947f52051473a8341b8068c30e..fe11a04f2fd0a3dc73474980de861438ca7bacaf 100644 --- a/configure.ac +++ b/configure.ac @@ -2398,8 +2398,8 @@ WINE_CONFIG_TEST(dlls/mstask/tests) WINE_CONFIG_DLL(msvcirt) WINE_CONFIG_DLL(msvcr70,,[msvcr70]) WINE_CONFIG_DLL(msvcr71,,[msvcr71]) -WINE_CONFIG_DLL(msvcr80,,[msvcr80]) -WINE_CONFIG_DLL(msvcr90,,[msvcr90]) +WINE_CONFIG_DLL(msvcr80) +WINE_CONFIG_DLL(msvcr90) WINE_CONFIG_TEST(dlls/msvcr90/tests) WINE_CONFIG_DLL(msvcrt,,[msvcrt]) WINE_CONFIG_TEST(dlls/msvcrt/tests) diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 31dae6a0b237889d92758120bb1f6e220aa3e9cb..a448e41bbbc74ca231b0f9cf83035dccc0df2a3e 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -3,8 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcr80.dll -IMPORTLIB = msvcr80 -IMPORTS = msvcrt msvcr90 kernel32 +IMPORTS = msvcrt kernel32 C_SRCS = \ msvcr80.c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7c1e10021f7cf6fa353aac93ca9e23a81772acff..13a7fa174151d329327c10bf9c911c798f04e27e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -360,7 +360,7 @@ @ stub _cwscanf_s @ stub _cwscanf_s_l @ extern _daylight msvcrt._daylight -@ stub _decode_pointer +@ cdecl _decode_pointer(ptr) msvcr90._decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 @ cdecl _difftime64(long long) msvcrt._difftime64 @ stub _dosmaperr @@ -370,7 +370,7 @@ @ stub _dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s -@ stub _encode_pointer +@ cdecl _encode_pointer(ptr) msvcr90._encode_pointer @ stub _encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 029e2c052816a852b78d609cbb2a16d272b4e7c4..613edab40ca8681ca047cf51141a712dc98fe012 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcr90.dll -IMPORTLIB = msvcr90 IMPORTS = msvcrt kernel32 C_SRCS = \ diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index e7baa6fae215a1aa6980882435be4e27be0840dc..97d09218beb6f0f8fd8627d1075e598223bc7103 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -44,6 +44,27 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } +/********************************************************************* + * _decode_pointer (MSVCR90.@) + * + * cdecl version of DecodePointer + * + */ +void * CDECL MSVCR90_decode_pointer(void * ptr) +{ + return DecodePointer(ptr); +} + +/********************************************************************* + * _encode_pointer (MSVCR90.@) + * + * cdecl version of EncodePointer + * + */ +void * CDECL MSVCR90_encode_pointer(void * ptr) +{ + return EncodePointer(ptr); +} /********************************************************************* * _initterm_e (MSVCR90.@) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f95f92b3b4c902f35ecafb83d67699753e59f32e..8c3138b2a4f41c832b72237c9214d1143ecb91a9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -352,7 +352,7 @@ @ stub _cwscanf_s @ stub _cwscanf_s_l @ extern _daylight msvcrt._daylight -@ stub _decode_pointer +@ cdecl _decode_pointer(ptr) MSVCR90_decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 @ cdecl _difftime64(long long) msvcrt._difftime64 @ stub _dosmaperr @@ -362,7 +362,7 @@ @ stub _dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s -@ stub _encode_pointer +@ cdecl _encode_pointer(ptr) MSVCR90_encode_pointer @ stub _encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ddfd7815c92cf7753296a748f706626163878e40..d8b84079883b1428267df10f2650642b220e4842 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -27,6 +27,8 @@ typedef int (__cdecl *_INITTERM_E_FN)(void); static int (__cdecl *p_initterm_e)(_INITTERM_E_FN *table, _INITTERM_E_FN *end); +static void* (__cdecl *p_encode_pointer)(void *); +static void* (__cdecl *p_decode_pointer)(void *); int cb_called[4]; /* ########## */ @@ -130,6 +132,26 @@ static void test__initterm_e(void) } +static void test__encode_pointer(void) +{ + void *ptr, *res; + + if(!p_encode_pointer || !p_decode_pointer) { + win_skip("_encode_pointer or _decode_pointer not found\n"); + return; + } + + ptr = (void*)0xdeadbeef; + res = p_encode_pointer(ptr); + res = p_decode_pointer(res); + ok(res == ptr, "Pointers are different after encoding and decoding\n"); + + ptr = p_encode_pointer(p_encode_pointer); + res = EncodePointer(p_encode_pointer); + ok(ptr == res, "_encode_pointer produced different result than EncodePointer\n"); + ok(p_decode_pointer(ptr) == p_encode_pointer, "Error decoding pointer\n"); +} + /* ########## */ START_TEST(msvcr90) @@ -144,7 +166,9 @@ START_TEST(msvcr90) } p_initterm_e = (void *) GetProcAddress(hcrt, "_initterm_e"); + p_encode_pointer = (void *) GetProcAddress(hcrt, "_encode_pointer"); + p_decode_pointer = (void *) GetProcAddress(hcrt, "_decode_pointer"); test__initterm_e(); - + test__encode_pointer(); }