December 2008 - Wine-commits

James Hawkins : msi: Implement MsiGetPatchInfoExW.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 5aac1ec6e5102131c4a5aca742a4b7f4deb10635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aac1ec6e5102131c4a5aca74… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:17 2008 -0600 msi: Implement MsiGetPatchInfoExW. --- dlls/msi/msi.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 9575459..9a5c54a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1250,11 +1250,150 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCWSTR szProperty, LPWSTR lpValue, DWORD *pcchValue) { - FIXME("(%s, %s, %s, %d, %s, %p, %p): stub!\n", debugstr_w(szPatchCode), + WCHAR squished_pc[GUID_SIZE]; + WCHAR squished_patch[GUID_SIZE]; + HKEY udprod = 0, prod = 0, props = 0; + HKEY patch = 0, patches = 0; + HKEY udpatch = 0, datakey = 0; + HKEY prodpatches = 0; + LPWSTR val = NULL; + UINT r = ERROR_UNKNOWN_PRODUCT; + DWORD len; + LONG res; + + static const WCHAR szEmpty[] = {0}; + static const WCHAR szPatches[] = {'P','a','t','c','h','e','s',0}; + static const WCHAR szInstalled[] = {'I','n','s','t','a','l','l','e','d',0}; + static const WCHAR szManagedPackage[] = {'M','a','n','a','g','e','d', + 'L','o','c','a','l','P','a','c','k','a','g','e',0}; + + TRACE("(%s, %s, %s, %d, %s, %p, %p)\n", debugstr_w(szPatchCode), debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, debugstr_w(szProperty), lpValue, pcchValue); - return ERROR_CALL_NOT_IMPLEMENTED; + if (!szProductCode || !squash_guid(szProductCode, squished_pc)) + return ERROR_INVALID_PARAMETER; + + if (!szPatchCode || !squash_guid(szPatchCode, squished_patch)) + return ERROR_INVALID_PARAMETER; + + if (!szProperty) + return ERROR_INVALID_PARAMETER; + + if (lpValue && !pcchValue) + return ERROR_INVALID_PARAMETER; + + if (dwContext != MSIINSTALLCONTEXT_USERMANAGED && + dwContext != MSIINSTALLCONTEXT_USERUNMANAGED && + dwContext != MSIINSTALLCONTEXT_MACHINE) + return ERROR_INVALID_PARAMETER; + + if (dwContext == MSIINSTALLCONTEXT_MACHINE && szUserSid) + return ERROR_INVALID_PARAMETER; + + if (!lstrcmpW(szUserSid, szLocalSid)) + return ERROR_INVALID_PARAMETER; + + if (MSIREG_OpenUserDataProductKey(szProductCode, dwContext, NULL, + &udprod, FALSE) != ERROR_SUCCESS) + goto done; + + if (MSIREG_OpenInstallProps(szProductCode, dwContext, NULL, + &props, FALSE) != ERROR_SUCCESS) + goto done; + + r = ERROR_UNKNOWN_PATCH; + + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); + if (res != ERROR_SUCCESS) + goto done; + + res = RegOpenKeyExW(patches, squished_patch, 0, KEY_READ, &patch); + if (res != ERROR_SUCCESS) + goto done; + + if (!lstrcmpW(szProperty, INSTALLPROPERTY_TRANSFORMSW)) + { + if (MSIREG_OpenProductKey(szProductCode, dwContext, + &prod, FALSE) != ERROR_SUCCESS) + goto done; + + res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); + if (res != ERROR_SUCCESS) + goto done; + + datakey = prodpatches; + szProperty = squished_patch; + } + else + { + if (MSIREG_OpenUserDataPatchKey(szPatchCode, dwContext, + &udpatch, FALSE) != ERROR_SUCCESS) + goto done; + + if (!lstrcmpW(szProperty, INSTALLPROPERTY_LOCALPACKAGEW)) + { + if (dwContext == MSIINSTALLCONTEXT_USERMANAGED) + szProperty = szManagedPackage; + datakey = udpatch; + } + else if (!lstrcmpW(szProperty, INSTALLPROPERTY_INSTALLDATEW)) + { + datakey = patch; + szProperty = szInstalled; + } + else if (!lstrcmpW(szProperty, INSTALLPROPERTY_LOCALPACKAGEW)) + { + datakey = udpatch; + } + else if (!lstrcmpW(szProperty, INSTALLPROPERTY_UNINSTALLABLEW) || + !lstrcmpW(szProperty, INSTALLPROPERTY_PATCHSTATEW) || + !lstrcmpW(szProperty, INSTALLPROPERTY_DISPLAYNAMEW) || + !lstrcmpW(szProperty, INSTALLPROPERTY_MOREINFOURLW)) + { + datakey = patch; + } + else + { + r = ERROR_UNKNOWN_PROPERTY; + goto done; + } + } + + val = msi_reg_get_val_str(datakey, szProperty); + if (!val) + val = strdupW(szEmpty); + + r = ERROR_SUCCESS; + + if (!pcchValue) + goto done; + + if (lpValue) + lstrcpynW(lpValue, val, *pcchValue); + + len = lstrlenW(val); + if ((*val && *pcchValue < len + 1) || !lpValue) + { + if (lpValue) + r = ERROR_MORE_DATA; + + *pcchValue = len * sizeof(WCHAR); + } + + *pcchValue = len; + +done: + msi_free(val); + RegCloseKey(prodpatches); + RegCloseKey(prod); + RegCloseKey(patch); + RegCloseKey(patches); + RegCloseKey(udpatch); + RegCloseKey(props); + RegCloseKey(udprod); + + return r; } UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes)

