June 2011 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Silence R16 and AL16 fourcc warnings.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 2e3cf68e0b127d61f6951f332a31441cbb7955de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3cf68e0b127d61f6951f332… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 2 23:42:21 2011 +0200 wined3d: Silence R16 and AL16 fourcc warnings. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/utils.c | 5 +++++ include/wine/wined3d.h | 2 ++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2ca7a8..1dd2cba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3410,6 +3410,8 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const case WINED3DFMT_R16G16B16A16_SNORM: case WINED3DFMT_R10G10B10_SNORM_A2_UNORM: case WINED3DFMT_R10G11B11_SNORM: + case WINED3DFMT_R16: + case WINED3DFMT_AL16: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8f48e46..a72999c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -134,6 +134,9 @@ static const struct StaticPixelFormatDesc formats[] = {WINED3DFMT_NVHU, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, {WINED3DFMT_NVHS, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, {WINED3DFMT_NULL, 0xff000000, 0x000000ff, 0x0000ff00, 0x00ff0000, 4, 0, 0}, + /* Unsure about them, could not find a Windows driver that supports them */ + {WINED3DFMT_R16, 0x0, 0x0000ffff, 0x0, 0x0, 2, 0, 0}, + {WINED3DFMT_AL16, 0xffff0000, 0x0, 0x0, 0x0, 4, 0, 0}, }; struct wined3d_format_base_flags @@ -1765,6 +1768,8 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); FMT_TO_STR(WINED3DFMT_INTZ); FMT_TO_STR(WINED3DFMT_NULL); + FMT_TO_STR(WINED3DFMT_R16); + FMT_TO_STR(WINED3DFMT_AL16); #undef FMT_TO_STR default: { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index aadd5fd..b88d201 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -252,6 +252,8 @@ enum wined3d_format_id WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'), + WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'), + WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'), WINED3DFMT_FORCE_DWORD = 0xffffffff };

1 0

Hans Leidekker : msi: Add a stub implementation of MsiCreateTransformSummaryInfo.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 6efc9f9281f89bdff2623b1102d515112a918be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efc9f9281f89bdff2623b110… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:12:50 2011 +0200 msi: Add a stub implementation of MsiCreateTransformSummaryInfo. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/suminfo.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 273e5dc..0fe2177 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -178,8 +178,8 @@ 182 stdcall -private DllGetVersion(ptr) 183 stub MsiGetProductCodeFromPackageCodeA 184 stub MsiGetProductCodeFromPackageCodeW -185 stub MsiCreateTransformSummaryInfoA -186 stub MsiCreateTransformSummaryInfoW +185 stdcall MsiCreateTransformSummaryInfoA(long long str long long) +186 stdcall MsiCreateTransformSummaryInfoW(long long wstr long long) 187 stub MsiQueryFeatureStateFromDescriptorA 188 stub MsiQueryFeatureStateFromDescriptorW 189 stdcall MsiConfigureProductExA(str long long str) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 2a9cd71..ccde725 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -977,3 +977,24 @@ UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle ) msiobj_release( &si->hdr ); return ret; } + +UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, LPCSTR transform, int error, int validation ) +{ + UINT r; + WCHAR *transformW = NULL; + + TRACE("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_a(transform), error, validation); + + if (transform && !(transformW = strdupAtoW( transform ))) + return ERROR_OUTOFMEMORY; + + r = MsiCreateTransformSummaryInfoW( db, db_ref, transformW, error, validation ); + msi_free( transformW ); + return r; +} + +UINT WINAPI MsiCreateTransformSummaryInfoW( MSIHANDLE db, MSIHANDLE db_ref, LPCWSTR transform, int error, int validation ) +{ + FIXME("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation); + return ERROR_FUNCTION_FAILED; +}

1 0

