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

Alexandre Julliard : user32/tests: Ignore repeat key flag that causes occasional failures on Windows.
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: fec9dc41f994542f1c9fe889a4380edb5e7ef559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec9dc41f994542f1c9fe889a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 13:37:42 2010 +0200 user32/tests: Ignore repeat key flag that causes occasional failures on Windows. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d67e5c..eb27800 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11663,7 +11663,7 @@ static const struct message wm_popup_menu_1[] = { WM_MENUSELECT, sent|wparam, MAKEWPARAM(200,MF_HILITE) }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'E', 0xf0000001 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xd0000001 }, - { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_RETURN, 0x10000001, 0, 0x40000000 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't create a window */ { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 },

1 0

Alexander Scott-Johns : include/msvcrt: Update a bit.
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: 5361263bdbc95b33e9c99f4c775773e2b8946b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5361263bdbc95b33e9c99f4c7… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Jun 16 22:42:49 2010 +0100 include/msvcrt: Update a bit. --- include/msvcrt/crtdefs.h | 5 ++++ include/msvcrt/memory.h | 13 +++++---- include/msvcrt/stddef.h | 2 - include/msvcrt/stdio.h | 16 ++++++++++++ include/msvcrt/stdlib.h | 7 +++++ include/msvcrt/string.h | 58 +++++++++++++++++++++++++++------------------- include/msvcrt/wchar.h | 16 ++++++++++++ 7 files changed, 85 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5361263bdbc95b33e9c99…

1 0

Andrew Nguyen : kernel32/tests: Add tests to examine output file part pointer behavior for GetFullPathNameW .
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: 1029167232fa7b5492f3cc0537120a911cbf4080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1029167232fa7b5492f3cc053… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 16 23:40:26 2010 -0500 kernel32/tests: Add tests to examine output file part pointer behavior for GetFullPathNameW. --- dlls/kernel32/tests/path.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 6fa4d93..e6d7e56 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1624,6 +1624,65 @@ static void test_GetFullPathNameA(void) } } +static void test_GetFullPathNameW(void) +{ + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'d','e','a','d','b','e','e','f',0}; + + WCHAR output[MAX_PATH], *filepart; + DWORD ret; + int i; + + const struct + { + LPCWSTR name; + DWORD len; + LPWSTR buffer; + LPWSTR *lastpart; + int win7_expect; + } invalid_parameters[] = + { + {NULL, 0, NULL, NULL}, + {NULL, 0, NULL, &filepart, 1}, + {NULL, MAX_PATH, NULL, NULL}, + {NULL, MAX_PATH, output, NULL}, + {NULL, MAX_PATH, output, &filepart, 1}, + {emptyW, 0, NULL, NULL}, + {emptyW, 0, NULL, &filepart, 1}, + {emptyW, MAX_PATH, NULL, NULL}, + {emptyW, MAX_PATH, output, NULL}, + {emptyW, MAX_PATH, output, &filepart, 1}, + }; + + SetLastError(0xdeadbeef); + ret = GetFullPathNameW(NULL, 0, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetFullPathNameW is not available\n"); + return; + } + + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + SetLastError(0xdeadbeef); + lstrcpyW(output, deadbeefW); + filepart = (WCHAR *)0xdeadbeef; + ret = GetFullPathNameW(invalid_parameters[i].name, + invalid_parameters[i].len, + invalid_parameters[i].buffer, + invalid_parameters[i].lastpart); + ok(!ret, "[%d] Expected GetFullPathNameW to return 0, got %u\n", i, ret); + ok(!lstrcmpW(output, deadbeefW), "[%d] Expected the output buffer to be unchanged, got %s\n", i, wine_dbgstr_w(output)); + ok(filepart == (WCHAR *)0xdeadbeef || + (invalid_parameters[i].win7_expect && filepart == NULL), + "[%d] Expected output file part pointer to be untouched, got %p\n", i, filepart); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INVALID_NAME, /* Win7 */ + "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n", + i, GetLastError()); + } +} + static void init_pointers(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -1666,4 +1725,5 @@ START_TEST(path) test_SearchPathA(); test_SearchPathW(); test_GetFullPathNameA(); + test_GetFullPathNameW(); }

1 0

Henri Verbeet : ntdll: The FPU control word for newly created threads is 0x27f.
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: 772a5c7c09a2568cd0ad2358f307c3eaa5fe4912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772a5c7c09a2568cd0ad2358f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 17 10:17:15 2010 +0200 ntdll: The FPU control word for newly created threads is 0x27f. This fixes a regression introduced by e6611e22fb037a879205f1330d1a3485f9f18705. --- dlls/kernel32/tests/thread.c | 84 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_i386.c | 10 +++++ dlls/ntdll/signal_x86_64.c | 10 +++++ 3 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 4c4e764..df87ae0 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1329,6 +1329,87 @@ static void test_ThreadErrorMode(void) pSetThreadErrorMode(oldmode, NULL); } +static inline void set_fpu_cw(WORD cw) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnclex; fldcw %0" : : "m" (cw)); +#endif +} + +static inline WORD get_fpu_cw(void) +{ + WORD cw = 0; +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#endif + return cw; +} + +struct fpu_thread_ctx +{ + WORD cw; + HANDLE finished; +}; + +static DWORD WINAPI fpu_thread(void *param) +{ + struct fpu_thread_ctx *ctx = param; + BOOL ret; + + ctx->cw = get_fpu_cw(); + + ret = SetEvent(ctx->finished); + ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); + + return 0; +} + +static WORD get_thread_fpu_cw(void) +{ + struct fpu_thread_ctx ctx; + DWORD tid, res; + HANDLE thread; + + ctx.finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(!!ctx.finished, "Failed to create event, last error %#x.\n", GetLastError()); + + thread = CreateThread(NULL, 0, fpu_thread, &ctx, 0, &tid); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + + res = WaitForSingleObject(ctx.finished, INFINITE); + ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + + res = CloseHandle(ctx.finished); + ok(!!res, "Failed to close event handle, last error %#x.\n", GetLastError()); + + return ctx.cw; +} + +static void test_thread_fpu_cw(void) +{ + WORD initial_cw, cw; + + initial_cw = get_fpu_cw(); + ok(initial_cw == 0x37f, "Expected FPU control word 0x37f, got %#x.\n", initial_cw); + + cw = get_thread_fpu_cw(); + ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw); + + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "Expected FPU control word 0xf60, got %#x.\n", cw); + + cw = get_thread_fpu_cw(); + ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw); + + cw = get_fpu_cw(); + ok(cw == 0xf60, "Expected FPU control word 0xf60, got %#x.\n", cw); + + set_fpu_cw(initial_cw); + cw = get_fpu_cw(); + ok(cw == initial_cw, "Expected FPU control word %#x, got %#x.\n", initial_cw, cw); +} + START_TEST(thread) { HINSTANCE lib; @@ -1401,4 +1482,7 @@ START_TEST(thread) test_RegisterWaitForSingleObject(); test_TLS(); test_ThreadErrorMode(); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + test_thread_fpu_cw(); +#endif } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7a60c2a..b003436 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2177,6 +2177,16 @@ void signal_init_thread( TEB *teb ) wine_ldt_set_flags( &fs_entry, WINE_LDT_FLAGS_DATA|WINE_LDT_FLAGS_32BIT ); wine_ldt_init_fs( thread_data->fs, &fs_entry ); thread_data->gs = wine_get_gs(); + + if (teb->Peb->ProcessHeap) /* Not for the inital thread. */ + { + const WORD fpu_cw = 0x27f; +#ifdef __GNUC__ + __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); +#else + FIXME("FPU setup not implemented for this platform.\n"); +#endif + } } /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f509006..188224d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2344,6 +2344,16 @@ void signal_init_thread( TEB *teb ) ss.ss_size = signal_stack_size; ss.ss_flags = 0; if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); + + if (teb->Peb->ProcessHeap) /* Not for the inital thread. */ + { + const WORD fpu_cw = 0x27f; +#ifdef __GNUC__ + __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); +#else + FIXME("FPU setup not implemented for this platform.\n"); +#endif + } } /**********************************************************************

