May 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : rpcrt4: Exclude unused headers.
by Alexandre Julliard May 18, 2007

May 18, 2007

Module: wine Branch: master Commit: d5d056ef75dbd38315e1801eafa1e981ff7a060a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d056ef75dbd38315e1801ea… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu May 17 21:07:35 2007 +0100 rpcrt4: Exclude unused headers. --- dlls/rpcrt4/ndr_clientserver.c | 1 - dlls/rpcrt4/ndr_marshall.c | 1 - dlls/rpcrt4/ndr_ole.c | 1 - dlls/rpcrt4/ndr_stubless.c | 1 - dlls/rpcrt4/rpc_binding.c | 1 - dlls/rpcrt4/rpc_epmap.c | 1 - dlls/rpcrt4/rpc_message.c | 1 - dlls/rpcrt4/rpc_server.c | 1 - dlls/rpcrt4/rpc_transport.c | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 1745b90..fe424a6 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -32,7 +32,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "objbase.h" diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index ad95b53..84d502b 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -39,7 +39,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "ndr_misc.h" #include "rpcndr.h" diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index b65e18b..0a8c1f2 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "objbase.h" diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index dbe500e..6a581a0 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "objbase.h" #include "rpc.h" diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index ad96ac6..4f276ae 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "winnls.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/unicode.h" diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 45471c1..cac3f62 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -29,7 +29,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "rpc.h" diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index a30c925..dd37f33 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "rpc.h" #include "rpcndr.h" diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 7152453..fd277b3 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "rpc.h" #include "rpcndr.h" diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b4af8e9..c3d1ef3 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -60,7 +60,6 @@ #include "winbase.h" #include "winnls.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/unicode.h"

1 0

Alexandre Julliard : advapi32: Launch winedevice. exe when asked to start a kernel driver service.
by Alexandre Julliard May 18, 2007

May 18, 2007

Module: wine Branch: master Commit: 020bd631ed302b5e6ae5b09c0f8c251ad67e9115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020bd631ed302b5e6ae5b09c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 17 16:52:18 2007 +0200 advapi32: Launch winedevice.exe when asked to start a kernel driver service. --- dlls/advapi32/service.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index e1d1065..e9a1160 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1486,26 +1486,43 @@ static DWORD service_start_process(struct sc_service *hsvc, LPDWORD ppid) PROCESS_INFORMATION pi; STARTUPINFOW si; LPWSTR path = NULL, str; - DWORD type, size, ret; + DWORD type, size, ret, svc_type; HANDLE handles[2]; BOOL r; - /* read the executable path from memory */ - size = 0; - ret = RegQueryValueExW(hsvc->hkey, _ImagePathW, NULL, &type, NULL, &size); - if (ret!=ERROR_SUCCESS) - return FALSE; - str = HeapAlloc(GetProcessHeap(),0,size); - ret = RegQueryValueExW(hsvc->hkey, _ImagePathW, NULL, &type, (LPBYTE)str, &size); - if (ret==ERROR_SUCCESS) + size = sizeof(svc_type); + if (RegQueryValueExW(hsvc->hkey, szType, NULL, &type, (LPBYTE)&svc_type, &size) || type != REG_DWORD) + svc_type = 0; + + if (svc_type == SERVICE_KERNEL_DRIVER) { - size = ExpandEnvironmentStringsW(str,NULL,0); - path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); - ExpandEnvironmentStringsW(str,path,size); + static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0}; + DWORD len = GetSystemDirectoryW( NULL, 0 ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(hsvc->name); + + if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + GetSystemDirectoryW( path, len ); + lstrcatW( path, winedeviceW ); + lstrcatW( path, hsvc->name ); + } + else + { + /* read the executable path from the registry */ + size = 0; + ret = RegQueryValueExW(hsvc->hkey, _ImagePathW, NULL, &type, NULL, &size); + if (ret!=ERROR_SUCCESS) + return FALSE; + str = HeapAlloc(GetProcessHeap(),0,size); + ret = RegQueryValueExW(hsvc->hkey, _ImagePathW, NULL, &type, (LPBYTE)str, &size); + if (ret==ERROR_SUCCESS) + { + size = ExpandEnvironmentStringsW(str,NULL,0); + path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); + ExpandEnvironmentStringsW(str,path,size); + } + HeapFree(GetProcessHeap(),0,str); + if (!path) + return FALSE; } - HeapFree(GetProcessHeap(),0,str); - if (!path) - return FALSE; /* wait for the process to start and set an event or terminate */ handles[0] = service_get_event_handle( hsvc->name );

1 0