Hans Leidekker : msi: Remove redundant function find_feature_by_name.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: aec97287bcc100f56a54587da6286f348ca3fe56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec97287bcc100f56a54587da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:13:20 2011 +0200 msi: Remove redundant function find_feature_by_name. --- dlls/msi/action.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e460465..3f6eae7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1081,22 +1081,6 @@ static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } -static MSIFEATURE *find_feature_by_name( MSIPACKAGE *package, LPCWSTR name ) -{ - MSIFEATURE *feature; - - if ( !name ) - return NULL; - - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if ( !strcmpW( feature->Feature, name ) ) - return feature; - } - - return NULL; -} - static UINT load_feature(MSIRECORD * row, LPVOID param) { MSIPACKAGE* package = param; @@ -1159,17 +1143,17 @@ static UINT load_feature(MSIRECORD * row, LPVOID param) static UINT find_feature_children(MSIRECORD * row, LPVOID param) { - MSIPACKAGE* package = param; + MSIPACKAGE *package = param; MSIFEATURE *parent, *child; - child = find_feature_by_name( package, MSI_RecordGetString( row, 1 ) ); + child = msi_get_loaded_feature( package, MSI_RecordGetString( row, 1 ) ); if (!child) return ERROR_FUNCTION_FAILED; if (!child->Feature_Parent) return ERROR_SUCCESS; - parent = find_feature_by_name( package, child->Feature_Parent ); + parent = msi_get_loaded_feature( package, child->Feature_Parent ); if (!parent) return ERROR_FUNCTION_FAILED;

1 0

Hans Leidekker : msi: Implement and test MsiGetFeatureInfo.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 4c9c50d86b475f2531f841c0ad1176470e89cc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c9c50d86b475f2531f841c0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:13:34 2011 +0200 msi: Implement and test MsiGetFeatureInfo. --- dlls/msi/action.c | 8 ++-- dlls/msi/install.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msi.spec | 4 +- dlls/msi/msipriv.h | 2 + dlls/msi/tests/install.c | 84 ++++++++++++++++++++++++++++++++ include/msi.h | 14 +++++ 6 files changed, 226 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c9c50d86b475f2531f84…

1 0

Hans Leidekker : msi: Implement and test MsiSetFeatureAttributes.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 667ba16dbcfe7af610df0fddcc581522788b39dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=667ba16dbcfe7af610df0fddc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:13:47 2011 +0200 msi: Implement and test MsiSetFeatureAttributes. --- dlls/msi/install.c | 70 ++++++++++++++++++++++++++++++++++++-- dlls/msi/msi.spec | 4 +- dlls/msi/tests/install.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ include/msiquery.h | 4 ++ 4 files changed, 155 insertions(+), 6 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 6225281..2be4c6c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1028,6 +1028,70 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, } /*********************************************************************** +* MsiSetFeatureAttributesA (MSI.@) +*/ +UINT WINAPI MsiSetFeatureAttributesA( MSIHANDLE handle, LPCSTR feature, DWORD attrs ) +{ + UINT r; + WCHAR *featureW = NULL; + + TRACE("%u, %s, 0x%08x\n", handle, debugstr_a(feature), attrs); + + if (feature && !(featureW = strdupAtoW( feature ))) return ERROR_OUTOFMEMORY; + + r = MsiSetFeatureAttributesW( handle, featureW, attrs ); + msi_free( featureW ); + return r; +} + +static DWORD unmap_feature_attributes( DWORD attrs ) +{ + DWORD ret = 0; + + if (attrs & INSTALLFEATUREATTRIBUTE_FAVORLOCAL) ret = msidbFeatureAttributesFavorLocal; + if (attrs & INSTALLFEATUREATTRIBUTE_FAVORSOURCE) ret |= msidbFeatureAttributesFavorSource; + if (attrs & INSTALLFEATUREATTRIBUTE_FOLLOWPARENT) ret |= msidbFeatureAttributesFollowParent; + if (attrs & INSTALLFEATUREATTRIBUTE_FAVORADVERTISE) ret |= msidbFeatureAttributesFavorAdvertise; + if (attrs & INSTALLFEATUREATTRIBUTE_DISALLOWADVERTISE) ret |= msidbFeatureAttributesDisallowAdvertise; + if (attrs & INSTALLFEATUREATTRIBUTE_NOUNSUPPORTEDADVERTISE) ret |= msidbFeatureAttributesNoUnsupportedAdvertise; + return ret; +} + +/*********************************************************************** +* MsiSetFeatureAttributesW (MSI.@) +*/ +UINT WINAPI MsiSetFeatureAttributesW( MSIHANDLE handle, LPCWSTR name, DWORD attrs ) +{ + MSIPACKAGE *package; + MSIFEATURE *feature; + WCHAR *costing; + + TRACE("%u, %s, 0x%08x\n", handle, debugstr_w(name), attrs); + + if (!name || !name[0]) return ERROR_UNKNOWN_FEATURE; + + if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) + return ERROR_INVALID_HANDLE; + + costing = msi_dup_property( package->db, szCostingComplete ); + if (!costing || !strcmpW( costing, szOne )) + { + msi_free( costing ); + msiobj_release( &package->hdr ); + return ERROR_FUNCTION_FAILED; + } + msi_free( costing ); + if (!(feature = msi_get_loaded_feature( package, name ))) + { + msiobj_release( &package->hdr ); + return ERROR_UNKNOWN_FEATURE; + } + feature->Attributes = unmap_feature_attributes( attrs ); + msiobj_release( &package->hdr ); + return ERROR_SUCCESS; +} + +/*********************************************************************** * MsiGetFeatureStateA (MSI.@) */ UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature, @@ -1036,12 +1100,10 @@ UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature, LPWSTR szwFeature = NULL; UINT rc; - szwFeature = strdupAtoW(szFeature); - - rc = MsiGetFeatureStateW(hInstall,szwFeature,piInstalled, piAction); + if (szFeature && !(szwFeature = strdupAtoW(szFeature))) return ERROR_OUTOFMEMORY; + rc = MsiGetFeatureStateW(hInstall, szwFeature, piInstalled, piAction); msi_free( szwFeature); - return rc; } diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 1008813..5f4a51f 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -199,8 +199,8 @@ 203 stdcall MsiProvideQualifiedComponentExW(wstr wstr long wstr long long ptr ptr) 204 stdcall MsiEnumRelatedProductsA(str long long ptr) 205 stdcall MsiEnumRelatedProductsW(wstr long long ptr) -206 stub MsiSetFeatureAttributesA -207 stub MsiSetFeatureAttributesW +206 stdcall MsiSetFeatureAttributesA(long str long) +207 stdcall MsiSetFeatureAttributesW(long wstr long) 208 stdcall MsiSourceListClearAllA(str str long) 209 stdcall MsiSourceListClearAllW(wstr wstr long) 210 stdcall MsiSourceListAddSourceA(str str long str) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 267b2bd..f93cc48 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6469,6 +6469,88 @@ static void test_MsiGetFeatureInfo(void) DeleteFileA( msifile ); } +static void test_MsiSetFeatureAttributes(void) +{ + UINT r; + DWORD attrs; + char path[MAX_PATH]; + MSIHANDLE package; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + create_database( msifile, tables, sizeof(tables) / sizeof(tables[0]) ); + + strcpy( path, CURR_DIR ); + strcat( path, "\\" ); + strcat( path, msifile ); + + r = MsiOpenPackage( path, &package ); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA( msifile ); + return; + } + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %u\n", r); + + r = MsiDoAction( package, "CostInitialize" ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( 0, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_UNKNOWN_FEATURE, "expected ERROR_UNKNOWN_FEATURE, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, NULL, INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_UNKNOWN_FEATURE, "expected ERROR_UNKNOWN_FEATURE, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", 0 ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + attrs = 0xdeadbeef; + r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, + "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got 0x%08x\n", attrs); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + attrs = 0; + r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, + "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got 0x%08x\n", attrs); + + r = MsiDoAction( package, "FileCost" ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORSOURCE ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + attrs = 0; + r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORSOURCE, + "expected INSTALLFEATUREATTRIBUTE_FAVORSOURCE, got 0x%08x\n", attrs); + + r = MsiDoAction( package, "CostFinalize" ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_FUNCTION_FAILED, "expected ERROR_FUNCTION_FAILED, got %u\n", r); + + MsiCloseHandle( package ); + DeleteFileA( msifile ); +} + START_TEST(install) { DWORD len; @@ -6559,6 +6641,7 @@ START_TEST(install) test_command_line_parsing(); test_upgrade_code(); test_MsiGetFeatureInfo(); + test_MsiSetFeatureAttributes(); DeleteFileA(log_file); diff --git a/include/msiquery.h b/include/msiquery.h index 2ea8320..fbd4651 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -248,6 +248,10 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE); UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE, MSICOLINFO, MSIHANDLE*); INT WINAPI MsiProcessMessage(MSIHANDLE, INSTALLMESSAGE, MSIHANDLE); +UINT WINAPI MsiSetFeatureAttributesA(MSIHANDLE, LPCSTR, DWORD); +UINT WINAPI MsiSetFeatureAttributesW(MSIHANDLE, LPCWSTR, DWORD); +#define MsiSetFeatureAttributes WINELIB_NAME_AW(MsiSetFeatureAttributes) + UINT WINAPI MsiSetFeatureStateA(MSIHANDLE, LPCSTR, INSTALLSTATE); UINT WINAPI MsiSetFeatureStateW(MSIHANDLE, LPCWSTR, INSTALLSTATE); #define MsiSetFeatureState WINELIB_NAME_AW(MsiSetFeatureState)

