Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[akhaldi] 56631: [STI] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 14:35:28 2012 New Revision: 56631 URL: http://svn.reactos.org/svn/reactos?rev=56631&view=rev Log: [STI] * Sync to Wine 1.5.4. Added: trunk/reactos/dll/win32/sti/sti.rc (with props) trunk/reactos/dll/win32/sti/sti.rgs (with props) Removed: trunk/reactos/dll/win32/sti/regsvr.c Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt trunk/reactos/dll/win32/sti/sti.c trunk/reactos/dll/win32/sti/sti_main.c trunk/reactos/dll/win32/sti/sti_wia.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Sat May 19 14:35:28 2012 @@ -6,38 +6,23 @@ -D__WINESRC__ -DENTRY_PREFIX=STI_ -DPROXY_DELEGATION - -DREGISTER_PROXY_DLL) + -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(sti.dll sti.spec) list(APPEND SOURCE - regsvr.c sti.c sti_main.c + sti.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) add_rpcproxy_files(sti_wia.idl) - add_library(sti SHARED ${SOURCE}) - set_module_type(sti win32dll) - -target_link_libraries(sti - wine - uuid - ${PSEH_LIB}) - -add_importlibs(sti - ole32 - oleaut32 - rpcrt4 - advapi32 - msvcrt - kernel32 - ntdll) - +target_link_libraries(sti wine uuid ${PSEH_LIB}) +add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET sti DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/sti/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/regsvr.c?rev… ============================================================================== --- trunk/reactos/dll/win32/sti/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/regsvr.c (removed) @@ -1,433 +1,0 @@ -/* - * self-registerable dll functions for sti.dll - * - * Copyright (C) 2003 John K. Hohm - * Copyright (C) 2009 Damjan Jovanovic - * - * 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 <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "objbase.h" -#include "initguid.h" -#include "sti.h" -#include "wia_lh.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sti); - -/* - * Near the bottom of this file are the exported DllRegisterServer and - * DllUnregisterServer, which make all this worthwhile. - */ - -/*********************************************************************** - * interface for self-registering - */ -struct regsvr_interface -{ - IID const *iid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - IID const *base_iid; /* can be NULL to omit */ - int num_methods; /* can be <0 to omit */ - CLSID const *ps_clsid; /* can be NULL to omit */ - CLSID const *ps_clsid32; /* can be NULL to omit */ -}; - -static HRESULT register_interfaces(struct regsvr_interface const *list); -static HRESULT unregister_interfaces(struct regsvr_interface const *list); - -struct regsvr_coclass -{ - CLSID const *clsid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - LPCSTR ips; /* can be NULL to omit */ - LPCSTR ips32; /* can be NULL to omit */ - LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR clsid_str; /* can be NULL to omit */ - LPCSTR progid; /* can be NULL to omit */ -}; - -static HRESULT register_coclasses(struct regsvr_coclass const *list); -static HRESULT unregister_coclasses(struct regsvr_coclass const *list); - -/*********************************************************************** - * static string constants - */ -static WCHAR const interface_keyname[10] = { - 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; -static WCHAR const base_ifa_keyname[14] = { - 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', - 'e', 0 }; -static WCHAR const num_methods_keyname[11] = { - 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; -static WCHAR const ps_clsid_keyname[15] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', 0 }; -static WCHAR const ps_clsid32_keyname[17] = { - 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', - 'i', 'd', '3', '2', 0 }; -static WCHAR const clsid_keyname[6] = { - 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const ips_keyname[13] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static WCHAR const ips32_keyname[15] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static char const tmodel_valuename[] = "ThreadingModel"; - -/*********************************************************************** - * static helper functions - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); -static LONG register_key_defvalueW(HKEY base, WCHAR const *name, - WCHAR const *value); -static LONG register_key_defvalueA(HKEY base, WCHAR const *name, - char const *value); - -/*********************************************************************** - * register_interfaces - */ -static HRESULT register_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - HKEY iid_key; - - StringFromGUID2(list->iid, buf, 39); - res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_interface_key; - - if (list->name) { - res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->base_iid) { - res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (0 <= list->num_methods) { - static WCHAR const fmt[3] = { '%', 'd', 0 }; - HKEY key; - - res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - - sprintfW(buf, fmt, list->num_methods); - res = RegSetValueExW(key, NULL, 0, REG_SZ, - (CONST BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid) { - res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - if (list->ps_clsid32) { - res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); - if (res != ERROR_SUCCESS) goto error_close_iid_key; - } - - error_close_iid_key: - RegCloseKey(iid_key); - } - -error_close_interface_key: - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_interfaces - */ -static HRESULT unregister_interfaces(struct regsvr_interface const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY interface_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, - KEY_READ | KEY_WRITE, &interface_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->iid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - } - - RegCloseKey(interface_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * register_coclasses - */ -static HRESULT register_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - HKEY clsid_key; - - StringFromGUID2(list->clsid, buf, 39); - res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips) { - res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips32) { - HKEY ips32_key; - - res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, - &ips32_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, - (CONST BYTE*)list->ips32, - lstrlenA(list->ips32) + 1); - if (res == ERROR_SUCCESS && list->ips32_tmodel) - res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (CONST BYTE*)list->ips32_tmodel, - strlen(list->ips32_tmodel) + 1); - RegCloseKey(ips32_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->clsid_str) { - res = register_key_defvalueA(clsid_key, clsid_keyname, - list->clsid_str); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->progid) { - HKEY progid_key; - - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_key_defvalueW(progid_key, clsid_keyname, buf); - RegCloseKey(progid_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - error_close_clsid_key: - RegCloseKey(clsid_key); - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_coclasses - */ -static HRESULT unregister_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, - KEY_READ | KEY_WRITE, &coclass_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * regsvr_key_guid - */ -static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) -{ - WCHAR buf[39]; - - StringFromGUID2(guid, buf, 39); - return register_key_defvalueW(base, name, buf); -} - -/*********************************************************************** - * regsvr_key_defvalueW - */ -static LONG register_key_defvalueW( - HKEY base, - WCHAR const *name, - WCHAR const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - (lstrlenW(value) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_key_defvalueA - */ -static LONG register_key_defvalueA( - HKEY base, - WCHAR const *name, - char const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - lstrlenA(value) + 1); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static struct regsvr_coclass const coclass_list[] = { - { &CLSID_Sti, - "StillImage", - NULL, - "sti.dll", - "Both" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * interface list - */ -static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ -}; - -extern HRESULT WINAPI STI_DllRegisterServer(void) DECLSPEC_HIDDEN; -extern HRESULT WINAPI STI_DllUnregisterServer(void) DECLSPEC_HIDDEN; - -/*********************************************************************** - * DllRegisterServer (STI.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = STI_DllRegisterServer(); - if (SUCCEEDED(hr)) - hr = register_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = register_interfaces(interface_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (STI.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = unregister_interfaces(interface_list); - if (SUCCEEDED(hr)) - hr = STI_DllUnregisterServer(); - return hr; -} Modified: trunk/reactos/dll/win32/sti/sti.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.c?rev=56… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti.c [iso-8859-1] Sat May 19 14:35:28 2012 @@ -28,8 +28,6 @@ #include "objbase.h" #include "sti.h" -#include "sti_private.h" - #include "wine/debug.h" #include "wine/unicode.h" @@ -44,33 +42,41 @@ 'R','e','g','i','s','t','e','r','e','d',' ','A','p','p','l','i','c','a','t','i','o','n','s',0 }; -static inline stillimage *impl_from_StillImageW(IStillImageW *iface) -{ - return (stillimage *)((char*)iface - FIELD_OFFSET(stillimage, lpVtbl)); +typedef struct _stillimage +{ + IStillImageW IStillImageW_iface; + IUnknown IUnknown_iface; + IUnknown *pUnkOuter; + LONG ref; +} stillimage; + +static inline stillimage *impl_from_IStillImageW(IStillImageW *iface) +{ + return CONTAINING_RECORD(iface, stillimage, IStillImageW_iface); } static HRESULT WINAPI stillimagew_QueryInterface(IStillImageW *iface, REFIID riid, void **ppvObject) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); TRACE("(%p %s %p)\n", This, debugstr_guid(riid), ppvObject); return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); } static ULONG WINAPI stillimagew_AddRef(IStillImageW *iface) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); return IUnknown_AddRef(This->pUnkOuter); } static ULONG WINAPI stillimagew_Release(IStillImageW *iface) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); return IUnknown_Release(This->pUnkOuter); } static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); TRACE("(%p, %p, 0x%X)\n", This, hinst, dwVersion); return S_OK; } @@ -78,7 +84,7 @@ static HRESULT WINAPI stillimagew_GetDeviceList(IStillImageW *iface, DWORD dwType, DWORD dwFlags, DWORD *pdwItemsReturned, LPVOID *ppBuffer) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %u, 0x%X, %p, %p): stub\n", This, dwType, dwFlags, pdwItemsReturned, ppBuffer); return E_NOTIMPL; } @@ -86,7 +92,7 @@ static HRESULT WINAPI stillimagew_GetDeviceInfo(IStillImageW *iface, LPWSTR pwszDeviceName, LPVOID *ppBuffer) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszDeviceName), ppBuffer); return E_NOTIMPL; } @@ -94,7 +100,7 @@ static HRESULT WINAPI stillimagew_CreateDevice(IStillImageW *iface, LPWSTR pwszDeviceName, DWORD dwMode, PSTIDEVICEW *pDevice, LPUNKNOWN pUnkOuter) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s, %u, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), dwMode, pDevice, pUnkOuter); return E_NOTIMPL; } @@ -102,7 +108,7 @@ static HRESULT WINAPI stillimagew_GetDeviceValue(IStillImageW *iface, LPWSTR pwszDeviceName, LPWSTR pValueName, LPDWORD pType, LPBYTE pData, LPDWORD cbData) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s, %s, %p, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), pType, pData, cbData); return E_NOTIMPL; @@ -111,7 +117,7 @@ static HRESULT WINAPI stillimagew_SetDeviceValue(IStillImageW *iface, LPWSTR pwszDeviceName, LPWSTR pValueName, DWORD type, LPBYTE pData, DWORD cbData) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s, %s, %u, %p, %u): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), type, pData, cbData); return E_NOTIMPL; @@ -120,7 +126,7 @@ static HRESULT WINAPI stillimagew_GetSTILaunchInformation(IStillImageW *iface, LPWSTR pwszDeviceName, DWORD *pdwEventCode, LPWSTR pwszEventName) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %p, %p, %p): stub\n", This, pwszDeviceName, pdwEventCode, pwszEventName); return E_NOTIMPL; @@ -136,7 +142,7 @@ HKEY registeredAppsKey = NULL; DWORD ret; HRESULT hr = S_OK; - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); TRACE("(%p, %s, %s)\n", This, debugstr_w(pwszAppName), debugstr_w(pwszCommandLine)); @@ -165,7 +171,7 @@ static HRESULT WINAPI stillimagew_UnregisterLaunchApplication(IStillImageW *iface, LPWSTR pwszAppName) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); HKEY registeredAppsKey = NULL; DWORD ret; HRESULT hr = S_OK; @@ -188,7 +194,7 @@ static HRESULT WINAPI stillimagew_EnableHwNotifications(IStillImageW *iface, LPCWSTR pwszDeviceName, BOOL bNewState) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s, %u): stub\n", This, debugstr_w(pwszDeviceName), bNewState); return E_NOTIMPL; } @@ -196,14 +202,14 @@ static HRESULT WINAPI stillimagew_GetHwNotificationState(IStillImageW *iface, LPCWSTR pwszDeviceName, BOOL *pbCurrentState) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszDeviceName), pbCurrentState); return E_NOTIMPL; } static HRESULT WINAPI stillimagew_RefreshDeviceBus(IStillImageW *iface, LPCWSTR pwszDeviceName) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s): stub\n", This, debugstr_w(pwszDeviceName)); return E_NOTIMPL; } @@ -211,7 +217,7 @@ static HRESULT WINAPI stillimagew_LaunchApplicationForDevice(IStillImageW *iface, LPWSTR pwszDeviceName, LPWSTR pwszAppName, LPSTINOTIFY pStiNotify) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %s, %s, %p): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pwszAppName), pStiNotify); return E_NOTIMPL; @@ -219,14 +225,14 @@ static HRESULT WINAPI stillimagew_SetupDeviceParameters(IStillImageW *iface, PSTI_DEVICE_INFORMATIONW pDevInfo) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %p): stub\n", This, pDevInfo); return E_NOTIMPL; } static HRESULT WINAPI stillimagew_WriteToErrorLog(IStillImageW *iface, DWORD dwMessageType, LPCWSTR pszMessage) { - stillimage *This = impl_from_StillImageW(iface); + stillimage *This = impl_from_IStillImageW(iface); FIXME("(%p, %u, %s): stub\n", This, dwMessageType, debugstr_w(pszMessage)); return E_NOTIMPL; } @@ -253,21 +259,21 @@ stillimagew_WriteToErrorLog }; -static inline stillimage *impl_from_InternalUnknown(IUnknown *iface) -{ - return (stillimage *)((char*)iface - FIELD_OFFSET(stillimage, lpInternalUnkVtbl)); +static inline stillimage *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, stillimage, IUnknown_iface); } static HRESULT WINAPI Internal_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) { - stillimage *This = impl_from_InternalUnknown(iface); + stillimage *This = impl_from_IUnknown(iface); TRACE("(%p %s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown)) *ppvObject = iface; else if (IsEqualGUID(riid, &IID_IStillImageW)) - *ppvObject = &This->lpVtbl; + *ppvObject = &This->IStillImageW_iface; else { if (IsEqualGUID(riid, &IID_IStillImageA)) @@ -284,14 +290,14 @@ static ULONG WINAPI Internal_AddRef(IUnknown *iface) { - stillimage *This = impl_from_InternalUnknown(iface); + stillimage *This = impl_from_IUnknown(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI Internal_Release(IUnknown *iface) { ULONG ref; - stillimage *This = impl_from_InternalUnknown(iface); + stillimage *This = impl_from_IUnknown(iface); ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -328,21 +334,21 @@ This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(stillimage)); if (This) { - This->lpVtbl = &stillimagew_vtbl; - This->lpInternalUnkVtbl = &internal_unk_vtbl; + This->IStillImageW_iface.lpVtbl = &stillimagew_vtbl; + This->IUnknown_iface.lpVtbl = &internal_unk_vtbl; if (pUnkOuter) This->pUnkOuter = pUnkOuter; else - This->pUnkOuter = (IUnknown*) &This->lpInternalUnkVtbl; + This->pUnkOuter = &This->IUnknown_iface; This->ref = 1; - hr = IStillImage_Initialize((IStillImageW*) &This->lpVtbl, hinst, dwVer); + hr = IStillImage_Initialize(&This->IStillImageW_iface, hinst, dwVer); if (SUCCEEDED(hr)) { if (pUnkOuter) - *ppSti = (IStillImageW*) &This->lpInternalUnkVtbl; + *ppSti = (IStillImageW*) &This->IUnknown_iface; else - *ppSti = (IStillImageW*) &This->lpVtbl; + *ppSti = &This->IStillImageW_iface; } } else Added: trunk/reactos/dll/win32/sti/sti.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rc?rev=5… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.rc (added) +++ trunk/reactos/dll/win32/sti/sti.rc [iso-8859-1] Sat May 19 14:35:28 2012 @@ -1,0 +1,1 @@ +1 WINE_REGISTRY sti.rgs Propchange: trunk/reactos/dll/win32/sti/sti.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sti/sti.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rgs?rev=… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.rgs (added) +++ trunk/reactos/dll/win32/sti/sti.rgs [iso-8859-1] Sat May 19 14:35:28 2012 @@ -1,0 +1,37 @@ +HKCR +{ + NoRemove Interface + { + '{5EB2502A-8CF1-11D1-BF92-0060081ED811}' = s 'IWiaDevMgr' + { + NumMethods = s 12 + ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' + } + '{5E38B83C-8CF1-11D1-BF92-0060081ED811}' = s 'IEnumWIA_DEV_INFO' + { + NumMethods = s 3 + ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' + } + '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' = s 'IWiaItem' + { + NumMethods = s 3 + ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' + } + '{AE6287B0-0084-11D2-973B-00A0C9068F2E}' = s 'IWiaEventCallback' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' + } + } + NoRemove CLSID + { + '{4DB1AD10-3391-11D2-9A33-00C04FA36145}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{B323F8E0-2E68-11D0-90EA-00AA0060F86C}' = s 'StillImage' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/sti/sti.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/sti/sti_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_main.c [iso-8859-1] Sat May 19 14:35:28 2012 @@ -26,6 +26,8 @@ #include "winreg.h" #include "winerror.h" #include "objbase.h" +#include "initguid.h" +#include "wia_lh.h" #include "sti.h" #include "wine/debug.h" @@ -34,18 +36,20 @@ extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +extern HRESULT WINAPI STI_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI STI_DllUnregisterServer(void) DECLSPEC_HIDDEN; typedef HRESULT (*fnCreateInstance)(REFIID riid, IUnknown *pUnkOuter, LPVOID *ppObj); typedef struct { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } sti_cf; static inline sti_cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (sti_cf *)((char *)iface - FIELD_OFFSET( sti_cf, vtbl )); + return CONTAINING_RECORD(iface, sti_cf, IClassFactory_iface); } static HRESULT sti_create( REFIID riid, IUnknown *pUnkOuter, LPVOID *ppObj ) @@ -127,7 +131,7 @@ sti_cf_LockServer }; -static sti_cf the_sti_cf = { &sti_cf_vtbl, sti_create }; +static sti_cf the_sti_cf = { { &sti_cf_vtbl }, sti_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -149,7 +153,7 @@ if (IsEqualGUID( rclsid, &CLSID_Sti )) { - cf = (IClassFactory *)&the_sti_cf.vtbl; + cf = &the_sti_cf.IClassFactory_iface; } if (cf) @@ -164,3 +168,19 @@ { return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer (STI.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return STI_DllRegisterServer(); +} + +/*********************************************************************** + * DllUnRegisterServer (STI.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return STI_DllUnregisterServer(); +} Modified: trunk/reactos/dll/win32/sti/sti_wia.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_wia.idl?… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] Sat May 19 14:35:28 2012 @@ -17,3 +17,17 @@ */ #include "wia_lh.idl" + +#ifdef __WIDL__ +[ + threading(both), + uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) /* IWiaItem */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ + threading(both), + uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c) +] +coclass StillImage { interface IStillImageW; } +#endif Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 14:35:28 2012 @@ -160,7 +160,7 @@ reactos/dll/win32/spoolss # Synced to Wine-1.5.4 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37 -reactos/dll/win32/sti # Autosync +reactos/dll/win32/sti # Synced to Wine-1.5.4 reactos/dll/win32/sxs # Synced to Wine-1.3.37 reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Autosync

