February 2008 - Wine-Commits

Jacek Caban : mshtml: Added nsIURI:: Clone implementation on URIs without necko interface associated.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 6a3984c3975d52e242ca183db85bdefcc789657c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3984c3975d52e242ca183db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 28 12:41:22 2008 +0100 mshtml: Added nsIURI::Clone implementation on URIs without necko interface associated. --- dlls/mshtml/nsio.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3517a27..ca269fc 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1533,29 +1533,28 @@ static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBo static nsresult NSAPI nsURI_Clone(nsIWineURI *iface, nsIURI **_retval) { nsURI *This = NSURI_THIS(iface); + nsIURI *nsuri = NULL; + nsIWineURI *wine_uri; + nsresult nsres; TRACE("(%p)->(%p)\n", This, _retval); if(This->uri) { - nsIURI *uri; - nsIWineURI *wine_uri; - nsresult nsres; - - nsres = nsIURI_Clone(This->uri, &uri); + nsres = nsIURI_Clone(This->uri, &nsuri); if(NS_FAILED(nsres)) { WARN("Clone failed: %08x\n", nsres); return nsres; } + } - nsres = create_uri(uri, This->container, &wine_uri); - *_retval = (nsIURI*)wine_uri; - if(NS_SUCCEEDED(nsres)) - return nsIWineURI_SetWineURL(wine_uri, This->wine_url); + nsres = create_uri(nsuri, This->container, &wine_uri); + if(NS_FAILED(nsres)) { + WARN("create_uri failed: %08x\n", nsres); return nsres; } - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + *_retval = (nsIURI*)wine_uri; + return nsIWineURI_SetWineURL(wine_uri, This->wine_url); } static nsresult NSAPI nsURI_Resolve(nsIWineURI *iface, const nsACString *arelativePath,

1 0

Paul Vriens : rpcrt4/tests: Make tests run on win9x/NT4 again.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 6832c8327d1cf7b73a9507932c1124981da168a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6832c8327d1cf7b73a9507932… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Feb 28 12:30:36 2008 +0100 rpcrt4/tests: Make tests run on win9x/NT4 again. --- dlls/rpcrt4/tests/server.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index e06e57a..20176a4 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -36,6 +36,17 @@ static const char *progname; static HANDLE stop_event; +static void (WINAPI *pNDRSContextMarshall2)(RPC_BINDING_HANDLE, NDR_SCONTEXT, void*, NDR_RUNDOWN, void*, ULONG); +static NDR_SCONTEXT (WINAPI *pNDRSContextUnmarshall2)(RPC_BINDING_HANDLE, void*, ULONG, void*, ULONG); + +static void InitFunctionPointers(void) +{ + HMODULE hrpcrt4 = GetModuleHandleA("rpcrt4.dll"); + + pNDRSContextMarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextMarshall2"); + pNDRSContextUnmarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextUnmarshall2"); +} + void __RPC_FAR *__RPC_USER midl_user_allocate(size_t n) { @@ -542,40 +553,40 @@ s_context_handle_test(void) binding = I_RpcGetCurrentCallHandle(); ok(binding != NULL, "I_RpcGetCurrentCallHandle returned NULL\n"); - h = NDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); + h = pNDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); /* marshal a context handle with NULL userContext */ memset(buf, 0xcc, sizeof(buf)); - NDRSContextMarshall2(binding, h, buf, NULL, NULL, 0); + pNDRSContextMarshall2(binding, h, buf, NULL, NULL, 0); ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); ok(UuidIsNil((UUID *)&buf[4], &status), "uuid should have been nil\n"); - h = NDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); + h = pNDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); /* marshal a context handle with non-NULL userContext */ memset(buf, 0xcc, sizeof(buf)); h->userContext = (void *)0xdeadbeef; - NDRSContextMarshall2(binding, h, buf, NULL, NULL, 0); + pNDRSContextMarshall2(binding, h, buf, NULL, NULL, 0); ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); ok(!UuidIsNil((UUID *)&buf[4], &status), "uuid should not have been nil\n"); - h = NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); + h = pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); ok(h->userContext == (void *)0xdeadbeef, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); /* marshal a context handle with an interface specified */ - h = NDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); + h = pNDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); memset(buf, 0xcc, sizeof(buf)); h->userContext = (void *)0xcafebabe; - NDRSContextMarshall2(binding, h, buf, NULL, &server_if.InterfaceId, 0); + pNDRSContextMarshall2(binding, h, buf, NULL, &server_if.InterfaceId, 0); ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); ok(!UuidIsNil((UUID *)&buf[4], &status), "uuid should not have been nil\n"); - h = NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); + h = pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); ok(h->userContext == (void *)0xcafebabe, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); @@ -585,7 +596,7 @@ s_context_handle_test(void) { RPC_SERVER_INTERFACE server_if_clone = server_if; - NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if_clone.InterfaceId, 0); + pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if_clone.InterfaceId, 0); } /* test different interface data, but different pointer */ @@ -604,9 +615,9 @@ s_context_handle_test(void) 0, 0, }; - NDRSContextMarshall2(binding, h, buf, NULL, &server_if.InterfaceId, 0); + pNDRSContextMarshall2(binding, h, buf, NULL, &server_if.InterfaceId, 0); - NDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if2.InterfaceId, 0); + pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if2.InterfaceId, 0); } } @@ -1242,6 +1253,8 @@ START_TEST(server) int argc; char **argv; + InitFunctionPointers(); + argc = winetest_get_mainargs(&argv); progname = argv[0];

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment_get_data.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: f9d89ed36a88c047ccd32d9a6a8c031349a46f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d89ed36a88c047ccd32d9a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 28 21:06:54 2008 +1100 msxml3: Implement IXMLDOMComment_get_data. --- dlls/msxml3/comment.c | 16 ++++++++++++++-- dlls/msxml3/tests/domdoc.c | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 8c86f4b..203faae 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -474,8 +474,20 @@ static HRESULT WINAPI domcomment_get_data( IXMLDOMComment *iface, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + HRESULT hr = E_FAIL; + VARIANT vRet; + + if(!p) + return E_INVALIDARG; + + hr = IXMLDOMNode_get_nodeValue( This->node, &vRet ); + if(hr == S_OK) + { + *p = V_BSTR(&vRet); + } + + return hr; } static HRESULT WINAPI domcomment_put_data( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0930e11..2ced1cc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2105,6 +2105,12 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); /* get data Tests */ + hr = IXMLDOMComment_get_data(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect get_data string\n"); + SysFreeString(str); + + /* get data Tests */ hr = IXMLDOMComment_get_nodeValue(pComment, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok( V_VT(&v) == VT_BSTR, "incorrect dataType type\n");

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMText_get_data.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: c48ad710688073fb7c151a19e92ceef6dbb58077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48ad710688073fb7c151a19e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 28 21:36:02 2008 +1100 msxml3: Implement IXMLDOMText_get_data. --- dlls/msxml3/tests/domdoc.c | 6 ++++++ dlls/msxml3/text.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2569647..0930e11 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -574,6 +574,12 @@ static void test_domdoc( void ) r = IXMLDOMText_put_data(nodetext, _bstr_("This &is a ; test <>\\")); ok(r == S_OK, "ret %08x\n", r ); + /* get data Tests */ + r = IXMLDOMText_get_data(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect put_data string\n"); + SysFreeString(str); + /* Confirm XML text is good */ r = IXMLDOMText_get_xml(nodetext, &str); ok(r == S_OK, "ret %08x\n", r ); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index d3a1542..af91449 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -475,8 +475,20 @@ static HRESULT WINAPI domtext_get_data( IXMLDOMText *iface, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + HRESULT hr = E_FAIL; + VARIANT vRet; + + if(!p) + return E_INVALIDARG; + + hr = IXMLDOMNode_get_nodeValue( This->element, &vRet ); + if(hr == S_OK) + { + *p = V_BSTR(&vRet); + } + + return hr; } static HRESULT WINAPI domtext_put_data(

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment_get_nodeValue.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: a1f5fef880382642fe11b135d42d09e2e2ed2b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f5fef880382642fe11b135d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 28 21:03:59 2008 +1100 msxml3: Implement IXMLDOMComment_get_nodeValue. --- dlls/msxml3/node.c | 1 + dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 23734ab..676209e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -251,6 +251,7 @@ static HRESULT WINAPI xmlnode_get_nodeValue( switch ( This->node->type ) { + case XML_COMMENT_NODE: case XML_PI_NODE: case XML_ATTRIBUTE_NODE: { diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index efaae79..2569647 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2098,6 +2098,13 @@ static void test_xmlTypes(void) hr = IXMLDOMComment_put_data(pComment, _bstr_("This &is a ; test <>\\")); ok(hr == S_OK, "ret %08x\n", hr ); + /* get data Tests */ + hr = IXMLDOMComment_get_nodeValue(pComment, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( V_VT(&v) == VT_BSTR, "incorrect dataType type\n"); + ok( !lstrcmpW( V_BSTR(&v), _bstr_("This &is a ; test <>\\") ), "incorrect get_nodeValue string\n"); + VariantClear(&v); + /* Confirm XML text is good */ hr = IXMLDOMComment_get_xml(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr );

1 0

Roy Shea : qmgr: Implement IEnumBackgroundCopyFiles_GetCount.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 84a5eca28e660174cc4a1a4fe443fdb084945941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a5eca28e660174cc4a1a4fe… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Wed Feb 27 21:04:58 2008 -0800 qmgr: Implement IEnumBackgroundCopyFiles_GetCount. --- dlls/qmgr/enum_files.c | 5 +- dlls/qmgr/tests/Makefile.in | 3 +- dlls/qmgr/tests/enum_files.c | 142 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 8dd479a..0f0a2d8 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -111,8 +111,9 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount( IEnumBackgroundCopyFiles* iface, ULONG *puCount) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + *puCount = This->numFiles; + return S_OK; } static const IEnumBackgroundCopyFilesVtbl BITS_IEnumBackgroundCopyFiles_Vtbl = diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 9e71b09..b70f662 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -3,9 +3,10 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = qmgr.dll -IMPORTS = ole32 user32 kernel32 +IMPORTS = ole32 shlwapi user32 kernel32 CTESTS = \ + enum_files.c \ job.c \ qmgr.c diff --git a/dlls/qmgr/tests/enum_files.c b/dlls/qmgr/tests/enum_files.c new file mode 100644 index 0000000..5cddee5 --- /dev/null +++ b/dlls/qmgr/tests/enum_files.c @@ -0,0 +1,142 @@ +/* + * Unit test suite for Enum Background Copy Files Interface + * + * Copyright 2007 Google (Roy Shea) + * + * 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 <shlwapi.h> +#include <stdio.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "bits.h" + +/* Globals used by many tests */ +#define NUM_FILES 2 +static const WCHAR test_remoteNameA[] = {'r','e','m','o','t','e','A', 0}; +static const WCHAR test_localNameA[] = {'l','o','c','a','l','A', 0}; +static const WCHAR test_remoteNameB[] = {'r','e','m','o','t','e','B', 0}; +static const WCHAR test_localNameB[] = {'l','o','c','a','l','B', 0}; +static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; +static const ULONG test_fileCount = NUM_FILES; +static IBackgroundCopyJob *test_job; +static IBackgroundCopyManager *test_manager; +static IEnumBackgroundCopyFiles *test_enumFiles; + +/* Helper function to add a file to a job. The helper function takes base + file name and creates properly formed path and URL strings for creation of + the file. */ +static HRESULT addFileHelper(IBackgroundCopyJob* job, + const WCHAR *localName, const WCHAR *remoteName) +{ + DWORD urlSize; + WCHAR localFile[MAX_PATH]; + WCHAR remoteUrl[MAX_PATH]; + WCHAR remoteFile[MAX_PATH]; + + GetCurrentDirectoryW(MAX_PATH, localFile); + PathAppendW(localFile, localName); + GetCurrentDirectoryW(MAX_PATH, remoteFile); + PathAppendW(remoteFile, remoteName); + urlSize = MAX_PATH; + UrlCreateFromPathW(remoteFile, remoteUrl, &urlSize, 0); + UrlUnescapeW(remoteUrl, NULL, &urlSize, URL_UNESCAPE_INPLACE); + return IBackgroundCopyJob_AddFile(test_job, remoteUrl, localFile); +} + +/* Generic test setup */ +static BOOL setup(void) +{ + HRESULT hres; + GUID test_jobId; + + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &test_manager); + if(hres != S_OK) + return FALSE; + + hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, + BG_JOB_TYPE_DOWNLOAD, &test_jobId, + &test_job); + if(hres != S_OK) + { + IBackgroundCopyManager_Release(test_manager); + return FALSE; + } + + if (addFileHelper(test_job, test_localNameA, test_remoteNameA) != S_OK + || addFileHelper(test_job, test_localNameB, test_remoteNameB) != S_OK + || IBackgroundCopyJob_EnumFiles(test_job, &test_enumFiles) != S_OK) + { + IBackgroundCopyJob_Release(test_job); + IBackgroundCopyManager_Release(test_manager); + return FALSE; + } + + return TRUE; +} + +/* Generic test cleanup */ +static void teardown(void) +{ + IEnumBackgroundCopyFiles_Release(test_enumFiles); + IBackgroundCopyJob_Release(test_job); + IBackgroundCopyManager_Release(test_manager); +} + +/* Test GetCount */ +static void test_GetCount(void) +{ + HRESULT hres; + ULONG fileCount; + + hres = IEnumBackgroundCopyFiles_GetCount(test_enumFiles, &fileCount); + ok(hres == S_OK, "GetCount failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get count from test_enumFiles.\n"); + return; + } + ok(fileCount == test_fileCount, "Got incorrect count\n"); +} + +typedef void (*test_t)(void); + +START_TEST(enum_files) +{ + static const test_t tests[] = { + test_GetCount, + 0 + }; + const test_t *test; + + CoInitialize(NULL); + for (test = tests; *test; ++test) + { + /* Keep state seperate between tests. */ + if (!setup()) + { + skip("Unable to setup test\n"); + break; + } + (*test)(); + teardown(); + } + CoUninitialize(); +}

1 0

James Hawkins : msi: Update controls based on a property when that property changes.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 174b7b51ac9e57c6cfa8f48e62bbf468ae3b1f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174b7b51ac9e57c6cfa8f48e6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Feb 27 22:11:39 2008 -0600 msi: Update controls based on a property when that property changes. --- dlls/msi/dialog.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4ab25f9..e084bf8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -50,12 +50,14 @@ extern HINSTANCE msi_hInstance; struct msi_control_tag; typedef struct msi_control_tag msi_control; typedef UINT (*msi_handler)( msi_dialog *, msi_control *, WPARAM ); +typedef void (*msi_update)( msi_dialog *, msi_control * ); struct msi_control_tag { struct list entry; HWND hwnd; msi_handler handler; + msi_update update; LPWSTR property; LPWSTR value; HBITMAP hBitmap; @@ -564,6 +566,16 @@ static HICON msi_load_icon( MSIDATABASE *db, LPCWSTR text, UINT attributes ) return msi_load_image( db, text, IMAGE_ICON, cx, cy, flags ); } +static void msi_dialog_update_controls( msi_dialog *dialog, LPCWSTR property ) +{ + msi_control *control; + + LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + { + if ( !lstrcmpW( control->property, property ) && control->update ) + control->update( dialog, control ); + } +} /* called from the Control Event subscription code */ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, @@ -855,6 +867,7 @@ static UINT msi_dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec ) control = msi_dialog_add_control( dialog, rec, szButton, BS_CHECKBOX | BS_MULTILINE | WS_TABSTOP ); control->handler = msi_dialog_checkbox_handler; + control->update = msi_dialog_checkbox_sync_state; prop = MSI_RecordGetString( rec, 9 ); if( prop ) { @@ -3083,6 +3096,7 @@ static UINT msi_dialog_set_property( msi_dialog *dialog, LPCWSTR event, LPCWSTR if( strcmpW( szNullArg, arg ) ) deformat_string( dialog->package, arg, &arg_fmt ); MSI_SetPropertyW( dialog->package, prop, arg_fmt ); + msi_dialog_update_controls( dialog, prop ); msi_free( arg_fmt ); } else

1 0

Roy Shea : qmgr: Implement IBackgroundCopyJob_EnumFiles.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 27421285b9d8bf578fb3b8df5316409a2d0238a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27421285b9d8bf578fb3b8df5… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Wed Feb 27 21:04:07 2008 -0800 qmgr: Implement IBackgroundCopyJob_EnumFiles. --- dlls/qmgr/job.c | 6 +++--- dlls/qmgr/tests/job.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 3db3c79..20d72dd 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -103,10 +103,10 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFile( static HRESULT WINAPI BITS_IBackgroundCopyJob_EnumFiles( IBackgroundCopyJob* iface, - IEnumBackgroundCopyFiles **pEnum) + IEnumBackgroundCopyFiles **ppEnum) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + TRACE("\n"); + return EnumBackgroundCopyFilesConstructor((LPVOID *) ppEnum, iface); } static HRESULT WINAPI BITS_IBackgroundCopyJob_Suspend( diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 7aec1a7..6fcf681 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -191,6 +191,33 @@ static void test_AddFile(void) ok(hres == S_OK, "Second call to AddFile failed: 0x%08x\n", hres); } +/* Test creation of a job enumerator */ +static void test_EnumFiles(void) +{ + HRESULT hres; + IEnumBackgroundCopyFiles *enumFiles; + ULONG res; + + hres = IBackgroundCopyJob_AddFile(test_job, test_remotePathA, + test_localPathA); + if (hres != S_OK) + { + skip("Unable to add file to job\n"); + return; + } + + hres = IBackgroundCopyJob_EnumFiles(test_job, &enumFiles); + ok(hres == S_OK, "EnumFiles failed: 0x%08x\n", hres); + if(hres != S_OK) + { + skip("Unable to create file enumerator.\n"); + return; + } + + res = IEnumBackgroundCopyFiles_Release(enumFiles); + ok(res == 0, "Bad ref count on release: %u\n", res); +} + typedef void (*test_t)(void); START_TEST(job) @@ -200,6 +227,7 @@ START_TEST(job) test_GetType, test_GetName, test_AddFile, + test_EnumFiles, 0 }; const test_t *test;

1 0

James Hawkins : msi: If a feature's action is INSTALLSTATE_UNKNOWN, MsiEvaluateCondition should return MSICONDITION_FALSE.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 5e2bc5b3fedbb32b6c9b7bdb4a4efcd07f88a524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2bc5b3fedbb32b6c9b7bdb4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Feb 27 17:47:03 2008 -0600 msi: If a feature's action is INSTALLSTATE_UNKNOWN, MsiEvaluateCondition should return MSICONDITION_FALSE. --- dlls/msi/cond.y | 6 +++++- dlls/msi/tests/package.c | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 9f1a74c..062af07 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -317,7 +317,11 @@ value_i: INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; MSI_GetFeatureStateW(cond->package, $2, &install, &action ); - $$ = action; + if (action == INSTALLSTATE_UNKNOWN) + $$ = MSICONDITION_FALSE; + else + $$ = action; + msi_free( $2 ); } | COND_EXCLAM identifier diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3d50a8f..540de8b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -986,6 +986,9 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "0"); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "-1"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "0 = 0"); ok( r == MSICONDITION_TRUE, "wrong return val\n"); @@ -1622,6 +1625,10 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "X !=\"\" and (X =\"5.0\" or X =\"5.1\" or X =\"6.0\")"); ok( r == MSICONDITION_ERROR, "wrong return val (%d)\n", r); + /* feature doesn't exist */ + r = MsiEvaluateCondition(hpkg, "&nofeature"); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Marcus Meissner : msi: Initialize type (Coverity).
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: eb836b718fb3ba20291e5e440b5806e79822d842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb836b718fb3ba20291e5e440… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Feb 22 01:11:12 2008 +0100 msi: Initialize type (Coverity). --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7cfafbc..4ea7b06 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -594,7 +594,7 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, BOOL classes = FALSE; BOOL badconfig = FALSE; LONG res; - DWORD save, type; + DWORD save, type = REG_NONE; static WCHAR empty[] = {0}; static const WCHAR sourcelist[] = {

1 0