January 2008 - Wine-Commits

Hans Leidekker : mscms: Use NT directory for storing color profiles.
by Alexandre Julliard Jan. 25, 2008

Jan. 25, 2008

Module: wine Branch: master Commit: 72ba2be6c49e0d84ee6db68b6b9611a2e3cc1c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ba2be6c49e0d84ee6db68b6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Jan 24 20:02:53 2008 +0100 mscms: Use NT directory for storing color profiles. --- dlls/mscms/profile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 4ecb361..11413f1 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -119,7 +119,8 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) { WCHAR colordir[MAX_PATH]; - static const WCHAR colorsubdir[] = { '\\','c','o','l','o','r',0 }; + static const WCHAR colorsubdir[] = + {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r',0}; DWORD len; TRACE( "( %p, %p )\n", buffer, size );

1 0

Andrey Esin : credui: Added Russian translation.
by Alexandre Julliard Jan. 25, 2008

Jan. 25, 2008

Module: wine Branch: master Commit: e1686af924847d6d0a685a11b64e4833fa61e698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1686af924847d6d0a685a11b… Author: Andrey Esin <andrey(a)esin.name> Date: Thu Jan 24 11:45:09 2008 +0300 credui: Added Russian translation. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_Ru.rc | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index 181e3b3..53f54a4 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -34,4 +34,5 @@ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp #include "credui_Ko.rc" #include "credui_No.rc" #include "credui_Pl.rc" +#include "credui_Ru.rc" #include "credui_Sv.rc" diff --git a/dlls/credui/credui_Ru.rc b/dlls/credui/credui_Ru.rc new file mode 100644 index 0000000..341b5b6 --- /dev/null +++ b/dlls/credui/credui_Ru.rc @@ -0,0 +1,50 @@ +/* + * Russian language resource file for Credentials UI + * + * Copyright 2008 Andrey Esin <andrey(a)esin.name> + * + * 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_RUSSIAN, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "��&��:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&��:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "��&�� ",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "��",IDOK,97,128,50,14 + PUSHBUTTON "��",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "�� %s" + IDS_MESSAGEFORMAT "�� %s" + IDS_INCORRECTPASSWORDTITLE "�� " + IDS_INCORRECTPASSWORD "��, �� \n� �� ." + IDS_CAPSLOCKONTITLE "Caps Lock ��" + IDS_CAPSLOCKON "�� -�� Caps Lock.\n\n�� Caps Lock �� , �� ." +}

1 0

Alexandre Julliard : winex11: Check for managed mode in create_whole_window again now that it is called lazily .
by Alexandre Julliard Jan. 25, 2008

Jan. 25, 2008

Module: wine Branch: master Commit: e6dfbcb07f912dba9d7eb456114fe9cd8a8270c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6dfbcb07f912dba9d7eb4561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 12:07:11 2008 +0100 winex11: Check for managed mode in create_whole_window again now that it is called lazily. --- dlls/winex11.drv/window.c | 7 +++++++ dlls/winex11.drv/winpos.c | 20 ++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5aa01d9..5ead133 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1102,6 +1102,13 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; + if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) + { + TRACE( "making win %p/%lx managed\n", data->hwnd, data->whole_window ); + data->managed = TRUE; + SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); + } + mask = get_window_attributes( display, data, &attr ); wine_tsx11_lock(); diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index b1a89fb..1a3cde5 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -139,21 +139,19 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) if (changed & WS_VISIBLE) { - if (!(data = X11DRV_get_win_data( hwnd )) && - !(data = X11DRV_create_win_data( hwnd ))) return; + data = X11DRV_get_win_data( hwnd ); + if (data) invalidate_dce( hwnd, &data->window_rect ); + + /* we don't unmap windows, that causes trouble with the window manager */ + if (!(new_style & WS_VISIBLE)) return; + + if (!data && !(data = X11DRV_create_win_data( hwnd ))) return; - if (data->whole_window && (new_style & WS_VISIBLE) && - X11DRV_is_window_rect_mapped( &data->window_rect )) + if (data->whole_window && X11DRV_is_window_rect_mapped( &data->window_rect )) { X11DRV_set_wm_hints( display, data ); if (!data->mapped) { - if (!data->managed && is_window_managed( hwnd, SWP_NOACTIVATE, &data->window_rect )) - { - TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); - data->managed = TRUE; - SetPropA( hwnd, managed_prop, (HANDLE)1 ); - } TRACE( "mapping win %p\n", hwnd ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); @@ -162,8 +160,6 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) data->mapped = TRUE; } } - /* we don't unmap windows, that causes trouble with the window manager */ - invalidate_dce( hwnd, &data->window_rect ); } if (changed & WS_DISABLED)

1 0

Reece H. Dunn : user32: Make the class tests pass on Vista.
by Alexandre Julliard Jan. 25, 2008