1 0

James Hawkins : msi: Add the ability to query a specific context for install properties.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: b5e3e19a19bf8fdfd4519f594f5fad8c341b2f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e3e19a19bf8fdfd4519f594… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:14 2008 -0600 msi: Add the ability to query a specific context for install properties. --- dlls/msi/action.c | 24 +++++--------------- dlls/msi/msi.c | 61 ++++++++++++++++---------------------------------- dlls/msi/msipriv.h | 5 +-- dlls/msi/registry.c | 43 ++++++++++++++++-------------------- 4 files changed, 47 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5e3e19a19bf8fdfd4519…

1 0

James Hawkins : msi: Add the ability to query a specific context for a product key.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 4a9f6995aa22097feac6a1e13a29fabc3025f1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9f6995aa22097feac6a1e13… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:06 2008 -0600 msi: Add the ability to query a specific context for a product key. --- dlls/msi/action.c | 18 ++++-------------- dlls/msi/msi.c | 3 ++- dlls/msi/msipriv.h | 4 ++-- dlls/msi/registry.c | 17 ++++++++++------- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 654a7d0..0a23136 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3589,20 +3589,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - if (package->Context == MSIINSTALLCONTEXT_MACHINE) - { - rc = MSIREG_OpenUserDataProductKey(package->ProductCode, szLocalSid, - &hudkey, TRUE); - if (rc != ERROR_SUCCESS) - goto end; - } - else - { - rc = MSIREG_OpenUserDataProductKey(package->ProductCode, NULL, - &hudkey, TRUE); - if (rc != ERROR_SUCCESS) - goto end; - } + rc = MSIREG_OpenUserDataProductKey(package->ProductCode, package->Context, + NULL, &hudkey, TRUE); + if (rc != ERROR_SUCCESS) + goto end; rc = msi_publish_upgrade_code(package); if (rc != ERROR_SUCCESS) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c49f86d..e6de69d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1988,7 +1988,8 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, state = INSTALLSTATE_ABSENT; if ((MSIREG_OpenInstallProps(szProduct, szLocalSid, &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenUserDataProductKey(szProduct, NULL, &hkey, FALSE) == ERROR_SUCCESS) && + MSIREG_OpenUserDataProductKey(szProduct, MSIINSTALLCONTEXT_USERUNMANAGED, + NULL, &hkey, FALSE) == ERROR_SUCCESS) && msi_reg_get_val_dword(hkey, wininstaller, &version) && GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 99eff8f..0eaa9f3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -776,8 +776,8 @@ extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL cr extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create); extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); -extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, - HKEY* key, BOOL create); +extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, + LPCWSTR szUserSid, HKEY *key, BOOL create); extern UINT MSIREG_OpenCurrentUserInstallProps(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, LPCWSTR szUserSID, HKEY *key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index db9ec65..a1c3a48 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -799,8 +799,8 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } -UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, - HKEY *key, BOOL create) +UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, + LPCWSTR szUserSid, HKEY *key, BOOL create) { UINT rc; WCHAR squished_pc[GUID_SIZE]; @@ -812,7 +812,11 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); - if (!szUserSid) + if (dwContext == MSIINSTALLCONTEXT_MACHINE) + sprintfW(keypath, szUserDataProd_fmt, szLocalSid, squished_pc); + else if (szUserSid) + sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); + else { rc = get_user_sid(&usersid); if (rc != ERROR_SUCCESS || !usersid) @@ -824,8 +828,6 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); LocalFree(usersid); } - else - sprintfW(keypath, szUserDataProd_fmt, szUserSid, squished_pc); if (create) rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); @@ -1679,7 +1681,8 @@ static UINT msi_get_patch_state(LPCWSTR prodcode, LPCWSTR usersid, *state = MSIPATCHSTATE_INVALID; /* FIXME: usersid might not be current user */ - r = MSIREG_OpenUserDataProductKey(prodcode, NULL, &prod, FALSE); + r = MSIREG_OpenUserDataProductKey(prodcode, MSIINSTALLCONTEXT_USERUNMANAGED, + NULL, &prod, FALSE); if (r != ERROR_SUCCESS) return ERROR_NO_MORE_ITEMS; @@ -1826,7 +1829,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, { usersid = szEmpty; - if (MSIREG_OpenUserDataProductKey(prodcode, szLocalSid, &localprod, FALSE) == ERROR_SUCCESS && + if (MSIREG_OpenUserDataProductKey(prodcode, context, NULL, &localprod, FALSE) == ERROR_SUCCESS && RegOpenKeyExW(localprod, szPatches, 0, KEY_READ, &localpatch) == ERROR_SUCCESS && RegOpenKeyExW(localpatch, ptr, 0, KEY_READ, &patchkey) == ERROR_SUCCESS) {

1 0

James Hawkins : msi: Add the ability to query a specific context for a patch.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 880b9199a9c54e578d6186b46e6019e1ac970665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880b9199a9c54e578d6186b46… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:09 2008 -0600 msi: Add the ability to query a specific context for a patch. --- dlls/msi/msipriv.h | 2 ++ dlls/msi/registry.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0eaa9f3..a7dada7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -778,6 +778,8 @@ extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserS extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, LPCWSTR szUserSid, HKEY *key, BOOL create); +extern UINT MSIREG_OpenUserDataPatchKey(LPCWSTR szPatch, MSIINSTALLCONTEXT dwContext, + HKEY *key, BOOL create); extern UINT MSIREG_OpenCurrentUserInstallProps(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, LPCWSTR szUserSID, HKEY *key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index a1c3a48..d8411ee 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -837,30 +837,38 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContex return rc; } -UINT MSIREG_OpenUserDataPatchKey(LPWSTR patch, HKEY *key, BOOL create) +UINT MSIREG_OpenUserDataPatchKey(LPCWSTR szPatch, MSIINSTALLCONTEXT dwContext, + HKEY *key, BOOL create) { UINT rc; + WCHAR squished_patch[GUID_SIZE]; WCHAR keypath[0x200]; LPWSTR usersid; - TRACE("\n"); + TRACE("%s\n", debugstr_w(szPatch)); + if (!squash_guid(szPatch, squished_patch)) + return ERROR_FUNCTION_FAILED; + TRACE("squished (%s)\n", debugstr_w(squished_patch)); - rc = get_user_sid(&usersid); - if (rc != ERROR_SUCCESS || !usersid) + if (dwContext == MSIINSTALLCONTEXT_MACHINE) + sprintfW(keypath, szUserDataPatch_fmt, szLocalSid, squished_patch); + else { - ERR("Failed to retrieve user SID: %d\n", rc); - return rc; - } + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } - sprintfW(keypath, szUserDataPatch_fmt, usersid, patch); + sprintfW(keypath, szUserDataPatch_fmt, usersid, squished_patch); + LocalFree(usersid); + } if (create) - rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); - else - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); - LocalFree(usersid); - return rc; + return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); } UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, LPCWSTR szUserSID, @@ -1819,7 +1827,8 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, } else { - temp = MSIREG_OpenUserDataPatchKey(ptr, &patchkey, FALSE); + temp = MSIREG_OpenUserDataPatchKey(patch, context, + &patchkey, FALSE); RegCloseKey(patchkey); if (temp != ERROR_SUCCESS) continue;

1 0

James Hawkins : msi: Forward MsiGetPatchInfoExA to MsiGetPatchInfoExW.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: d195ee3cc475dd21f4892f3c841c5918d79381ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d195ee3cc475dd21f4892f3c8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:02 2008 -0600 msi: Forward MsiGetPatchInfoExA to MsiGetPatchInfoExW. --- dlls/msi/msi.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7c980ee..c49f86d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1194,11 +1194,67 @@ UINT WINAPI MsiGetPatchInfoExA(LPCSTR szPatchCode, LPCSTR szProductCode, LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCSTR szProperty, LPSTR lpValue, DWORD *pcchValue) { - FIXME("(%s, %s, %s, %d, %s, %p, %p): stub!\n", debugstr_a(szPatchCode), + LPWSTR patch = NULL, product = NULL, usersid = NULL; + LPWSTR property = NULL, val = NULL; + DWORD len; + UINT r; + + TRACE("(%s, %s, %s, %d, %s, %p, %p)\n", debugstr_a(szPatchCode), debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, debugstr_a(szProperty), lpValue, pcchValue); - return ERROR_CALL_NOT_IMPLEMENTED; + if (lpValue && !pcchValue) + return ERROR_INVALID_PARAMETER; + + if (szPatchCode) patch = strdupAtoW(szPatchCode); + if (szProductCode) product = strdupAtoW(szProductCode); + if (szUserSid) usersid = strdupAtoW(szUserSid); + if (szProperty) property = strdupAtoW(szProperty); + + len = 0; + r = MsiGetPatchInfoExW(patch, product, usersid, dwContext, property, + NULL, &len); + if (r != ERROR_SUCCESS) + goto done; + + val = msi_alloc(++len * sizeof(WCHAR)); + if (!val) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + r = MsiGetPatchInfoExW(patch, product, usersid, dwContext, property, + val, &len); + if (r != ERROR_SUCCESS || !pcchValue) + goto done; + + if (lpValue) + WideCharToMultiByte(CP_ACP, 0, val, -1, lpValue, + *pcchValue - 1, NULL, NULL); + + len = lstrlenW(val); + if ((*val && *pcchValue < len + 1) || !lpValue) + { + if (lpValue) + { + r = ERROR_MORE_DATA; + lpValue[*pcchValue - 1] = '\0'; + } + + *pcchValue = len * sizeof(WCHAR); + } + else + *pcchValue = len; + +done: + msi_free(val); + msi_free(patch); + msi_free(product); + msi_free(usersid); + msi_free(property); + + return r; } UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode,

1 0

Christian Costa : amstream: Add stubbed implementation of MediaStreamFilter .
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 48e213b4d8ccd718a0fe3f9b5f6a8577a5d6f3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e213b4d8ccd718a0fe3f9b5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 19:08:17 2008 +0100 amstream: Add stubbed implementation of MediaStreamFilter. --- dlls/amstream/Makefile.in | 1 + dlls/amstream/amstream_private.h | 1 + dlls/amstream/main.c | 1 + dlls/amstream/mediastreamfilter.c | 313 +++++++++++++++++++++++++++++++++++++ include/amstream.idl | 1 + 5 files changed, 317 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48e213b4d8ccd718a0fe3…

1 0

Nikolay Sivov : gdiplus: Added GdipAddPathCurve3/ GdipAddPathCurve3I with tests.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 7cddc57989261aaa1ef4a7d066e75505fe28d748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cddc57989261aaa1ef4a7d06… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Dec 15 02:52:35 2008 +0300 gdiplus: Added GdipAddPathCurve3/GdipAddPathCurve3I with tests. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphicspath.c | 22 ++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 40 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9473f1b..d380d74 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -10,8 +10,8 @@ @ stdcall GdipAddPathClosedCurveI(ptr ptr long) @ stdcall GdipAddPathCurve2(ptr ptr long long) @ stdcall GdipAddPathCurve2I(ptr ptr long long) -@ stub GdipAddPathCurve3 -@ stub GdipAddPathCurve3I +@ stdcall GdipAddPathCurve3(ptr ptr long long long long) +@ stdcall GdipAddPathCurve3I(ptr ptr long long long long) @ stdcall GdipAddPathCurve(ptr ptr long) @ stdcall GdipAddPathCurveI(ptr ptr long) @ stdcall GdipAddPathEllipse(ptr long long long long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 20a3b2c..042d4a2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -524,6 +524,28 @@ GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath *path, GDIPCONST GpPoint *points, return stat; } +GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath *path, GDIPCONST GpPointF *points, + INT count, INT offset, INT nseg, REAL tension) +{ + TRACE("(%p, %p, %d, %d, %d, %.2f)\n", path, points, count, offset, nseg, tension); + + if(!path || !points || offset + 1 >= count || count - offset < nseg + 1) + return InvalidParameter; + + return GdipAddPathCurve2(path, &points[offset], nseg + 1, tension); +} + +GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath *path, GDIPCONST GpPoint *points, + INT count, INT offset, INT nseg, REAL tension) +{ + TRACE("(%p, %p, %d, %d, %d, %.2f)\n", path, points, count, offset, nseg, tension); + + if(!path || !points || offset + 1 >= count || count - offset < nseg + 1) + return InvalidParameter; + + return GdipAddPathCurve2I(path, &points[offset], nseg + 1, tension); +} + GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, REAL height) { diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 168c4b5..416d80c 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -726,6 +726,15 @@ static path_test_t addcurve_path2[] = { {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*10*/ {30.0, 10.0, PathPointTypeBezier, 0, 0} /*11*/ }; +static path_test_t addcurve_path3[] = { + {10.0, 10.0, PathPointTypeStart, 0, 0}, /*0*/ + {13.3, 16.7, PathPointTypeBezier, 0, 1}, /*1*/ + {3.3, 20.0, PathPointTypeBezier, 0, 0}, /*2*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*3*/ + {16.7, 20.0, PathPointTypeBezier, 0, 0}, /*4*/ + {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*5*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0} /*6*/ + }; static void test_addcurve(void) { GpStatus status; @@ -765,6 +774,37 @@ static void test_addcurve(void) status = GdipAddPathCurve2(path, points, 4, 1.0); expect(Ok, status); ok_path(path, addcurve_path2, sizeof(addcurve_path2)/sizeof(path_test_t), FALSE); + + /* NULL args */ + GdipResetPath(path); + status = GdipAddPathCurve3(NULL, NULL, 0, 0, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, NULL, 0, 0, 0, 0.0); + expect(InvalidParameter, status); + /* wrong count, offset.. */ + status = GdipAddPathCurve3(path, points, 0, 0, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 0, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 0, 4, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 1, 3, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 1, 0, 0.0); + expect(InvalidParameter, status); + status = GdipAddPathCurve3(path, points, 4, 3, 1, 0.0); + expect(InvalidParameter, status); + + /* use all points */ + status = GdipAddPathCurve3(path, points, 4, 0, 3, 1.0); + expect(Ok, status); + ok_path(path, addcurve_path, sizeof(addcurve_path)/sizeof(path_test_t), FALSE); + GdipResetPath(path); + + status = GdipAddPathCurve3(path, points, 4, 1, 2, 1.0); + expect(Ok, status); + ok_path(path, addcurve_path3, sizeof(addcurve_path3)/sizeof(path_test_t), FALSE); + GdipDeletePath(path); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 216b2f3..1a39dee 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -256,6 +256,8 @@ GpStatus WINGDIPAPI GdipAddPathCurve(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL); +GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath*,GDIPCONST GpPointF*,INT,INT,INT,REAL); +GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath*,GDIPCONST GpPoint*,INT,INT,INT,REAL); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);

