wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Dylan Smith : comdlg32: Test and fix Find/ ReplaceText parameter checking code.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: e5a476c66d4f9183b8f9edff7b783d5c33ddd864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a476c66d4f9183b8f9edff7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 20 17:50:06 2010 -0400 comdlg32: Test and fix Find/ReplaceText parameter checking code. --- dlls/comdlg32/finddlg.c | 10 +-- dlls/comdlg32/tests/Makefile.in | 1 + dlls/comdlg32/tests/finddlg.c | 145 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/finddlg.c b/dlls/comdlg32/finddlg.c index 8527631..e3a2c1a 100644 --- a/dlls/comdlg32/finddlg.c +++ b/dlls/comdlg32/finddlg.c @@ -304,7 +304,7 @@ static BOOL COMDLG32_FR_CheckPartial( ) { if(!pfr) { - COMDLG32_SetCommDlgExtendedError(CDERR_GENERALCODES); + COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION); return FALSE; } @@ -344,18 +344,12 @@ static BOOL COMDLG32_FR_CheckPartial( return FALSE; } - if((pfr->Flags & (FR_ENABLETEMPLATE | FR_ENABLETEMPLATEHANDLE)) && !pfr->hInstance) + if((pfr->Flags & FR_ENABLETEMPLATEHANDLE) && !pfr->hInstance) { COMDLG32_SetCommDlgExtendedError(CDERR_NOHINSTANCE); return FALSE; } - if((pfr->Flags & FR_ENABLETEMPLATE) && !pfr->lpTemplateName) - { - COMDLG32_SetCommDlgExtendedError(CDERR_NOTEMPLATE); - return FALSE; - } - return TRUE; } diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index cfdecef..9362cd3 100644 --- a/dlls/comdlg32/tests/Makefile.in +++ b/dlls/comdlg32/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = comdlg32 winspool user32 gdi32 kernel32 C_SRCS = \ filedlg.c \ + finddlg.c \ fontdlg.c \ printdlg.c diff --git a/dlls/comdlg32/tests/finddlg.c b/dlls/comdlg32/tests/finddlg.c new file mode 100644 index 0000000..4a10909 --- /dev/null +++ b/dlls/comdlg32/tests/finddlg.c @@ -0,0 +1,145 @@ +/* + * Unit test suite for comdlg32 API functions: find/replace dialogs + * + * Copyright 2010 by Dylan Smith + * + * 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 "windows.h" +#include "commdlg.h" +#include "wine/test.h" + +static UINT ID_FINDMSGSTRING; + +static LRESULT handle_findmsg(FINDREPLACEA *fr) +{ + return 0; +} + +static LRESULT CALLBACK OwnerWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if(msg == ID_FINDMSGSTRING) { + return handle_findmsg((FINDREPLACEA*)lParam); + } + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +static void test_param_check(void) +{ + char findbuffer[64]; + char replacebuffer[64]; + FINDREPLACEA fr, *pFr; + WNDCLASSA wc; + + ZeroMemory(&wc, sizeof(wc)); + wc.lpfnWndProc = OwnerWndProc; + wc.lpszClassName = "test_param_check"; + RegisterClassA(&wc); + +#define CHECK_FIND_OR_REPLACE(FUNC, FAIL, ERR_CODE) \ + do { \ + HWND hwnd = FUNC(pFr); \ + BOOL is_ok = !!hwnd == !FAIL; \ + ok(is_ok, "%s should%s fail\n", #FUNC, FAIL ? "" : "n't"); \ + if (FAIL && is_ok) { \ + DWORD ext_err = CommDlgExtendedError(); \ + ok(ext_err == ERR_CODE, "expected err %x got %x\n", \ + ERR_CODE, ext_err); \ + } else { \ + DestroyWindow(hwnd); \ + } \ + } while (0) + +#define CHECK_FIND_FAIL(ERR_CODE) \ + CHECK_FIND_OR_REPLACE(FindTextA, TRUE, ERR_CODE) + +#define CHECK_FIND_SUCCEED() \ + CHECK_FIND_OR_REPLACE(FindTextA, FALSE, 0) + +#define CHECK_REPLACE_FAIL(ERR_CODE) \ + CHECK_FIND_OR_REPLACE(ReplaceTextA, TRUE, ERR_CODE) + +#define CHECK_REPLACE_SUCCEED() \ + CHECK_FIND_OR_REPLACE(ReplaceTextA, FALSE, 0) + +#define CHECK_FINDREPLACE_FAIL(ERR_CODE) \ + do { \ + CHECK_FIND_FAIL(ERR_CODE); \ + CHECK_REPLACE_FAIL(ERR_CODE); \ + } while (0) + + pFr = NULL; + CHECK_FINDREPLACE_FAIL(CDERR_INITIALIZATION); + pFr = &fr; + + ZeroMemory(&fr, sizeof(fr)); + /* invalid lStructSize (0) */ + CHECK_FINDREPLACE_FAIL(CDERR_STRUCTSIZE); + fr.lStructSize = sizeof(fr); + + /* invalid hwndOwner (NULL) */ + CHECK_FINDREPLACE_FAIL(CDERR_DIALOGFAILURE); + fr.hwndOwner = CreateWindowA(wc.lpszClassName, NULL, WS_VISIBLE, 0, 0, 200, 100, + NULL, NULL, GetModuleHandleA(NULL), NULL); + + /* invalid wFindWhatLen (0) */ + CHECK_FINDREPLACE_FAIL(FRERR_BUFFERLENGTHZERO); + fr.wFindWhatLen = sizeof(findbuffer); + + /* invalid lpstrFindWhat (NULL) */ + CHECK_FINDREPLACE_FAIL(FRERR_BUFFERLENGTHZERO); + fr.lpstrFindWhat = findbuffer; + + /* invalid lpstrReplaceWith (NULL) for ReplaceText */ + CHECK_FIND_SUCCEED(); + CHECK_REPLACE_FAIL(FRERR_BUFFERLENGTHZERO); + fr.lpstrReplaceWith = replacebuffer; + + /* wReplaceWithLen may be 0, even for ReplaceText */ + CHECK_FIND_SUCCEED(); + CHECK_REPLACE_SUCCEED(); + fr.wReplaceWithLen = sizeof(replacebuffer); + + /* invalid lpfnHook (NULL) when Flags has FR_ENABLEHOOK */ + fr.Flags = FR_ENABLEHOOK; + CHECK_FINDREPLACE_FAIL(CDERR_NOHOOK); + + /* invalid hInstance (NULL) + * when Flags has FR_ENABLETEMPLATE or FR_ENABLETEMPLATEHANDLE */ + fr.Flags = FR_ENABLETEMPLATE; + CHECK_FINDREPLACE_FAIL(CDERR_FINDRESFAILURE); + fr.Flags = FR_ENABLETEMPLATEHANDLE; + CHECK_FINDREPLACE_FAIL(CDERR_NOHINSTANCE); + fr.hInstance = GetModuleHandle(NULL); + + /* invalid lpTemplateName (NULL) when Flags has FR_ENABLETEMPLATE */ + fr.Flags = FR_ENABLETEMPLATE; + CHECK_FINDREPLACE_FAIL(CDERR_FINDRESFAILURE); + fr.Flags = 0; + + CHECK_FIND_SUCCEED(); + CHECK_REPLACE_SUCCEED(); + + DestroyWindow(fr.hwndOwner); +} + +START_TEST(finddlg) +{ + ID_FINDMSGSTRING = RegisterWindowMessageA(FINDMSGSTRINGA); + + test_param_check(); +}