Marcus Meissner : shell32: Avoid potential 1 byte overflow.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 29700766ea4e95082342bc536efc955646df054d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29700766ea4e95082342bc536… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri May 11 20:09:29 2007 +0100 shell32: Avoid potential 1 byte overflow. --- dlls/shell32/shlexec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 6e38dbd..5b2ee4e 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -654,6 +654,8 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, &filetypelen) == ERROR_SUCCESS) { filetypelen /= sizeof(WCHAR); + if (filetypelen == sizeof(filetype)/sizeof(WCHAR)) + filetypelen--; filetype[filetypelen] = '\0'; TRACE("File type: %s\n", debugstr_w(filetype)); }

1 0

Jeff Latimer : hnetcfg: Add netfw.idl - Network Firewall interface.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: af62bcbd328732c1074dbac8a8bf25aaa1df0a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af62bcbd328732c1074dbac8a… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri May 11 22:53:32 2007 +1000 hnetcfg: Add netfw.idl - Network Firewall interface. --- .gitignore | 1 + include/Makefile.in | 1 + include/netfw.idl | 470 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 472 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af62bcbd328732c1074db…

1 0

Jeff Latimer : hnetcfg: Define icftypes.idl.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 1ddcc3fa258f8049e510988970bf31098cc23dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddcc3fa258f8049e51098897… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri May 11 22:53:23 2007 +1000 hnetcfg: Define icftypes.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/icftypes.idl | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 62efdba..9510c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -693,6 +693,7 @@ include/exdisp.h include/hlink.h include/htiframe.h include/iads.h +include/icftypes.h include/indexsrv.h include/mediaobj.h include/mimeinfo.h diff --git a/include/Makefile.in b/include/Makefile.in index 7dc0cc3..7c8a25d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -19,6 +19,7 @@ IDL_H_SRCS = \ hlink.idl \ htiframe.idl \ iads.idl \ + icftypes.idl \ indexsrv.idl \ mediaobj.idl \ mimeinfo.idl \ diff --git a/include/icftypes.idl b/include/icftypes.idl new file mode 100644 index 0000000..9cc0b6a --- /dev/null +++ b/include/icftypes.idl @@ -0,0 +1,69 @@ +/* + * Types for the ICF api + * + * Copyright 2007 Jeff Latimer + * + * 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 + * + */ + +import "wtypes.idl"; + +typedef enum NET_FW_PROFILE_TYPE_ +{ + NET_FW_PROFILE_DOMAIN, + NET_FW_PROFILE_STANDARD, + NET_FW_PROFILE_CURRENT, + NET_FW_PROFILE_TYPE_MAX +} NET_FW_PROFILE_TYPE; + +typedef enum NET_FW_IP_VERSION_ +{ + NET_FW_IP_VERSION_V4, + NET_FW_IP_VERSION_V6, + NET_FW_IP_VERSION_ANY, + NET_FW_IP_VERSION_MAX +} NET_FW_IP_VERSION; + +typedef enum NET_FW_POLICY_TYPE_ +{ + NET_FW_POLICY_GROUP, + NET_FW_POLICY_LOCAL, + NET_FW_POLICY_EFFECTIVE, + NET_FW_POLICY_TYPE_MAX +} NET_FW_POLICY_TYPE; + +typedef enum NET_FW_SCOPE_ +{ + NET_FW_SCOPE_ALL, + NET_FW_SCOPE_LOCAL_SUBNET, + NET_FW_SCOPE_CUSTOM, + NET_FW_SCOPE_MAX +} NET_FW_SCOPE; + +typedef enum NET_FW_SERVICE_TYPE_ +{ + NET_FW_SERVICE_FILE_AND_PRINT, + NET_FW_SERVICE_UPNP, + NET_FW_SERVICE_REMOTE_DESKTOP, + NET_FW_SERVICE_NONE, + NET_FW_SERVICE_TYPE_MAX +} NET_FW_SERVICE_TYPE; + +typedef enum NET_FW_IP_PROTOCOL_ +{ + NET_FW_IP_PROTOCOL_TCP = 6, + NET_FW_IP_PROTOCOL_UDP = 17 +} NET_FW_IP_PROTOCOL;

1 0