1 0

James Hawkins : msi: Add a stub implementation of MsiGetPatchInfoEx.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 199a26c81a4f5c82ea324626976d040c945c8c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199a26c81a4f5c82ea3246269… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:06:55 2008 -0600 msi: Add a stub implementation of MsiGetPatchInfoEx. --- dlls/msi/msi.c | 22 ++++++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- include/msi.h | 4 ++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ef1b871..7c980ee 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1190,6 +1190,28 @@ done: return r; } +UINT WINAPI MsiGetPatchInfoExA(LPCSTR szPatchCode, LPCSTR szProductCode, + LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, + LPCSTR szProperty, LPSTR lpValue, DWORD *pcchValue) +{ + FIXME("(%s, %s, %s, %d, %s, %p, %p): stub!\n", debugstr_a(szPatchCode), + debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, + debugstr_a(szProperty), lpValue, pcchValue); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, + LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, + LPCWSTR szProperty, LPWSTR lpValue, DWORD *pcchValue) +{ + FIXME("(%s, %s, %s, %d, %s, %p, %p): stub!\n", debugstr_w(szPatchCode), + debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, + debugstr_w(szProperty), lpValue, pcchValue); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes) { LPWSTR szwLogFile = NULL; diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index db7aa90..017fdbe 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -236,8 +236,8 @@ 240 stub MsiApplyMultiplePatchesW 241 stub MsiExtractPatchXMLDataA 242 stub MsiExtractPatchXMLDataW -243 stub MsiGetPatchInfoExA -244 stub MsiGetPatchInfoExW +243 stdcall MsiGetPatchInfoExA(str str str long str ptr ptr) +244 stdcall MsiGetPatchInfoExW(wstr wstr wstr long wstr ptr ptr) 245 stdcall MsiEnumProductsExA(str str long long ptr ptr ptr ptr) 246 stdcall MsiEnumProductsExW(wstr wstr long long ptr ptr ptr ptr) 247 stdcall MsiGetProductInfoExA(str str long str ptr ptr) diff --git a/include/msi.h b/include/msi.h index 2dbe4d3..5564fcd 100644 --- a/include/msi.h +++ b/include/msi.h @@ -497,6 +497,10 @@ UINT WINAPI MsiGetProductInfoExA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPST UINT WINAPI MsiGetProductInfoExW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); #define MsiGetProductInfoEx WINELIB_NAME_AW(MsiGetProductInfoEx) +UINT WINAPI MsiGetPatchInfoExA(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, LPDWORD); +UINT WINAPI MsiGetPatchInfoExW(LPCWSTR, LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); +#define MsiGetPatchInfoEx WINELIB_NAME_AW(MsiGetPatchInfoEx) + UINT WINAPI MsiEnableLogA(DWORD, LPCSTR, DWORD); UINT WINAPI MsiEnableLogW(DWORD, LPCWSTR, DWORD); #define MsiEnableLog WINELIB_NAME_AW(MsiEnableLog)