1 0

Andrew Nguyen : ntdll/tests: Add tests to examine output file part pointer behavior for RtlGetFullPathName_U .
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: bdf583b349a6c721a968ccee66358fc59f24e3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf583b349a6c721a968ccee6… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 16 23:40:04 2010 -0500 ntdll/tests: Add tests to examine output file part pointer behavior for RtlGetFullPathName_U. --- dlls/ntdll/tests/path.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9d39cdc..90db536 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -226,6 +226,9 @@ static void test_RtlIsNameLegalDOS8Dot3(void) } static void test_RtlGetFullPathName_U(void) { + static const WCHAR emptyW[] = {0}; + static const WCHAR deadbeefW[] = {'d','e','a','d','b','e','e','f',0}; + struct test { const char *path; @@ -269,6 +272,26 @@ static void test_RtlGetFullPathName_U(void) DWORD reslen; UINT len; + file_part = (WCHAR *)0xdeadbeef; + lstrcpyW(rbufferW, deadbeefW); + ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!lstrcmpW(rbufferW, deadbeefW), + "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); + ok(file_part == (WCHAR *)0xdeadbeef || + file_part == NULL, /* Win7 */ + "Expected file part pointer to be untouched, got %p\n", file_part); + + file_part = (WCHAR *)0xdeadbeef; + lstrcpyW(rbufferW, deadbeefW); + ret = pRtlGetFullPathName_U(emptyW, MAX_PATH, rbufferW, &file_part); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!lstrcmpW(rbufferW, deadbeefW), + "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); + ok(file_part == (WCHAR *)0xdeadbeef || + file_part == NULL, /* Win7 */ + "Expected file part pointer to be untouched, got %p\n", file_part); + for (test = tests; test->path; test++) { len= strlen(test->rname) * sizeof(WCHAR);

1 0

Luca Bennati : oleacc: Add Italian translation.
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: 660ead08476b6e5712ab3caf408cb2ac0574de02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=660ead08476b6e5712ab3caf4… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Jun 16 21:52:27 2010 +0200 oleacc: Add Italian translation. --- dlls/oleacc/Makefile.in | 1 + dlls/oleacc/oleacc_It.rc | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 96689a5..2f1a67d 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ oleacc_De.rc \ oleacc_En.rc \ oleacc_Fr.rc \ + oleacc_It.rc \ oleacc_Ko.rc \ oleacc_Lt.rc \ oleacc_Nl.rc \ diff --git a/dlls/oleacc/oleacc_It.rc b/dlls/oleacc/oleacc_It.rc new file mode 100644 index 0000000..3f99e65 --- /dev/null +++ b/dlls/oleacc/oleacc_It.rc @@ -0,0 +1,96 @@ +/* + * Italian resources for oleacc + * + * Copyright 2008 Nikolay Sivov + * Copyright 2010 Luca Bennati + * + * 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 "oleacc.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "oggetto sconosciuto" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "barra del titolo" + ROLE_SYSTEM_MENUBAR "barra dei menù" + ROLE_SYSTEM_SCROLLBAR "barra dello scorrimento" + ROLE_SYSTEM_GRIP "maniglia" + ROLE_SYSTEM_SOUND "suono" + ROLE_SYSTEM_CURSOR "cursore" + ROLE_SYSTEM_CARET "cursore di testo" + ROLE_SYSTEM_ALERT "allarme" + ROLE_SYSTEM_WINDOW "finestra" + ROLE_SYSTEM_CLIENT "client" + ROLE_SYSTEM_MENUPOPUP "menù a comparsa" + ROLE_SYSTEM_MENUITEM "elemento del menù" + ROLE_SYSTEM_TOOLTIP "tooltip" + ROLE_SYSTEM_APPLICATION "applicazione" + ROLE_SYSTEM_DOCUMENT "documento" + ROLE_SYSTEM_PANE "pannello" + ROLE_SYSTEM_CHART "diagramma" + ROLE_SYSTEM_DIALOG "dialogo" + ROLE_SYSTEM_BORDER "bordo" + ROLE_SYSTEM_GROUPING "raggruppamento" + ROLE_SYSTEM_SEPARATOR "separatore" + ROLE_SYSTEM_TOOLBAR "barra degli strumenti" + ROLE_SYSTEM_STATUSBAR "barra dello stato" + ROLE_SYSTEM_TABLE "tabella" + ROLE_SYSTEM_COLUMNHEADER "intestazione di colonna" + ROLE_SYSTEM_ROWHEADER "intestazione di riga" + ROLE_SYSTEM_COLUMN "colonna" + ROLE_SYSTEM_ROW "riga" + ROLE_SYSTEM_CELL "cella" + ROLE_SYSTEM_LINK "collegamento" + ROLE_SYSTEM_HELPBALLOON "balloon d'aiuto" + ROLE_SYSTEM_CHARACTER "carattere" + ROLE_SYSTEM_LIST "lista" + ROLE_SYSTEM_LISTITEM "elemento della lista" + ROLE_SYSTEM_OUTLINE "schema" + ROLE_SYSTEM_OUTLINEITEM "elemento dello schema" + ROLE_SYSTEM_PAGETAB "linguetta di pagina" + ROLE_SYSTEM_PROPERTYPAGE "pagina delle proprietà" + ROLE_SYSTEM_INDICATOR "indicatore" + ROLE_SYSTEM_GRAPHIC "immagine" + ROLE_SYSTEM_STATICTEXT "testo statico" + ROLE_SYSTEM_TEXT "testo" + ROLE_SYSTEM_PUSHBUTTON "pulsante" + ROLE_SYSTEM_CHECKBUTTON "pulsante di controllo" + ROLE_SYSTEM_RADIOBUTTON "pulsante radio" + ROLE_SYSTEM_COMBOBOX "casella combinata" + ROLE_SYSTEM_DROPLIST "lista a discesa" + ROLE_SYSTEM_PROGRESSBAR "barra del progresso" + ROLE_SYSTEM_DIAL "quadrante" + ROLE_SYSTEM_HOTKEYFIELD "campo con scorciatoia da tastiera" + ROLE_SYSTEM_SLIDER "diapositiva" + ROLE_SYSTEM_SPINBUTTON "casella di selezione" + ROLE_SYSTEM_DIAGRAM "diagramma" + ROLE_SYSTEM_ANIMATION "animazione" + ROLE_SYSTEM_EQUATION "equazione" + ROLE_SYSTEM_BUTTONDROPDOWN "pulsante a discesa" + ROLE_SYSTEM_BUTTONMENU "bottone menù" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "griglia con pulsante a discesa" + ROLE_SYSTEM_WHITESPACE "spazio bianco" + ROLE_SYSTEM_PAGETABLIST "lista delle linguette di pagina" + ROLE_SYSTEM_CLOCK "orologio" + ROLE_SYSTEM_SPLITBUTTON "pulsante di menù combinato" + ROLE_SYSTEM_IPADDRESS "indirizzo IP" + ROLE_SYSTEM_OUTLINEBUTTON "pulsante dello schema" +}

1 0

Aric Stewart : usp10/tests: Remove a test for a bug corrected in later versions of usp10.
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: 5c5e6a5fc94169e2a26d39ece0cc6fb81d59be79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5e6a5fc94169e2a26d39ece… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 17 11:23:49 2010 +0900 usp10/tests: Remove a test for a bug corrected in later versions of usp10. The undocumented interaction with ScriptStringCPtoX causing ScriptStringFree is an undocumented bug that appears to have been fixed in later versions of Uniscribe. We should not be trying to conform to that. --- dlls/usp10/tests/usp10.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8b1f603..7d0f3eb 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1388,13 +1388,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); ok(hr == E_INVALIDARG, "ScriptStringCPtoX should return E_INVALIDARG not %08x\n", hr); - hr = ScriptStringFree(&ssa); - /* - * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail - */ - ok(hr == E_INVALIDARG || - hr == E_FAIL, /* win2k3 */ - "ScriptStringFree should return E_INVALIDARG or E_FAIL not %08x\n", hr); + ScriptStringFree(&ssa); } }

