September 2008 - Wine-Commits

Alexandre Julliard : Release 1.1.5.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: d381c7cbf4d463189f479a0b3986f6767aeb8dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d381c7cbf4d463189f479a0b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 18:05:36 2008 +0200 Release 1.1.5. --- ANNOUNCE | 1530 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 778 insertions(+), 772 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d381c7cbf4d463189f479…

1 0

Alexandre Julliard : winetest: Don't wrap the date in the index table.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: tools Branch: master Commit: 9c006943786ec6b036310794d48e3f1472e699a4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9c006943786ec6b036310794… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 12:28:14 2008 +0200 winetest: Don't wrap the date in the index table. --- winetest/build-index | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index e282277..9d55f28 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -225,7 +225,7 @@ foreach my $build (@builds) { printf OUT " <tr><td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d-%s-%04d %02d:%02d</td>", $date[3], $months[$date[4]], $date[5] + 1900, $date[2], $date[1], $date[0]; + printf OUT " <td class=\"date\">%02d-%s-%04d %02d:%02d</td>", $date[3], $months[$date[4]], $date[5] + 1900, $date[2], $date[1], $date[0]; my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) {

1 0

Muneyuki Noguchi : oleview: Add Japanese resources.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 08040c70a84500d1d5daabe7efbcaff925b941fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08040c70a84500d1d5daabe7e… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Fri Sep 19 19:26:47 2008 +0900 oleview: Add Japanese resources. --- programs/oleview/Ja.rc | 213 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 214 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Ja.rc b/programs/oleview/Ja.rc new file mode 100644 index 0000000..9402dd7 --- /dev/null +++ b/programs/oleview/Ja.rc @@ -0,0 +1,213 @@ +/* + * OleView (Ja.rc) + * Japanese Language Support + * + * Copyright 2006 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 + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDM_MENU MENU +{ + POPUP "�t�@�C��(&F)" + { + MENUITEM "�t�@�C��Ƀo�C��h(&B)...", IDM_BIND + MENUITEM "TypeLib �̕\\��(&V)...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "�V�X�e��ݒ�(&S)...", IDM_SYSCONF + MENUITEM "��W�X�g�� G�f�B�^�̎��s(&R)", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "�I��(&X)", IDM_EXIT + } + POPUP "�I�u�W�F�N�g(&O)" + { + POPUP "&CoCreateInstance �t��O" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "�^�C�v��̕\\��(&T)", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "�C��X�^��X�̍쐬(&I)", IDM_CREATEINST, GRAYED + MENUITEM "Create Instance &On...", IDM_CREATEINSTON, GRAYED + MENUITEM "�C��X�^��X�̊J��(&R)", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&LSID ��N��b�v�{�[�h�ɃR�s�[", IDM_COPYCLSID, GRAYED + MENUITEM "&HTML �I�u�W�F�N�g �^�O��N��b�v�{�[�h�ɃR�s�[", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "�\\��(&V)...", IDM_VIEW, GRAYED + } + POPUP "�\\��(&V)" + { + MENUITEM "�㋉��[�h(&E)", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "�B��ꂽ�R��|�[�l��g�̃J�e�S��(&H)", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "�c�[�� o�[(&T)", IDM_TOOLBAR,CHECKED + MENUITEM "�X�e�[�^�X �o�[(&S)", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "�X�V(&R)\tF5", IDM_REFRESH + } + POPUP "�w��v(&H)" + { + MENUITEM "OleView �ɂ��(&A)", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "�t�@�C��(&F)" + { + MENUITEM "��O��t��ĕۑ�(&S)...", IDM_SAVEAS + MENUITEM "��(&C)", IDM_CLOSE + } + POPUP "�\\��(&V)" + { + MENUITEM "�^�C�v�̎�ނŕ��(&G)", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "�c�[�� o�[(&T)", IDM_TOOLBAR + MENUITEM "�X�e�[�^�X �o�[(&S)", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "�ҋ@��" + IDS_ABOUT "OleView - OLE/COM �I�u�W�F�N�g �r��A�[" + IDS_ABOUTVER "�o�[�W�� 1.0" + IDS_TYPELIBTITLE "ITypeLib �r��A�[" + IDS_OPEN "�J��" + IDS_OPEN_TYPELIB_FILTER "TypeLib �t�@�C�� (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0��ׂẴt�@�C�� (*.*)\0*.*\0\0" + + IDM_BIND, "File Moniker ��ʂ��ăt�@�C��Ƀo�C��h��܂�" + IDM_TYPELIB, "TypeLib �t�@�C��J��Ē��g��\\��܂�" + IDM_SYSCONF, "�}�V��S�̂̕��U COM �̐ݒ��ύX��܂�" + IDM_REGEDIT, "Wine ��W�X�g�� G�f�B�^��s��܂�" + IDM_EXIT, "�A�v��P�[�V��I��܂��B�ύX��ۑ��悤�ɑ��܂�" + IDM_CREATEINST, "�I��ꂽ�I�u�W�F�N�g�̃C��X�^��X��쐬��܂�" + IDM_CREATEINSTON, "��̃}�V��̑I��ꂽ�I�u�W�F�N�g�̃C��X�^��X��쐬��܂�" + IDM_RELEASEINST, "��ݑI��ꂽ�I�u�W�F�N�g�̃C��X�^��X��J��܂�" + IDM_COPYCLSID, "��ݑI��ꂽ��ڂ� GUID ��N��b�v�{�[�h�ɃR�s�[��܂�" + IDM_VIEW, "�I��ꂽ��ڂ̃r��A�[��\\��܂�" + IDM_FLAG_INSERV, "CoGetClassObject ��ĂԂƂ�� CLSCTX_INPROC_SERVER ��g��܂�" + IDM_FLAG_INHANDL, "CoGetClassObject ��ĂԂƂ�� CLSCTX_INPROC_HANDLER ��g��܂�" + IDM_FLAG_LOCSERV, "CoGetClassObject ��ĂԂƂ�� CLSCTX_LOCAL_SERVER ��g��܂�" + IDM_FLAG_REMSERV, "CoGetClassObject ��ĂԂƂ�� CLSCTX_REMOTE_SERVER ��g��܂�" + IDM_EXPERT, "�㋉�Ə��\\��[�h��؂�ւ��܂�" + IDM_HIDDEN, "�\��悤�ɂȂ��Ă��Ȃ��R��|�[�l��g�̃J�e�S��̕\��؂�ւ��܂�" + IDM_TOOLBAR, "�c�[�� o�[�̕\\��/��\\��؂�ւ��܂�" + IDM_STATUSBAR, "�X�e�[�^�X �o�[�̕\\��/��\\��؂�ւ��܂�" + IDM_REFRESH, "��ׂẴ��X�g��X�V��܂�" + IDM_ABOUT, "�v��O��A�o�[�W��ԍ��ƒ��쌠��\\��܂�" + + IDM_SAVEAS, ".IDL �܂�� .H �t�@�C��Ƃ��ĕۑ��܂�" + IDM_CLOSE, "�E�B��h�E��܂�" + IDM_GROUP, "��ނŃ^�C�v��𕪗ނ��܂�" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "�R��|�[�l��g�̃J�e�S��ŕ��" + IDS_TREE_O1O, "OLE 1.0 �I�u�W�F�N�g" + IDS_TREE_CLO, "COM ��C�u�� I�u�W�F�N�g" + IDS_TREE_AO, "��ׂẴI�u�W�F�N�g" + IDS_TREE_AID, "�A�v��P�[�V�� ID" + IDS_TREE_TL, "�^�C�v ��C�u��" + IDS_TL_VER, "�o�[�W��" + IDS_TREE_I, "�C��^�[�t�F�C�X" + + IDS_TAB_REG, "Registry" + IDS_TAB_IMPL, "Implementation" + IDS_TAB_ACTIV, "Activation" + + IDS_CGCOFAIL, "CoGetClassObject ��s��܂��B" + IDS_ERROR_UNKN, "�s��ȃG��[" + IDS_TRUE, "True" + IDS_FALSE, "False" + IDS_BYTES, "�o�C�g" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) ��s��܂�� ($%x)" + IDS_INHERITINTERFACES, "�p��ꂽ�C��^�[�t�F�C�X" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "��̃}�V��ɐڑ�" +FONT 9, "MS Shell Dlg" +{ + LTEXT "�}�V��(&M):", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "�L��Z��(&C)", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�V�X�e��ݒ�" +FONT 9, "MS Shell Dlg" +{ + LTEXT "�V�X�e��ݒ�", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "��U COM ��L��ɂ��(&E)", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "��[�g�ڑ��L��ɂ��(Win95 �̂�)(&R)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "��̐ݒ�̓��W�X�^�[�̒l�݂̂�ς��܂��B\nWine �̃p�t�H�[�}��X�ɂ͉e��܂��B", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "�L��Z��(&C)", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "��̃C��^�[�t�F�C�X �r��A�[" +FONT 9, "MS Shell Dlg" +{ + LTEXT "�C��^�[�t�F�C�X", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "��(&C)", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "�^�C�v��\\��(&V)", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist �C��^�[�t�F�C�X �r��A�[" +FONT 9, "MS Shell Dlg" +{ + LTEXT "�N��X��:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "��(&C)", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream �C��^�[�t�F�C�X �r��A�[" +FONT 9, "MS Shell Dlg" +{ + LTEXT "�N��X��:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "��(&C)", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 4edf2fd..02d460f 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -27,6 +27,7 @@ #include "De.rc" #include "En.rc" #include "Fr.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

Alexandre Julliard : ntdll/tests: Fix a couple of tests failing on NT4.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 42e6d94784cd403be77c6bd25b88d875a084438f URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e6d94784cd403be77c6bd25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 14:03:47 2008 +0200 ntdll/tests: Fix a couple of tests failing on NT4. --- dlls/ntdll/tests/om.c | 71 +++++++++++++++++++++++++++--------------------- dlls/ntdll/tests/reg.c | 2 +- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d211ea0..1999da6 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -285,6 +285,7 @@ static void test_directory(void) UNICODE_STRING str; OBJECT_ATTRIBUTES attr; HANDLE dir, dir1, h; + BOOL is_nt4; /* No name and/or no attributes */ status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); @@ -335,14 +336,18 @@ static void test_directory(void) pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr); - ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); - pRtlFreeUnicodeString(&str); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); - DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH) - pRtlFreeUnicodeString(&str); - pNtClose(h); - pNtClose(dir); + is_nt4 = (status == STATUS_OBJECT_NAME_NOT_FOUND); /* nt4 doesn't have Local\\ symlink */ + if (!is_nt4) + { + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); + pRtlFreeUnicodeString(&str); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH) + pRtlFreeUnicodeString(&str); + pNtClose(h); + pNtClose(dir); + } pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); @@ -393,22 +398,23 @@ static void test_directory(void) pNtClose(dir); - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Global\\om.c-test"); - DIR_TEST_CREATE_SUCCESS(&dir) - pRtlFreeUnicodeString(&str); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local\\om.c-test\\one more level"); - DIR_TEST_CREATE_SUCCESS(&h) - pRtlFreeUnicodeString(&str); - pNtClose(h); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); - DIR_TEST_CREATE_SUCCESS(&dir) - pRtlFreeUnicodeString(&str); - pNtClose(h); - - pNtClose(dir); - + if (!is_nt4) + { + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Global\\om.c-test"); + DIR_TEST_CREATE_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local\\om.c-test\\one more level"); + DIR_TEST_CREATE_SUCCESS(&h) + pRtlFreeUnicodeString(&str); + pNtClose(h); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + DIR_TEST_CREATE_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + pNtClose(h); + pNtClose(dir); + } /* Create other objects using RootDirectory */ @@ -462,9 +468,6 @@ static void test_directory(void) #define SYMLNK_TEST_CREATE_SUCCESS(h) \ status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target); \ ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status); -#define SYMLNK_TEST_OPEN_SUCCESS(h) \ - status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr); \ - ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); static void test_symboliclink(void) { @@ -518,18 +521,24 @@ static void test_symboliclink(void) /* Compaund test */ - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); - DIR_TEST_OPEN_SUCCESS(&dir) + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); + status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) /* nt4 doesn't have Local\\ */ + { + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); + status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + } + ok(status == STATUS_SUCCESS, "Failed to open Directory(%08x)\n", status); pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "Local\\test-link"); + pRtlCreateUnicodeStringFromAsciiz(&str, "test-link"); pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); SYMLNK_TEST_CREATE_SUCCESS(&link) pRtlFreeUnicodeString(&str); pRtlFreeUnicodeString(&target); - pRtlCreateUnicodeStringFromAsciiz(&str, "Local\\test-link\\PIPE"); + pRtlCreateUnicodeStringFromAsciiz(&str, "test-link\\PIPE"); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); todo_wine ok(status == STATUS_SUCCESS, "Failed to open NamedPipe(%08x)\n", status); pRtlFreeUnicodeString(&str); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 94f2a0b..70864b6 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -575,7 +575,7 @@ static void test_RtlpNtQueryValueKey(void) START_TEST(reg) { - static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t','\\',0}; + static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; if(!InitFunctionPtrs()) return; pRtlFormatCurrentUserKeyPath(&winetestpath);