Misha Koshelev : msi: automation: Implement Installer::ProductInfo.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 8136bd41179516fd964e1946bdf3a5b47cd4479f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8136bd41179516fd964e1946b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 00:42:46 2007 -0500 msi: automation: Implement Installer::ProductInfo. --- dlls/msi/automation.c | 36 ++++++++++++++++++++- dlls/msi/msiserver.idl | 4 ++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 70 ++++++++++++++++++++---------------------- 4 files changed, 72 insertions(+), 39 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 762f20c..f6be108 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1167,6 +1167,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( UINT ret; VARIANTARG varg0, varg1, varg2; HRESULT hr; + LPWSTR szString = NULL; + DWORD dwSize = 0; VariantInit(&varg0); VariantInit(&varg1); @@ -1256,8 +1258,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( case DISPID_INSTALLER_REGISTRYVALUE: if (wFlags & DISPATCH_METHOD) { HKEY hkey; - LPWSTR szString = NULL; - DWORD dwSize = 0, dwType; + DWORD dwType; UINT posValue = 2; /* Save valuePos so we can save puArgErr if we are unable to do our type conversions */ hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); @@ -1353,6 +1354,37 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_PRODUCTINFO: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); + if (FAILED(hr)) + { + VariantClear(&varg0); + return hr; + } + V_VT(pVarResult) = VT_BSTR; + V_BSTR(pVarResult) = NULL; + if ((ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), NULL, &dwSize)) == ERROR_SUCCESS) + { + if (!(szString = msi_alloc((++dwSize)*sizeof(WCHAR)))) + ERR("Out of memory\n"); + else if ((ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), szString, &dwSize)) == ERROR_SUCCESS) + V_BSTR(pVarResult) = SysAllocString(szString); + msi_free(szString); + } + if (ret != ERROR_SUCCESS) + { + ERR("MsiGetProductInfo returned %d\n", ret); + VariantClear(&varg1); + VariantClear(&varg0); + return DISP_E_EXCEPTION; + } + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_PRODUCTS: if (wFlags & DISPATCH_PROPERTYGET) { diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 5721319..33b6bf8 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -77,6 +77,10 @@ library WindowsInstaller [id(DISPID_INSTALLER_PRODUCTSTATE), propget] MsiInstallState ProductState( [in] BSTR Product); + [id(DISPID_INSTALLER_PRODUCTINFO), propget] + BSTR ProductInfo( + [in] BSTR Product, + [in] BSTR Attribute); [id(DISPID_INSTALLER_PRODUCTS), propget] StringList *Products(); [id(DISPID_INSTALLER_RELATEDPRODUCTS), propget] diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 92c3429..065b874 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -21,6 +21,7 @@ #define DISPID_INSTALLER_INSTALLPRODUCT 8 #define DISPID_INSTALLER_REGISTRYVALUE 11 #define DISPID_INSTALLER_PRODUCTSTATE 17 +#define DISPID_INSTALLER_PRODUCTINFO 18 #define DISPID_INSTALLER_PRODUCTS 35 #define DISPID_INSTALLER_RELATEDPRODUCTS 40 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index c9ff1f8..fb353a5 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -443,8 +443,8 @@ static void test_dispid(void) ok( get_dispid( pInstaller, "FileVersion" ) == 16, "dispid wrong\n"); } ok( get_dispid( pInstaller, "ProductState" ) == 17, "dispid wrong\n"); - todo_wine { ok( get_dispid( pInstaller, "ProductInfo" ) == 18, "dispid wrong\n"); + todo_wine { ok( get_dispid( pInstaller, "ConfigureProduct" ) == 19, "dispid wrong\n"); ok( get_dispid( pInstaller, "ReinstallProduct" ) == 20 , "dispid wrong\n"); ok( get_dispid( pInstaller, "CollectUserInfo" ) == 21, "dispid wrong\n"); @@ -1686,32 +1686,30 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) ok(iValue == INSTALLSTATE_DEFAULT, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_DEFAULT); /* Installer::ProductInfo for our product code */ - todo_wine - { - /* NULL attribute */ - memset(szString, 0, sizeof(szString)); - hr = Installer_ProductInfo(szProductCode, NULL, szString); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - ok_exception(hr, szProductInfoException); - /* Non-existent attribute */ - memset(szString, 0, sizeof(szString)); - hr = Installer_ProductInfo(szProductCode, szMsifile, szString); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - ok_exception(hr, szProductInfoException); + /* NULL attribute */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, NULL, szString); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); - /* Package name */ - memset(szString, 0, sizeof(szString)); - hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szString); - ok(SUCCEEDED(hr), "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - ok_w2("StringList_Item returned %s but expected %s\n", szString, szMsifile); + /* Non-existent attribute */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, szMsifile, szString); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); - /* Product name */ - memset(szString, 0, sizeof(szString)); - hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PRODUCTNAMEW, szString); - ok(SUCCEEDED(hr), "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - ok_w2("StringList_Item returned %s but expected %s\n", szString, szMSITEST); - } + /* Package name */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szString); + todo_wine ok(SUCCEEDED(hr), "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + todo_wine ok_w2("StringList_Item returned %s but expected %s\n", szString, szMsifile); + + /* Product name */ + memset(szString, 0, sizeof(szString)); + hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PRODUCTNAMEW, szString); + ok(SUCCEEDED(hr), "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_w2("StringList_Item returned %s but expected %s\n", szString, szMSITEST); /* Installer::RelatedProducts for our upgrade code */ hr = Installer_RelatedProducts(szUpgradeCode, &pStringList); @@ -1933,20 +1931,18 @@ static void test_Installer(void) ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); /* Installer::ProductInfo for our product code, which should not be installed */ - todo_wine - { - /* Package name */ - memset(szPath, 0, sizeof(szPath)); - hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szPath); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - ok_exception(hr, szProductInfoException); - /* NULL attribute and NULL product code */ - memset(szPath, 0, sizeof(szPath)); - hr = Installer_ProductInfo(NULL, NULL, szPath); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - ok_exception(hr, szProductInfoException); - } + /* Package name */ + memset(szPath, 0, sizeof(szPath)); + hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szPath); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); + + /* NULL attribute and NULL product code */ + memset(szPath, 0, sizeof(szPath)); + hr = Installer_ProductInfo(NULL, NULL, szPath); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok_exception(hr, szProductInfoException); /* Installer::RelatedProducts for our upgrade code, should not find anything */ hr = Installer_RelatedProducts(szUpgradeCode, &pStringList);

1 0

Misha Koshelev : msi: Return appropriate values for empty MsiProductInfo parameters.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: d800a082a8352421d98c4d81112535dda7d8105a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d800a082a8352421d98c4d811… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 00:42:20 2007 -0500 msi: Return appropriate values for empty MsiProductInfo parameters. --- dlls/msi/msi.c | 6 +++++- dlls/msi/tests/msi.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ae67b75..34721df 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -444,7 +444,7 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, * FIXME: Values seem scattered/duplicated in the registry. Is there a system? */ - if ((szValue->str.w && !pcchValueBuf) || !szProduct || !szAttribute) + if ((szValue->str.w && !pcchValueBuf) || !szProduct || !szProduct[0] || !szAttribute) return ERROR_INVALID_PARAMETER; /* check for special properties */ @@ -505,6 +505,10 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, RegCloseKey(hkey); } + else if (!szAttribute[0]) + { + return ERROR_UNKNOWN_PROPERTY; + } else { static const WCHAR szDisplayVersion[] = { diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 81a5b73..4e5db4f 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -131,7 +131,7 @@ static void test_null(void) ok( r == ERROR_SUCCESS, "wrong error %d\n", r); r = MsiGetProductInfoA("", "", NULL, NULL); - todo_wine ok ( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + ok ( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); if (lpData) { @@ -157,7 +157,7 @@ static void test_null(void) ok( r == ERROR_SUCCESS, "wrong error %d\n", r); r = MsiGetProductInfoA("{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", "", NULL, NULL); - todo_wine ok ( r == ERROR_UNKNOWN_PROPERTY, "wrong error %d\n", r); + ok ( r == ERROR_UNKNOWN_PROPERTY, "wrong error %d\n", r); r = RegCloseKey(hkey); ok( r == ERROR_SUCCESS, "wrong error %d\n", r);

1 0

Misha Koshelev : msi/tests: Add test for empty MsiGetProductInfo parameters not referencing default registry values .
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 68bfb39767b9f12e48c6d8254210997e0d78ad91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bfb39767b9f12e48c6d8254… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 00:42:13 2007 -0500 msi/tests: Add test for empty MsiGetProductInfo parameters not referencing default registry values. --- dlls/msi/tests/msi.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3b98d53..81a5b73 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -81,6 +81,9 @@ static void test_null(void) { MSIHANDLE hpkg; UINT r; + HKEY hkey; + DWORD dwType, cbData; + LPBYTE lpData = NULL; r = pMsiOpenPackageExW(NULL, 0, &hpkg); ok( r == ERROR_INVALID_PARAMETER,"wrong error\n"); @@ -102,6 +105,65 @@ static void test_null(void) r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000000}", "foo", INSTALLSTATE_DEFAULT); ok( r == ERROR_UNKNOWN_PRODUCT, "wrong error %d\n", r); + + /* make sure empty string to MsiGetProductInfo is not a handle to default registry value, saving and restoring the + * necessary registry values */ + + /* empty product string */ + r = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", &hkey); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + + r = RegQueryValueExA(hkey, NULL, 0, &dwType, lpData, &cbData); + ok ( r == ERROR_SUCCESS || r == ERROR_FILE_NOT_FOUND, "wrong error %d\n", r); + if ( r == ERROR_SUCCESS ) + { + lpData = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!lpData) + skip("Out of memory\n"); + else + { + r = RegQueryValueExA(hkey, NULL, 0, &dwType, lpData, &cbData); + ok ( r == ERROR_SUCCESS, "wrong error %d\n", r); + } + } + + r = RegSetValueA(hkey, NULL, REG_SZ, "test", strlen("test")); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + + r = MsiGetProductInfoA("", "", NULL, NULL); + todo_wine ok ( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + + if (lpData) + { + r = RegSetValueExA(hkey, NULL, 0, dwType, lpData, cbData); + ok ( r == ERROR_SUCCESS, "wrong error %d\n", r); + + HeapFree(GetProcessHeap(), 0, lpData); + } + else + { + r = RegDeleteValueA(hkey, NULL); + ok ( r == ERROR_SUCCESS, "wrong error %d\n", r); + } + + r = RegCloseKey(hkey); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + + /* empty attribute */ + r = RegCreateKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", &hkey); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + + r = RegSetValueA(hkey, NULL, REG_SZ, "test", strlen("test")); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + + r = MsiGetProductInfoA("{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", "", NULL, NULL); + todo_wine ok ( r == ERROR_UNKNOWN_PROPERTY, "wrong error %d\n", r); + + r = RegCloseKey(hkey); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); + + r = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}"); + ok( r == ERROR_SUCCESS, "wrong error %d\n", r); } static void test_getcomponentpath(void)

1 0

Andrew Talbot : qcap: Exclude unused headers.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: b3d32c8a0da24424fe10d1ebb214a0e021af4af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d32c8a0da24424fe10d1ebb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 16 19:01:56 2007 +0100 qcap: Exclude unused headers. --- dlls/qcap/capturegraph.c | 1 - dlls/qcap/vfwcapture.c | 1 - dlls/qcap/yuv.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index c947980..c25dfe3 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "winerror.h" #include "objbase.h" -#include "uuids.h" #include "evcode.h" #include "strmif.h" diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index d388c00..b461054 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -38,7 +38,6 @@ #include "pin.h" #include "capture.h" #include "uuids.h" -#include "mmreg.h" #include "vfwmsgs.h" #include "amvideo.h" #include "strmif.h" diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 36e1855..26048e1 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -24,7 +24,6 @@ #include <stdarg.h> #include "windef.h" -#include "winbase.h" #include "objbase.h" #include "strmif.h" #include "qcap_main.h"

1 0

Andrew Talbot : quartz: Exclude unused headers.
by Alexandre Julliard May 17, 2007

May 17, 2007

Module: wine Branch: master Commit: 5ded3a9e88115a21e25a859e6f9ab882a5ce8316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ded3a9e88115a21e25a859e6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 16 19:02:28 2007 +0100 quartz: Exclude unused headers. --- dlls/quartz/acmwrapper.c | 2 -- dlls/quartz/avidec.c | 4 ---- dlls/quartz/avisplit.c | 1 - dlls/quartz/dsoundrender.c | 2 -- dlls/quartz/mpegsplit.c | 1 - 5 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 0258e9c..210ea1e 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -21,7 +21,6 @@ #include "config.h" #include "quartz_private.h" -#include "control_private.h" #include "pin.h" #include "uuids.h" @@ -31,7 +30,6 @@ #include "dshow.h" #include "strmif.h" #include "vfwmsgs.h" -#include "evcode.h" #include "msacm.h" #include <assert.h> diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 0225d38..139e44d 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -21,12 +21,9 @@ #include "config.h" #include "quartz_private.h" -#include "control_private.h" #include "pin.h" #include "uuids.h" -#include "aviriff.h" -#include "mmreg.h" #include "vfwmsgs.h" #include "amvideo.h" #include "windef.h" @@ -34,7 +31,6 @@ #include "dshow.h" #include "strmif.h" #include "vfwmsgs.h" -#include "evcode.h" #include "vfw.h" #include <assert.h> diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f3a6f64..3121ead 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -29,7 +29,6 @@ #include "uuids.h" #include "aviriff.h" -#include "mmreg.h" #include "vfwmsgs.h" #include "amvideo.h" diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 2492052..9e73eee 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -25,9 +25,7 @@ #include "pin.h" #include "uuids.h" -#include "mmreg.h" #include "vfwmsgs.h" -#include "fourcc.h" #include "windef.h" #include "winbase.h" #include "dshow.h" diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 4057d7d..205f645 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -29,7 +29,6 @@ #include "uuids.h" #include "mmreg.h" -#include "vfwmsgs.h" #include "mmsystem.h" #include "winternl.h"

1 0