1 0

Michael Stefaniuc : notepad: Fix an error in the Czech translation.
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: 1734d098c9e34affde6fca6c30385bffb76e830b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1734d098c9e34affde6fca6c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 17 11:38:53 2010 +0200 notepad: Fix an error in the Czech translation. Translation by Radek Vokal. --- programs/notepad/Cs.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Cs.rc b/programs/notepad/Cs.rc index 745062d..016f61e 100644 --- a/programs/notepad/Cs.rc +++ b/programs/notepad/Cs.rc @@ -59,6 +59,7 @@ POPUP "U&pravit" { POPUP "&Hled�n�" { MENUITEM "&Hledej...\tCtrl+F", CMD_SEARCH MENUITEM "&Najdi dal��\tF3", CMD_SEARCH_NEXT + MENUITEM "Nah&radit...\tCtrl+H", CMD_REPLACE } POPUP "&N�pov�da" { MENUITEM "&Obsah", CMD_HELP_CONTENTS

1 0

Andrew Nguyen : kernel32/tests: Add tests to examine output file part pointer behavior for GetFullPathNameA .
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: 70099e897199ebfc5c4baf48c50fd34ccfcb7e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70099e897199ebfc5c4baf48c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 16 23:40:17 2010 -0500 kernel32/tests: Add tests to examine output file part pointer behavior for GetFullPathNameA. --- dlls/kernel32/tests/path.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8232fdf..6fa4d93 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1569,6 +1569,61 @@ if (0) "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); } +static void test_GetFullPathNameA(void) +{ + char output[MAX_PATH], *filepart; + DWORD ret; + int is_win9x, i; + + const struct + { + LPCSTR name; + DWORD len; + LPSTR buffer; + LPSTR *lastpart; + int win9x_crash; + } invalid_parameters[] = + { + {NULL, 0, NULL, NULL, 1}, + {NULL, MAX_PATH, NULL, NULL, 1}, + {NULL, MAX_PATH, output, NULL, 1}, + {NULL, MAX_PATH, output, &filepart, 1}, + {"", 0, NULL, NULL}, + {"", MAX_PATH, NULL, NULL}, + {"", MAX_PATH, output, NULL}, + {"", MAX_PATH, output, &filepart}, + }; + + SetLastError(0xdeadbeef); + ret = GetFullPathNameW(NULL, 0, NULL, NULL); + is_win9x = !ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; + + if (is_win9x) + win_skip("Skipping some tests that cause GetFullPathNameA to crash on Win9x\n"); + + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + if (is_win9x && invalid_parameters[i].win9x_crash) + continue; + + SetLastError(0xdeadbeef); + strcpy(output, "deadbeef"); + filepart = (char *)0xdeadbeef; + ret = GetFullPathNameA(invalid_parameters[i].name, + invalid_parameters[i].len, + invalid_parameters[i].buffer, + invalid_parameters[i].lastpart); + ok(!ret, "[%d] Expected GetFullPathNameA to return 0, got %u\n", i, ret); + ok(!strcmp(output, "deadbeef"), "[%d] Expected the output buffer to be unchanged, got \"%s\"\n", i, output); + ok(filepart == (char *)0xdeadbeef, "[%d] Expected output file part pointer to be untouched, got %p\n", i, filepart); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_BAD_PATHNAME || /* Win9x */ + GetLastError() == ERROR_INVALID_NAME, /* Win7 */ + "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n", + i, GetLastError()); + } +} + static void init_pointers(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -1610,4 +1665,5 @@ START_TEST(path) test_drive_letter_case(); test_SearchPathA(); test_SearchPathW(); + test_GetFullPathNameA(); }

