July 2010 - Wine-Commits - list.winehq.org

Dylan Smith : comdlg32: Zero length replace buffer is valid for ReplaceText .
by Alexandre Julliard July 21, 2010

July 21, 2010

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

Piotr Caban : msvcp90/tests: Added char_traits<char>::_Copy_s tests.
by Alexandre Julliard July 21, 2010

July 21, 2010

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(a)_W@std@@SA_NAB_W0(a)Z"); p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NABG0(a)Z"); + p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)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 July 21, 2010

July 21, 2010

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(a)_W@std@@SAXAA_WAB_W(a)Z"); p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAAGABG(a)Z"); + p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)D@std@@SA_NABD0(a)Z"); + p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)_W@std@@SA_NAB_W0(a)Z"); + p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NABG0(a)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

Dylan Smith : comdlg32: Check for valid replace parameters on ReplaceTextW.
by Alexandre Julliard July 21, 2010

July 21, 2010

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

Dylan Smith : comdlg32: Test and fix Find/ ReplaceText parameter checking code.
by Alexandre Julliard July 21, 2010

July 21, 2010

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

Piotr Caban : msvcp90/tests: Added char_traits assign tests.
by Alexandre Julliard July 21, 2010

July 21, 2010

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 + +(a)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(a)D@std@@SAXAADABD(a)Z"); + p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); + p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAAGABG(a)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