Jan. 25, 2008

Module: wine Branch: master Commit: d2900d42dd02e8bbfbb4e026c27d1f5c2e275768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2900d42dd02e8bbfbb4e026c… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Wed Jan 23 23:46:58 2008 +0000 user32: Make the class tests pass on Vista. --- dlls/user32/tests/class.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 577a7b8..aa2c60a 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -555,7 +555,8 @@ static void test_instances(void) ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, "Wrong error code %d\n", GetLastError() ); ok( !GetClassInfo( 0, "BUTTON", &wc ), "Button still exists\n" ); ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST || - GetLastError() == ERROR_INVALID_PARAMETER /* W2K3 */, + GetLastError() == ERROR_INVALID_PARAMETER || /* W2K3 */ + GetLastError() == ERROR_SUCCESS /* Vista */, "Wrong error code %d\n", GetLastError() ); /* we can change the instance of a system class */

1 0

Reece H. Dunn : user32: Make the clipboard tests pass on Vista.
by Alexandre Julliard Jan. 25, 2008

Jan. 25, 2008

Module: wine Branch: master Commit: ad89ff0abf5e2b6aff6ccd6023ac30af2978c2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad89ff0abf5e2b6aff6ccd602… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Wed Jan 23 23:32:52 2008 +0000 user32: Make the clipboard tests pass on Vista. --- dlls/user32/tests/clipboard.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5624408..30b1707 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -66,8 +66,9 @@ static void test_ClipboardOwner(void) ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); SetLastError(0xdeadbeef); - ok(!OpenClipboard(hWnd2) && GetLastError() == 0xdeadbeef, - "OpenClipboard should fail without setting last error value\n"); + ok(!OpenClipboard(hWnd2) && + (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED), + "OpenClipboard should fail without setting last error value, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should still be not owned\n"); @@ -76,8 +77,9 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); SetLastError(0xdeadbeef); - ok(!OpenClipboard(hWnd2) && GetLastError() == 0xdeadbeef, - "OpenClipboard should fail without setting last error value\n"); + ok(!OpenClipboard(hWnd2) && + (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED), + "OpenClipboard should fail without setting last error valuei, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError());

1 0

Paul Vriens : kernel32/tests: Win9x returns a different last error.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: 71f81bf1f59422a5eaefbdca0060e211eb65b806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f81bf1f59422a5eaefbdca0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 24 13:18:58 2008 +0100 kernel32/tests: Win9x returns a different last error. --- dlls/kernel32/tests/thread.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 5989ccc..6812f16 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -601,8 +601,10 @@ static VOID test_thread_priority(void) rc = SetThreadPriority(curthread,min_priority-1); ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_PRIORITY /* Win9x */, + "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER or ERROR_INVALID_PRIORITY\n", + GetLastError()); ok(GetThreadPriority(curthread)==min_priority, "GetThreadPriority didn't return min_priority\n"); @@ -611,8 +613,10 @@ static VOID test_thread_priority(void) rc = SetThreadPriority(curthread,max_priority+1); ok(rc == FALSE, "SetThreadPriority passed with a bad argument\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER (87)\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_PRIORITY /* Win9x */, + "SetThreadPriority error %d, expected ERROR_INVALID_PARAMETER or ERROR_INVALID_PRIORITY\n", + GetLastError()); ok(GetThreadPriority(curthread)==max_priority, "GetThreadPriority didn't return max_priority\n");

1 0

Alexandre Julliard : Avoid sizeof in traces.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: e84daed48528063cdbc85e1f26edd8f90704978f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84daed48528063cdbc85e1f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 14:03:10 2008 +0100 Avoid sizeof in traces. --- dlls/advapi32/tests/service.c | 4 ++-- dlls/kernel32/tests/environ.c | 2 +- dlls/wined3d/device.c | 16 ++++------------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index f0b7867..cf5b809 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -949,7 +949,7 @@ static void test_queryconfig2(void) pConfig->lpDescription = (LPSTR)0xdeadbeef; ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,sizeof(SERVICE_DESCRIPTIONA),&needed); ok(ret, "expected QueryServiceConfig2A to succeed\n"); - ok(needed == sizeof(SERVICE_DESCRIPTIONA), "expected needed to be %d, got %d\n", sizeof(SERVICE_DESCRIPTIONA), needed); + ok(needed == sizeof(SERVICE_DESCRIPTIONA), "got %d\n", needed); ok(!pConfig->lpDescription, "expected lpDescription to be NULL, got %p\n", pConfig->lpDescription); SetLastError(0xdeadbeef); @@ -957,7 +957,7 @@ static void test_queryconfig2(void) ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,NULL,0,&needed); ok(!ret, "expected QueryServiceConfig2A to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - ok(needed == sizeof(SERVICE_DESCRIPTIONA), "expected needed to be %d, got %d\n", sizeof(SERVICE_DESCRIPTIONA), needed); + ok(needed == sizeof(SERVICE_DESCRIPTIONA), "got %d\n", needed); if(!pChangeServiceConfig2A) { diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 632e3bc..3088e92 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -284,7 +284,7 @@ static void test_ExpandEnvironmentStringsA(void) strcpy(buf, "Indirect-%IndirectVar%-Indirect"); strcpy(buf2, "Indirect-Foo%EnvVar%Bar-Indirect"); ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1)); - ok(ret_size == strlen(buf2)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, strlen(buf2)+1); + ok(ret_size == strlen(buf2)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlen(buf2)+1); ok(!strcmp(buf1, buf2), "ExpandEnvironmentStrings returned [%s]\n", buf1); SetEnvironmentVariableA("IndirectVar", NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d8e530b..742734c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3185,9 +3185,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface, } if (Sampler >= sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])) { - ERR("Current Sampler overflows sampleState0 array (sampler %d vs size %d)\n", Sampler, - sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0]) - ); + ERR("Current Sampler overflows sampleState0 array (sampler %d)\n", Sampler); return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ } /** @@ -3236,9 +3234,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSamplerState(IWineD3DDevice *iface, } if (Sampler >= sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])) { - ERR("Current Sampler overflows sampleState0 array (sampler %d vs size %d)\n", Sampler, - sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0]) - ); + ERR("Current Sampler overflows sampleState0 array (sampler %d)\n", Sampler); return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ } *Value = This->stateBlock->samplerState[Sampler][Type]; @@ -4417,9 +4413,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD } if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) { - ERR("Current stage overflows textures array (stage %d vs size %d)\n", Stage, - sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0]) - ); + ERR("Current stage overflows textures array (stage %d)\n", Stage); return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ } @@ -4516,9 +4510,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTexture(IWineD3DDevice *iface, DWORD } if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) { - ERR("Current stage overflows textures array (stage %d vs size %d)\n", Stage, - sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0]) - ); + ERR("Current stage overflows textures array (stage %d)\n", Stage); return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ }

1 0

Alistair Leslie-Hughes : gmsxml3: Added typelib support.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: 7645f321d9d9f97ecc5dcd37b90e7f0f922b1628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7645f321d9d9f97ecc5dcd37b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 24 21:38:46 2008 +1100 gmsxml3: Added typelib support. --- .gitignore | 1 + dlls/msxml3/Makefile.in | 2 ++ dlls/msxml3/msxml3_v1.idl | 19 +++++++++++++++++++ dlls/msxml3/version.rc | 2 ++ include/msxml2.idl | 12 ++++++++++++ 5 files changed, 36 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index d1b2f57..193ead6 100644 --- a/.gitignore +++ b/.gitignore @@ -305,6 +305,7 @@ dlls/msvidc32/rsrc.res dlls/msvideo.dll16 dlls/mswsock/libmswsock.def dlls/mswsock/version.res +dlls/msxml3/msxml3_v1.tlb dlls/msxml3/tests/*.ok dlls/msxml3/tests/msxml3_crosstest.exe dlls/msxml3/tests/testlist.c diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 16a2179..a75cd01 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -34,6 +34,8 @@ C_SRCS = \ RC_SRCS = version.rc +IDL_TLB_SRCS = msxml3_v1.idl + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msxml3/msxml3_v1.idl b/dlls/msxml3/msxml3_v1.idl new file mode 100644 index 0000000..d80833f --- /dev/null +++ b/dlls/msxml3/msxml3_v1.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2007 Alistair Leslie-Hughes + * + * 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 "msxml2.idl" diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index a035174..0d82c31 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -14,6 +14,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +1 TYPELIB LOADONCALL DISCARDABLE msxml3_v1.tlb + #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll" diff --git a/include/msxml2.idl b/include/msxml2.idl index fb32a79..9aa5645 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -23,6 +23,16 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; +[ + uuid(f5078f18-c551-11d3-89b9-0000f81fe221), + version(3.0), + helpstring("Microsoft XML, v3.0") +] +library MSXML2 +{ + +importlib("stdole2.tlb"); + interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; @@ -1052,3 +1062,5 @@ coclass XSLTemplate30 { [default] interface IXSLTemplate; } + +} /* Library MSXML */

1 0

Paul Vriens : msi/tests: Only use functions if they are implemented.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: 46f1330e02a2b038c85b9537f878084ba72def4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f1330e02a2b038c85b9537f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 24 11:56:21 2008 +0100 msi/tests: Only use functions if they are implemented. --- dlls/msi/tests/source.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 07e6742..7407f5b 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -41,9 +41,17 @@ static void init_functionpointers(void) HMODULE hmsi = GetModuleHandleA("msi.dll"); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pMsiSourceListGetInfoA = (void*)GetProcAddress(hmsi, "MsiSourceListGetInfoA"); - pMsiSourceListAddSourceExA = (void*)GetProcAddress(hmsi, "MsiSourceListAddSourceExA"); - pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); +#define GET_PROC(dll, func) \ + p ## func = (void *)GetProcAddress(dll, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + GET_PROC(hmsi, MsiSourceListAddSourceExA) + GET_PROC(hmsi, MsiSourceListGetInfoA) + + GET_PROC(hadvapi32, ConvertSidToStringSidA) + +#undef GET_PROC } /* copied from dlls/msi/registry.c */ @@ -125,6 +133,12 @@ static void test_MsiSourceListGetInfo(void) HKEY userkey, hkey; DWORD size; + if (!pMsiSourceListGetInfoA) + { + skip("Skipping MsiSourceListGetInfoA tests\n"); + return; + } + create_test_guid(prodcode, prod_squashed); get_user_sid(&usersid); @@ -348,7 +362,7 @@ static void test_MsiSourceListAddSourceEx(void) if (!pMsiSourceListAddSourceExA) { - skip("Skipping MsiSourceListAddSourceEx tests\n"); + skip("Skipping MsiSourceListAddSourceExA tests\n"); return; }