1 0

Alexandre Julliard : kernel32/tests: Fix a couple of tests failing on NT4.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 7e54db23e97d861187d6468813cd28ce0fd932c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e54db23e97d861187d646881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 14:03:40 2008 +0200 kernel32/tests: Fix a couple of tests failing on NT4. --- dlls/kernel32/tests/module.c | 3 ++- dlls/kernel32/tests/virtual.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 1fce13c..b076a67 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -328,7 +328,8 @@ static void testLoadLibraryEx(void) { ok(hmodule == 0, "Expected 0, got %p\n", hmodule); } - ok(GetLastError() == ERROR_FILE_NOT_FOUND, + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* nt4 */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 3da3bce..76d74f7 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -270,6 +270,7 @@ static void test_VirtualAlloc(void) static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; + const char *name; HANDLE file, mapping; void *ptr, *ptr2; MEMORY_BASIC_INFORMATION info; @@ -450,11 +451,18 @@ static void test_MapViewOfFile(void) DeleteFileA( testfile ); SetLastError(0xdeadbeef); - file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "Local\\Foo"); + name = "Local\\Foo"; + file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, name ); + /* nt4 doesn't have Local\\ */ + if (!file && GetLastError() == ERROR_PATH_NOT_FOUND) + { + name = "Foo"; + file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, name ); + } ok( file != 0, "CreateFileMapping PAGE_READWRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); - mapping = OpenFileMapping( FILE_MAP_READ, FALSE, "Local\\Foo" ); + mapping = OpenFileMapping( FILE_MAP_READ, FALSE, name ); ok( mapping != 0, "OpenFileMapping FILE_MAP_READ error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); @@ -476,7 +484,7 @@ todo_wine ok( info.Protect == PAGE_READONLY, "%x != PAGE_READONLY\n", info.Prote CloseHandle( mapping ); SetLastError(0xdeadbeef); - mapping = OpenFileMapping( FILE_MAP_WRITE, FALSE, "Local\\Foo" ); + mapping = OpenFileMapping( FILE_MAP_WRITE, FALSE, name ); ok( mapping != 0, "OpenFileMapping FILE_MAP_WRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 );

1 0

Alexandre Julliard : kernel32/tests: Fix race condition in the thread test.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: ea39761d3a89098699f0f1549518848e83bbd664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea39761d3a89098699f0f1549… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 12:21:45 2008 +0200 kernel32/tests: Fix race condition in the thread test. --- dlls/kernel32/tests/thread.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index ff9dad2..649c49c 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -104,13 +104,15 @@ CreateThread certain chunks of code at a time, and we know which one is executing it. It basically makes multithreaded execution linear, which defeats the purpose of multiple threads, but makes testing easy. */ -static HANDLE all_synced; +static HANDLE start_event, stop_event; static LONG num_syncing_threads, num_synced; static void init_thread_sync_helpers(LONG num_threads) { - all_synced = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(all_synced != NULL, "CreateEvent failed\n"); + start_event = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(start_event != NULL, "CreateEvent failed\n"); + stop_event = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(stop_event != NULL, "CreateEvent failed\n"); num_syncing_threads = num_threads; num_synced = 0; } @@ -120,13 +122,13 @@ static BOOL sync_threads_and_run_one(DWORD sync_id, DWORD my_id) LONG num = InterlockedIncrement(&num_synced); assert(0 < num && num <= num_syncing_threads); if (num == num_syncing_threads) - /* FIXME: MSDN claims PulseEvent is unreliable. For a test this isn't - so important, but we could use condition variables with more effort. - The given approach is clearer, though. */ - PulseEvent(all_synced); + { + ResetEvent( stop_event ); + SetEvent( start_event ); + } else { - DWORD ret = WaitForSingleObject(all_synced, 60000); + DWORD ret = WaitForSingleObject(start_event, 10000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); } return sync_id == my_id; @@ -137,18 +139,21 @@ static void resync_after_run(void) LONG num = InterlockedDecrement(&num_synced); assert(0 <= num && num < num_syncing_threads); if (num == 0) - PulseEvent(all_synced); + { + ResetEvent( start_event ); + SetEvent( stop_event ); + } else { - DWORD ret = WaitForSingleObject(all_synced, 60000); + DWORD ret = WaitForSingleObject(stop_event, 10000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); } } static void cleanup_thread_sync_helpers(void) { - CloseHandle(all_synced); - all_synced = NULL; + CloseHandle(start_event); + CloseHandle(stop_event); } DWORD tlsIndex;

1 0

Allan Tong : wined3d: Fix Geforce9 detection.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 43f2ec33bfe7ee6c02d7b44b739e72a5134a86f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f2ec33bfe7ee6c02d7b44b7… Author: Allan Tong <actong88(a)gmail.com> Date: Thu Sep 18 19:18:23 2008 -0400 wined3d: Fix Geforce9 detection. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9f48da9..5d805e3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1088,7 +1088,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { vidmem = 384; /* The 9600GSO has 384MB, the 9600GT has 512-1024MB */ } /* Geforce8 - highend */ - if (strstr(gl_info->gl_renderer, "8800")) { + else if (strstr(gl_info->gl_renderer, "8800")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_8800GTS; vidmem = 320; /* The 8800GTS uses 320MB, a 8800GTX can have 768MB */ }

1 0

Jeff Zaroyko : dsound: Fix a failing test on XP.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 724a45d15ef460eb29eb27cc0e36a40ab829fd78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724a45d15ef460eb29eb27cc0… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Sep 19 15:26:57 2008 +1000 dsound: Fix a failing test on XP. --- dlls/dsound/tests/dsound.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 9dc8f21..256f086 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -763,8 +763,9 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL) && !secondary) - || rc==DS_OK, /* 2003 / 2008 */ + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) + && !secondary) + || rc==DS_OK, /* 2003 / 2008 */ "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary)