Paul Vriens : appwiz.cpl: Add the Serbian (Latin) translation.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: 5de86f4db2c918b6c754358840b3068b5b79dd64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de86f4db2c918b6c75435884… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 20 23:22:43 2010 +0200 appwiz.cpl: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/appwiz.cpl/Makefile.in | 1 + dlls/appwiz.cpl/Sr.rc | 87 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 079c1e0..4a92f35 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -26,6 +26,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc \ Zh.rc \ diff --git a/dlls/appwiz.cpl/Sr.rc b/dlls/appwiz.cpl/Sr.rc new file mode 100644 index 0000000..9fb2e77 --- /dev/null +++ b/dlls/appwiz.cpl/Sr.rc @@ -0,0 +1,87 @@ +/* +* Add/Remove Programs Serbian resources +* +* Copyright 2010 Nenad Vujic +* Paul Vriens +* +* 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 "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_CPL_TITLE, "Dodaj/Ukloni programe" + IDS_CPL_DESC, "Instaliranje novog programa ili brisanje istog savašeg računara." + IDS_TAB1_TITLE, "Programi" + + IDS_UNINSTALL_FAILED, "Brisanje programa se ne može pokrenuti, '%s'. Da li želite da uklonite opciju Brisanje za ovajprogram iz registra?" + IDS_NOT_SPECIFIED, "Nije određeno" + + IDS_COLUMN_NAME, "Ime" + IDS_COLUMN_PUBLISHER, "Izdavač" + IDS_COLUMN_VERSION, "Verzija" + IDS_INSTALL_FILTER, "Instalacioni programi\\0*instal*.exe;*setup*.exe;*.msi\\0Programs (*.exe)\\0*.exe\\0All Files (*.*)\\0*.*\\0\\0" + + IDS_REMOVE, "&Ukloni..." + IDS_MODIFY_REMOVE, "&Izmeni/Ukloni..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instaliraj/Ukloni" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Da instalirate novi program sa diskete, diska ili sa vašeg hard diska, kliknite Instaliraj.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instaliraj...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Program se može aitomatski ukloniti. Da uklonite program ili da izmenite njegove instalirane delove, izaberite sa liste i kliknite Izmeni/Ukloni.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Info podrške...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Izmeni...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Ukloni...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Info podrške" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ova informacija se može koristiti da dobijete Tehničku podršku za %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Izdavač:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Verzija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Info podrške:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telefon podrške:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Procitaj me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Nove verzije:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Komentari:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +}

1 0

Paul Vriens : comctl32: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: bd16a7225d3bdbb71099e6ee7431156597143721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd16a7225d3bdbb71099e6ee7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 20 23:12:17 2010 +0200 comctl32: Add the Serbian (Cyrillic) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/comctl32/comctl_Sr.rc | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl_Sr.rc b/dlls/comctl32/comctl_Sr.rc index a5cdfbf..52f520c 100644 --- a/dlls/comctl32/comctl_Sr.rc +++ b/dlls/comctl32/comctl_Sr.rc @@ -90,3 +90,73 @@ STRINGTABLE DISCARDABLE { HKY_NONE "Ništa" } + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Детаљи за %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Откажи", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Примени", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Помоћ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Таб", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Чаробњак" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Назад", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Следеће >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Заврши", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Откажи", IDCANCEL,178,138,50,14 + PUSHBUTTON "Помоћ", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Таб", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Подеси Тулбар" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Затвори", IDCANCEL,308,6,44,14 + PUSHBUTTON "Р&есетуј", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Помоћ", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "Помери &Горе", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Помери &Доле", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "Д&оступни тастери:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Додај ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Уклони", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Тулбар тастери:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Затвори" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Данас:" + IDM_GOTODAY "Иди на данас" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Одвајање" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Ништа" +}

1 0

Andrew Eikum : shlwapi: Be less strict on which type of IShellFolder can be enumerated.
by Alexandre Julliard July 21, 2010

July 21, 2010

Module: wine Branch: master Commit: d6a827d083157605a6f145773ddd85db0226e562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a827d083157605a6f145773… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 20 14:54:12 2010 -0500 shlwapi: Be less strict on which type of IShellFolder can be enumerated. --- dlls/shlwapi/ordinal.c | 29 +++----- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 150 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 5f332f3..7c00669 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3694,24 +3694,19 @@ BOOL WINAPI GetOpenFileNameWrapW(LPOPENFILENAMEW ofn) */ HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHCONTF flags, IEnumIDList **ppenum) { - IPersist *persist; - HRESULT hr; + /* Windows attempts to get an IPersist interface and, if that fails, an + * IPersistFolder interface on the folder passed-in here. If one of those + * interfaces is available, it then calls GetClassID on the folder... and + * then calls IShellFolder_EnumObjects no matter what, even crashing if + * lpFolder isn't actually an IShellFolder object. The purpose of getting + * the ClassID is unknown, so we don't do it here. + * + * For discussion and detailed tests, see: + * "shlwapi: Be less strict on which type of IShellFolder can be enumerated" + * wine-devel mailing list, 3 Jun 2010 + */ - hr = IShellFolder_QueryInterface(lpFolder, &IID_IPersist, (LPVOID)&persist); - if(SUCCEEDED(hr)) - { - CLSID clsid; - hr = IPersist_GetClassID(persist, &clsid); - if(SUCCEEDED(hr)) - { - if(IsEqualCLSID(&clsid, &CLSID_ShellFSFolder)) - hr = IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum); - else - hr = E_FAIL; - } - IPersist_Release(persist); - } - return hr; + return IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum); } /* INTERNAL: Map from HLS color space to RGB */ diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 038d76c..1e5cb5e 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll -IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 kernel32 +IMPORTS = shell32 shlwapi user32 ole32 oleaut32 advapi32 kernel32 C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index c8cfcfc..4b1690a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -31,6 +31,7 @@ #include "shlwapi.h" #include "docobj.h" #include "shobjidl.h" +#include "shlobj.h" /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; @@ -56,6 +57,7 @@ static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*); static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*); static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); +static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2370,6 +2372,152 @@ static void test_SHCreateWorkerWindowA(void) DestroyWindow(hwnd); } +static HRESULT WINAPI SF_QueryInterface(IShellFolder *iface, + REFIID riid, void **ppv) +{ + /* SHIShellFolder_EnumObjects doesn't QI the object for IShellFolder */ + ok(!IsEqualGUID(&IID_IShellFolder, riid), + "Unexpected QI for IShellFolder\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI SF_AddRef(IShellFolder *iface) +{ + return 2; +} + +static ULONG WINAPI SF_Release(IShellFolder *iface) +{ + return 1; +} + +static HRESULT WINAPI SF_ParseDisplayName(IShellFolder *iface, + HWND owner, LPBC reserved, LPOLESTR displayName, ULONG *eaten, + LPITEMIDLIST *idl, ULONG *attr) +{ + ok(0, "Didn't expect ParseDisplayName\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_EnumObjects(IShellFolder *iface, + HWND owner, SHCONTF flags, IEnumIDList **enm) +{ + *enm = (IEnumIDList*)0xcafebabe; + return S_OK; +} + +static HRESULT WINAPI SF_BindToObject(IShellFolder *iface, + LPCITEMIDLIST idl, LPBC reserved, REFIID riid, void **obj) +{ + ok(0, "Didn't expect BindToObject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_BindToStorage(IShellFolder *iface, + LPCITEMIDLIST idl, LPBC reserved, REFIID riid, void **obj) +{ + ok(0, "Didn't expect BindToStorage\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_CompareIDs(IShellFolder *iface, + LPARAM lparam, LPCITEMIDLIST idl1, LPCITEMIDLIST idl2) +{ + ok(0, "Didn't expect CompareIDs\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_CreateViewObject(IShellFolder *iface, + HWND owner, REFIID riid, void **out) +{ + ok(0, "Didn't expect CreateViewObject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_GetAttributesOf(IShellFolder *iface, + UINT cidl, LPCITEMIDLIST *idl, SFGAOF *inOut) +{ + ok(0, "Didn't expect GetAttributesOf\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_GetUIObjectOf(IShellFolder *iface, + HWND owner, UINT cidl, LPCITEMIDLIST *idls, REFIID riid, UINT *inOut, + void **out) +{ + ok(0, "Didn't expect GetUIObjectOf\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_GetDisplayNameOf(IShellFolder *iface, + LPCITEMIDLIST idl, SHGDNF flags, STRRET *name) +{ + ok(0, "Didn't expect GetDisplayNameOf\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SF_SetNameOf(IShellFolder *iface, + HWND hwnd, LPCITEMIDLIST idl, LPCOLESTR name, SHGDNF flags, + LPITEMIDLIST *idlOut) +{ + ok(0, "Didn't expect SetNameOf\n"); + return E_NOTIMPL; +} + +static IShellFolderVtbl ShellFolderVtbl = { + SF_QueryInterface, + SF_AddRef, + SF_Release, + SF_ParseDisplayName, + SF_EnumObjects, + SF_BindToObject, + SF_BindToStorage, + SF_CompareIDs, + SF_CreateViewObject, + SF_GetAttributesOf, + SF_GetUIObjectOf, + SF_GetDisplayNameOf, + SF_SetNameOf +}; + +static IShellFolder ShellFolder = { &ShellFolderVtbl }; + +static void test_SHIShellFolder_EnumObjects(void) +{ + IEnumIDList *enm; + HRESULT hres; + IShellFolder *folder; + + if(!pSHIShellFolder_EnumObjects || is_win2k_and_lower){ + win_skip("SHIShellFolder_EnumObjects not available\n"); + return; + } + + if(0){ + /* NULL object crashes on Windows */ + hres = pSHIShellFolder_EnumObjects(NULL, NULL, 0, NULL); + } + + /* SHIShellFolder_EnumObjects doesn't QI the object for IShellFolder */ + enm = (IEnumIDList*)0xdeadbeef; + hres = pSHIShellFolder_EnumObjects(&ShellFolder, NULL, 0, &enm); + ok(hres == S_OK, "SHIShellFolder_EnumObjects failed: 0x%08x\n", hres); + ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm); + + /* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */ + hres = SHGetDesktopFolder(&folder); + ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres); + + enm = NULL; + hres = pSHIShellFolder_EnumObjects(folder, NULL, 0, &enm); + ok(hres == S_OK, "SHIShellFolder_EnumObjects failed: 0x%08x\n", hres); + ok(enm != NULL, "Didn't get an enumerator\n"); + if(enm) + IEnumIDList_Release(enm); + + IShellFolder_Release(folder); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2388,6 +2536,7 @@ static void init_pointers(void) MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); + MAKEFUNC(SHIShellFolder_EnumObjects, 404); MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(IUnknown_QueryServiceExec, 484); MAKEFUNC(SHPropertyBag_ReadLONG, 496); @@ -2420,4 +2569,5 @@ START_TEST(ordinal) test_IUnknown_QueryServiceExec(); test_IUnknown_ProfferService(); test_SHCreateWorkerWindowA(); + test_SHIShellFolder_EnumObjects(); }

1 0

Piotr Caban : msvcp90: Added char_traits<unsigned short> implementation.
by Alexandre Julliard July 21, 2010

July 21, 2010

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