1 0

Hans Leidekker : advapi32: Make sure lpDisplayName is initialized in EnumServicesStatusA.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: dc46df47a41c34cdc94e7ac1f5da84e0d898877a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc46df47a41c34cdc94e7ac1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:14:07 2011 +0200 advapi32: Make sure lpDisplayName is initialized in EnumServicesStatusA. --- dlls/advapi32/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 88a15b9..2fc3d71 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1514,6 +1514,7 @@ EnumServicesStatusA( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST p += sz; n -= sz; } + else services[i].lpDisplayName = NULL; services[i].ServiceStatus = servicesW[i].ServiceStatus; } @@ -1640,6 +1641,7 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st p += sz; n -= sz; } + else services[i].lpDisplayName = NULL; services[i].ServiceStatusProcess = servicesW[i].ServiceStatusProcess; }

1 0

Alexandre Julliard : dispex: Make sure we don' t pass a NULL array to IDispatchEx_InvokeEx.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: a2f987c338ceea52e88c6e18cafc9de4f94471ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f987c338ceea52e88c6e18c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 20:55:49 2011 +0200 dispex: Make sure we don't pass a NULL array to IDispatchEx_InvokeEx. --- dlls/dispex/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index cc72469..2fcba52 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -47,9 +47,9 @@ HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy(IDispatchEx* This, DISPID id, LCID l HRESULT hr; VARIANT result; EXCEPINFO excep_info; - UINT byref_args, arg; + UINT byref_args, arg, dummy_idx; VARIANT dummy_arg, *ref_arg = &dummy_arg, *copy_arg, *orig_arg = NULL; - UINT *ref_idx = NULL; + UINT *ref_idx = &dummy_idx; DWORD dword_flags = wFlags & 0xf; TRACE("(%p)->(%08x, %04x, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags,

1 0

Alexandre Julliard : advapi32: Fix the parameter checks in QueryServiceStatusEx.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 519fbf620230882bec91a94789bfab2ae907fb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=519fbf620230882bec91a9478… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 21:40:08 2011 +0200 advapi32: Fix the parameter checks in QueryServiceStatusEx. --- dlls/advapi32/service.c | 23 +++++++++++++++++------ dlls/advapi32/tests/service.c | 16 ++++++---------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2b37338..1674c6f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1172,21 +1172,32 @@ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel, TRACE("%p %d %p %d %p\n", hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - __TRY + if (InfoLevel != SC_STATUS_PROCESS_INFO) { - err = svcctl_QueryServiceStatusEx(hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + err = ERROR_INVALID_LEVEL; } - __EXCEPT(rpc_filter) + else if (cbBufSize < sizeof(SERVICE_STATUS_PROCESS)) { - err = map_exception_code(GetExceptionCode()); + *pcbBytesNeeded = sizeof(SERVICE_STATUS_PROCESS); + err = ERROR_INSUFFICIENT_BUFFER; + } + else + { + __TRY + { + err = svcctl_QueryServiceStatusEx(hService, InfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY } - __ENDTRY if (err != ERROR_SUCCESS) { SetLastError(err); return FALSE; } - return TRUE; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index e86208f..e243db0 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -956,7 +956,6 @@ static void test_query_svc(void) SetLastError(0xdeadbeef); ret = pQueryServiceStatusEx(NULL, 1, NULL, 0, NULL); ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_LEVEL, "Expected ERROR_INVALID_LEVEL, got %d\n", GetLastError()); @@ -966,8 +965,8 @@ static void test_query_svc(void) /* Only info level is correct. It looks like the buffer/size is checked second */ SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(NULL, 0, NULL, 0, &needed); - /* NT4 and Wine check the handle first */ + ret = pQueryServiceStatusEx(NULL, SC_STATUS_PROCESS_INFO, NULL, 0, &needed); + /* NT4 checks the handle first */ if (GetLastError() != ERROR_INVALID_HANDLE) { ok(!ret, "Expected failure\n"); @@ -981,7 +980,7 @@ static void test_query_svc(void) statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); bufsize = needed; SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(NULL, 0, (BYTE*)statusproc, bufsize, &needed); + ret = pQueryServiceStatusEx(NULL, SC_STATUS_PROCESS_INFO, (BYTE*)statusproc, bufsize, &needed); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -989,25 +988,22 @@ static void test_query_svc(void) /* Correct handle and info level */ SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(svc_handle, 0, NULL, 0, &needed); + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, NULL, 0, &needed); /* NT4 doesn't return the needed size */ if (GetLastError() != ERROR_INVALID_PARAMETER) { ok(!ret, "Expected failure\n"); - todo_wine - { ok(needed == sizeof(SERVICE_STATUS_PROCESS), "Needed buffersize is wrong : %d\n", needed); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - } } /* All parameters are OK but we don't have enough rights */ statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); bufsize = sizeof(SERVICE_STATUS_PROCESS); SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(svc_handle, 0, (BYTE*)statusproc, bufsize, &needed); + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)statusproc, bufsize, &needed); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); @@ -1021,7 +1017,7 @@ static void test_query_svc(void) statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); bufsize = sizeof(SERVICE_STATUS_PROCESS); SetLastError(0xdeadbeef); - ret = pQueryServiceStatusEx(svc_handle, 0, (BYTE*)statusproc, bufsize, &needed); + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)statusproc, bufsize, &needed); ok(ret, "Expected success, got error %u\n", GetLastError()); if (statusproc->dwCurrentState == SERVICE_RUNNING) ok(statusproc->dwProcessId != 0,

1 0

Alexandre Julliard : advapi32: Always pass valid buffers in the EnumServicesStatus requests.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: ad4c995c3f9f844a35f3ee9cc9479bdb9b26e75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4c995c3f9f844a35f3ee9cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 22:00:15 2011 +0200 advapi32: Always pass valid buffers in the EnumServicesStatus requests. --- dlls/advapi32/service.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1674c6f..88a15b9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1486,13 +1486,14 @@ EnumServicesStatusA( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed, returned, resume_handle); - if (size && !(servicesW = HeapAlloc( GetProcessHeap(), 0, 2 * size ))) + sz = max( 2 * size, sizeof(*servicesW) ); + if (!(servicesW = HeapAlloc( GetProcessHeap(), 0, sz ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - ret = EnumServicesStatusW( hmngr, type, state, servicesW, 2 * size, needed, returned, resume_handle ); + ret = EnumServicesStatusW( hmngr, type, state, servicesW, sz, needed, returned, resume_handle ); if (!ret) goto done; p = (char *)services + *returned * sizeof(ENUM_SERVICE_STATUSA); @@ -1532,6 +1533,7 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST LPDWORD resume_handle ) { DWORD err, i; + ENUM_SERVICE_STATUSW dummy_status; TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed, returned, resume_handle); @@ -1545,6 +1547,13 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST return FALSE; } + /* make sure we pass a valid pointer */ + if (!services || size < sizeof(*services)) + { + services = &dummy_status; + size = sizeof(dummy_status); + } + __TRY { err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned ); @@ -1591,7 +1600,8 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st TRACE("%p %u 0x%x 0x%x %p %u %p %p %p %s\n", hmngr, level, type, state, buffer, size, needed, returned, resume_handle, debugstr_a(group)); - if (size && !(servicesW = HeapAlloc( GetProcessHeap(), 0, 2 * size ))) + sz = max( 2 * size, sizeof(*servicesW) ); + if (!(servicesW = HeapAlloc( GetProcessHeap(), 0, sz ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; @@ -1608,7 +1618,7 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st MultiByteToWideChar( CP_ACP, 0, group, -1, groupW, len * sizeof(WCHAR) ); } - ret = EnumServicesStatusExW( hmngr, level, type, state, (BYTE *)servicesW, 2 * size, + ret = EnumServicesStatusExW( hmngr, level, type, state, (BYTE *)servicesW, sz, needed, returned, resume_handle, groupW ); if (!ret) goto done; @@ -1650,6 +1660,7 @@ EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st LPDWORD resume_handle, LPCWSTR group ) { DWORD err, i; + ENUM_SERVICE_STATUS_PROCESSW dummy_status; ENUM_SERVICE_STATUS_PROCESSW *services = (ENUM_SERVICE_STATUS_PROCESSW *)buffer; TRACE("%p %u 0x%x 0x%x %p %u %p %p %p %s\n", hmngr, level, type, state, buffer, @@ -1669,6 +1680,13 @@ EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st return FALSE; } + /* make sure we pass a valid buffer pointer */ + if (!services || size < sizeof(*services)) + { + buffer = (BYTE *)&dummy_status; + size = sizeof(dummy_status); + } + __TRY { err = svcctl_EnumServicesStatusExW( hmngr, type, state, buffer, size, needed,

1 0

Juan Lang : setupapi: Make sure machine name is non-empty before failing.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 4fe8cc61642c462883e748b566f93f984e3b4f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe8cc61642c462883e748b56… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 9 11:35:11 2011 -0700 setupapi: Make sure machine name is non-empty before failing. --- dlls/setupapi/devinst.c | 6 +++--- dlls/setupapi/tests/devinst.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0a3c3bd..9176554 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1163,7 +1163,7 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); - if (MachineName != NULL) + if (MachineName && *MachineName) { FIXME("remote support is not implemented\n"); SetLastError(ERROR_INVALID_MACHINENAME); @@ -2371,7 +2371,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW( set = SetupDiCreateDeviceInfoListExW(class, parent, machine, reserved); if (set) { - if (machine) + if (machine && *machine) FIXME("%s: unimplemented for remote machines\n", debugstr_w(machine)); else if (flags & DIGCF_DEVICEINTERFACE) @@ -3562,7 +3562,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( LPCWSTR lpKeyName; LONG l; - if (MachineName != NULL) + if (MachineName && *MachineName) { FIXME("Remote access not supported yet!\n"); return INVALID_HANDLE_VALUE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 1905406..3c01f32 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -261,6 +261,7 @@ static void test_SetupDiCreateDeviceInfoListEx(void) DWORD error; static CHAR notnull[] = "NotNull"; static const WCHAR machine[] = { 'd','u','m','m','y',0 }; + static const WCHAR empty[] = { 0 }; SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set Reserved to a value, which is not NULL */ @@ -290,6 +291,14 @@ static void test_SetupDiCreateDeviceInfoListEx(void) /* destroy DeviceInfoList */ ret = pSetupDiDestroyDeviceInfoList(devlist); ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); + + /* create empty DeviceInfoList with empty machine name */ + devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); + ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); + + /* destroy DeviceInfoList */ + ret = pSetupDiDestroyDeviceInfoList(devlist); + ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); } static void test_SetupDiOpenClassRegKeyExA(void)

1 0