1 0

Christian Costa : amstream: Some fixes.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: c4a8ab069ff645598dfa020b89c4a19b2357d82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a8ab069ff645598dfa020b8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 19:07:32 2008 +0100 amstream: Some fixes. --- dlls/amstream/amstream.c | 30 ++++++++++++++++++------------ dlls/amstream/mediastream.c | 18 ++++++++++++++---- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 384b342..7c8a94b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -57,6 +57,11 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) return CLASS_E_NOAGGREGATION; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAMMultiMediaStreamImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } object->lpVtbl.lpVtbl = &AM_Vtbl; object->ref = 1; @@ -71,7 +76,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IAMMultiMediaStream)) @@ -113,7 +118,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetInformation(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pdwFlags, pStreamType); + FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pdwFlags, pStreamType); return E_NOTIMPL; } @@ -144,7 +149,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_EnumMediaStreams(IAMMultiMediaStre { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%ld,%p) stub!\n", This, iface, Index, ppMediaStream); + FIXME("(%p/%p)->(%ld,%p) stub!\n", This, iface, Index, ppMediaStream); return E_NOTIMPL; } @@ -153,7 +158,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* ifac { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentState); + FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentState); return E_NOTIMPL; } @@ -162,7 +167,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* ifac { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->() stub!\n", This, iface); + FIXME("(%p/%p)->() stub!\n", This, iface); return E_NOTIMPL; } @@ -171,7 +176,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentTime); + FIXME("(%p/%p)->(%p) stub!\n", This, iface, pCurrentTime); return E_NOTIMPL; } @@ -180,7 +185,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* i { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); + FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); return E_NOTIMPL; } @@ -189,7 +194,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, S { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->() stub!\n", This, iface); + FIXME("(%p/%p)->() stub!\n", This, iface); return E_NOTIMPL; } @@ -198,7 +203,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, phEOS); + FIXME("(%p/%p)->(%p) stub!\n", This, iface, phEOS); return E_NOTIMPL; } @@ -233,7 +238,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder); + FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder); return E_NOTIMPL; } @@ -343,7 +348,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac } ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); - end: + +end: IBaseFilter_Release(BaseFilter); IFileSourceFilter_Release(SourceFilter); return ret; @@ -362,7 +368,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%x)\n", This, iface, dwFlags); + FIXME("(%p/%p)->(%x) partial stub!\n", This, iface, dwFlags); if(dwFlags != AMMSF_NOCLOCK) return E_INVALIDARG; diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 01ee926..39e9a28 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -61,7 +61,12 @@ HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, S TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); - + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + object->lpVtbl.lpVtbl = &MediaStream_Vtbl; object->ref = 1; @@ -70,7 +75,7 @@ HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, S object->StreamType = StreamType; *ppMediaStream = (IMediaStream*)object; - + return S_OK; } @@ -82,7 +87,7 @@ static HRESULT WINAPI IMediaStreamImpl_QueryInterface(IMediaStream* iface, REFII TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IAMMultiMediaStream)) + IsEqualGUID(riid, &IID_IMediaStream)) { IClassFactory_AddRef(iface); *ppvObject = This; @@ -120,7 +125,7 @@ static HRESULT WINAPI IMediaStreamImpl_GetMultiMediaStream(IMediaStream* iface, { IMediaStreamImpl *This = (IMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); + FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); return S_FALSE; } @@ -196,6 +201,11 @@ HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPu TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } object->lpVtbl.lpVtbl = &DirectDrawMediaStream_Vtbl; object->ref = 1;

1 0

Christian Costa : dmime: Check input params in IDirectMusicSegmentState8Impl_QueryInterface.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 53562c7a843eb9e7d4b8673c2a0ae38f55ec1309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53562c7a843eb9e7d4b8673c2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 19:03:56 2008 +0100 dmime: Check input params in IDirectMusicSegmentState8Impl_QueryInterface. --- dlls/dmime/segmentstate.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 191b2f0..afa67c0 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -26,6 +26,9 @@ static HRESULT WINAPI IDirectMusicSegmentState8Impl_QueryInterface (LPDIRECTMUSI IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); + if (!riid || !ppobj) + return E_POINTER; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicSegmentState) || IsEqualIID(riid, &IID_IDirectMusicSegmentState8)) {

1 0