1 0

Juan Lang : tools/wine.inf: Register cryptdlg.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: f5bdc72c498bdda0efda712c386066b0f27a779f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5bdc72c498bdda0efda712c3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 18 16:34:41 2008 -0700 tools/wine.inf: Register cryptdlg. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cc5916d..ffa27c7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2181,6 +2181,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,browseui.dll,1 11,,comcat.dll,1 11,,comctl32.dll,2 +11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,d3dxof.dll,1 11,,ddraw.dll,1

1 0

Juan Lang : include: Add missing defines.
by Alexandre Julliard Sept. 19, 2008

Sept. 19, 2008

Module: wine Branch: master Commit: 3e207c221b71d2adf3c00980074a8389015dca38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e207c221b71d2adf3c009800… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 18 12:40:28 2008 -0700 include: Add missing defines. --- include/cryptuiapi.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index 3d027f5..f2efe8f 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -69,6 +69,26 @@ typedef struct tagCRYPTUI_INITDIALOG_STRUCT PCCERT_CONTEXT pCertContext; } CRYPTUI_INITDIALOG_STRUCT, *PCRYPTUI_INITDIALOG_STRUCT; +/* Values for CRYPTUI_VIEWCERTIFICATE_STRUCT's dwFlags */ +#define CRYPTUI_HIDE_HIERARCHYPAGE 0x00000001 +#define CRYPTUI_HIDE_DETAILPAGE 0x00000002 +#define CRYPTUI_DISABLE_EDITPROPERTIES 0x00000004 +#define CRYPTUI_ENABLE_EDITPROPERTIES 0x00000008 +#define CRYPTUI_DISABLE_ADDTOSTORE 0x00000010 +#define CRYPTUI_ENABLE_ADDTOSTORE 0x00000020 +#define CRYPTUI_ACCEPT_DECLINE_STYLE 0x00000040 +#define CRYPTUI_IGNORE_UNTRUSTED_ROOT 0x00000080 +#define CRYPTUI_DONT_OPEN_STORES 0x00000100 +#define CRYPTUI_ONLY_OPEN_ROOT_STORE 0x00000200 +#define CRYPTUI_WARN_UNTRUSTED_ROOT 0x00000400 +#define CRYPTUI_ENABLE_REVOCATION_CHECKING 0x00000800 +#define CRYPTUI_WARN_REMOTE_TRUST 0x00001000 +#define CRYPTUI_DISABLE_EXPORT 0x00002000 +#define CRYPTUI_ENABLE_REVOCATION_CHECK_END_CERT 0x00004000 +#define CRYPTUI_ENABLE_REVOCATION_CHECK_CHAIN 0x00008000 +#define CRYPTUI_ENABLE_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT CRYPTUI_ENABLE_REVOCATION_CHECKING +#define CRYPTUI_DISABLE_HTMLLINK 0x00010000 + typedef struct tagCRYPTUI_VIEWCERTIFICATE_STRUCTA { DWORD dwSize;

1 0