1 0

Paul Vriens : msi/tests: Only use functions if they are implemented.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: 3272fef91a9aaa54f4a47c28e2ffedfcdc8b3b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3272fef91a9aaa54f4a47c28e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 24 11:56:08 2008 +0100 msi/tests: Only use functions if they are implemented. --- dlls/msi/tests/msi.c | 53 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index d400360..a2149c8 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -48,14 +48,21 @@ static void init_functionpointers(void) HMODULE hmsi = GetModuleHandleA("msi.dll"); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pMsiGetComponentPathA = (void*)GetProcAddress(hmsi, "MsiGetComponentPathA"); - pMsiGetFileHashA = (void*)GetProcAddress(hmsi, "MsiGetFileHashA"); - pMsiOpenPackageExA = (void*)GetProcAddress(hmsi, "MsiOpenPackageExA"); - pMsiOpenPackageExW = (void*)GetProcAddress(hmsi, "MsiOpenPackageExW"); - pMsiQueryComponentStateA = (void*)GetProcAddress(hmsi, "MsiQueryComponentStateA"); - pMsiUseFeatureExA = (void*)GetProcAddress(hmsi, "MsiUseFeatureExA"); - - pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); +#define GET_PROC(dll, func) \ + p ## func = (void *)GetProcAddress(dll, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + GET_PROC(hmsi, MsiGetComponentPathA) + GET_PROC(hmsi, MsiGetFileHashA) + GET_PROC(hmsi, MsiOpenPackageExA) + GET_PROC(hmsi, MsiOpenPackageExW) + GET_PROC(hmsi, MsiQueryComponentStateA) + GET_PROC(hmsi, MsiUseFeatureExA) + + GET_PROC(hadvapi32, ConvertSidToStringSidA) + +#undef GET_PROC } static void test_usefeature(void) @@ -63,7 +70,10 @@ static void test_usefeature(void) INSTALLSTATE r; if (!pMsiUseFeatureExA) + { + skip("MsiUseFeatureExA not implemented\n"); return; + } r = MsiQueryFeatureState(NULL,NULL); ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n"); @@ -279,7 +289,7 @@ static void test_MsiGetFileHash(void) if (!pMsiGetFileHashA) { - skip("MsiGetFileHash not implemented."); + skip("MsiGetFileHash not implemented\n"); return; } @@ -724,6 +734,12 @@ static void test_MsiQueryComponentState(void) static const INSTALLSTATE MAGIC_ERROR = 0xdeadbeef; + if (!pMsiQueryComponentStateA) + { + skip("MsiQueryComponentStateA not implemented\n"); + return; + } + create_test_guid(prodcode, prod_squashed); compose_base85_guid(component, comp_base85, comp_squashed); get_user_sid(&usersid); @@ -1782,10 +1798,17 @@ START_TEST(msi) test_null(); test_getcomponentpath(); test_MsiGetFileHash(); - test_MsiQueryProductState(); - test_MsiQueryFeatureState(); - test_MsiQueryComponentState(); - test_MsiGetComponentPath(); - test_MsiGetProductCode(); - test_MsiEnumClients(); + + if (!pConvertSidToStringSidA) + skip("ConvertSidToStringSidA not implemented\n"); + else + { + /* These tests rely on get_user_sid that needs ConvertSidToStringSidA */ + test_MsiQueryProductState(); + test_MsiQueryFeatureState(); + test_MsiQueryComponentState(); + test_MsiGetComponentPath(); + test_MsiGetProductCode(); + test_MsiEnumClients(); + } }

1 0