1 0

Dylan Smith : comdlg32: Zero length replace buffer is valid for ReplaceText .
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 51ba036f6c4e98db0f89a6510dff2814248d6e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ba036f6c4e98db0f89a6510… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 20 17:49:59 2010 -0400 comdlg32: Zero length replace buffer is valid for ReplaceText. --- dlls/comdlg32/finddlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/finddlg.c b/dlls/comdlg32/finddlg.c index 8f391b2..8527631 100644 --- a/dlls/comdlg32/finddlg.c +++ b/dlls/comdlg32/finddlg.c @@ -321,7 +321,7 @@ static BOOL COMDLG32_FR_CheckPartial( } if((pfr->wFindWhatLen < 1 || !pfr->lpstrFindWhat) - ||(Replace && (pfr->wReplaceWithLen < 1 || !pfr->lpstrReplaceWith))) + ||(Replace && !pfr->lpstrReplaceWith)) { COMDLG32_SetCommDlgExtendedError(FRERR_BUFFERLENGTHZERO); return FALSE;

1 0

Dylan Smith : comdlg32: Check for valid replace parameters on ReplaceTextW.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: f89b14020f83824cfc8dc81b7991382d65c1c07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89b14020f83824cfc8dc81b7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 20 17:49:49 2010 -0400 comdlg32: Check for valid replace parameters on ReplaceTextW. COMDLG32_FR_CheckPartial is called with the second parameter of TRUE to indicate that it is checking for a replace dialog, which includes checking for a non-NULL replace buffer. This was called correctly on ReplaceTextA but not for ReplaceTextW. --- dlls/comdlg32/finddlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/finddlg.c b/dlls/comdlg32/finddlg.c index f6c780e..8f391b2 100644 --- a/dlls/comdlg32/finddlg.c +++ b/dlls/comdlg32/finddlg.c @@ -536,7 +536,7 @@ HWND WINAPI ReplaceTextW( TRACE("LPFINDREPLACE=%p\n", pfr); - if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE)) + if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, TRUE)) return 0; len1 = WideCharToMultiByte( CP_ACP, 0, pfr->lpstrFindWhat, pfr->wFindWhatLen,

1 0

Piotr Caban : msvcp90/tests: Added char_traits<char>::_Copy_s tests.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 166b7f4ffba5b556c00f6cfac85aff73165d8480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166b7f4ffba5b556c00f6cfac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:25:07 2010 +0200 msvcp90/tests: Added char_traits<char>::_Copy_s tests. --- dlls/msvcp90/tests/misc.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 10616a9..0fe28ce 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -32,6 +32,8 @@ static BYTE (__cdecl *p_char_eq)(const void*, const void*); static BYTE (__cdecl *p_wchar_eq)(const void*, const void*); static BYTE (__cdecl *p_short_eq)(const void*, const void*); +static char* (__cdecl *p_Copy_s)(char*, unsigned int, const char*, unsigned int); + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -70,6 +72,8 @@ static BOOL init(void) p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@_W@std@@SA_NAB_W0@Z"); 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"); + return TRUE; } @@ -136,6 +140,53 @@ static void test_equal(void) ok(ret == FALSE, "ret = %d\n", (int)ret); } +static void test_Copy_s(void) +{ + static const char src[] = "abcd"; + char dest[32], *ret; + + if(!p_Copy_s) { + win_skip("Copy_s tests skipped\n"); + return; + } + + dest[4] = '#'; + dest[5] = '\0'; + ret = p_Copy_s(dest, 4, src, 4); + ok(ret == dest, "ret != dest\n"); + ok(dest[4] == '#', "dest[4] != '#'\n"); + ok(!memcmp(dest, src, sizeof(char[4])), "dest = %s\n", dest); + + ret = p_Copy_s(dest, 32, src, 4); + ok(ret == dest, "ret != dest\n"); + ok(dest[4] == '#', "dest[4] != '#'\n"); + ok(!memcmp(dest, src, sizeof(char[4])), "dest = %s\n", dest); + + errno = 0xdeadbeef; + dest[0] = '#'; + ret = p_Copy_s(dest, 3, src, 4); + ok(ret == dest, "ret != dest\n"); + ok(dest[0] == '\0', "dest[0] != 0\n"); + ok(invalid_parameter==1, "invalid_parameter = %d\n", + invalid_parameter); + invalid_parameter = 0; + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_Copy_s(NULL, 32, src, 4); + ok(invalid_parameter==1, "invalid_parameter = %d\n", + invalid_parameter); + invalid_parameter = 0; + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_Copy_s(dest, 32, NULL, 4); + ok(invalid_parameter==1, "invalid_parameter = %d\n", + invalid_parameter); + invalid_parameter = 0; + ok(errno == 0xdeadbeef, "errno = %d\n", errno); +} + START_TEST(misc) { if(!init()) @@ -143,6 +194,7 @@ START_TEST(misc) test_assign(); test_equal(); + test_Copy_s(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

Piotr Caban : msvcp90/tests: Added char_traits equal tests.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: b5a6ed7469a9f1a408d4c9c72c12a316d710b785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a6ed7469a9f1a408d4c9c72… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:24:51 2010 +0200 msvcp90/tests: Added char_traits equal tests. --- dlls/msvcp90/tests/misc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 2995dfd..10616a9 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -28,6 +28,10 @@ static void (__cdecl *p_char_assign)(void*, const void*); static void (__cdecl *p_wchar_assign)(void*, const void*); static void (__cdecl *p_short_assign)(void*, const void*); +static BYTE (__cdecl *p_char_eq)(const void*, const void*); +static BYTE (__cdecl *p_wchar_eq)(const void*, const void*); +static BYTE (__cdecl *p_short_eq)(const void*, const void*); + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -62,6 +66,10 @@ static BOOL init(void) p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@G@std@@SAXAAGABG@Z"); + p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@D@std@@SA_NABD0@Z"); + p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@_W@std@@SA_NAB_W0@Z"); + p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits@G@std@@SA_NABG0@Z"); + return TRUE; } @@ -93,12 +101,48 @@ static void test_assign(void) ok(out[2] == '#', "out[2] = %c\n", out[2]); } +static void test_equal(void) +{ + static const char in1[] = "abc"; + static const char in2[] = "ab"; + static const char in3[] = "a"; + static const char in4[] = "b"; + BYTE ret; + + if(!p_char_eq || !p_wchar_eq || !p_short_eq) { + win_skip("equal tests skipped\n"); + return; + } + + ret = p_char_eq(in1, in2); + ok(ret == TRUE, "ret = %d\n", (int)ret); + ret = p_char_eq(in1, in3); + ok(ret == TRUE, "ret = %d\n", (int)ret); + ret = p_char_eq(in1, in4); + ok(ret == FALSE, "ret = %d\n", (int)ret); + + ret = p_wchar_eq(in1, in2); + ok(ret == TRUE, "ret = %d\n", (int)ret); + ret = p_wchar_eq(in1, in3); + ok(ret == FALSE, "ret = %d\n", (int)ret); + ret = p_wchar_eq(in1, in4); + ok(ret == FALSE, "ret = %d\n", (int)ret); + + ret = p_short_eq(in1, in2); + ok(ret == TRUE, "ret = %d\n", (int)ret); + ret = p_short_eq(in1, in3); + ok(ret == FALSE, "ret = %d\n", (int)ret); + ret = p_short_eq(in1, in4); + ok(ret == FALSE, "ret = %d\n", (int)ret); +} + START_TEST(misc) { if(!init()) return; test_assign(); + test_equal(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

Piotr Caban : msvcp90/tests: Added char_traits assign tests.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: d589d95d508ee7d687599a8a98f76677d860039f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d589d95d508ee7d687599a8a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:24:32 2010 +0200 msvcp90/tests: Added char_traits assign tests. --- configure | 1 + configure.ac | 1 + dlls/msvcp90/tests/Makefile.in | 17 ++++++ dlls/msvcp90/tests/misc.c | 104 +++++++++++++++++++++++++++++++++++ dlls/msvcp90/tests/msvcp90.manifest | 22 +++++++ dlls/msvcp90/tests/msvcp90.rc | 22 +++++++ 6 files changed, 167 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 084a3b7..6f8fca2 100755 --- a/configure +++ b/configure @@ -14519,6 +14519,7 @@ wine_fn_config_dll mstask enable_mstask wine_fn_config_test dlls/mstask/tests mstask_test wine_fn_config_dll msvcirt enable_msvcirt wine_fn_config_dll msvcp90 enable_msvcp90 +wine_fn_config_test dlls/msvcp90/tests msvcp90_test wine_fn_config_dll msvcr100 enable_msvcr100 wine_fn_config_dll msvcr70 enable_msvcr70 msvcr70 wine_fn_config_dll msvcr71 enable_msvcr71 msvcr71 diff --git a/configure.ac b/configure.ac index 4c27f84..5638f2b 100644 --- a/configure.ac +++ b/configure.ac @@ -2456,6 +2456,7 @@ WINE_CONFIG_DLL(mstask) WINE_CONFIG_TEST(dlls/mstask/tests) WINE_CONFIG_DLL(msvcirt) WINE_CONFIG_DLL(msvcp90) +WINE_CONFIG_TEST(dlls/msvcp90/tests) WINE_CONFIG_DLL(msvcr100) WINE_CONFIG_DLL(msvcr70,,[msvcr70]) WINE_CONFIG_DLL(msvcr71,,[msvcr71]) diff --git a/dlls/msvcp90/tests/Makefile.in b/dlls/msvcp90/tests/Makefile.in new file mode 100644 index 0000000..37cc9ab --- /dev/null +++ b/dlls/msvcp90/tests/Makefile.in @@ -0,0 +1,17 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = msvcp90.dll +APPMODE = -mno-cygwin +IMPORTS = kernel32 +MODCFLAGS = @BUILTINFLAG@ +EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt + +C_SRCS = \ + misc.c + +RC_SRCS = \ + msvcp90.rc + +@MAKE_TEST_RULES@ diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c new file mode 100644 index 0000000..2995dfd --- /dev/null +++ b/dlls/msvcp90/tests/misc.c @@ -0,0 +1,104 @@ +/* + * Copyright 2010 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +static void* (__cdecl *p_set_invalid_parameter_handler)(void*); + +static void (__cdecl *p_char_assign)(void*, const void*); +static void (__cdecl *p_wchar_assign)(void*, const void*); +static void (__cdecl *p_short_assign)(void*, const void*); + +static int invalid_parameter = 0; +static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, + const wchar_t *function, const wchar_t *file, + unsigned line, uintptr_t arg) +{ + ok(expression == NULL, "expression is not NULL\n"); + ok(function == NULL, "function is not NULL\n"); + ok(file == NULL, "file is not NULL\n"); + ok(line == 0, "line = %u\n", line); + ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); + invalid_parameter++; +} + +static BOOL init(void) +{ + HMODULE msvcr = LoadLibraryA("msvcr90.dll"); + HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + if(!msvcr || !msvcp) { + win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); + return FALSE; + } + + p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); + if(!p_set_invalid_parameter_handler) { + win_skip("Error setting tests environment\n"); + return FALSE; + } + + p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + 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"); + p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits@G@std@@SAXAAGABG@Z"); + + return TRUE; +} + +static void test_assign(void) +{ + const char in[] = "abc"; + char out[4]; + + if(!p_char_assign || !p_wchar_assign || !p_short_assign) { + win_skip("assign tests skipped\n"); + return; + } + + out[1] = '#'; + p_char_assign(out, in); + ok(out[0] == in[0], "out[0] = %c\n", out[0]); + ok(out[1] == '#', "out[1] = %c\n", out[1]); + + out[2] = '#'; + p_wchar_assign(out, in); + ok(*((char*)out)==in[0] && *((char*)out+1)==in[1], + "out[0] = %d, out[1] = %d\n", (int)out[0], (int)out[1]); + ok(out[2] == '#', "out[2] = %c\n", out[2]); + + out[2] = '#'; + p_short_assign(out, in); + ok(*((char*)out)==in[0] && *((char*)out+1)==in[1], + "out[0] = %d, out[1] = %d\n", (int)out[0], (int)out[1]); + ok(out[2] == '#', "out[2] = %c\n", out[2]); +} + +START_TEST(misc) +{ + if(!init()) + return; + + test_assign(); + + ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); +} diff --git a/dlls/msvcp90/tests/msvcp90.manifest b/dlls/msvcp90/tests/msvcp90.manifest new file mode 100644 index 0000000..3cf3405 --- /dev/null +++ b/dlls/msvcp90/tests/msvcp90.manifest @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.msvcp90.Test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine msvcp90 test suite</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="microsoft.vc90.crt" + version="9.0.20718.0" + processorArchitecture="*" + publicKeyToken="1fc8b3b9a1e18e3b" + language="*" + /> +</dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/msvcp90/tests/msvcp90.rc b/dlls/msvcp90/tests/msvcp90.rc new file mode 100644 index 0000000..4f2dd98 --- /dev/null +++ b/dlls/msvcp90/tests/msvcp90.rc @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2010 Piotr Caban + * + * 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 "winuser.h" + +/* @makedep: msvcp90.manifest */ +1 RT_MANIFEST msvcp90.manifest

1 0

Piotr Caban : msvcp90: Added char_traits<unsigned short> implementation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 0a4e90153d74d524e2b895b58f6b49f2b44bc285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4e90153d74d524e2b895b58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 11:10:07 2010 +0200 msvcp90: Added char_traits<unsigned short> implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++----- dlls/msvcp90/string.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4e90153d74d524e2b89…

1 0

Piotr Caban : msvcp90: Added char_traits<wchar_t> implementation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 8313d52ccccdb8260464919bd3128e09517e055d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8313d52ccccdb8260464919bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:23:24 2010 +0200 msvcp90: Added char_traits<wchar_t> implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++----- dlls/msvcp90/string.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8313d52ccccdb82604649…

1 0

Piotr Caban : msvcp90: Added char_traits<char> implementation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: b895c104324a45ed85266cd1c208ba4ff16d3987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b895c104324a45ed85266cd1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:22:59 2010 +0200 msvcp90: Added char_traits<char> implementation. --- dlls/msvcp90/Makefile.in | 3 +- dlls/msvcp90/msvcp90.h | 24 ++++++++ dlls/msvcp90/msvcp90.spec | 32 +++++----- dlls/msvcp90/string.c | 145 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b895c104324a45ed85266…

1 0

Piotr Caban : msvcp90: Added stub dll.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 9ae9d263dafc8da8f51e3c1e4f27e81400f72456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae9d263dafc8da8f51e3c1e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:22:16 2010 +0200 msvcp90: Added stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcp90/Makefile.in | 13 + dlls/msvcp90/msvcp90.spec | 3189 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90_main.c | 44 + 5 files changed, 3248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ae9d263dafc8da8f51e3…

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
90
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 July 2010