1 0

Aric Stewart : usp10/tests: Windows 95 does not set invalid glyphs to 0 but instead 0x80.
by Alexandre Julliard June 17, 2010

June 17, 2010

Module: wine Branch: master Commit: baaaee823f7f8285b40f07e1a42074aeb155928e URL: http://source.winehq.org/git/wine.git/?a=commit;h=baaaee823f7f8285b40f07e1a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 17 13:11:25 2010 +0900 usp10/tests: Windows 95 does not set invalid glyphs to 0 but instead 0x80. --- dlls/usp10/tests/usp10.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7d0f3eb..522e035 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -262,8 +262,8 @@ static void test_ScriptShape(HDC hdc) hr = ScriptShape(hdc, &sc, test2, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); ok(nb == 4, "Wrong number of items\n"); - ok(glyphs2[0] == 0, "Incorrect glyph for 0x202B\n"); - ok(glyphs2[3] == 0, "Incorrect glyph for 0x202C\n"); + ok(glyphs2[0] == 0 || broken(glyphs2[0] == 0x80), "Incorrect glyph for 0x202B\n"); + ok(glyphs2[3] == 0 || broken(glyphs2[3] == 0x80), "Incorrect glyph for 0x202C\n"); ok(logclust[0] == 0, "clusters out of order\n"); ok(logclust[1] == 1, "clusters out of order\n"); ok(logclust[2] == 2, "clusters out of order\n"); @@ -640,8 +640,8 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) hr = ScriptGetCMap(hdc, &psc, TestItem2, cInChars, dwFlags, pwOutGlyphs3); ok (hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok(pwOutGlyphs3[0] == 0, "Glyph 0 should be default glyph\n"); - ok(pwOutGlyphs3[3] == 0, "Glyph 0 should be default glyph\n"); + ok(pwOutGlyphs3[0] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n"); + ok(pwOutGlyphs3[3] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n"); cInChars = cChars = 9;

1 0