1 0

[akhaldi] 56630: [SPOOLSS_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 14:15:59 2012 New Revision: 56630 URL: http://svn.reactos.org/svn/reactos?rev=56630&view=rev Log: [SPOOLSS_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/spoolss/spoolss.c Modified: trunk/rostests/winetests/spoolss/spoolss.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/spoolss… ============================================================================== --- trunk/rostests/winetests/spoolss/spoolss.c [iso-8859-1] (original) +++ trunk/rostests/winetests/spoolss/spoolss.c [iso-8859-1] Sat May 19 14:15:59 2012 @@ -60,6 +60,16 @@ ptr = "SplInitializeWinSpoolDrv"; pSplInitializeWinSpoolDrv = (void *) GetProcAddress(hspl, ptr); if (!pSplInitializeWinSpoolDrv) return ptr; + + + /* Calling BuildOtherNamesFromMachineName or SplInitializeWinSpoolDrv on + * Win7 results in a breakpoint exception. If you continue after hitting + * the breakpoint, the functions fail with ERROR_NOT_SUPPORTED. So we + * just skip the tests on Win7, since they won't provide any useful info. + * To detect Win7, we check whether UnloadDriver exists (it doesn't on + * Win7, but does exist on earlier Windows versions) */ + ptr = "UnloadDriver"; + if (GetProcAddress(hspl, ptr) == NULL) return ptr; ptr = "winspool.drv"; @@ -198,10 +208,10 @@ { LPCSTR ptr; - /* spoolss.dll does not exist on win9x */ + /* The tests fail on Win7 (see comments in load_function() */ ptr = load_functions(); if (ptr) { - skip("%s not found\n", ptr); + win_skip("%s not found\n", ptr); return; }

1 0

[akhaldi] 56629: [SPOOLSS] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 14:15:55 2012 New Revision: 56629 URL: http://svn.reactos.org/svn/reactos?rev=56629&view=rev Log: [SPOOLSS] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/spoolss/router.c trunk/reactos/dll/win32/spoolss/spoolss.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/spoolss/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/router.c… ============================================================================== --- trunk/reactos/dll/win32/spoolss/router.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/router.c [iso-8859-1] Sat May 19 14:15:55 2012 @@ -266,13 +266,12 @@ BOOL backend_load_all(void) { static BOOL failed = FALSE; - backend_t * pb; EnterCriticalSection(&backend_cs); /* if we failed before, don't try again */ if (!failed && (used_backends == 0)) { - pb = backend_load(localsplW, NULL, NULL); + backend_load(localsplW, NULL, NULL); /* ToDo: parse the registry and load all other backends */ Modified: trunk/reactos/dll/win32/spoolss/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss.h [iso-8859-1] Sat May 19 14:15:55 2012 @@ -21,8 +21,8 @@ /* ################################ */ -BOOL backend_load_all(void); -void backend_unload_all(void); +BOOL backend_load_all(void) DECLSPEC_HIDDEN; +void backend_unload_all(void) DECLSPEC_HIDDEN; /* ## Memory allocation functions ## */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 14:15:55 2012 @@ -157,7 +157,7 @@ reactos/dll/win32/slbcsp # Synced to Wine-1.3.37 reactos/dll/win32/snmpapi # Synced to Wine-1.3.37 reactos/dll/win32/softpub # Synced to Wine-1.3.37 -reactos/dll/win32/spoolss # Autosync +reactos/dll/win32/spoolss # Synced to Wine-1.5.4 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37 reactos/dll/win32/sti # Autosync

1 0

[akhaldi] 56628: [SETUPAPI_WINETEST] * Sync to Wine 1.5.4. I excluded devinst tests from the sync until bug #7077 is fixed.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 14:09:14 2012 New Revision: 56628 URL: http://svn.reactos.org/svn/reactos?rev=56628&view=rev Log: [SETUPAPI_WINETEST] * Sync to Wine 1.5.4. I excluded devinst tests from the sync until bug #7077 is fixed. Added: trunk/rostests/winetests/setupapi/diskspace.c (with props) Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/setupapi/install.c trunk/rostests/winetests/setupapi/misc.c trunk/rostests/winetests/setupapi/parser.c trunk/rostests/winetests/setupapi/query.c trunk/rostests/winetests/setupapi/stringtable.c trunk/rostests/winetests/setupapi/testlist.c Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Sat May 19 14:09:14 2012 @@ -5,6 +5,7 @@ list(APPEND SOURCE devclass.c devinst.c + diskspace.c install.c misc.c parser.c Added: trunk/rostests/winetests/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/disksp… ============================================================================== --- trunk/rostests/winetests/setupapi/diskspace.c (added) +++ trunk/rostests/winetests/setupapi/diskspace.c [iso-8859-1] Sat May 19 14:09:14 2012 @@ -1,0 +1,485 @@ +/* + * Unit tests for disk space functions + * + * Copyright 2010 Andrew Nguyen + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" + +#include "wine/test.h" + +static void test_SetupCreateDiskSpaceListA(void) +{ + HDSKSPC ret; + + ret = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + ret = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA(NULL, 0, ~0U); + ok(ret == NULL || + broken(ret != NULL), /* NT4/Win9x/Win2k */ + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + if (!ret) + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + else + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA(NULL, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win9x/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA((void *)0xdeadbeef, 0, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win9x/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListA((void *)0xdeadbeef, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListA to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win9x/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); +} + +static void test_SetupCreateDiskSpaceListW(void) +{ + HDSKSPC ret; + + ret = SetupCreateDiskSpaceListW(NULL, 0, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupCreateDiskSpaceListW is not implemented\n"); + return; + } + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListW to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + ret = SetupCreateDiskSpaceListW(NULL, 0, SPDSL_IGNORE_DISK); + ok(ret != NULL, + "Expected SetupCreateDiskSpaceListW to return a valid handle, got NULL\n"); + + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW(NULL, 0, ~0U); + ok(ret == NULL || + broken(ret != NULL), /* NT4/Win2k */ + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + if (!ret) + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + else + ok(SetupDestroyDiskSpaceList(ret), "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW(NULL, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0); + ok(ret == NULL, + "Expected SetupCreateDiskSpaceListW to return NULL, got %p\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); +} + +static void test_SetupDuplicateDiskSpaceListA(void) +{ + HDSKSPC handle, duplicate; + int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; + + if (is_win9x) + win_skip("SetupDuplicateDiskSpaceListA crashes with NULL disk space handle on Win9x\n"); + else + { + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, (void *)0xdeadbeef, 0, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0xdeadbeef, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(NULL, NULL, 0, ~0U); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + } + + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + if (!handle) + { + skip("Failed to create a disk space handle\n"); + return; + } + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(handle, (void *)0xdeadbeef, 0, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(handle, NULL, 0xdeadbeef, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(handle, NULL, 0, SPDSL_IGNORE_DISK); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListA(handle, NULL, 0, ~0U); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + duplicate = SetupDuplicateDiskSpaceListA(handle, NULL, 0, 0); + ok(duplicate != NULL, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(duplicate != handle, + "Expected new handle (%p) to be different from the old handle (%p)\n", duplicate, handle); + + ok(SetupDestroyDiskSpaceList(duplicate), "Expected SetupDestroyDiskSpaceList to succeed\n"); + ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); +} + +static void test_SetupDuplicateDiskSpaceListW(void) +{ + HDSKSPC handle, duplicate; + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(NULL, NULL, 0, 0); + if (!duplicate && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupDuplicateDiskSpaceListW is not available\n"); + return; + } + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(NULL, (void *)0xdeadbeef, 0, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(NULL, NULL, 0xdeadbeef, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(NULL, NULL, 0, ~0U); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + handle = SetupCreateDiskSpaceListW(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListW to return a valid handle, got NULL\n"); + + if (!handle) + { + skip("Failed to create a disk space handle\n"); + return; + } + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(handle, (void *)0xdeadbeef, 0, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(handle, NULL, 0xdeadbeef, 0); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(handle, NULL, 0, SPDSL_IGNORE_DISK); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + duplicate = SetupDuplicateDiskSpaceListW(handle, NULL, 0, ~0U); + ok(!duplicate, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + duplicate = SetupDuplicateDiskSpaceListW(handle, NULL, 0, 0); + ok(duplicate != NULL, "Expected SetupDuplicateDiskSpaceList to return NULL, got %p\n", duplicate); + ok(duplicate != handle, + "Expected new handle (%p) to be different from the old handle (%p)\n", duplicate, handle); + + ok(SetupDestroyDiskSpaceList(duplicate), "Expected SetupDestroyDiskSpaceList to succeed\n"); + ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); +} + +static void test_SetupQuerySpaceRequiredOnDriveA(void) +{ + BOOL ret; + HDSKSPC handle; + LONGLONG space; + int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; + + if (is_win9x) + win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n"); + else + { + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveA(NULL, NULL, &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveA(NULL, "", &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); + } + + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveA(handle, NULL, NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_DRIVE, /* Win9x */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveA(handle, NULL, &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_DRIVE, /* Win9x */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveA(handle, "", NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_DRIVE, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveA(handle, "", &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_DRIVE, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); +} + +static void test_SetupQuerySpaceRequiredOnDriveW(void) +{ + static const WCHAR emptyW[] = {0}; + + BOOL ret; + HDSKSPC handle; + LONGLONG space; + + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, NULL, NULL, NULL, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupQuerySpaceRequiredOnDriveW is not available\n"); + return; + } + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveW(NULL, NULL, &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", + GetLastError()); + + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveW(handle, NULL, NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_DRIVE, /* NT4/Win2k/XP/Win2k3 */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveW(handle, NULL, &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_DRIVE, /* NT4/Win2k/XP/Win2k3 */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, NULL, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_DRIVE, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + space = 0xdeadbeef; + ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, &space, NULL, 0); + ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); + ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); + ok(GetLastError() == ERROR_INVALID_DRIVE, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); +} + +START_TEST(diskspace) +{ + test_SetupCreateDiskSpaceListA(); + test_SetupCreateDiskSpaceListW(); + test_SetupDuplicateDiskSpaceListA(); + test_SetupDuplicateDiskSpaceListW(); + test_SetupQuerySpaceRequiredOnDriveA(); + test_SetupQuerySpaceRequiredOnDriveW(); +} Propchange: trunk/rostests/winetests/setupapi/diskspace.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/instal… ============================================================================== --- trunk/rostests/winetests/setupapi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/install.c [iso-8859-1] Sat May 19 14:09:14 2012 @@ -120,12 +120,14 @@ { static const char infwithspaces[] = "test file.inf"; char path[MAX_PATH]; + BOOL ret; create_inf_file(inffile, cmdline_inf); sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path); ok_registry(TRUE); - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); /* Test handling of spaces in path, unquoted and quoted */ create_inf_file(infwithspaces, cmdline_inf); @@ -138,7 +140,8 @@ run_cmdline("DefaultInstall", 128, path); ok_registry(FALSE); - ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(infwithspaces); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } static const char *cmdline_inf_reg = "[Version]\n" @@ -153,6 +156,7 @@ HKEY key; LONG res; char path[MAX_PATH]; + BOOL ret; /* First create a registry structure we would like to be deleted */ ok(!RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest", &key), @@ -176,7 +180,8 @@ RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest"); RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); } - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } static void test_install_svc_from(void) @@ -724,6 +729,7 @@ /* Check if pInstallHinfSectionA sets last error or is a stub (as on WinXP) */ static const char *minimal_inf = "[Version]\nSignature=\"$Chicago$\"\n"; char cmdline[MAX_PATH*2]; + BOOL ret; create_inf_file(inffile, minimal_inf); sprintf(cmdline, "DefaultInstall 128 %s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); @@ -733,7 +739,8 @@ skip("InstallHinfSectionA is broken (stub)\n"); pInstallHinfSectionA = NULL; } - ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + ret = DeleteFile(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } if (!pInstallHinfSectionW && !pInstallHinfSectionA) win_skip("InstallHinfSectionA and InstallHinfSectionW are not available\n"); Modified: trunk/rostests/winetests/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/misc.c… ============================================================================== --- trunk/rostests/winetests/setupapi/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/misc.c [iso-8859-1] Sat May 19 14:09:14 2012 @@ -312,16 +312,41 @@ if (pSetupUninstallOEMInfA) { + char pnf[MAX_PATH]; + char *pnffile; char *destfile = strrchr(dest, '\\') + 1; + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + pnffile = strrchr(pnf, '\\') + 1; + SetLastError(0xdeadbeef); - ok(pSetupUninstallOEMInfA(destfile, 0, NULL), "Failed to uninstall '%s' : %d\n", destfile, GetLastError()); + res = pSetupUninstallOEMInfA(destfile, 0, NULL); + if(!res) + res = pSetupUninstallOEMInfA(pnffile, 0, NULL); + ok(res, "Failed to uninstall '%s'/'%s' : %d\n", destfile, + pnffile, GetLastError()); + todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); + if(file_exists(dest)) + { + SetLastError(0xdeadbeef); + res = DeleteFileA(dest); + ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); + } + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + if(file_exists(pnf)) + { + SetLastError(0xdeadbeef); + res = DeleteFileA(pnf); + ok(res, "Failed to delete file '%s' : %d\n", pnf, GetLastError()); + } } else { /* Win9x/WinMe */ SetLastError(0xdeadbeef); - ok(DeleteFileA(dest), "Failed to delete file '%s' : %d\n", dest, GetLastError()); + res = DeleteFileA(dest); + ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); /* On WinMe we also need to remove the .pnf file */ *(strrchr(dest, '.') + 1) = 'p'; Modified: trunk/rostests/winetests/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/parser… ============================================================================== --- trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] Sat May 19 14:09:14 2012 @@ -406,7 +406,7 @@ static void test_key_names(void) { char buffer[MAX_INF_STRING_LENGTH+32]; - const char *key, *line; + const char *line; unsigned int i, index, count; UINT err_line; HINF hinf; @@ -426,7 +426,7 @@ ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); assert( ret ); - key = check_key( &context, key_names[i].key ); + check_key( &context, key_names[i].key ); buffer[0] = buffer[1] = 0; /* build the full line */ for (index = 0; ; index++) Modified: trunk/rostests/winetests/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/query.… ============================================================================== --- trunk/rostests/winetests/setupapi/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/query.c [iso-8859-1] Sat May 19 14:09:14 2012 @@ -23,8 +23,8 @@ #include <setupapi.h> #include "wine/test.h" -CHAR CURR_DIR[MAX_PATH]; -CHAR WIN_DIR[MAX_PATH]; +static CHAR CURR_DIR[MAX_PATH]; +static CHAR WIN_DIR[MAX_PATH]; static void get_directories(void) { Modified: trunk/rostests/winetests/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/string… ============================================================================== --- trunk/rostests/winetests/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/stringtable.c [iso-8859-1] Sat May 19 14:09:14 2012 @@ -33,6 +33,9 @@ #include "wine/test.h" + +//DECLARE_HANDLE(HSTRING_TABLE); + /* Flags for StringTableAddString and StringTableLookUpString */ #define ST_CASE_SENSITIVE_COMPARE 0x00000001 @@ -50,7 +53,7 @@ static VOID (WINAPI *pStringTableTrim)(HSTRING_TABLE); #endif -HMODULE hdll; +static HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0}; static WCHAR String[] = {'S','t','r','i','n','g',0}; static WCHAR foo[] = {'f','o','o',0}; Modified: trunk/rostests/winetests/setupapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/testli… ============================================================================== --- trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/testlist.c [iso-8859-1] Sat May 19 14:09:14 2012 @@ -8,6 +8,7 @@ extern void func_devclass(void); extern void func_devinst(void); +extern void func_diskspace(void); extern void func_install(void); extern void func_misc(void); extern void func_parser(void); @@ -19,6 +20,7 @@ { { "devclass", func_devclass }, { "devinst", func_devinst }, + { "diskspace", func_diskspace }, { "install", func_install }, { "misc", func_misc }, { "parser", func_parser },

1 0

[akhaldi] 56627: [SETUPAPI] * Import SetupDuplicateDiskSpaceListA/W and SetupQuerySpaceRequiredOnDriveW from Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 14:07:00 2012 New Revision: 56627 URL: http://svn.reactos.org/svn/reactos?rev=56627&view=rev Log: [SETUPAPI] * Import SetupDuplicateDiskSpaceListA/W and SetupQuerySpaceRequiredOnDriveW from Wine 1.5.4. Modified: trunk/reactos/dll/win32/setupapi/diskspace.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] Sat May 19 14:07:00 2012 @@ -85,6 +85,44 @@ return SetupCreateDiskSpaceListW( Reserved1, Reserved2, Flags ); } +/*********************************************************************** + * SetupDuplicateDiskSpaceListW (SETUPAPI.@) + */ +HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags) +{ + DISKSPACELIST *list_copy, *list_original = DiskSpace; + + if (Reserved1 || Reserved2 || Flags) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + if (!DiskSpace) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(DISKSPACELIST)); + if (!list_copy) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + *list_copy = *list_original; + + return list_copy; +} + +/*********************************************************************** + * SetupDuplicateDiskSpaceListA (SETUPAPI.@) + */ +HDSKSPC WINAPI SetupDuplicateDiskSpaceListA(HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags) +{ + return SetupDuplicateDiskSpaceListW(DiskSpace, Reserved1, Reserved2, Flags); +} /*********************************************************************** * SetupAddInstallSectionToDiskSpaceListA (SETUPAPI.@) @@ -98,24 +136,42 @@ } /*********************************************************************** -* SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) +* SetupQuerySpaceRequiredOnDriveW (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, - LPCSTR DriveSpec, LONGLONG* SpaceRequired, +BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, + LPCWSTR DriveSpec, LONGLONG *SpaceRequired, PVOID Reserved1, UINT Reserved2) { - WCHAR driveW[20]; + WCHAR *driveW; unsigned int i; - LPDISKSPACELIST list = (LPDISKSPACELIST)DiskSpace; + LPDISKSPACELIST list = DiskSpace; BOOL rc = FALSE; static const WCHAR bkslsh[]= {'\\',0}; - MultiByteToWideChar(CP_ACP,0,DriveSpec,-1,driveW,20); - + if (!DiskSpace) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!DriveSpec) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + driveW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(DriveSpec) + 2) * sizeof(WCHAR)); + if (!driveW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + lstrcpyW(driveW,DriveSpec); lstrcatW(driveW,bkslsh); TRACE("Looking for drive %s\n",debugstr_w(driveW)); - + for (i = 0; i < list->dwDriveCount; i++) { TRACE("checking drive %s\n",debugstr_w(list->Drives[i].lpzName)); @@ -127,7 +183,54 @@ } } + HeapFree(GetProcessHeap(), 0, driveW); + + if (!rc) SetLastError(ERROR_INVALID_DRIVE); return rc; +} + +/*********************************************************************** +* SetupQuerySpaceRequiredOnDriveA (SETUPAPI.@) +*/ +BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, + LPCSTR DriveSpec, LONGLONG *SpaceRequired, + PVOID Reserved1, UINT Reserved2) +{ + DWORD len; + LPWSTR DriveSpecW; + BOOL ret; + + /* The parameter validation checks are in a different order from the + * Unicode variant of SetupQuerySpaceRequiredOnDrive. */ + if (!DriveSpec) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!DiskSpace) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + len = MultiByteToWideChar(CP_ACP, 0, DriveSpec, -1, NULL, 0); + + DriveSpecW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!DriveSpecW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, DriveSpec, -1, DriveSpecW, len); + + ret = SetupQuerySpaceRequiredOnDriveW(DiskSpace, DriveSpecW, SpaceRequired, + Reserved1, Reserved2); + + HeapFree(GetProcessHeap(), 0, DriveSpecW); + + return ret; } /*********************************************************************** Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat May 19 14:07:00 2012 @@ -388,8 +388,8 @@ @ stdcall SetupDiSetSelectedDriverA(ptr ptr ptr) @ stdcall SetupDiSetSelectedDriverW(ptr ptr ptr) @ stdcall SetupDiUnremoveDevice(ptr ptr) -@ stub SetupDuplicateDiskSpaceListA -@ stub SetupDuplicateDiskSpaceListW +@ stdcall SetupDuplicateDiskSpaceListA(ptr ptr long long) +@ stdcall SetupDuplicateDiskSpaceListW(ptr ptr long long) @ stdcall SetupEnumInfSectionsA(long long ptr long ptr) @ stdcall SetupEnumInfSectionsW(long long ptr long ptr) @ stdcall SetupFindFirstLineA(long str str ptr) @@ -481,7 +481,7 @@ @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) -@ stub SetupQuerySpaceRequiredOnDriveW +@ stdcall SetupQuerySpaceRequiredOnDriveW(long wstr ptr ptr long) @ stdcall SetupQueueCopyA(long str str str str str str str long) @ stdcall SetupQueueCopyIndirectA(ptr) @ stdcall SetupQueueCopyIndirectW(ptr)

1 0

[akhaldi] 56626: [RSAENH] * Fix msvc build.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 13:04:19 2012 New Revision: 56626 URL: http://svn.reactos.org/svn/reactos?rev=56626&view=rev Log: [RSAENH] * Fix msvc build. Removed: trunk/reactos/dll/win32/rsaenh/version.rc Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Sat May 19 13:04:19 2012 @@ -17,12 +17,11 @@ rsaenh.c sha2.c rsrc.rc - version.rc ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) add_library(rsaenh SHARED ${SOURCE}) set_module_type(rsaenh win32dll) -target_link_libraries(rsaenh wine) +target_link_libraries(rsaenh uuid wine) add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) add_pch(rsaenh tomcrypt.h) add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/rsaenh/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/version.r… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/version.rc (removed) @@ -1,26 +1,0 @@ -/* - * Copyright (c) 2007 Alexandre Julliard - * - * 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 - */ - -#define WINE_FILEDESCRIPTION_STR "Wine rsaenh" -#define WINE_FILENAME_STR "rsaenh.dll" -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" - -#include "wine/wine_common_ver.rc"

1 0

[akhaldi] 56625: [RSAENH_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 12:34:31 2012 New Revision: 56625 URL: http://svn.reactos.org/svn/reactos?rev=56625&view=rev Log: [RSAENH_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/rsaenh/rsaenh.c Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Sat May 19 12:34:31 2012 @@ -662,6 +662,8 @@ sizeof(signed_ssl3_shamd5_hash)); printBytes("got", pbSigValue, len); } + result = CryptDestroyKey(hKeyExchangeKey); + ok(result, "CryptDestroyKey failed 0x%08x\n", GetLastError()); result = CryptDestroyHash(hHash); ok(result, "CryptDestroyHash failed 0x%08x\n", GetLastError()); result = CryptReleaseContext(prov, 0); @@ -945,10 +947,12 @@ for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; - /* AES provider doesn't support salt */ + /* Does AES provider support salt? */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == ERROR_NO_TOKEN /* Win7 */), - "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); + ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, + "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + if (result) + ok(!dwLen, "unexpected salt length %d\n", dwLen); dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); @@ -1246,6 +1250,7 @@ dwKeyLen = 1025; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); + ok(!result, "CryptSetKeyParam failed: %08x\n", GetLastError()); dwLen = sizeof(dwKeyLen); CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); @@ -1511,7 +1516,9 @@ 0x40, 0x64, 0x28, 0xe8, 0x8a, 0xe7, 0xa4, 0xd4, 0x1c, 0xfd, 0xde, 0x71 }; - + BLOBHEADER *blobHeader = (BLOBHEADER *)abPlainPrivateKey; + RSAPUBKEY *rsaPubKey = (RSAPUBKEY *)(blobHeader+1); + dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); if (!result) { @@ -1556,6 +1563,21 @@ CryptDestroyKey(hSessionKey); CryptDestroyKey(hKeyExchangeKey); + + /* Test importing a private key with a buffer that's smaller than the + * actual buffer. The private exponent can be omitted, its length is + * inferred from the passed-in length parameter. + */ + dwLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + rsaPubKey->bitlen / 8 + 5 * rsaPubKey->bitlen / 16; + for (; dwLen < sizeof(abPlainPrivateKey); dwLen++) + { + result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + ok(result, "CryptImportKey failed at size %d: %d (%08x)\n", dwLen, + GetLastError(), GetLastError()); + if (result) + CryptDestroyKey(hKeyExchangeKey); + } } static void test_verify_signature(void) { @@ -1766,16 +1788,15 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; + /* It seems that CPVerifySignature doesn't care about the OID at all. */ + result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; - /* Next test fails on WinXP SP2. It seems that CPVerifySignature doesn't care about - * the OID at all. */ - /*result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); - ok(!result && GetLastError()==NTE_BAD_SIGNATURE, "%08lx\n", GetLastError()); - if (result) return;*/ - CryptDestroyHash(hHash); result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); @@ -1790,6 +1811,10 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1808,6 +1833,10 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1823,6 +1852,10 @@ if (!result) return; result = CryptVerifySignature(hHash, abSignatureSHA, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignature(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, 0); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -2151,6 +2184,115 @@ CryptDestroyKey(hPrivKey); } + +static void test_import_hmac(void) +{ + /* Test cases from RFC 2202, section 3 */ + static const struct rfc2202_test_case { + const char *key; + DWORD key_len; + const char *data; + const DWORD data_len; + const char *digest; + } cases[] = { + { "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" + "\x0b\x0b\x0b\x0b", 20, + "Hi There", 8, + "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e" + "\xf1\x46\xbe\x00" }, + { "Jefe", 4, + "what do ya want for nothing?", 28, + "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c" + "\x25\x9a\x7c\x79" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa", 20, + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd", 50, + "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f" + "\x63\xf1\x75\xd3" }, + { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" + "\x11\x12\x13\x14\x15\x16\x17\x18\x19", 25, + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd", 50, + "\x4c\x90\x07\xF4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c" + "\x2d\x72\x35\xda" }, + { "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c" + "\x0c\x0c\x0c\x0c", 20, + "Test With Truncation", 20, + "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32" + "\x4a\x9a\x5a\x04" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", + 80, + "Test Using Larger Than Block-Size Key - Hash Key First", 54, + "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55" + "\xed\x40\x21\x12" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", + 80, + "Test Using Larger Than Block-Size Key and Larger " + "Than One Block-Size Data", 73, + "\xe8\xe9\x9D\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08" + "\xbb\xff\x1a\x91" } + }; + DWORD i; + + for (i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) + { + const struct rfc2202_test_case *test_case = &cases[i]; + DWORD size = sizeof(BLOBHEADER) + sizeof(DWORD) + test_case->key_len; + BYTE *blob = HeapAlloc(GetProcessHeap(), 0, size); + + if (blob) + { + BLOBHEADER *header = (BLOBHEADER *)blob; + DWORD *key_len = (DWORD *)(header + 1); + BYTE *key_bytes = (BYTE *)(key_len + 1); + BOOL result; + HCRYPTKEY key; + + header->bType = PLAINTEXTKEYBLOB; + header->bVersion = CUR_BLOB_VERSION; + header->reserved = 0; + header->aiKeyAlg = CALG_RC2; + *key_len = test_case->key_len; + memcpy(key_bytes, test_case->key, *key_len); + result = CryptImportKey(hProv, blob, size, 0, CRYPT_IPSEC_HMAC_KEY, &key); + ok(result || broken(GetLastError() == NTE_BAD_FLAGS /* Win2k */), "CryptImportKey failed on test case %d: %08x\n", i, GetLastError()); + if (result) + { + HCRYPTHASH hash; + HMAC_INFO hmac_info = { CALG_SHA1, 0 }; + BYTE digest[20]; + DWORD digest_size; + + result = CryptCreateHash(hProv, CALG_HMAC, key, 0, &hash); + ok(result, "CryptCreateHash failed on test case %d: %08x\n", i, GetLastError()); + result = CryptSetHashParam(hash, HP_HMAC_INFO, (BYTE *)&hmac_info, 0); + ok(result, "CryptSetHashParam failed on test case %d: %08x\n", i, GetLastError()); + result = CryptHashData(hash, (const BYTE *)test_case->data, test_case->data_len, 0); + ok(result, "CryptHashData failed on test case %d: %08x\n", i, GetLastError()); + digest_size = sizeof(digest); + result = CryptGetHashParam(hash, HP_HASHVAL, digest, &digest_size, 0); + ok(result, "CryptGetHashParam failed on test case %d: %08x\n", i, GetLastError()); + ok(!memcmp(digest, test_case->digest, sizeof(digest)), "Unexpected value on test case %d\n", i); + CryptDestroyHash(hash); + CryptDestroyKey(key); + } + HeapFree(GetProcessHeap(), 0, blob); + } + } +} static void test_schannel_provider(void) { @@ -2227,7 +2369,16 @@ result = CryptImportKey(hProv, abTLS1Master, dwLen, hRSAKey, 0, &hMasterSecret); ok (result, "%08x\n", GetLastError()); if (!result) return; - + + /* Deriving a hash from the master secret. This is due to the CryptoAPI architecture. + * (Keys can only be derived from hashes, not from other keys.) + * The hash can't be created yet because the key doesn't have the client + * random or server random set. + */ + result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + /* Setting the TLS1 client and server random parameters, as well as the * MAC and encryption algorithm parameters. */ data_blob.cbData = 33; @@ -2241,7 +2392,20 @@ result = CryptSetKeyParam(hMasterSecret, KP_SERVER_RANDOM, (BYTE*)&data_blob, 0); ok (result, "%08x\n", GetLastError()); if (!result) return; - + + result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); + ok (result, "%08x\n", GetLastError()); + if (!result) return; + + /* Deriving the server write encryption key from the master hash can't + * succeed before the encryption key algorithm is set. + */ + result = CryptDeriveKey(hProv, CALG_SCHANNEL_ENC_KEY, hMasterHash, CRYPT_SERVER, &hServerWriteKey); + ok (!result && GetLastError() == NTE_BAD_FLAGS, + "expected NTE_BAD_FLAGS, got %08x\n", GetLastError()); + + CryptDestroyHash(hMasterHash); + saSChannelAlg.dwUse = SCHANNEL_ENC_KEY; saSChannelAlg.Algid = CALG_DES; saSChannelAlg.cBits = 64; @@ -2260,8 +2424,6 @@ ok (result, "%08x\n", GetLastError()); if (!result) return; - /* Deriving a hash from the master secret. This is due to the CryptoAPI architecture. - * (Keys can only be derived from hashes, not from other keys.) */ result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); ok (result, "%08x\n", GetLastError()); if (!result) return; @@ -2362,7 +2524,8 @@ dataLen = strlen(test_string) + 1; result = CryptEncrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen, sizeof(data)); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptEncrypt failed: %08x\n", GetLastError()); /* export the key... */ result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, NULL, @@ -2371,6 +2534,7 @@ exportedKey = HeapAlloc(GetProcessHeap(), 0, keyLen); result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, exportedKey, &keyLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); /* destroy the key... */ CryptDestroyKey(keyExchangeKey); CryptDestroyKey(signKey); @@ -2382,7 +2546,8 @@ * key. */ result = CryptDecrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptDecrypt failed: %08x\n", GetLastError()); if (result) { @@ -2809,22 +2974,23 @@ { result = CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); } dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(prov1, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); dwLen = (DWORD)sizeof(abSessionKey); result = CryptImportKey(prov1, abSessionKey, dwLen, hKeyExchangeKey, 0, &hSessionKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); /* Once the key has been imported, subsequently acquiring a context with * the same name will allow retrieving the key. */ result = CryptAcquireContext(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGetUserKey(prov2, AT_KEYEXCHANGE, &hKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); CryptReleaseContext(prov2, 0); @@ -2854,6 +3020,7 @@ test_verify_signature(); test_rsa_encrypt(); test_import_export(); + test_import_hmac(); test_enum_container(); clean_up_base_environment(); test_key_permissions();

1 0

[akhaldi] 56624: [RSAENH] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 12:34:30 2012 New Revision: 56624 URL: http://svn.reactos.org/svn/reactos?rev=56624&view=rev Log: [RSAENH] * Sync to Wine 1.5.4. Added: trunk/reactos/dll/win32/rsaenh/rsaenh.rgs (with props) trunk/reactos/dll/win32/rsaenh/rsrc.rc (with props) Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt trunk/reactos/dll/win32/rsaenh/handle.c trunk/reactos/dll/win32/rsaenh/handle.h trunk/reactos/dll/win32/rsaenh/implglue.c trunk/reactos/dll/win32/rsaenh/implglue.h trunk/reactos/dll/win32/rsaenh/mpi.c trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Sat May 19 12:34:30 2012 @@ -16,14 +16,13 @@ rsa.c rsaenh.c sha2.c + rsrc.rc version.rc ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) add_library(rsaenh SHARED ${SOURCE}) - set_module_type(rsaenh win32dll) target_link_libraries(rsaenh wine) add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) add_pch(rsaenh tomcrypt.h) - add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/rsaenh/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/handle.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -41,7 +41,7 @@ * Initializes the HANDLETABLE structure pointed to by lpTable * * PARAMS - * lpTable [I] Pointer to the HANDLETABLE structure, which is to be initalized. + * lpTable [I] Pointer to the HANDLETABLE structure, which is to be initialized. * * NOTES * You have to call destroy_handle_table when you don't need the table Modified: trunk/reactos/dll/win32/rsaenh/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.h?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/handle.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/handle.h [iso-8859-1] Sat May 19 12:34:30 2012 @@ -56,15 +56,15 @@ CRITICAL_SECTION mutex; }; -void init_handle_table (struct handle_table *lpTable); -void destroy_handle_table(struct handle_table *lpTable); -int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); -int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy); -int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject); -int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); +void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN; +void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN; +int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; +int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; +int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, - OBJECTHDR **ppObject); + OBJECTHDR **ppObject) DECLSPEC_HIDDEN; #ifdef __cplusplus } Modified: trunk/reactos/dll/win32/rsaenh/implglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/implglue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/implglue.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -482,7 +482,7 @@ } BOOL import_private_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp) + DWORD dwDataLen, DWORD dwPubExp) { BYTE *pbTemp, *pbBigNum; @@ -496,7 +496,7 @@ pbTemp = HeapAlloc(GetProcessHeap(), 0, 2*dwKeyLen+5*((dwKeyLen+1)>>1)); if (!pbTemp) return FALSE; - memcpy(pbTemp, pbSrc, 2*dwKeyLen+5*((dwKeyLen+1)>>1)); + memcpy(pbTemp, pbSrc, min(dwDataLen, 2*dwKeyLen+5*((dwKeyLen+1)>>1))); pbBigNum = pbTemp; pKeyContext->rsa.type = PK_PRIVATE; @@ -518,6 +518,10 @@ reverse_bytes(pbBigNum, (dwKeyLen+1)>>1); mp_read_unsigned_bin(&pKeyContext->rsa.qP, pbBigNum, (dwKeyLen+1)>>1); pbBigNum += (dwKeyLen+1)>>1; + /* The size of the private exponent d is inferred from the remaining + * data length. + */ + dwKeyLen = min(dwKeyLen, dwDataLen - (pbBigNum - pbTemp)); reverse_bytes(pbBigNum, dwKeyLen); mp_read_unsigned_bin(&pKeyContext->rsa.d, pbBigNum, dwKeyLen); mp_set_int(&pKeyContext->rsa.e, dwPubExp); Modified: trunk/reactos/dll/win32/rsaenh/implglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/implglue.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/implglue.h [iso-8859-1] Sat May 19 12:34:30 2012 @@ -72,34 +72,34 @@ rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext); +BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, CONST BYTE *pbData, - DWORD dwDataLen); -BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue); + DWORD dwDataLen) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; BOOL duplicate_hash_impl(ALG_ID aiAlgid, CONST HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext); + HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; -BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen); -BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext); +BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; +BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; BOOL setup_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue); + DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue) DECLSPEC_HIDDEN; BOOL duplicate_key_impl(ALG_ID aiAlgid, CONST KEY_CONTEXT *pSrcKeyContext, - KEY_CONTEXT *pDestKeyContext); + KEY_CONTEXT *pDestKeyContext) DECLSPEC_HIDDEN; /* dwKeySpec is optional for symmetric key algorithms */ BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, CONST BYTE *pbIn, BYTE *pbOut, - DWORD enc); -BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen); + DWORD enc) DECLSPEC_HIDDEN; +BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen) DECLSPEC_HIDDEN; BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp); + DWORD *pdwPubExp) DECLSPEC_HIDDEN; BOOL import_public_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp); + DWORD dwPubExp) DECLSPEC_HIDDEN; BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp); + DWORD *pdwPubExp) DECLSPEC_HIDDEN; BOOL import_private_key_impl(CONST BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp); + DWORD dwDataLen, DWORD dwPubExp) DECLSPEC_HIDDEN; -BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen); +BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) DECLSPEC_HIDDEN; #endif /* __WINE_IMPLGLUE_H */ Modified: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -1412,7 +1412,7 @@ bottom = a->dp + a->used - 1 - b; /* much like mp_rshd this is implemented using a sliding window - * except the window goes the otherway around. Copying from + * except the window goes the other way around. Copying from * the bottom to the top. see bn_mp_rshd.c for more info. */ for (x = a->used - 1; x >= b; x--) { @@ -3663,7 +3663,7 @@ } /* pre-calculate the value required for Barrett reduction - * For a given modulus "b" it calulates the value required in "a" + * For a given modulus "b" it calculates the value required in "a" */ int mp_reduce_setup (mp_int * a, const mp_int * b) { Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -37,8 +37,11 @@ #include "handle.h" #include "implglue.h" #include "objbase.h" +#include "rpcproxy.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); + +static HINSTANCE instance; /****************************************************************************** * CRYPTHASH - hash objects @@ -71,7 +74,7 @@ * CRYPTKEY - key objects */ #define RSAENH_MAGIC_KEY 0x73620457u -#define RSAENH_MAX_KEY_SIZE 48 +#define RSAENH_MAX_KEY_SIZE 64 #define RSAENH_MAX_BLOCK_SIZE 24 #define RSAENH_KEYSTATE_IDLE 0 #define RSAENH_KEYSTATE_ENCRYPTING 1 @@ -102,6 +105,7 @@ BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE]; BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE]; RSAENH_SCHANNEL_INFO siSChannelInfo; + CRYPT_DATA_BLOB blobHmacKey; } CRYPTKEY; /****************************************************************************** @@ -135,6 +139,7 @@ #define RSAENH_HMAC_DEF_IPAD_CHAR 0x36 #define RSAENH_HMAC_DEF_OPAD_CHAR 0x5c #define RSAENH_HMAC_DEF_PAD_LEN 64 +#define RSAENH_HMAC_BLOCK_LEN 64 #define RSAENH_DES_EFFECTIVE_KEYLEN 56 #define RSAENH_DES_STORAGE_KEYLEN 64 #define RSAENH_3DES112_EFFECTIVE_KEYLEN 112 @@ -358,6 +363,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: + instance = hInstance; DisableThreadLibraryCalls(hInstance); init_handle_table(&handle_table); break; @@ -728,6 +734,7 @@ free_key_impl(pCryptKey->aiAlgid, &pCryptKey->context); free_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); free_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); + free_data_blob(&pCryptKey->blobHmacKey); HeapFree(GetProcessHeap(), 0, pCryptKey); } @@ -755,7 +762,7 @@ * * PARAMS * hProv [I] Handle to the provider to which the created key will belong. - * aiAlgid [I] The new key shall use the crypto algorithm idenfied by aiAlgid. + * aiAlgid [I] The new key shall use the crypto algorithm identified by aiAlgid. * dwFlags [I] Upper 16 bits give the key length. * Lower 16 bits: CRYPT_EXPORTABLE, CRYPT_CREATE_SALT, * CRYPT_NO_SALT @@ -821,7 +828,13 @@ return (HCRYPTKEY)INVALID_HANDLE_VALUE; } break; - + + case CALG_HMAC: + /* Avoid the key length check for HMAC keys, which have unlimited + * length. + */ + break; + default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || @@ -853,8 +866,11 @@ pCryptKey->dwSaltLen = 0; memset(pCryptKey->abKeyValue, 0, sizeof(pCryptKey->abKeyValue)); memset(pCryptKey->abInitVector, 0, sizeof(pCryptKey->abInitVector)); + memset(&pCryptKey->siSChannelInfo.saEncAlg, 0, sizeof(pCryptKey->siSChannelInfo.saEncAlg)); + memset(&pCryptKey->siSChannelInfo.saMACAlg, 0, sizeof(pCryptKey->siSChannelInfo.saMACAlg)); init_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); init_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); + init_data_blob(&pCryptKey->blobHmacKey); switch(aiAlgid) { @@ -886,6 +902,11 @@ case CALG_RSA_KEYX: case CALG_RSA_SIGN: pCryptKey->dwBlockLen = dwKeyLen >> 3; + pCryptKey->dwMode = 0; + break; + + case CALG_HMAC: + pCryptKey->dwBlockLen = 0; pCryptKey->dwMode = 0; break; } @@ -1783,7 +1804,7 @@ /****************************************************************************** * CPCreateHash (RSAENH.@) * - * CPCreateHash creates and initalizes a new hash object. + * CPCreateHash creates and initializes a new hash object. * * PARAMS * hProv [I] Handle to the key container to which the new hash will belong. @@ -1836,6 +1857,13 @@ (pCryptKey->aiAlgid != CALG_TLS1_MASTER)) { SetLastError(NTE_BAD_KEY); + return FALSE; + } + if (Algid == CALG_SCHANNEL_MASTER_HASH && + ((!pCryptKey->siSChannelInfo.blobClientRandom.cbData) || + (!pCryptKey->siSChannelInfo.blobServerRandom.cbData))) + { + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1904,7 +1932,7 @@ /****************************************************************************** * CPDestroyHash (RSAENH.@) * - * Releases the handle to a hash object. The object is destroyed if it's reference + * Releases the handle to a hash object. The object is destroyed if its reference * count reaches zero. * * PARAMS @@ -1937,7 +1965,7 @@ /****************************************************************************** * CPDestroyKey (RSAENH.@) * - * Releases the handle to a key object. The object is destroyed if it's reference + * Releases the handle to a key object. The object is destroyed if its reference * count reaches zero. * * PARAMS @@ -1970,7 +1998,7 @@ /****************************************************************************** * CPDuplicateHash (RSAENH.@) * - * Clones a hash object including it's current state. + * Clones a hash object including its current state. * * PARAMS * hUID [I] Handle to the key container the hash belongs to. @@ -2026,7 +2054,7 @@ /****************************************************************************** * CPDuplicateKey (RSAENH.@) * - * Clones a key object including it's current state. + * Clones a key object including its current state. * * PARAMS * hUID [I] Handle to the key container the hash belongs to. @@ -2518,7 +2546,7 @@ pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; *pKeyLen = pCryptKey->dwKeyLen; - memcpy(pbKey, &pCryptKey->abKeyValue, pCryptKey->dwKeyLen); + memcpy(pbKey, pCryptKey->abKeyValue, pCryptKey->dwKeyLen); } *pdwDataLen = dwDataLen; return TRUE; @@ -2690,6 +2718,12 @@ CONST RSAPUBKEY *pRSAPubKey = (CONST RSAPUBKEY*)(pBlobHeader+1); BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2697,11 +2731,27 @@ return FALSE; } - if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY)) || - (pRSAPubKey->magic != RSAENH_MAGIC_RSA2) || - (dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + - (2 * pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)))) - { + if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY))) + { + ERR("datalen %d not long enough for a BLOBHEADER + RSAPUBKEY\n", + dwDataLen); + SetLastError(NTE_BAD_DATA); + return FALSE; + } + if (pRSAPubKey->magic != RSAENH_MAGIC_RSA2) + { + ERR("unexpected magic %08x\n", pRSAPubKey->magic); + SetLastError(NTE_BAD_DATA); + return FALSE; + } + if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)))) + { + DWORD expectedLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)); + + ERR("blob too short for pub key: expect %d, got %d\n", + expectedLen, dwDataLen); SetLastError(NTE_BAD_DATA); return FALSE; } @@ -2710,7 +2760,7 @@ if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; setup_key(pCryptKey); ret = import_private_key_impl((CONST BYTE*)(pRSAPubKey+1), &pCryptKey->context, - pRSAPubKey->bitlen/8, pRSAPubKey->pubexp); + pRSAPubKey->bitlen/8, dwDataLen, pRSAPubKey->pubexp); if (ret) { if (dwFlags & CRYPT_EXPORTABLE) pCryptKey->dwPermissions |= CRYPT_EXPORT; @@ -2766,6 +2816,12 @@ ALG_ID algID; BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2840,6 +2896,12 @@ BYTE *pbDecrypted; DWORD dwKeyLen; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hPubKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pPubKey) || pPubKey->aiAlgid != CALG_RSA_KEYX) { @@ -2915,13 +2977,47 @@ return FALSE; } - *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, *pKeyLen<<19, &pCryptKey); - if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) - return FALSE; - memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); - setup_key(pCryptKey); - if (dwFlags & CRYPT_EXPORTABLE) - pCryptKey->dwPermissions |= CRYPT_EXPORT; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + *phKey = new_key(hProv, CALG_HMAC, 0, &pCryptKey); + if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return FALSE; + if (*pKeyLen <= RSAENH_MIN(sizeof(pCryptKey->abKeyValue), RSAENH_HMAC_BLOCK_LEN)) + { + memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); + pCryptKey->dwKeyLen = *pKeyLen; + } + else + { + CRYPT_DATA_BLOB blobHmacKey = { *pKeyLen, (BYTE *)pbKeyStream }; + + /* In order to initialize an HMAC key, the key material is hashed, + * and the output of the hash function is used as the key material. + * Unfortunately, the way the Crypto API is designed, we don't know + * the hash algorithm yet, so we have to copy the entire key + * material. + */ + if (!copy_data_blob(&pCryptKey->blobHmacKey, &blobHmacKey)) + { + release_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY); + *phKey = (HCRYPTKEY)INVALID_HANDLE_VALUE; + return FALSE; + } + } + setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; + } + else + { + *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, *pKeyLen<<19, &pCryptKey); + if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return FALSE; + memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); + setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; + } return TRUE; } @@ -3022,12 +3118,6 @@ TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); - if (dwFlags & CRYPT_IPSEC_HMAC_KEY) - { - FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); - SetLastError(NTE_BAD_FLAGS); - return FALSE; - } return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); } @@ -3851,6 +3941,12 @@ { /* See RFC 2246, chapter 6.3 Key calculation */ case CALG_SCHANNEL_ENC_KEY: + if (!pMasterKey->siSChannelInfo.saEncAlg.Algid || + !pMasterKey->siSChannelInfo.saEncAlg.cBits) + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } *phKey = new_key(hProv, pMasterKey->siSChannelInfo.saEncAlg.Algid, MAKELONG(LOWORD(dwFlags),pMasterKey->siSChannelInfo.saEncAlg.cBits), &pCryptKey); @@ -4150,6 +4246,29 @@ return FALSE; } + if (pCryptKey->aiAlgid == CALG_HMAC && !pCryptKey->dwKeyLen) { + HCRYPTHASH hKeyHash; + DWORD keyLen; + + if (!RSAENH_CPCreateHash(hProv, ((PHMAC_INFO)pbData)->HashAlgid, 0, 0, + &hKeyHash)) + return FALSE; + if (!RSAENH_CPHashData(hProv, hKeyHash, pCryptKey->blobHmacKey.pbData, + pCryptKey->blobHmacKey.cbData, 0)) + { + RSAENH_CPDestroyHash(hProv, hKeyHash); + return FALSE; + } + keyLen = sizeof(pCryptKey->abKeyValue); + if (!RSAENH_CPGetHashParam(hProv, hKeyHash, HP_HASHVAL, pCryptKey->abKeyValue, + &keyLen, 0)) + { + RSAENH_CPDestroyHash(hProv, hKeyHash); + return FALSE; + } + pCryptKey->dwKeyLen = keyLen; + RSAENH_CPDestroyHash(hProv, hKeyHash); + } for (i=0; i<RSAENH_MIN(pCryptKey->dwKeyLen,pCryptHash->pHMACInfo->cbInnerString); i++) { pCryptHash->pHMACInfo->pbInnerString[i] ^= pCryptKey->abKeyValue[i]; } @@ -4369,204 +4488,39 @@ goto cleanup; } - if (!build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags)) { + if (build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags) && + !memcmp(pbDecrypted, pbConstructed, dwSigLen)) { + res = TRUE; goto cleanup; } - if (memcmp(pbDecrypted, pbConstructed, dwSigLen)) { - SetLastError(NTE_BAD_SIGNATURE); + if (!(dwFlags & CRYPT_NOHASHOID) && + build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags|CRYPT_NOHASHOID) && + !memcmp(pbDecrypted, pbConstructed, dwSigLen)) { + res = TRUE; goto cleanup; } - - res = TRUE; + + SetLastError(NTE_BAD_SIGNATURE); + cleanup: HeapFree(GetProcessHeap(), 0, pbConstructed); HeapFree(GetProcessHeap(), 0, pbDecrypted); return res; } -static const WCHAR szProviderKeys[6][116] = { - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ','B','a','s', - 'e',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d', - ' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ','S','t','r','o','n','g', - ' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'R','S','A',' ','S','C','h','a','n','n','e','l',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r', - ' ','(','P','r','o','t','o','t','y','p','e',')',0 } -}; -static const WCHAR szDefaultKeys[3][65] = { - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','0','1',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','1','2',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','2','4',0 } -}; - - /****************************************************************************** * DllRegisterServer (RSAENH.@) - * - * Dll self registration. - * - * PARAMS - * - * RETURNS - * Success: S_OK. - * Failure: != S_OK - * - * NOTES - * Registers the following keys: - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider\ - * Microsoft Base Cryptographic Provider v1.0 - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider\ - * Microsoft Enhanced Cryptographic Provider - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider\ - * Microsoft Strong Cryptographpic Provider - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider Types\Type 001 */ HRESULT WINAPI DllRegisterServer(void) { - HKEY key; - DWORD dp; - long apiRet; - int i; - - for (i=0; i<6; i++) { - apiRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szProviderKeys[i], 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, &dp); - - if (apiRet == ERROR_SUCCESS) - { - if (dp == REG_CREATED_NEW_KEY) - { - static const WCHAR szImagePath[] = { 'I','m','a','g','e',' ','P','a','t','h',0 }; - static const WCHAR szRSABase[] = { 'r','s','a','e','n','h','.','d','l','l',0 }; - static const WCHAR szType[] = { 'T','y','p','e',0 }; - static const WCHAR szSignature[] = { 'S','i','g','n','a','t','u','r','e',0 }; - DWORD type, sign; - - switch(i) - { - case 3: - type=PROV_RSA_SCHANNEL; - break; - case 4: - case 5: - type=PROV_RSA_AES; - break; - default: - type=PROV_RSA_FULL; - break; - } - sign = 0xdeadbeef; - RegSetValueExW(key, szImagePath, 0, REG_SZ, (const BYTE *)szRSABase, - (lstrlenW(szRSABase) + 1) * sizeof(WCHAR)); - RegSetValueExW(key, szType, 0, REG_DWORD, (LPBYTE)&type, sizeof(type)); - RegSetValueExW(key, szSignature, 0, REG_BINARY, (LPBYTE)&sign, sizeof(sign)); - } - RegCloseKey(key); - } - } - - for (i=0; i<3; i++) { - apiRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szDefaultKeys[i], 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, &dp); - if (apiRet == ERROR_SUCCESS) - { - if (dp == REG_CREATED_NEW_KEY) - { - static const WCHAR szName[] = { 'N','a','m','e',0 }; - static const WCHAR szRSAName[3][54] = { - { 'M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', - 'P','r','o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'M','i','c','r','o','s','o','f','t',' ','R','S','A',' ', - 'S','C','h','a','n','n','e','l',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', - 'P','r','o','v','i','d','e','r',0 }, - { 'M','i','c','r','o','s','o','f','t',' ','E','n','h','a','n','c','e','d',' ', - 'R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', - 'P','r','o','v','i','d','e','r',0 } }; - static const WCHAR szTypeName[] = { 'T','y','p','e','N','a','m','e',0 }; - static const WCHAR szRSATypeName[3][38] = { - { 'R','S','A',' ','F','u','l','l',' ', - '(','S','i','g','n','a','t','u','r','e',' ','a','n','d',' ', - 'K','e','y',' ','E','x','c','h','a','n','g','e',')',0 }, - { 'R','S','A',' ','S','C','h','a','n','n','e','l',0 }, - { 'R','S','A',' ','F','u','l','l',' ','a','n','d',' ','A','E','S',0 } }; - - RegSetValueExW(key, szName, 0, REG_SZ, - (const BYTE *)szRSAName[i], lstrlenW(szRSAName[i])*sizeof(WCHAR)+sizeof(WCHAR)); - RegSetValueExW(key, szTypeName, 0, REG_SZ, - (const BYTE *)szRSATypeName[i], lstrlenW(szRSATypeName[i])*sizeof(WCHAR)+sizeof(WCHAR)); - } - } - RegCloseKey(key); - } - - return HRESULT_FROM_WIN32(apiRet); + return __wine_register_resources( instance ); } /****************************************************************************** * DllUnregisterServer (RSAENH.@) - * - * Dll self unregistration. - * - * PARAMS - * - * RETURNS - * Success: S_OK - * - * NOTES - * For the relevant keys see DllRegisterServer. */ HRESULT WINAPI DllUnregisterServer(void) { - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[0]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[1]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[2]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[3]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[4]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[5]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[0]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[1]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[2]); - return S_OK; -} + return __wine_unregister_resources( instance ); +} Added: trunk/reactos/dll/win32/rsaenh/rsaenh.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.rg… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.rgs (added) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.rgs [iso-8859-1] Sat May 19 12:34:30 2012 @@ -1,0 +1,72 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Cryptography + { + NoRemove Defaults + { + NoRemove Provider + { + ForceRemove 'Microsoft Base Cryptographic Provider v1.0' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 1 + } + ForceRemove 'Microsoft Enhanced Cryptographic Provider v1.0' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 1 + } + ForceRemove 'Microsoft Enhanced RSA and AES Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 24 + } + ForceRemove 'Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 24 + } + ForceRemove 'Microsoft RSA SChannel Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 12 + } + ForceRemove 'Microsoft Strong Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 1 + } + } + NoRemove 'Provider Types' + { + ForceRemove 'Type 001' + { + val 'Name' = s 'Microsoft Enhanced Cryptographic Provider v1.0' + val 'TypeName' = s 'RSA Full (Signature and Key Exchange)' + } + ForceRemove 'Type 012' + { + val 'Name' = s 'Microsoft RSA SChannel Cryptographic Provider' + val 'TypeName' = s 'RSA SChannel' + } + ForceRemove 'Type 024' + { + val 'Name' = s 'Microsoft Enhanced RSA and AES Cryptographic Provider' + val 'TypeName' = s 'RSA Full and AES' + } + } + } + } + } + } +} Propchange: trunk/reactos/dll/win32/rsaenh/rsaenh.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rsaenh/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsrc.rc (added) +++ trunk/reactos/dll/win32/rsaenh/rsrc.rc [iso-8859-1] Sat May 19 12:34:30 2012 @@ -1,0 +1,31 @@ +/* + * Resources for rsaenh + * + * Copyright (c) 2007 Alexandre Julliard + * + * 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 + */ + +/* @makedep: rsaenh.rgs */ +1 WINE_REGISTRY rsaenh.rgs + +#define WINE_FILEDESCRIPTION_STR "Wine rsaenh" +#define WINE_FILENAME_STR "rsaenh.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/rsaenh/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 12:34:30 2012 @@ -143,7 +143,7 @@ reactos/dll/win32/riched32 # Synced to Wine-1.3.37 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync -reactos/dll/win32/rsaenh # Autosync +reactos/dll/win32/rsaenh # Synced to Wine-1.5.4 reactos/dll/win32/sccbase # Synced to Wine-1.3.37 reactos/dll/win32/schannel # Synced to Wine-1.3.37 reactos/dll/win32/secur32 # Forked

1 0

[akhaldi] 56623: [PSTOREC] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 12:06:22 2012 New Revision: 56623 URL: http://svn.reactos.org/svn/reactos?rev=56623&view=rev Log: [PSTOREC] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sat May 19 12:06:22 2012 @@ -298,9 +298,8 @@ const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pProomptInfo, DWORD dwFlags ) { - FIXME("%p %08x %s %s %p %08x %p %08x\n", This, Key, - debugstr_guid(pItemType), debugstr_guid(pItemSubtype), - debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); + FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), + debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); return E_NOTIMPL; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 12:06:22 2012 @@ -135,7 +135,7 @@ reactos/dll/win32/pidgen # Synced to Wine-1.3.37 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.3.37 -reactos/dll/win32/pstorec # Synced to Wine-1.3.37 +reactos/dll/win32/pstorec # Synced to Wine-1.5.4 reactos/dll/win32/query # Synced to Wine-1.3.37 reactos/dll/win32/rasapi32 # Synced to Wine-1.3.37 reactos/dll/win32/resutils # Synced to Wine-1.3.37

1 0

[akhaldi] 56622: [MSCMS_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 11:45:41 2012 New Revision: 56622 URL: http://svn.reactos.org/svn/reactos?rev=56622&view=rev Log: [MSCMS_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/mscms/profile.c Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… ============================================================================== --- trunk/rostests/winetests/mscms/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/profile.c [iso-8859-1] Sat May 19 11:45:41 2012 @@ -131,12 +131,6 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x2d, 0xd3, 0x00, 0x00, 0x20, 0x20, 0x50, 0x48 }; -static LPSTR standardprofile; -static LPWSTR standardprofileW; - -static LPSTR testprofile; -static LPWSTR testprofileW; - #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') static void MSCMS_basenameA( LPCSTR path, LPSTR name ) @@ -227,7 +221,7 @@ ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); } -static void test_GetColorProfileElement(void) +static void test_GetColorProfileElement( char *standardprofile ) { if (standardprofile) { @@ -277,7 +271,7 @@ } } -static void test_GetColorProfileElementTag(void) +static void test_GetColorProfileElementTag( char *standardprofile ) { if (standardprofile) { @@ -318,7 +312,7 @@ } } -static void test_GetColorProfileFromHandle(void) +static void test_GetColorProfileFromHandle( char *testprofile ) { if (testprofile) { @@ -376,7 +370,7 @@ } } -static void test_GetColorProfileHeader(void) +static void test_GetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -417,7 +411,7 @@ } } -static void test_GetCountColorProfileElements(void) +static void test_GetCountColorProfileElements( char *standardprofile ) { if (standardprofile) { @@ -453,7 +447,7 @@ } } -static void test_GetStandardColorSpaceProfileA(void) +static void test_GetStandardColorSpaceProfileA( char *standardprofile ) { BOOL ret; DWORD size; @@ -538,7 +532,7 @@ ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); } -static void test_GetStandardColorSpaceProfileW(void) +static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) { BOOL ret; DWORD size; @@ -644,7 +638,7 @@ ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); } -static void test_EnumColorProfilesA(void) +static void test_EnumColorProfilesA( char *standardprofile ) { BOOL ret; DWORD total, size, number; @@ -698,7 +692,7 @@ HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_EnumColorProfilesW(void) +static void test_EnumColorProfilesW( WCHAR *standardprofileW ) { BOOL ret; DWORD total, size, number; @@ -751,7 +745,7 @@ HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_InstallColorProfileA(void) +static void test_InstallColorProfileA( char *standardprofile, char *testprofile ) { BOOL ret; @@ -808,7 +802,7 @@ } } -static void test_InstallColorProfileW(void) +static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofileW ) { BOOL ret; @@ -865,7 +859,7 @@ } } -static void test_IsColorProfileTagPresent(void) +static void test_IsColorProfileTagPresent( char *standardprofile ) { if (standardprofile) { @@ -905,7 +899,7 @@ } } -static void test_OpenColorProfileA(void) +static void test_OpenColorProfileA( char *standardprofile ) { PROFILE profile; HPROFILE handle; @@ -965,7 +959,7 @@ } } -static void test_OpenColorProfileW(void) +static void test_OpenColorProfileW( WCHAR *standardprofileW ) { PROFILE profile; HPROFILE handle; @@ -1015,7 +1009,7 @@ } } -static void test_SetColorProfileElement(void) +static void test_SetColorProfileElement( char *testprofile ) { if (testprofile) { @@ -1077,7 +1071,7 @@ } } -static void test_SetColorProfileHeader(void) +static void test_SetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -1148,7 +1142,7 @@ } } -static void test_UninstallColorProfileA(void) +static void test_UninstallColorProfileA( char *testprofile ) { BOOL ret; @@ -1196,7 +1190,7 @@ } } -static void test_UninstallColorProfileW(void) +static void test_UninstallColorProfileW( WCHAR *testprofileW ) { BOOL ret; @@ -1248,7 +1242,7 @@ } } -static void test_AssociateColorProfileWithDeviceA(void) +static void test_AssociateColorProfileWithDeviceA( char *testprofile ) { BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; @@ -1331,10 +1325,10 @@ { UINT len; HANDLE handle; - char path[MAX_PATH], file[MAX_PATH]; - char profilefile1[MAX_PATH], profilefile2[MAX_PATH]; - WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH]; - WCHAR fileW[MAX_PATH]; + char path[MAX_PATH], file[MAX_PATH], profilefile1[MAX_PATH], profilefile2[MAX_PATH]; + WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH], fileW[MAX_PATH]; + char *standardprofile = NULL, *testprofile = NULL; + WCHAR *standardprofileW = NULL, *testprofileW = NULL; UINT ret; hmscms = LoadLibraryA( "mscms.dll" ); @@ -1395,10 +1389,8 @@ if (CopyFileA( standardprofile, file, FALSE )) { testprofile = (LPSTR)&file; - len = MultiByteToWideChar( CP_ACP, 0, testprofile, -1, NULL, 0 ); MultiByteToWideChar( CP_ACP, 0, testprofile, -1, fileW, len ); - testprofileW = (LPWSTR)&fileW; } } @@ -1407,40 +1399,37 @@ test_GetColorDirectoryA(); test_GetColorDirectoryW(); - test_GetColorProfileElement(); - test_GetColorProfileElementTag(); - - test_GetColorProfileFromHandle(); - test_GetColorProfileHeader(); - - test_GetCountColorProfileElements(); - - test_GetStandardColorSpaceProfileA(); - test_GetStandardColorSpaceProfileW(); - - test_EnumColorProfilesA(); - test_EnumColorProfilesW(); - - test_InstallColorProfileA(); - test_InstallColorProfileW(); - - test_IsColorProfileTagPresent(); - - test_OpenColorProfileA(); - test_OpenColorProfileW(); - - test_SetColorProfileElement(); - test_SetColorProfileHeader(); - - test_UninstallColorProfileA(); - test_UninstallColorProfileW(); - - test_AssociateColorProfileWithDeviceA(); - - /* Clean up */ - if (testprofile) - DeleteFileA( testprofile ); - + test_GetColorProfileElement( standardprofile ); + test_GetColorProfileElementTag( standardprofile ); + + test_GetColorProfileFromHandle( testprofile ); + test_GetColorProfileHeader( testprofile ); + + test_GetCountColorProfileElements( standardprofile ); + + test_GetStandardColorSpaceProfileA( standardprofile ); + test_GetStandardColorSpaceProfileW( standardprofileW ); + + test_EnumColorProfilesA( standardprofile ); + test_EnumColorProfilesW( standardprofileW ); + + test_InstallColorProfileA( standardprofile, testprofile ); + test_InstallColorProfileW( standardprofileW, testprofileW ); + + test_IsColorProfileTagPresent( standardprofile ); + + test_OpenColorProfileA( standardprofile ); + test_OpenColorProfileW( standardprofileW ); + + test_SetColorProfileElement( testprofile ); + test_SetColorProfileHeader( testprofile ); + + test_UninstallColorProfileA( testprofile ); + test_UninstallColorProfileW( testprofileW ); + + test_AssociateColorProfileWithDeviceA( testprofile ); + + if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); FreeLibrary( hmscms ); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2012