Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 55242: [DDK] * Update drmk.h annotations.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 13:52:36 2012 New Revision: 55242 URL: http://svn.reactos.org/svn/reactos?rev=55242&view=rev Log: [DDK] * Update drmk.h annotations. Modified: trunk/reactos/include/ddk/drmk.h Modified: trunk/reactos/include/ddk/drmk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/drmk.h?rev=552… ============================================================================== --- trunk/reactos/include/ddk/drmk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/drmk.h [iso-8859-1] Fri Jan 27 13:52:36 2012 @@ -32,50 +32,56 @@ extern "C" { #endif +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI DrmAddContentHandlers( - IN ULONG ContentId, - IN PVOID *paHandlers, - IN ULONG NumHandlers); + _In_ ULONG ContentId, + _In_reads_(NumHandlers) PVOID *paHandlers, + _In_ ULONG NumHandlers); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI DrmCreateContentMixed( - IN PULONG paContentId, - IN ULONG cContentId, - OUT PULONG pMixedContentId); + _In_ PULONG paContentId, + _In_ ULONG cContentId, + _Out_ PULONG pMixedContentId); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI DrmDestroyContent( - IN ULONG ContentId); + _In_ ULONG ContentId); NTSTATUS NTAPI DrmForwardContentToDeviceObject( - IN ULONG ContentId, - IN PVOID Reserved, - IN PCDRMFORWARD DrmForward); + _In_ ULONG ContentId, + _In_opt_ PVOID Reserved, + _In_ PCDRMFORWARD DrmForward); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI DrmForwardContentToFileObject( - IN ULONG ContentId, - IN PFILE_OBJECT FileObject); + _In_ ULONG ContentId, + _In_ PFILE_OBJECT FileObject); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI DrmForwardContentToInterface( - IN ULONG ContentId, - IN PUNKNOWN pUnknown, - IN ULONG NumMethods); + _In_ ULONG ContentId, + _In_ PUNKNOWN pUnknown, + _In_ ULONG NumMethods); +_IRQL_requires_max_(PASSIVE_LEVEL) NTSTATUS NTAPI DrmGetContentRights( - IN ULONG ContentId, - OUT PDRMRIGHTS DrmRights); + _In_ ULONG ContentId, + _Out_ PDRMRIGHTS DrmRights); #ifdef __cplusplus } @@ -89,14 +95,14 @@ DECLARE_INTERFACE_(IDrmAudioStream, IUnknown) { STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface + _In_ REFIID InterfaceId, + _Out_ PVOID* Interface ) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(NTSTATUS,SetContentId)(THIS_ - IN ULONG ContentId, - IN PCDRMRIGHTS DrmRights + _In_ ULONG ContentId, + _In_ PCDRMRIGHTS DrmRights ) PURE; }; @@ -104,7 +110,7 @@ #define IMP_IDrmAudioStream \ STDMETHODIMP_(NTSTATUS) SetContentId( \ - IN ULONG ContentId, \ - IN PCDRMRIGHTS DrmRights); + _In_ ULONG ContentId, \ + _In_ PCDRMRIGHTS DrmRights); #endif /* DRMK_H */

1 0

[akhaldi] 55241: [MSG711.ACM] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 13:50:29 2012 New Revision: 55241 URL: http://svn.reactos.org/svn/reactos?rev=55241&view=rev Log: [MSG711.ACM] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] Fri Jan 27 13:50:29 2012 @@ -131,7 +131,7 @@ /*********************************************************************** * R16 * - * Read a 16 bit sample (correctly handles endianess) + * Read a 16 bit sample (correctly handles endianness) */ static inline short R16(const unsigned char* src) { @@ -141,7 +141,7 @@ /*********************************************************************** * W16 * - * Write a 16 bit sample (correctly handles endianess) + * Write a 16 bit sample (correctly handles endianness) */ static inline void W16(unsigned char* dst, short s) { 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] Fri Jan 27 13:50:29 2012 @@ -98,7 +98,7 @@ reactos/dll/win32/mscoree # Autosync reactos/dll/win32/msctf # Autosync reactos/dll/win32/msftedit # Synced to Wine-1.3.37 -reactos/dll/win32/msg711.acm # Autosync +reactos/dll/win32/msg711.acm # Synced to Wine-1.3.37 reactos/dll/win32/msgsm32.acm # Autosync reactos/dll/win32/mshtml # Autosync reactos/dll/win32/msimg32 # Autosync

1 0

[akhaldi] 55240: [INSENG] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 13:43:48 2012 New Revision: 55240 URL: http://svn.reactos.org/svn/reactos?rev=55240&view=rev Log: [INSENG] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/inseng/inseng.idl (with props) trunk/reactos/dll/win32/inseng/inseng.rc (with props) trunk/reactos/dll/win32/inseng/inseng.rgs (with props) Removed: trunk/reactos/dll/win32/inseng/regsvr.c Modified: trunk/reactos/dll/win32/inseng/CMakeLists.txt trunk/reactos/dll/win32/inseng/inseng.rbuild trunk/reactos/dll/win32/inseng/inseng_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inseng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/inseng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/CMakeLists.txt [iso-8859-1] Fri Jan 27 13:43:48 2012 @@ -6,11 +6,12 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(inseng.dll inseng.spec) list(APPEND SOURCE inseng_main.c - regsvr.c + inseng.rc ${CMAKE_CURRENT_BINARY_DIR}/inseng_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/inseng.def) Added: trunk/reactos/dll/win32/inseng/inseng.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.id… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.idl (added) +++ trunk/reactos/dll/win32/inseng/inseng.idl [iso-8859-1] Fri Jan 27 13:43:48 2012 @@ -1,0 +1,33 @@ +/* + * COM Classes for inseng + * + * Copyright 2010 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 + */ + +[ + helpstring("Microsoft Active Setup Engine"), + threading(apartment), + uuid(6e449686-c509-11cf-aafa-00aa00b6015c) +] +coclass ActiveSetupEng { } + +[ + helpstring("Download Site Manager"), + threading(apartment), + uuid(bfc880f1-7484-11d0-8309-00aa00b6015c) +] +coclass DLManager { } Propchange: trunk/reactos/dll/win32/inseng/inseng.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/inseng/inseng.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.rb… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng.rbuild [iso-8859-1] Fri Jan 27 13:43:48 2012 @@ -6,7 +6,7 @@ <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> <file>inseng_main.c</file> - <file>regsvr.c</file> + <file>inseng.rc</file> <library>wine</library> <library>uuid</library> <library>ole32</library> Added: trunk/reactos/dll/win32/inseng/inseng.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.rc… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.rc (added) +++ trunk/reactos/dll/win32/inseng/inseng.rc [iso-8859-1] Fri Jan 27 13:43:48 2012 @@ -1,0 +1,1 @@ +1 WINE_REGISTRY inseng.rgs Propchange: trunk/reactos/dll/win32/inseng/inseng.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/inseng/inseng.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.rg… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.rgs (added) +++ trunk/reactos/dll/win32/inseng/inseng.rgs [iso-8859-1] Fri Jan 27 13:43:48 2012 @@ -1,0 +1,17 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{6E449686-C509-11CF-AAFA-00AA00B6015C}' = s 'Microsoft Active Setup Engine' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + '{BFC880F1-7484-11D0-8309-00AA00B6015C}' = s 'Download Site Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + } +} Propchange: trunk/reactos/dll/win32/inseng/inseng.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/inseng/inseng_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng_ma… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng_main.c [iso-8859-1] Fri Jan 27 13:43:48 2012 @@ -28,11 +28,14 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "rpcproxy.h" #include "initguid.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); + +static HINSTANCE instance; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -41,6 +44,7 @@ case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: @@ -59,9 +63,28 @@ return CLASS_E_CLASSNOTAVAILABLE; } +/*********************************************************************** + * DllCanUnloadNow (INSENG.@) + */ HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (INSENG.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (INSENG.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); } BOOL WINAPI CheckTrustEx( LPVOID a, LPVOID b, LPVOID c, LPVOID d, LPVOID e ) Removed: trunk/reactos/dll/win32/inseng/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/regsvr.c?… ============================================================================== --- trunk/reactos/dll/win32/inseng/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/regsvr.c (removed) @@ -1,501 +1,0 @@ -/* - * self-registerable dll functions for inseng.dll - * - * Copyright (C) 2003 John K. Hohm - * Copyright (C) 2004 Steven Edwards for ReactOS - * - * 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 "wingdi.h" -#include "winreg.h" -#include "winerror.h" - -#include "objbase.h" -#include "initguid.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inseng); - -DEFINE_GUID(CLSID_ActiveSetupEng, 0x6e449686,0xc509,0x11cf,0xaa,0xfa,0x00,0xaa,0x00,0xb6,0x01,0x5c ); -DEFINE_GUID(CLSID_DLManager, 0xBFC880F1,0x7484,0x11D0,0x83,0x09,0x00,0xAA,0x00,0xB6,0x01,0x5C); - -/* - * 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 progid; /* can be NULL to omit */ - LPCSTR viprogid; /* can be NULL to omit */ - LPCSTR progid_extra; /* 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 curver_keyname[7] = { - 'C', 'u', 'r', 'V', 'e', 'r', 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 WCHAR const viprogid_keyname[25] = { - 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', - 'e', 'n', 'd', 'e', 'n', 't', '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); -static LONG register_progid(WCHAR const *clsid, - char const *progid, char const *curver_progid, - char const *name, char const *extra); - -/*********************************************************************** - * 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->progid) { - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->progid, NULL, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->viprogid) { - res = register_key_defvalueA(clsid_key, viprogid_keyname, - list->viprogid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->viprogid, list->progid, - list->name, list->progid_extra); - 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; - } - - if (list->viprogid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); - 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; -} - -/*********************************************************************** - * regsvr_progid - */ -static LONG register_progid( - WCHAR const *clsid, - char const *progid, - char const *curver_progid, - char const *name, - char const *extra) -{ - LONG res; - HKEY progid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) return res; - - if (name) { - res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, - (CONST BYTE*)name, strlen(name) + 1); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (clsid) { - res = register_key_defvalueW(progid_key, clsid_keyname, clsid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (curver_progid) { - res = register_key_defvalueA(progid_key, curver_keyname, - curver_progid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (extra) { - HKEY extra_key; - - res = RegCreateKeyExA(progid_key, extra, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &extra_key, NULL); - if (res == ERROR_SUCCESS) - RegCloseKey(extra_key); - } - -error_close_progid_key: - RegCloseKey(progid_key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static struct regsvr_coclass const coclass_list[] = { - { - &CLSID_ActiveSetupEng, - "Microsoft Active Setup Engine", - NULL, - "inseng.dll", - "Apartment" - }, - { - &CLSID_DLManager, - "Download Site Manager", - NULL, - "inseng.dll", - "Apartment" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * interface list - */ - -static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (INSENG.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = register_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = register_interfaces(interface_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (INSENG.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = unregister_interfaces(interface_list); - return hr; -} 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] Fri Jan 27 13:43:48 2012 @@ -74,7 +74,7 @@ reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/inetmib1 # Autosync reactos/dll/win32/initpki # Autosync -reactos/dll/win32/inseng # Autosync +reactos/dll/win32/inseng # Synced to Wine-1.3.37 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Autosync reactos/dll/win32/itss # Autosync

1 0

[akhaldi] 55239: [HNETCFG] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 13:09:03 2012 New Revision: 55239 URL: http://svn.reactos.org/svn/reactos?rev=55239&view=rev Log: [HNETCFG] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl (with props) trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc (with props) trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs (with props) Removed: trunk/reactos/dll/win32/hnetcfg/regsvr.c Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt trunk/reactos/dll/win32/hnetcfg/apps.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/dll/win32/hnetcfg/manager.c trunk/reactos/dll/win32/hnetcfg/policy.c trunk/reactos/dll/win32/hnetcfg/port.c trunk/reactos/dll/win32/hnetcfg/profile.c trunk/reactos/dll/win32/hnetcfg/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -6,6 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(hnetcfg.dll hnetcfg.spec) list(APPEND SOURCE @@ -15,8 +16,8 @@ policy.c port.c profile.c - regsvr.c service.c + hnetcfg.rc ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def) add_library(hnetcfg SHARED ${SOURCE}) Modified: trunk/reactos/dll/win32/hnetcfg/apps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -36,13 +36,13 @@ typedef struct fw_app { - const INetFwAuthorizedApplicationVtbl *vtbl; + INetFwAuthorizedApplication INetFwAuthorizedApplication_iface; LONG refs; } fw_app; static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) { - return (fw_app *)((char *)iface - FIELD_OFFSET( fw_app, vtbl )); + return CONTAINING_RECORD(iface, fw_app, INetFwAuthorizedApplication_iface); } static ULONG WINAPI fw_app_AddRef( @@ -262,7 +262,7 @@ fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %d\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static const struct INetFwAuthorizedApplicationVtbl fw_app_vtbl = @@ -297,23 +297,23 @@ fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; - fa->vtbl = &fw_app_vtbl; + fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; fa->refs = 1; - *ppObj = &fa->vtbl; + *ppObj = &fa->INetFwAuthorizedApplication_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; } typedef struct fw_apps { - const INetFwAuthorizedApplicationsVtbl *vtbl; + INetFwAuthorizedApplications INetFwAuthorizedApplications_iface; LONG refs; } fw_apps; static inline fw_apps *impl_from_INetFwAuthorizedApplications( INetFwAuthorizedApplications *iface ) { - return (fw_apps *)((char *)iface - FIELD_OFFSET( fw_apps, vtbl )); + return CONTAINING_RECORD(iface, fw_apps, INetFwAuthorizedApplications_iface); } static ULONG WINAPI fw_apps_AddRef( @@ -490,10 +490,10 @@ fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; - fa->vtbl = &fw_apps_vtbl; + fa->INetFwAuthorizedApplications_iface.lpVtbl = &fw_apps_vtbl; fa->refs = 1; - *ppObj = &fa->vtbl; + *ppObj = &fa->INetFwAuthorizedApplications_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpcproxy.h" #include "netfw.h" #include "wine/debug.h" @@ -30,17 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); +static HINSTANCE instance; + typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); typedef struct { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } hnetcfg_cf; static inline hnetcfg_cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (hnetcfg_cf *)((char *)iface - FIELD_OFFSET( hnetcfg_cf, vtbl )); + return CONTAINING_RECORD(iface, hnetcfg_cf, IClassFactory_iface); } static HRESULT WINAPI hnetcfg_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -107,8 +110,8 @@ hnetcfg_cf_LockServer }; -static hnetcfg_cf fw_manager_cf = { &hnetcfg_cf_vtbl, NetFwMgr_create }; -static hnetcfg_cf fw_app_cf = { &hnetcfg_cf_vtbl, NetFwAuthorizedApplication_create }; +static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; +static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -118,6 +121,7 @@ case DLL_WINE_PREATTACH: return FALSE; case DLL_PROCESS_ATTACH: + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: @@ -134,11 +138,11 @@ if (IsEqualGUID( rclsid, &CLSID_NetFwMgr )) { - cf = (IClassFactory *)&fw_manager_cf.vtbl; + cf = &fw_manager_cf.IClassFactory_iface; } else if (IsEqualGUID( rclsid, &CLSID_NetFwAuthorizedApplication )) { - cf = (IClassFactory *)&fw_app_cf.vtbl; + cf = &fw_app_cf.IClassFactory_iface; } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; @@ -149,3 +153,19 @@ { return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer (HNETCFG.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (HNETCFG.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +} Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -1,0 +1,35 @@ +/* + * COM Classes for hnetcfg + * + * Copyright 2010 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 + */ + +[ + helpstring("HNetCfg.FwMgr"), + progid("HNetCfg.FwMgr"), + threading(both), + uuid(304ce942-6e39-40d8-943a-b913c40c9cd4) +] +coclass NetFwMgr { interface INetFwMgr; } + +[ + helpstring("HNetCfg.FwAuthorizedApplication"), + progid("HNetCfg.FwAuthorizedApplication"), + threading(both), + uuid(ec9846b3-2762-4a6b-a214-6acb603462d2) +] +coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; } Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.rbuild [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -14,6 +14,6 @@ <file>policy.c</file> <file>port.c</file> <file>profile.c</file> - <file>regsvr.c</file> <file>service.c</file> + <file>hnetcfg.rc</file> </module> Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -1,0 +1,1 @@ +1 WINE_REGISTRY hnetcfg.rgs Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs (added) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -1,0 +1,27 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{304CE942-6E39-40D8-943A-B913C40C9CD4}' = s 'HNetCfg.FwMgr' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'HNetCfg.FwMgr' + } + '{EC9846B3-2762-4A6B-A214-6ACB603462D2}' = s 'HNetCfg.FwAuthorizedApplication' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'HNetCfg.FwAuthorizedApplication' + } + } + 'HNetCfg.FwMgr' = s 'HNetCfg.FwMgr' + { + CLSID = s '{304CE942-6E39-40D8-943A-B913C40C9CD4}' + } + 'HNetCfg.FwAuthorizedApplication' = s 'HNetCfg.FwAuthorizedApplication' + { + CLSID = s '{EC9846B3-2762-4A6B-A214-6ACB603462D2}' + } +} Propchange: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT NetFwMgr_create(IUnknown *, LPVOID *); -HRESULT NetFwPolicy_create(IUnknown *, LPVOID *); -HRESULT NetFwProfile_create(IUnknown *, LPVOID *); -HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *); -HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *); -HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *); -HRESULT NetFwServices_create(IUnknown *, LPVOID *); +HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwProfile_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/hnetcfg/manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/manager.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/manager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/manager.c [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -37,13 +37,13 @@ typedef struct fw_manager { - const INetFwMgrVtbl *vtbl; + INetFwMgr INetFwMgr_iface; LONG refs; } fw_manager; static inline fw_manager *impl_from_INetFwMgr( INetFwMgr *iface ) { - return (fw_manager *)((char *)iface - FIELD_OFFSET( fw_manager, vtbl )); + return CONTAINING_RECORD(iface, fw_manager, INetFwMgr_iface); } static ULONG WINAPI fw_manager_AddRef( @@ -230,10 +230,10 @@ fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); if (!fm) return E_OUTOFMEMORY; - fm->vtbl = &fw_manager_vtbl; + fm->INetFwMgr_iface.lpVtbl = &fw_manager_vtbl; fm->refs = 1; - *ppObj = &fm->vtbl; + *ppObj = &fm->INetFwMgr_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Modified: trunk/reactos/dll/win32/hnetcfg/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/policy.c… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/policy.c [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -36,13 +36,13 @@ typedef struct fw_policy { - const INetFwPolicyVtbl *vtbl; + INetFwPolicy INetFwPolicy_iface; LONG refs; } fw_policy; static inline fw_policy *impl_from_INetFwPolicy( INetFwPolicy *iface ) { - return (fw_policy *)((char *)iface - FIELD_OFFSET( fw_policy, vtbl )); + return CONTAINING_RECORD(iface, fw_policy, INetFwPolicy_iface); } static ULONG WINAPI fw_policy_AddRef( @@ -186,10 +186,10 @@ fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_policy_vtbl; + fp->INetFwPolicy_iface.lpVtbl = &fw_policy_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwPolicy_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Modified: trunk/reactos/dll/win32/hnetcfg/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/port.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -36,13 +36,13 @@ typedef struct fw_port { - const INetFwOpenPortVtbl *vtbl; + INetFwOpenPort INetFwOpenPort_iface; LONG refs; } fw_port; static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface ) { - return (fw_port *)((char *)iface - FIELD_OFFSET( fw_port, vtbl )); + return CONTAINING_RECORD(iface, fw_port, INetFwOpenPort_iface); } static ULONG WINAPI fw_port_AddRef( @@ -330,10 +330,10 @@ fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_port_vtbl; + fp->INetFwOpenPort_iface.lpVtbl = &fw_port_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwOpenPort_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; @@ -341,13 +341,13 @@ typedef struct fw_ports { - const INetFwOpenPortsVtbl *vtbl; + INetFwOpenPorts INetFwOpenPorts_iface; LONG refs; } fw_ports; static inline fw_ports *impl_from_INetFwOpenPorts( INetFwOpenPorts *iface ) { - return (fw_ports *)((char *)iface - FIELD_OFFSET( fw_ports, vtbl )); + return CONTAINING_RECORD(iface, fw_ports, INetFwOpenPorts_iface); } static ULONG WINAPI fw_ports_AddRef( @@ -536,10 +536,10 @@ fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_ports_vtbl; + fp->INetFwOpenPorts_iface.lpVtbl = &fw_ports_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwOpenPorts_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Modified: trunk/reactos/dll/win32/hnetcfg/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/profile.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/profile.c [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -36,13 +36,13 @@ typedef struct fw_profile { - const INetFwProfileVtbl *vtbl; + INetFwProfile INetFwProfile_iface; LONG refs; } fw_profile; static inline fw_profile *impl_from_INetFwProfile( INetFwProfile *iface ) { - return (fw_profile *)((char *)iface - FIELD_OFFSET( fw_profile, vtbl )); + return CONTAINING_RECORD(iface, fw_profile, INetFwProfile_iface); } static ULONG WINAPI fw_profile_AddRef( @@ -319,10 +319,10 @@ fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_profile_vtbl; + fp->INetFwProfile_iface.lpVtbl = &fw_profile_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwProfile_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; Removed: trunk/reactos/dll/win32/hnetcfg/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/regsvr.c (removed) @@ -1,430 +1,0 @@ -/* - * self-registerable dll functions for hnetcfg.dll - * - * Copyright (C) 2003 John K. Hohm - * - * 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 "netfw.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); - -/* - * 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_NetFwMgr, - "NetFwMgr", - NULL, - "hnetcfg.dll", - "Both" - }, - { &CLSID_NetFwAuthorizedApplication, - "NetFwAuthorizedApplication", - NULL, - "hnetcfg.dll", - "Both" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * interface list - */ -static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (HNETCFG.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = register_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = register_interfaces(interface_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (HNETCFG.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = unregister_interfaces(interface_list); - return hr; -} Modified: trunk/reactos/dll/win32/hnetcfg/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/service.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/service.c [iso-8859-1] Fri Jan 27 13:09:03 2012 @@ -36,13 +36,13 @@ typedef struct fw_service { - const INetFwServiceVtbl *vtbl; + INetFwService INetFwService_iface; LONG refs; } fw_service; static inline fw_service *impl_from_INetFwService( INetFwService *iface ) { - return (fw_service *)((char *)iface - FIELD_OFFSET( fw_service, vtbl )); + return CONTAINING_RECORD(iface, fw_service, INetFwService_iface); } static ULONG WINAPI fw_service_AddRef( @@ -295,10 +295,10 @@ fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_service_vtbl; + fp->INetFwService_iface.lpVtbl = &fw_service_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwService_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; @@ -306,13 +306,13 @@ typedef struct fw_services { - const INetFwServicesVtbl *vtbl; + INetFwServices INetFwServices_iface; LONG refs; } fw_services; static inline fw_services *impl_from_INetFwServices( INetFwServices *iface ) { - return (fw_services *)((char *)iface - FIELD_OFFSET( fw_services, vtbl )); + return CONTAINING_RECORD(iface, fw_services, INetFwServices_iface); } static ULONG WINAPI fw_services_AddRef( @@ -469,10 +469,10 @@ fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_services_vtbl; + fp->INetFwServices_iface.lpVtbl = &fw_services_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwServices_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; 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] Fri Jan 27 13:09:03 2012 @@ -64,7 +64,7 @@ reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Synced to Wine-1.3.37 -reactos/dll/win32/hnetcfg # Autosync +reactos/dll/win32/hnetcfg # Synced to Wine-1.3.37 reactos/dll/win32/httpapi # Synced to Wine-1.3.37 reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10

1 0

[janderwald] 55238: [USBHUB_NEW] - Rewrite GetDeviceIds function - Don't rely on hardcoded constants when building the device id strings - Don't corrupt the device id string when building the insta...
by janderwald＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: janderwald Date: Fri Jan 27 12:29:18 2012 New Revision: 55238 URL: http://svn.reactos.org/svn/reactos?rev=55238&view=rev Log: [USBHUB_NEW] - Rewrite GetDeviceIds function - Don't rely on hardcoded constants when building the device id strings - Don't corrupt the device id string when building the instance id string - Fix bug in GetUsbStringDescriptor which read beyond the allocated string when copying the result. Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Fri Jan 27 12:29:18 2012 @@ -700,6 +700,7 @@ NTSTATUS Status; PUSB_STRING_DESCRIPTOR StringDesc = NULL; ULONG SizeNeeded; + LPWSTR Buffer; StringDesc = ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_STRING_DESCRIPTOR), @@ -777,23 +778,29 @@ // // Allocate Buffer to return // - *TransferBuffer = ExAllocatePoolWithTag(NonPagedPool, - SizeNeeded, - USB_HUB_TAG); - if (!*TransferBuffer) + Buffer = ExAllocatePoolWithTag(NonPagedPool, + SizeNeeded, + USB_HUB_TAG); + if (!Buffer) { DPRINT1("Failed to allocate buffer for string!\n"); ExFreePool(StringDesc); return STATUS_INSUFFICIENT_RESOURCES; } - - RtlZeroMemory(*TransferBuffer, SizeNeeded); + DPRINT1("Buffer %p\n", Buffer); + RtlZeroMemory(Buffer, SizeNeeded); + + DPRINT1("Buffer %p\n", Buffer); + DPRINT1("SizeNeeded %lu\n", SizeNeeded); + DPRINT1("Offset %lu\n", FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); + DPRINT1("Length %lu\n", SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); // // Copy the string to destination // - RtlCopyMemory(*TransferBuffer, StringDesc->bString, SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); + RtlCopyMemory(Buffer, StringDesc->bString, SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bString)); *Size = SizeNeeded; + *TransferBuffer = Buffer; ExFreePool(StringDesc); @@ -852,9 +859,9 @@ PDEVICE_OBJECT UsbChildDeviceObject) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Index; - PWCHAR BufferPtr; - WCHAR Buffer[100]; + ULONG Index = 0; + LPWSTR DeviceString; + WCHAR Buffer[200]; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; @@ -866,27 +873,6 @@ UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)UsbChildDeviceObject->DeviceExtension; // - // Initialize the CompatibleIds String - // - UsbChildExtension->usCompatibleIds.Length = 188; //FIXME - UsbChildExtension->usCompatibleIds.MaximumLength = UsbChildExtension->usCompatibleIds.Length; - - // - // allocate mem for compatible id string - // - BufferPtr = ExAllocatePoolWithTag(NonPagedPool, - UsbChildExtension->usCompatibleIds.Length, - USB_HUB_TAG); - if (!BufferPtr) - { - DPRINT1("Failed to allocate memory\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory(BufferPtr, UsbChildExtension->usCompatibleIds.Length); - Index = 0; - - // // get device descriptor // DeviceDescriptor = &UsbChildExtension->DeviceDesc; @@ -897,9 +883,10 @@ ConfigurationDescriptor = UsbChildExtension->FullConfigDesc; // - // get interface descriptor - // - InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ConfigurationDescriptor + 1); + // use first interface descriptor available + // + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, 0, -1, -1, -1, -1); + ASSERT(InterfaceDescriptor); // // Construct the CompatibleIds @@ -911,17 +898,16 @@ // ASSERT(DeviceDescriptor->bNumConfigurations == 1); ASSERT(ConfigurationDescriptor->bNumInterfaces > 1); - - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x", DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\DevClass_%02x&SubClass_%02x", DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\DevClass_%02x", DeviceDescriptor->bDeviceClass) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\COMPOSITE") + 1; } else @@ -938,85 +924,109 @@ if (DeviceDescriptor->bDeviceClass == 0) { - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", InterfaceDescriptor->bInterfaceClass, InterfaceDescriptor->bInterfaceSubClass, InterfaceDescriptor->bInterfaceProtocol) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x&SubClass_%02x", InterfaceDescriptor->bInterfaceClass, InterfaceDescriptor->bInterfaceSubClass) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x", InterfaceDescriptor->bInterfaceClass) + 1; } else { - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x&SubClass_%02x", DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Class_%02x", DeviceDescriptor->bDeviceClass) + 1; - - - } - } - - BufferPtr[Index] = UNICODE_NULL; - UsbChildExtension->usCompatibleIds.Buffer = BufferPtr; + } + } + + // + // now allocate the buffer + // + DeviceString = ExAllocatePool(NonPagedPool, (Index + 1) * sizeof(WCHAR)); + if (!DeviceString) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + RtlCopyMemory(DeviceString, Buffer, Index * sizeof(WCHAR)); + DeviceString[Index] = UNICODE_NULL; + UsbChildExtension->usCompatibleIds.Buffer = DeviceString; + UsbChildExtension->usCompatibleIds.Length = Index * sizeof(WCHAR); + UsbChildExtension->usCompatibleIds.MaximumLength = (Index + 1) * sizeof(WCHAR); DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds); // - // Initialize the DeviceId String - // - UsbChildExtension->usDeviceId.Length = 44; - UsbChildExtension->usDeviceId.MaximumLength = UsbChildExtension->usDeviceId.Length; - BufferPtr = ExAllocatePoolWithTag(NonPagedPool, - UsbChildExtension->usDeviceId.Length, - USB_HUB_TAG); - if (!BufferPtr) - { - DPRINT1("Failed to allocate memory\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Cleanup; - } - - // - // Construct DeviceId - // - swprintf(BufferPtr, L"USB\\Vid_%04x&Pid_%04x\0", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct); - UsbChildExtension->usDeviceId.Buffer = BufferPtr; + // Construct DeviceId string + // + Index = swprintf(Buffer, L"USB\\Vid_%04x&Pid_%04x", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct) + 1; + + // + // now allocate the buffer + // + DeviceString = ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); + if (!DeviceString) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + RtlCopyMemory(DeviceString, Buffer, Index * sizeof(WCHAR)); + UsbChildExtension->usDeviceId.Buffer = DeviceString; + UsbChildExtension->usDeviceId.Length = (Index-1) * sizeof(WCHAR); + UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR); DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usDeviceId); // - // Initialize the HardwareId String - // - UsbChildExtension->usHardwareIds.Length = 110; - UsbChildExtension->usHardwareIds.MaximumLength = UsbChildExtension->usHardwareIds.Length; - BufferPtr = ExAllocatePoolWithTag(NonPagedPool, UsbChildExtension->usHardwareIds.Length, USB_HUB_TAG); - if (!BufferPtr) - { - DPRINT1("Failed to allocate memory\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Cleanup; - } - - RtlZeroMemory(BufferPtr, UsbChildExtension->usHardwareIds.Length); - - // - // Consturct HardwareIds + // Construct HardwareIds // Index = 0; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Vid_%04x&Pid_%04x&Rev_%04x", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct, UsbChildExtension->DeviceDesc.bcdDevice) + 1; - Index += swprintf(&BufferPtr[Index], + Index += swprintf(&Buffer[Index], L"USB\\Vid_%04x&Pid_%04x", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct) + 1; - BufferPtr[Index] = UNICODE_NULL; - UsbChildExtension->usHardwareIds.Buffer = BufferPtr; + + // + // now allocate the buffer + // + DeviceString = ExAllocatePool(NonPagedPool, (Index + 1) * sizeof(WCHAR)); + if (!DeviceString) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + RtlCopyMemory(DeviceString, Buffer, Index * sizeof(WCHAR)); + DeviceString[Index] = UNICODE_NULL; + UsbChildExtension->usHardwareIds.Buffer = DeviceString; + UsbChildExtension->usHardwareIds.Length = (Index + 1) * sizeof(WCHAR); + UsbChildExtension->usHardwareIds.MaximumLength = (Index + 1) * sizeof(WCHAR); DPRINT1("usHardWareIds %wZ\n", &UsbChildExtension->usHardwareIds); // @@ -1036,7 +1046,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - goto Cleanup; + return Status; } UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; @@ -1056,7 +1066,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - goto Cleanup; + return Status; } UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length; @@ -1073,35 +1083,17 @@ { DPRINT1("Error: failed to allocate %lu bytes\n", Index * sizeof(WCHAR)); Status = STATUS_INSUFFICIENT_RESOURCES; - goto Cleanup; + return Status; } // // copy instance id // RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); - UsbChildExtension->usInstanceId.Length = UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR); + UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); } - - - return Status; - -Cleanup: - // - // Free Memory - // - if (UsbChildExtension->usCompatibleIds.Buffer) - ExFreePool(UsbChildExtension->usCompatibleIds.Buffer); - if (UsbChildExtension->usDeviceId.Buffer) - ExFreePool(UsbChildExtension->usDeviceId.Buffer); - if (UsbChildExtension->usHardwareIds.Buffer) - ExFreePool(UsbChildExtension->usHardwareIds.Buffer); - if (UsbChildExtension->usTextDescription.Buffer) - ExFreePool(UsbChildExtension->usTextDescription.Buffer); - if (UsbChildExtension->usInstanceId.Buffer) - ExFreePool(UsbChildExtension->usInstanceId.Buffer); return Status; } Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Fri Jan 27 12:29:18 2012 @@ -393,9 +393,22 @@ if (SourceString) { - ReturnString = ExAllocatePool(PagedPool, SourceString->Length); - RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->Length); - DPRINT1("%S\n", ReturnString); + // + // allocate buffer + // + ReturnString = ExAllocatePool(PagedPool, SourceString->MaximumLength); + if (!ReturnString) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->MaximumLength); } *Information = (ULONG_PTR)ReturnString;

1 0

[akhaldi] 55237: [HLINK_WINETEST] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 12:14:09 2012 New Revision: 55237 URL: http://svn.reactos.org/svn/reactos?rev=55237&view=rev Log: [HLINK_WINETEST] * Sync to Wine 1.3.37. Modified: trunk/rostests/winetests/hlink/browse_ctx.c trunk/rostests/winetests/hlink/hlink.c Modified: trunk/rostests/winetests/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/browse_ct… ============================================================================== --- trunk/rostests/winetests/hlink/browse_ctx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/browse_ctx.c [iso-8859-1] Fri Jan 27 12:14:09 2012 @@ -23,16 +23,6 @@ #include <hlink.h> #include "wine/test.h" - -/* Win9x and WinMe don't have lstrcmpW */ -static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) -{ - DWORD len1 = lstrlenW(str1); - DWORD len2 = lstrlenW(str2); - - if (len1 != len2) return 1; - return memcmp(str1, str2, len1 * sizeof(WCHAR)); -} static void test_SetInitialHlink(void) { @@ -68,7 +58,7 @@ hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); - ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); + ok(!lstrcmpW(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); CoTaskMemFree(exp_name); CoTaskMemFree(found_name); @@ -124,6 +114,8 @@ hres = IHlinkBrowseContext_GetBrowseWindowInfo(bc, &bwinfo_get); ok(hres == S_OK, "GetBrowseWindowInfo failed: 0x%08x\n", hres); ok(!memcmp(&bwinfo_set, &bwinfo_get, sizeof(HLBWINFO)), "Set and Get differ\n"); + + IHlinkBrowseContext_Release(bc); } START_TEST(browse_ctx) Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… ============================================================================== --- trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] Fri Jan 27 12:14:09 2012 @@ -57,6 +57,14 @@ DEFINE_EXPECT(BindToStorage); DEFINE_EXPECT(GetDisplayName); +DEFINE_EXPECT(ComposeWith); +DEFINE_EXPECT(OnNavigationComplete); +DEFINE_EXPECT(Enum); +DEFINE_EXPECT(Reduce); + +DEFINE_EXPECT(GetClassID); +DEFINE_EXPECT(Save); + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -347,7 +355,6 @@ const unsigned char *data; DWORD i; BOOL same; - unsigned int expected_data_win9x_size = 0; hr = IHlink_QueryInterface(lnk, &IID_IPersistStream, (void **)&ps); ok(hr == S_OK, "IHlink_QueryInterface failed with error 0x%08x\n", hr); @@ -365,13 +372,9 @@ data = GlobalLock(hglobal); - if (expected_data_size % 4) - expected_data_win9x_size = 4 * ((expected_data_size / 4) + 1); - /* first check we have the right amount of data */ ok((data_size == expected_data_size) || - (data_size == expected_data_alt_size) || - broken(data_size == expected_data_win9x_size), /* Win9x and WinMe */ + (data_size == expected_data_alt_size), "%s: Size of saved data differs (expected %d or %d, actual %d)\n", testname, expected_data_size, expected_data_alt_size, data_size); @@ -437,9 +440,9 @@ hr = HlinkCreateFromString(url, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); - ok(hr == S_OK, "IHlinkCreateFromString failed with error 0x%08x\n", hr); + ok(hr == S_OK, "HlinkCreateFromString failed with error 0x%08x\n", hr); if (!lnk) { - skip("Can't create lnk, skipping test_persist. Was wineprefixcreate run properly?\n"); + skip("Can't create lnk, skipping test_persist.\n"); return; } test_persist_save_data("url only", lnk, @@ -449,7 +452,7 @@ hr = HlinkCreateFromString(url, NULL, friendly_name, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); - ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); + ok(hr == S_OK, "HlinkCreateFromString failed with error 0x%08x\n", hr); test_persist_save_data("url + friendly name", lnk, expected_hlink_data2, sizeof(expected_hlink_data2), expected_hlink_data2_ie7, sizeof(expected_hlink_data2_ie7)); @@ -457,7 +460,7 @@ hr = HlinkCreateFromString(url, location, friendly_name, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); - ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); + ok(hr == S_OK, "HlinkCreateFromString failed with error 0x%08x\n", hr); test_persist_save_data("url + friendly_name + location", lnk, expected_hlink_data3, sizeof(expected_hlink_data3), expected_hlink_data3_ie7, sizeof(expected_hlink_data3_ie7)); @@ -465,7 +468,7 @@ hr = HlinkCreateFromString(rel_url, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); - ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); + ok(hr == S_OK, "HlinkCreateFromString failed with error 0x%08x\n", hr); test_persist_save_data("relative url", lnk, expected_hlink_data4, sizeof(expected_hlink_data4), expected_hlink_data4, sizeof(expected_hlink_data4)); @@ -473,7 +476,7 @@ hr = HlinkCreateFromString(url, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); - ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); + ok(hr == S_OK, "HlinkCreateFromString failed with error 0x%08x\n", hr); hr = IHlink_SetTargetFrameName(lnk, target_frame_name); ok(hr == S_OK, "IHlink_SetTargetFrameName failed with error 0x%08x\n", hr); test_persist_save_data("url + target frame name", lnk, @@ -483,7 +486,7 @@ hr = HlinkCreateFromString(filename, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); - ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); + ok(hr == S_OK, "HlinkCreateFromString failed with error 0x%08x\n", hr); test_persist_save_data("filename", lnk, expected_hlink_data6, sizeof(expected_hlink_data6), expected_hlink_data6, sizeof(expected_hlink_data6)); @@ -813,8 +816,9 @@ static HRESULT WINAPI Moniker_GetClassID(IMoniker *iface, CLSID *pClassID) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetClassID); + *pClassID = IID_IUnknown; /* not a valid CLSID */ + return S_OK; } static HRESULT WINAPI Moniker_IsDirty(IMoniker *iface) @@ -831,8 +835,8 @@ static HRESULT WINAPI Moniker_Save(IMoniker *iface, IStream *pStm, BOOL fClearDirty) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(Save); + return S_OK; } static HRESULT WINAPI Moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSize) @@ -876,7 +880,7 @@ static HRESULT WINAPI Moniker_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(Reduce); return E_NOTIMPL; } @@ -889,7 +893,7 @@ static HRESULT WINAPI Moniker_Enum(IMoniker *iface, BOOL fForwrd, IEnumMoniker **ppenumMoniker) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(Enum); return E_NOTIMPL; } @@ -1056,6 +1060,7 @@ ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); @@ -1066,6 +1071,7 @@ ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); @@ -1076,6 +1082,7 @@ ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); @@ -1086,17 +1093,19 @@ ok(hres == E_INVALIDARG, "IHlink_SetMonikerReference should've failed with E_INVALIDARG (0x%08x), failed with 0x%08x\n", E_INVALIDARG, hres); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); CoTaskMemFree(found_loc); /* invalid HLINKSETF flags */ - hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two); /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ - if (0) ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres); + if (0) + IHlink_SetMonikerReference(hlink, 12, dummy2, two); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); @@ -1107,6 +1116,7 @@ ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); @@ -1117,6 +1127,7 @@ ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); ok(found_trgt == NULL, "Found target should've been %p, was: %p\n", NULL, found_trgt); ok(found_loc == NULL, "Found location should've been %s, was: %s\n", wine_dbgstr_w(NULL), wine_dbgstr_w(found_loc)); if(found_trgt) @@ -1244,12 +1255,12 @@ CoTaskMemFree(fnd_tgt); CoTaskMemFree(fnd_loc); - hres = IHlink_SetStringReference(link, 4, NULL, NULL); - /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ - if (0) ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres); - - hres = IHlink_SetStringReference(link, -4, NULL, NULL); - if (0) ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres); + if (0) + { + /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ + IHlink_SetStringReference(link, 4, NULL, NULL); + IHlink_SetStringReference(link, -4, NULL, NULL); + } IHlink_Release(link); } @@ -1440,6 +1451,411 @@ IHlink_Release(hlink); } +} + +static WCHAR site_monikerW[] = {'S','I','T','E','_','M','O','N','I','K','E','R',0}; +static WCHAR ref_monikerW[] = {'R','E','F','_','M','O','N','I','K','E','R',0}; + +static HRESULT WINAPI hls_test_Moniker_BindToStorage(IMoniker *iface, + IBindCtx *pbc, IMoniker *toLeft, REFIID riid, void **obj) +{ + ok(0, "BTS: %p %p %p %p %p\n", iface, pbc, toLeft, riid, obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI hls_site_Moniker_ComposeWith(IMoniker *iface, + IMoniker *right, BOOL onlyIfNotGeneric, IMoniker **composite) +{ + LPOLESTR rightName; + HRESULT hres; + + ok(onlyIfNotGeneric == 0, "Expected onlyIfNotGeneric to be FALSE\n"); + + CHECK_EXPECT(ComposeWith); + + hres = IMoniker_GetDisplayName(right, NULL, NULL, &rightName); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok(!lstrcmpW(rightName, ref_monikerW), + "Expected to get moniker set via SetMonikerReference, instead got: %s\n", + wine_dbgstr_w(rightName)); + CoTaskMemFree(rightName); + + *composite = NULL; + + /* unlikely error code to verify this return result is used */ + return E_OUTOFMEMORY; +} + +static HRESULT WINAPI hls_site_Moniker_GetDisplayName(IMoniker *iface, + IBindCtx *pbc, IMoniker *toLeft, LPOLESTR *displayName) +{ + *displayName = CoTaskMemAlloc(sizeof(site_monikerW)); + memcpy(*displayName, site_monikerW, sizeof(site_monikerW)); + return S_OK; +} + +static HRESULT WINAPI hls_ref_Moniker_GetDisplayName(IMoniker *iface, + IBindCtx *pbc, IMoniker *toLeft, LPOLESTR *displayName) +{ + *displayName = CoTaskMemAlloc(sizeof(ref_monikerW)); + memcpy(*displayName, ref_monikerW, sizeof(ref_monikerW)); + return S_OK; +} + +static HRESULT WINAPI hls_test_Moniker_IsSystemMoniker(IMoniker *iface, + DWORD *mksys) +{ + return S_FALSE; +} + +static IMonikerVtbl hls_site_MonikerVtbl = { + Moniker_QueryInterface, + Moniker_AddRef, + Moniker_Release, + Moniker_GetClassID, + Moniker_IsDirty, + Moniker_Load, + Moniker_Save, + Moniker_GetSizeMax, + Moniker_BindToObject, + hls_test_Moniker_BindToStorage, + Moniker_Reduce, + hls_site_Moniker_ComposeWith, + Moniker_Enum, + Moniker_IsEqual, + Moniker_Hash, + Moniker_IsRunning, + Moniker_GetTimeOfLastChange, + Moniker_Inverse, + Moniker_CommonPrefixWith, + Moniker_RelativePathTo, + hls_site_Moniker_GetDisplayName, + Moniker_ParseDisplayName, + hls_test_Moniker_IsSystemMoniker +}; + +static IMonikerVtbl hls_ref_MonikerVtbl = { + Moniker_QueryInterface, + Moniker_AddRef, + Moniker_Release, + Moniker_GetClassID, + Moniker_IsDirty, + Moniker_Load, + Moniker_Save, + Moniker_GetSizeMax, + Moniker_BindToObject, + hls_test_Moniker_BindToStorage, + Moniker_Reduce, + Moniker_ComposeWith, + Moniker_Enum, + Moniker_IsEqual, + Moniker_Hash, + Moniker_IsRunning, + Moniker_GetTimeOfLastChange, + Moniker_Inverse, + Moniker_CommonPrefixWith, + Moniker_RelativePathTo, + hls_ref_Moniker_GetDisplayName, + Moniker_ParseDisplayName, + hls_test_Moniker_IsSystemMoniker +}; + +static IMoniker hls_site_Moniker = { &hls_site_MonikerVtbl }; +static IMoniker hls_ref_Moniker = { &hls_ref_MonikerVtbl }; + +static HRESULT WINAPI hls_QueryInterface(IHlinkSite *iface, REFGUID iid, + void **obj) +{ + ok(0, "QI: %p %s %p\n", iface, debugstr_guid(iid), obj); + return E_NOTIMPL; +} + +static ULONG WINAPI hls_AddRef(IHlinkSite *iface) +{ + return 2; +} + +static ULONG WINAPI hls_Release(IHlinkSite *iface) +{ + return 1; +} + +static HRESULT WINAPI hls_QueryService(IHlinkSite *iface, DWORD siteData, + REFGUID service, REFIID riid, IUnknown **punk) +{ + ok(0, "QS: %p %x %s %s %p\n", iface, siteData, debugstr_guid(service), + debugstr_guid(riid), punk); + return E_NOTIMPL; +} + +static HRESULT WINAPI hls_GetMoniker(IHlinkSite *iface, DWORD siteData, + DWORD assign, DWORD which, IMoniker **pmk) +{ + ok(siteData == 17, "Expected siteData == 17, got: %d\n", siteData); + *pmk = &hls_site_Moniker; + return S_OK; +} + +static HRESULT WINAPI hls_ReadyToNavigate(IHlinkSite *iface, DWORD siteData, + DWORD reserved) +{ + ok(0, "RTN: %p %x %x\n", iface, siteData, reserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI hls_OnNavigationComplete(IHlinkSite *iface, + DWORD siteData, DWORD reserved, HRESULT error, LPCWSTR errorStr) +{ + CHECK_EXPECT(OnNavigationComplete); + ok(siteData == 17, "Expected siteData == 17, got: %d\n", siteData); + ok(error == E_OUTOFMEMORY, "Expected E_OUTOFMEMORY, got: %08x\n", error); + return E_NOTIMPL; +} + +static IHlinkSiteVtbl HlinkSiteVtbl = { + hls_QueryInterface, + hls_AddRef, + hls_Release, + hls_QueryService, + hls_GetMoniker, + hls_ReadyToNavigate, + hls_OnNavigationComplete +}; + +static IHlinkSite HlinkSite = { &HlinkSiteVtbl }; + +static void test_HlinkSite(void) +{ + IHlink *hl; + IMoniker *mon_ref; + IBindCtx *pbc; + HRESULT hres; + + hres = HlinkCreateFromString(NULL, NULL, NULL, NULL, 0, NULL, + &IID_IHlink, (LPVOID*)&hl); + ok(hres == S_OK, "HlinkCreateFromString failed: %08x\n", hres); + getMonikerRef(hl, NULL, NULL); + + hres = IHlink_SetHlinkSite(hl, &HlinkSite, 17); + ok(hres == S_OK, "SetHlinkSite failed: %08x\n", hres); + getMonikerRef(hl, NULL, NULL); + getStringRef(hl, NULL, NULL); + + hres = IHlink_GetMonikerReference(hl, HLINKGETREF_RELATIVE, &mon_ref, NULL); + ok(hres == S_OK, "GetMonikerReference failed: %08x\n", hres); + ok(mon_ref == NULL, "Didn't get expected moniker, instead: %p\n", mon_ref); + + hres = IHlink_GetMonikerReference(hl, HLINKGETREF_ABSOLUTE, &mon_ref, NULL); + ok(hres == S_OK, "GetMonikerReference failed: %08x\n", hres); + ok(mon_ref == &hls_site_Moniker, "Didn't get expected moniker, instead: %p\n", mon_ref); + + SET_EXPECT(Reduce); + SET_EXPECT(Enum); + hres = IHlink_SetMonikerReference(hl, HLINKSETF_TARGET, &hls_ref_Moniker, NULL); + ok(hres == S_OK, "SetMonikerReference failed: %08x\n", hres); + todo_wine CHECK_CALLED(Reduce); + todo_wine CHECK_CALLED(Enum); + + getMonikerRef(hl, &hls_ref_Moniker, NULL); + + SET_EXPECT(Enum); + getStringRef(hl, ref_monikerW, NULL); + todo_wine CHECK_CALLED(Enum); + + hres = IHlink_GetMonikerReference(hl, HLINKGETREF_RELATIVE, &mon_ref, NULL); + ok(hres == S_OK, "GetMonikerReference failed: %08x\n", hres); + ok(mon_ref == &hls_ref_Moniker, "Didn't get expected moniker, instead: %p\n", mon_ref); + IMoniker_Release(mon_ref); + + SET_EXPECT(ComposeWith); + hres = IHlink_GetMonikerReference(hl, HLINKGETREF_ABSOLUTE, &mon_ref, NULL); + ok(hres == E_OUTOFMEMORY, "Expected E_OUTOFMEMORY, got: %08x\n", hres); + ok(mon_ref == NULL, "Shouldn't have got a Moniker, got: %p\n", mon_ref); + CHECK_CALLED(ComposeWith); + + hres = CreateBindCtx(0, &pbc); + ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); + + SET_EXPECT(ComposeWith); + SET_EXPECT(OnNavigationComplete); + hres = IHlink_Navigate(hl, 0, pbc, NULL, NULL); + ok(hres == E_OUTOFMEMORY, "Navigate should've failed: %08x\n", hres); + CHECK_CALLED(ComposeWith); + CHECK_CALLED(OnNavigationComplete); + + IBindCtx_Release(pbc); + IHlink_Release(hl); + + SET_EXPECT(Reduce); + SET_EXPECT(Enum); + hres = HlinkCreateFromMoniker(&hls_ref_Moniker, NULL, NULL, &HlinkSite, 17, + NULL, &IID_IHlink, (LPVOID*)&hl); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: %08x\n", hres); + todo_wine CHECK_CALLED(Reduce); + todo_wine CHECK_CALLED(Enum); + getMonikerRef(hl, &hls_ref_Moniker, NULL); + IHlink_Release(hl); + + hres = HlinkCreateFromMoniker(NULL, NULL, NULL, &HlinkSite, 17, + NULL, &IID_IHlink, (LPVOID*)&hl); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: %08x\n", hres); + getMonikerRef(hl, NULL, NULL); + IHlink_Release(hl); +} + +static void test_HlinkClone(void) +{ + HRESULT hres; + IHlink *hl, *cloned = NULL; + IMoniker *dummy, *fnd_mk; + IHlinkSite *fnd_site; + WCHAR *fnd_name; + DWORD fnd_data; + const WCHAR one[] = {'1',0}; + const WCHAR two[] = {'2',0}; + const WCHAR name[] = {'a',0}; + + hres = HlinkClone(NULL, NULL, NULL, 0, NULL); + ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + + hres = HlinkCreateFromString(NULL, NULL, NULL, NULL, 0, NULL, + &IID_IHlink, (void**)&hl); + ok(hres == S_OK, "HlinkCreateFromString failed: %08x\n", hres); + + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, NULL); + ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + + if (0) + { + /* crash on Windows XP */ + HlinkClone(hl, NULL, NULL, 0, NULL); + + HlinkClone(hl, NULL, NULL, 0, (void**)&cloned); + } + + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); + ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); + ok(cloned != NULL, "Didn't get a clone\n"); + getMonikerRef(cloned, NULL, NULL); + IHlink_Release(cloned); + + IHlink_Release(hl); + + SET_EXPECT(Reduce); + SET_EXPECT(Enum); + hres = HlinkCreateFromMoniker(&hls_ref_Moniker, two, NULL, NULL, 0, NULL, &IID_IHlink, (void**)&hl); + todo_wine CHECK_CALLED(Reduce); + todo_wine CHECK_CALLED(Enum); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + getMonikerRef(hl, &hls_ref_Moniker, two); + + SET_EXPECT(Save); + SET_EXPECT(GetClassID); + cloned = (IHlink*)0xdeadbeef; + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); + /* fails because of invalid CLSID given by Moniker_GetClassID */ + ok(hres == REGDB_E_CLASSNOTREG, "Wrong error code: %08x\n", hres); + ok(cloned == NULL, "Shouldn't have gotten a clone\n"); + CHECK_CALLED(Save); + CHECK_CALLED(GetClassID); + + IHlink_Release(hl); + + hres = CreateItemMoniker(one, one, &dummy); + ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + + hres = HlinkCreateFromMoniker(dummy, two, name, &HlinkSite, 17, NULL, &IID_IHlink, (void**)&hl); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + getMonikerRef(hl, dummy, two); + + cloned = NULL; + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); + ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); + ok(cloned != NULL, "Should have gotten a clone\n"); + + fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, two); + ok(fnd_mk != NULL, "Expected non-null Moniker\n"); + ok(fnd_mk != dummy, "Expected a new Moniker to be created\n"); + + fnd_name = NULL; + hres = IHlink_GetFriendlyName(cloned, HLFNAMEF_DEFAULT, &fnd_name); + ok(hres == S_OK, "GetFriendlyName failed: %08x\n", hres); + ok(fnd_name != NULL, "Expected friendly name to be non-NULL\n"); + ok(lstrcmpW(fnd_name, name) == 0, "Expected friendly name to be %s, was %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(fnd_name)); + CoTaskMemFree(fnd_name); + + fnd_site = (IHlinkSite*)0xdeadbeef; + fnd_data = 4; + hres = IHlink_GetHlinkSite(cloned, &fnd_site, &fnd_data); + ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); + ok(fnd_site == NULL, "Expected NULL site\n"); + ok(fnd_data == 4, "Expected site data to be 4, was: %d\n", fnd_data); + + IHlink_Release(cloned); + IHlink_Release(hl); + + hres = HlinkCreateFromMoniker(dummy, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void**)&hl); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + getMonikerRef(hl, dummy, NULL); + + cloned = NULL; + hres = HlinkClone(hl, &IID_IHlink, &HlinkSite, 17, (void**)&cloned); + ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); + ok(cloned != NULL, "Should have gotten a clone\n"); + + fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, NULL); + ok(fnd_mk != NULL, "Expected non-null Moniker\n"); + ok(fnd_mk != dummy, "Expected a new Moniker to be created\n"); + + fnd_site = (IHlinkSite*)0xdeadbeef; + fnd_data = 4; + hres = IHlink_GetHlinkSite(cloned, &fnd_site, &fnd_data); + ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); + ok(fnd_site == &HlinkSite, "Expected found site to be HlinkSite, was: %p\n", fnd_site); + ok(fnd_data == 17, "Expected site data to be 17, was: %d\n", fnd_data); + + IHlink_Release(cloned); + IHlink_Release(hl); + + IMoniker_Release(dummy); +} + +static void test_StdHlink(void) +{ + IHlink *hlink; + WCHAR *str; + HRESULT hres; + + static const WCHAR testW[] = {'t','e','s','t',0}; + + hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHlink, (void**)&hlink); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + hres = IHlink_SetTargetFrameName(hlink, testW); + ok(hres == S_OK, "SetTargetFrameName failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_OK, "GetTargetFrameName failed: %08x\n", hres); + ok(!lstrcmpW(str, testW), "str = %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + hres = IHlink_SetTargetFrameName(hlink, NULL); + ok(hres == S_OK, "SetTargetFrameName failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + IHlink_Release(hlink); } START_TEST(hlink) @@ -1457,6 +1873,9 @@ test_HlinkGetSetStringReference(); test_HlinkMoniker(); test_HashLink(); + test_HlinkSite(); + test_HlinkClone(); + test_StdHlink(); CoUninitialize(); }

1 0

[akhaldi] 55236: [HLINK] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 12:14:01 2012 New Revision: 55236 URL: http://svn.reactos.org/svn/reactos?rev=55236&view=rev Log: [HLINK] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/hlink/hlink.rc (with props) trunk/reactos/dll/win32/hlink/hlink.rgs (with props) trunk/reactos/dll/win32/hlink/hlink_classes.idl (with props) Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt trunk/reactos/dll/win32/hlink/browse_ctx.c trunk/reactos/dll/win32/hlink/extserv.c trunk/reactos/dll/win32/hlink/hlink.rbuild trunk/reactos/dll/win32/hlink/hlink.spec trunk/reactos/dll/win32/hlink/hlink_main.c trunk/reactos/dll/win32/hlink/hlink_private.h trunk/reactos/dll/win32/hlink/link.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -2,6 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(hlink.dll hlink.spec) list(APPEND SOURCE @@ -9,6 +10,7 @@ extserv.c hlink_main.c link.c + hlink.rc ${CMAKE_CURRENT_BINARY_DIR}/hlink_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/hlink.def) Modified: trunk/reactos/dll/win32/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/browse_ctx… ============================================================================== --- trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/browse_ctx.c [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -24,43 +24,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); -static const IHlinkBrowseContextVtbl hlvt; - typedef struct { - const IHlinkBrowseContextVtbl *lpVtbl; + IHlinkBrowseContext IHlinkBrowseContext_iface; LONG ref; HLBWINFO* BrowseWindowInfo; IHlink* CurrentPage; } HlinkBCImpl; - -HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, - LPVOID *ppv) -{ - HlinkBCImpl * hl; - - TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); - *ppv = NULL; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - hl = heap_alloc_zero(sizeof(HlinkBCImpl)); - if (!hl) - return E_OUTOFMEMORY; - - hl->ref = 1; - hl->lpVtbl = &hlvt; - - *ppv = hl; - return S_OK; +static inline HlinkBCImpl *impl_from_IHlinkBrowseContext(IHlinkBrowseContext *iface) +{ + return CONTAINING_RECORD(iface, HlinkBCImpl, IHlinkBrowseContext_iface); } static HRESULT WINAPI IHlinkBC_fnQueryInterface( IHlinkBrowseContext *iface, REFIID riid, LPVOID* ppvObj) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppvObj); if (IsEqualIID(riid, &IID_IUnknown) || @@ -77,7 +57,7 @@ static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -87,7 +67,7 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount + 1); @@ -106,7 +86,7 @@ DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) { static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); IMoniker *mon; IMoniker *composite; IRunningObjectTable *ROT; @@ -138,7 +118,7 @@ { HRESULT r = S_OK; IRunningObjectTable *ROT; - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); FIXME("(%p)->(%i)\n", This, dwRegister); @@ -152,7 +132,7 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, HLBWINFO *phlbwi) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE("(%p)->(%p)\n", This, phlbwi); if(!phlbwi) @@ -168,7 +148,7 @@ static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface, HLBWINFO *phlbwi) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE("(%p)->(%p)\n", This, phlbwi); if(!phlbwi) @@ -185,7 +165,7 @@ static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); FIXME("(%p)->(%p %s %s)\n", This, pimkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); @@ -203,7 +183,7 @@ DWORD grfHLNF, IMoniker* pmkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG *puHLID) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); FIXME("(%p)->(%i %p %s %s %p)\n", This, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); @@ -236,7 +216,7 @@ static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, ULONG uHLID, IHlink** ppihl) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE("(%p)->(%x %p)\n", This, uHLID, ppihl); @@ -266,7 +246,7 @@ } static HRESULT WINAPI IHlinkBC_Close(IHlinkBrowseContext* iface, - DWORD reserverd) + DWORD reserved) { FIXME("\n"); return E_NOTIMPL; @@ -292,3 +272,24 @@ IHlinkBC_Clone, IHlinkBC_Close }; + +HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + HlinkBCImpl * hl; + + TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); + *ppv = NULL; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + hl = heap_alloc_zero(sizeof(HlinkBCImpl)); + if (!hl) + return E_OUTOFMEMORY; + + hl->ref = 1; + hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; + + *ppv = hl; + return S_OK; +} Modified: trunk/reactos/dll/win32/hlink/extserv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?… ============================================================================== --- trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -23,13 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); -#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) - typedef struct { - const IUnknownVtbl *lpIUnknownVtbl; - const IAuthenticateVtbl *lpIAuthenticateVtbl; - const IHttpNegotiateVtbl *lpIHttpNegotiateVtbl; - const IExtensionServicesVtbl *lpIExtensionServicesVtbl; + IUnknown IUnknown_iface; + IAuthenticate IAuthenticate_iface; + IHttpNegotiate IHttpNegotiate_iface; + IExtensionServices IExtensionServices_iface; LONG ref; IUnknown *outer; @@ -40,31 +38,29 @@ LPWSTR headers; } ExtensionService; -#define EXTSERVUNK(x) ((IUnknown*)&(x)->lpIUnknownVtbl) -#define AUTHENTICATE(x) (&(x)->lpIAuthenticateVtbl) -#define HTTPNEGOTIATE(x) (&(x)->lpIHttpNegotiateVtbl) -#define EXTENSIONSERVICES(x) (&(x)->lpIExtensionServicesVtbl) - -#define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) +static inline ExtensionService *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, ExtensionService, IUnknown_iface); +} static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ExtensionService *This = EXTSERVUNK_THIS(iface); + ExtensionService *This = impl_from_IUnknown(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = EXTSERVUNK(This); + *ppv = &This->IUnknown_iface; }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate %p)\n", This, ppv); - *ppv = AUTHENTICATE(This); + *ppv = &This->IAuthenticate_iface; }else if(IsEqualGUID(&IID_IHttpNegotiate, riid)) { TRACE("(%p)->(IID_IHttpNegotiate %p)\n", This, ppv); - *ppv = HTTPNEGOTIATE(This); + *ppv = &This->IHttpNegotiate_iface; }else if(IsEqualGUID(&IID_IExtensionServices, riid)) { TRACE("(%p)->(IID_IExtensionServices %p)\n", This, ppv); - *ppv = EXTENSIONSERVICES(This); + *ppv = &This->IExtensionServices_iface; } if(*ppv) { @@ -78,7 +74,7 @@ static ULONG WINAPI ExtServUnk_AddRef(IUnknown *iface) { - ExtensionService *This = EXTSERVUNK_THIS(iface); + ExtensionService *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -88,7 +84,7 @@ static ULONG WINAPI ExtServUnk_Release(IUnknown *iface) { - ExtensionService *This = EXTSERVUNK_THIS(iface); + ExtensionService *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -103,38 +99,39 @@ return ref; } -#undef EXTSERVUNK_THIS - static const IUnknownVtbl ExtServUnkVtbl = { ExtServUnk_QueryInterface, ExtServUnk_AddRef, ExtServUnk_Release }; -#define AUTHENTICATE_THIS(iface) DEFINE_THIS(ExtensionService, IAuthenticate, iface) +static inline ExtensionService *impl_from_IAuthenticate(IAuthenticate *iface) +{ + return CONTAINING_RECORD(iface, ExtensionService, IAuthenticate_iface); +} static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, REFIID riid, void **ppv) { - ExtensionService *This = AUTHENTICATE_THIS(iface); + ExtensionService *This = impl_from_IAuthenticate(iface); return IUnknown_QueryInterface(This->outer, riid, ppv); } static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) { - ExtensionService *This = AUTHENTICATE_THIS(iface); + ExtensionService *This = impl_from_IAuthenticate(iface); return IUnknown_AddRef(This->outer); } static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) { - ExtensionService *This = AUTHENTICATE_THIS(iface); + ExtensionService *This = impl_from_IAuthenticate(iface); return IUnknown_Release(This->outer); } static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, HWND *phwnd, LPWSTR *pszUsername, LPWSTR *pszPassword) { - ExtensionService *This = AUTHENTICATE_THIS(iface); + ExtensionService *This = impl_from_IAuthenticate(iface); TRACE("(%p)->(%p %p %p)\n", This, phwnd, pszUsername, pszPassword); @@ -147,8 +144,6 @@ return S_OK; } - -#undef AUTHENTICATE_THIS static const IAuthenticateVtbl AuthenticateVtbl = { Authenticate_QueryInterface, @@ -157,30 +152,33 @@ Authenticate_Authenticate }; -#define HTTPNEGOTIATE_THIS(iface) DEFINE_THIS(ExtensionService, IHttpNegotiate, iface) +static inline ExtensionService *impl_from_IHttpNegotiate(IHttpNegotiate *iface) +{ + return CONTAINING_RECORD(iface, ExtensionService, IHttpNegotiate_iface); +} static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate *iface, REFIID riid, void **ppv) { - ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + ExtensionService *This = impl_from_IHttpNegotiate(iface); return IUnknown_QueryInterface(This->outer, riid, ppv); } static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate *iface) { - ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + ExtensionService *This = impl_from_IHttpNegotiate(iface); return IUnknown_AddRef(This->outer); } static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate *iface) { - ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + ExtensionService *This = impl_from_IHttpNegotiate(iface); return IUnknown_Release(This->outer); } static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) { - ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + ExtensionService *This = impl_from_IHttpNegotiate(iface); TRACE("(%p)->(%s %s %x %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); @@ -195,7 +193,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD dwResponseCode, LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders) { - ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + ExtensionService *This = impl_from_IHttpNegotiate(iface); TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); @@ -203,8 +201,6 @@ *pszAdditionalRequestHeaders = NULL; return S_OK; } - -#undef HTTPNEGOTIATE_THIS static const IHttpNegotiateVtbl HttpNegotiateVtbl = { HttpNegotiate_QueryInterface, @@ -214,23 +210,26 @@ HttpNegotiate_OnResponse }; -#define EXTENSIONSERVICES_THIS(iface) DEFINE_THIS(ExtensionService, IExtensionServices, iface) +static inline ExtensionService *impl_from_IExtensionServices(IExtensionServices *iface) +{ + return CONTAINING_RECORD(iface, ExtensionService, IExtensionServices_iface); +} static HRESULT WINAPI ExtServ_QueryInterface(IExtensionServices *iface, REFIID riid, void **ppv) { - ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + ExtensionService *This = impl_from_IExtensionServices(iface); return IUnknown_QueryInterface(This->outer, riid, ppv); } static ULONG WINAPI ExtServ_AddRef(IExtensionServices *iface) { - ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + ExtensionService *This = impl_from_IExtensionServices(iface); return IUnknown_AddRef(This->outer); } static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) { - ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + ExtensionService *This = impl_from_IExtensionServices(iface); return IUnknown_Release(This->outer); } @@ -260,7 +259,7 @@ static HRESULT WINAPI ExtServ_SetAdditionalHeaders(IExtensionServices* iface, LPCWSTR pwzAdditionalHeaders) { - ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + ExtensionService *This = impl_from_IExtensionServices(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzAdditionalHeaders)); @@ -281,14 +280,12 @@ static HRESULT WINAPI ExtServ_SetAuthenticateData(IExtensionServices* iface, HWND phwnd, LPCWSTR pwzUsername, LPCWSTR pwzPassword) { - ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + ExtensionService *This = impl_from_IExtensionServices(iface); TRACE("(%p)->(%p %s %s)\n", This, phwnd, debugstr_w(pwzUsername), debugstr_w(pwzPassword)); return ExtServ_ImplSetAuthenticateData(This, phwnd, pwzUsername, pwzPassword); } - -#undef EXTENSIONSERVICES_THIS static const IExtensionServicesVtbl ExtServVtbl = { ExtServ_QueryInterface, @@ -314,10 +311,10 @@ ret = heap_alloc(sizeof(*ret)); - ret->lpIUnknownVtbl = &ExtServUnkVtbl; - ret->lpIAuthenticateVtbl = &AuthenticateVtbl; - ret->lpIHttpNegotiateVtbl = &HttpNegotiateVtbl; - ret->lpIExtensionServicesVtbl= &ExtServVtbl; + ret->IUnknown_iface.lpVtbl = &ExtServUnkVtbl; + ret->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; + ret->IHttpNegotiate_iface.lpVtbl = &HttpNegotiateVtbl; + ret->IExtensionServices_iface.lpVtbl = &ExtServVtbl; ret->ref = 1; ret->headers = NULL; ret->hwnd = NULL; @@ -328,14 +325,14 @@ ExtServ_ImplSetAdditionalHeaders(ret, pwzAdditionalHeaders); if(!punkOuter) { - ret->outer = EXTSERVUNK(ret); - hres = IUnknown_QueryInterface(EXTSERVUNK(ret), riid, ppv); - IUnknown_Release(EXTSERVUNK(ret)); + ret->outer = &ret->IUnknown_iface; + hres = IUnknown_QueryInterface(&ret->IUnknown_iface, riid, ppv); + IUnknown_Release(&ret->IUnknown_iface); }else if(IsEqualGUID(&IID_IUnknown, riid)) { ret->outer = punkOuter; - *ppv = EXTSERVUNK(ret); + *ppv = &ret->IUnknown_iface; }else { - IUnknown_Release(EXTSERVUNK(ret)); + IUnknown_Release(&ret->IUnknown_iface); hres = E_INVALIDARG; } Modified: trunk/reactos/dll/win32/hlink/hlink.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.rbui… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink.rbuild [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -11,6 +11,7 @@ <file>extserv.c</file> <file>hlink_main.c</file> <file>link.c</file> + <file>hlink.rc</file> <pch>hlink_private.h</pch> <library>wine</library> <library>shell32</library> Added: trunk/reactos/dll/win32/hlink/hlink.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.rc?r… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.rc (added) +++ trunk/reactos/dll/win32/hlink/hlink.rc [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -1,0 +1,1 @@ +1 WINE_REGISTRY hlink.rgs Propchange: trunk/reactos/dll/win32/hlink/hlink.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hlink/hlink.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.rgs?… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.rgs (added) +++ trunk/reactos/dll/win32/hlink/hlink.rgs [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -1,0 +1,17 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{79EAC9D0-BAF9-11CE-8C82-00AA004BA90B}' = s 'StdHlink' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + '{79EAC9D1-BAF9-11CE-8C82-00AA004BA90B}' = s 'StdHlinkBrowseContext' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + } +} Propchange: trunk/reactos/dll/win32/hlink/hlink.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hlink/hlink.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.spec… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink.spec [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -30,4 +30,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() -# @ stub -private DllUnregisterServer +@ stdcall -private DllUnregisterServer() Added: trunk/reactos/dll/win32/hlink/hlink_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_clas… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_classes.idl (added) +++ trunk/reactos/dll/win32/hlink/hlink_classes.idl [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -1,0 +1,36 @@ +/* + * COM Classes for hlink + * + * Copyright 2010 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 + */ + +[ + threading(apartment), + uuid(79eac9d0-baf9-11ce-8c82-00aa004ba90b) +] +coclass StdHlink +{ + interface IHlink; + interface IPersistStream; + interface IDataObject; +} + +[ + threading(apartment), + uuid(79eac9d1-baf9-11ce-8c82-00aa004ba90b) +] +coclass StdHlinkBrowseContext { interface IHlinkBrowseContext; } Propchange: trunk/reactos/dll/win32/hlink/hlink_classes.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -21,19 +21,27 @@ #include "hlink_private.h" #include "winreg.h" +#include "rpcproxy.h" #include "hlguids.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); -typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); +static HINSTANCE instance; + +typedef HRESULT (*LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); typedef struct { - const IClassFactoryVtbl *lpVtbl; - LPFNCREATEINSTANCE lpfnCI; + IClassFactory IClassFactory_iface; + LPFNCREATEINSTANCE lpfnCI; } CFImpl; + +static inline CFImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, CFImpl, IClassFactory_iface); +} BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -42,6 +50,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: + instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: @@ -252,14 +261,16 @@ HRESULT r; IHlink *hlink = NULL; - FIXME("%s %s %p %08x %p %08x %p %p %p\n", + TRACE("%s %s %p %08x %p %08x %p %p %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); r = HlinkCreateFromString( pwzTarget, pwzLocation, NULL, pihlsite, dwSiteData, NULL, &IID_IHlink, (LPVOID*) &hlink ); - if (SUCCEEDED(r)) + if (SUCCEEDED(r)) { r = HlinkNavigate(hlink, pihlframe, grfHLNF, pibc, pibsc, pihlbc); + IHlink_Release(hlink); + } return r; } @@ -496,7 +507,7 @@ static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - CFImpl *This = (CFImpl *)iface; + CFImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%s)\n",This,debugstr_guid(riid)); @@ -526,7 +537,7 @@ static HRESULT WINAPI HLinkCF_fnCreateInstance( LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) { - CFImpl *This = (CFImpl *)iface; + CFImpl *This = impl_from_IClassFactory(iface); TRACE("%p->(%p,%s,%p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObject); @@ -550,8 +561,8 @@ HLinkCF_fnLockServer }; -static CFImpl HLink_cf = { &hlcfvt, HLink_Constructor }; -static CFImpl HLinkBrowseContext_cf = { &hlcfvt, HLinkBrowseContext_Constructor }; +static CFImpl HLink_cf = { { &hlcfvt }, HLink_Constructor }; +static CFImpl HLinkBrowseContext_cf = { { &hlcfvt }, HLinkBrowseContext_Constructor }; /*********************************************************************** * DllGetClassObject (HLINK.@) @@ -567,55 +578,27 @@ *ppv = NULL; if (IsEqualIID(rclsid, &CLSID_StdHlink)) - pcf = (IClassFactory*) &HLink_cf; + pcf = &HLink_cf.IClassFactory_iface; else if (IsEqualIID(rclsid, &CLSID_StdHlinkBrowseContext)) - pcf = (IClassFactory*) &HLinkBrowseContext_cf; + pcf = &HLinkBrowseContext_cf.IClassFactory_iface; else return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface(pcf, iid, ppv); } -static HRESULT register_clsid(LPCGUID guid) -{ - static const WCHAR clsid[] = - {'C','L','S','I','D','\\',0}; - static const WCHAR ips[] = - {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; - static const WCHAR hlink[] = - {'h','l','i','n','k','.','d','l','l',0}; - static const WCHAR threading_model[] = - {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; - static const WCHAR apartment[] = - {'A','p','a','r','t','m','e','n','t',0}; - WCHAR path[80]; - HKEY key = NULL; - LONG r; - - lstrcpyW(path, clsid); - StringFromGUID2(guid, &path[6], 80); - lstrcatW(path, ips); - r = RegCreateKeyW(HKEY_CLASSES_ROOT, path, &key); - if (r != ERROR_SUCCESS) - return E_FAIL; - - RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE *)hlink, sizeof hlink); - RegSetValueExW(key, threading_model, 0, REG_SZ, (const BYTE *)apartment, sizeof apartment); - RegCloseKey(key); - - return S_OK; -} - -/*********************************************************************** - * DllRegisterServer (HLINK.@) +/*********************************************************************** + * DllRegisterServer (HLINK.@) */ HRESULT WINAPI DllRegisterServer(void) { - HRESULT r; - - r = register_clsid(&CLSID_StdHlink); - if (SUCCEEDED(r)) - r = register_clsid(&CLSID_StdHlinkBrowseContext); - - return S_OK; -} + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (HLINK.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +} Modified: trunk/reactos/dll/win32/hlink/hlink_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_priv… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_private.h [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -29,8 +29,8 @@ #include "wine/unicode.h" -extern HRESULT WINAPI HLink_Constructor(IUnknown*,REFIID,void**); -extern HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**); +extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; static inline void *heap_alloc(size_t len) { Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Fri Jan 27 12:14:01 2012 @@ -37,17 +37,13 @@ /* known flags */ #define HLINK_SAVE_ALL (HLINK_SAVE_TARGET_FRAME_PRESENT|HLINK_SAVE_FRIENDLY_PRESENT|HLINK_SAVE_LOCATION_PRESENT|0x04|HLINK_SAVE_MONIKER_IS_ABSOLUTE|HLINK_SAVE_MONIKER_PRESENT) -static const IHlinkVtbl hlvt; -static const IPersistStreamVtbl psvt; -static const IDataObjectVtbl dovt; - typedef struct { - const IHlinkVtbl *lpVtbl; + IHlink IHlink_iface; LONG ref; - const IPersistStreamVtbl *lpPSVtbl; - const IDataObjectVtbl *lpDOVtbl; + IPersistStream IPersistStream_iface; + IDataObject IDataObject_iface; LPWSTR FriendlyName; LPWSTR Location; @@ -58,15 +54,20 @@ BOOL absolute; } HlinkImpl; - -static inline HlinkImpl* HlinkImpl_from_IPersistStream( IPersistStream* iface) -{ - return (HlinkImpl*) ((CHAR*)iface - FIELD_OFFSET(HlinkImpl, lpPSVtbl)); -} - -static inline HlinkImpl* HlinkImpl_from_IDataObject( IDataObject* iface) -{ - return (HlinkImpl*) ((CHAR*)iface - FIELD_OFFSET(HlinkImpl, lpDOVtbl)); +static inline HlinkImpl *impl_from_IHlink(IHlink *iface) +{ + return CONTAINING_RECORD(iface, HlinkImpl, IHlink_iface); +} + + +static inline HlinkImpl* impl_from_IPersistStream( IPersistStream* iface) +{ + return CONTAINING_RECORD(iface, HlinkImpl, IPersistStream_iface); +} + +static inline HlinkImpl* impl_from_IDataObject( IDataObject* iface) +{ + return CONTAINING_RECORD(iface, HlinkImpl, IDataObject_iface); } static HRESULT __GetMoniker(HlinkImpl* This, IMoniker** moniker, @@ -105,34 +106,10 @@ return S_OK; } -HRESULT WINAPI HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, - LPVOID *ppv) -{ - HlinkImpl * hl; - - TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); - *ppv = NULL; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - hl = heap_alloc_zero(sizeof(HlinkImpl)); - if (!hl) - return E_OUTOFMEMORY; - - hl->ref = 1; - hl->lpVtbl = &hlvt; - hl->lpPSVtbl = &psvt; - hl->lpDOVtbl = &dovt; - - *ppv = hl; - return S_OK; -} - static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid, LPVOID *ppvObj) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppvObj); @@ -141,9 +118,9 @@ if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) *ppvObj = This; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ppvObj = &(This->lpPSVtbl); + *ppvObj = &This->IPersistStream_iface; else if (IsEqualIID(riid, &IID_IDataObject)) - *ppvObj = &(This->lpDOVtbl); + *ppvObj = &This->IDataObject_iface; if (*ppvObj) { @@ -155,7 +132,7 @@ static ULONG WINAPI IHlink_fnAddRef (IHlink* iface) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -165,7 +142,7 @@ static ULONG WINAPI IHlink_fnRelease (IHlink* iface) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount + 1); @@ -187,7 +164,7 @@ static HRESULT WINAPI IHlink_fnSetHlinkSite( IHlink* iface, IHlinkSite* pihlSite, DWORD dwSiteData) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%p %i)\n", This, pihlSite, dwSiteData); @@ -206,7 +183,7 @@ static HRESULT WINAPI IHlink_fnGetHlinkSite( IHlink* iface, IHlinkSite** ppihlSite, DWORD *pdwSiteData) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%p %p)\n", This, ppihlSite, pdwSiteData); @@ -223,7 +200,7 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, DWORD rfHLSETF, IMoniker *pmkTarget, LPCWSTR pwzLocation) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, debugstr_w(pwzLocation)); @@ -259,7 +236,7 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, DWORD grfHLSETF, LPCWSTR pwzTarget, LPCWSTR pwzLocation) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%i %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), debugstr_w(pwzLocation)); @@ -323,7 +300,7 @@ static HRESULT WINAPI IHlink_fnGetMonikerReference(IHlink* iface, DWORD dwWhichRef, IMoniker **ppimkTarget, LPWSTR *ppwzLocation) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppimkTarget, ppwzLocation); @@ -348,7 +325,7 @@ static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface, DWORD dwWhichRef, LPWSTR *ppwzTarget, LPWSTR *ppwzLocation) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); @@ -396,7 +373,7 @@ static HRESULT WINAPI IHlink_fnSetFriendlyName (IHlink *iface, LPCWSTR pwzFriendlyName) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p) -> (%s)\n", This, debugstr_w(pwzFriendlyName)); @@ -409,7 +386,7 @@ static HRESULT WINAPI IHlink_fnGetFriendlyName (IHlink* iface, DWORD grfHLFNAMEF, LPWSTR* ppwzFriendlyName) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p) -> (%i %p)\n", This, grfHLFNAMEF, ppwzFriendlyName); @@ -445,7 +422,7 @@ static HRESULT WINAPI IHlink_fnSetTargetFrameName(IHlink* iface, LPCWSTR pwzTargetFramename) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzTargetFramename)); heap_free(This->TargetFrameName); @@ -457,10 +434,18 @@ static HRESULT WINAPI IHlink_fnGetTargetFrameName(IHlink* iface, LPWSTR *ppwzTargetFrameName) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%p)\n", This, ppwzTargetFrameName); + + if(!This->TargetFrameName) { + *ppwzTargetFrameName = NULL; + return S_FALSE; + } + *ppwzTargetFrameName = hlink_co_strdupW( This->TargetFrameName ); + if(!*ppwzTargetFrameName) + return E_OUTOFMEMORY; return S_OK; } @@ -474,7 +459,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *pbsc, IHlinkBrowseContext *phbc) { - HlinkImpl *This = (HlinkImpl*)iface; + HlinkImpl *This = impl_from_IHlink(iface); IMoniker *mon = NULL; HRESULT r; @@ -565,23 +550,23 @@ static HRESULT WINAPI IDataObject_fnQueryInterface(IDataObject* iface, REFIID riid, LPVOID *ppvObj) { - HlinkImpl *This = HlinkImpl_from_IDataObject(iface); + HlinkImpl *This = impl_from_IDataObject(iface); TRACE("%p\n", This); - return IHlink_QueryInterface((IHlink*)This, riid, ppvObj); + return IHlink_QueryInterface(&This->IHlink_iface, riid, ppvObj); } static ULONG WINAPI IDataObject_fnAddRef (IDataObject* iface) { - HlinkImpl *This = HlinkImpl_from_IDataObject(iface); + HlinkImpl *This = impl_from_IDataObject(iface); TRACE("%p\n", This); - return IHlink_AddRef((IHlink*)This); + return IHlink_AddRef(&This->IHlink_iface); } static ULONG WINAPI IDataObject_fnRelease (IDataObject* iface) { - HlinkImpl *This = HlinkImpl_from_IDataObject(iface); + HlinkImpl *This = impl_from_IDataObject(iface); TRACE("%p\n", This); - return IHlink_Release((IHlink*)This); + return IHlink_Release(&This->IHlink_iface); } static HRESULT WINAPI IDataObject_fnGetData(IDataObject* iface, @@ -667,29 +652,29 @@ static HRESULT WINAPI IPersistStream_fnQueryInterface(IPersistStream* iface, REFIID riid, LPVOID *ppvObj) { - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + HlinkImpl *This = impl_from_IPersistStream(iface); TRACE("(%p)\n", This); - return IHlink_QueryInterface((IHlink*)This, riid, ppvObj); + return IHlink_QueryInterface(&This->IHlink_iface, riid, ppvObj); } static ULONG WINAPI IPersistStream_fnAddRef (IPersistStream* iface) { - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + HlinkImpl *This = impl_from_IPersistStream(iface); TRACE("(%p)\n", This); - return IHlink_AddRef((IHlink*)This); + return IHlink_AddRef(&This->IHlink_iface); } static ULONG WINAPI IPersistStream_fnRelease (IPersistStream* iface) { - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + HlinkImpl *This = impl_from_IPersistStream(iface); TRACE("(%p)\n", This); - return IHlink_Release((IHlink*)This); + return IHlink_Release(&This->IHlink_iface); } static HRESULT WINAPI IPersistStream_fnGetClassID(IPersistStream* iface, CLSID* pClassID) { - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + HlinkImpl *This = impl_from_IPersistStream(iface); TRACE("(%p)\n", This); *pClassID = CLSID_StdHlink; return S_OK; @@ -763,7 +748,7 @@ HRESULT r; DWORD hdr[2]; DWORD read; - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + HlinkImpl *This = impl_from_IPersistStream(iface); r = IStream_Read(pStm, hdr, sizeof(hdr), &read); if (read != sizeof(hdr) || (hdr[0] != HLINK_SAVE_MAGIC)) @@ -816,7 +801,7 @@ IStream* pStm, BOOL fClearDirty) { HRESULT r; - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + HlinkImpl *This = impl_from_IPersistStream(iface); DWORD hdr[2]; IMoniker *moniker; @@ -887,7 +872,7 @@ ULARGE_INTEGER* pcbSize) { HRESULT r; - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + HlinkImpl *This = impl_from_IPersistStream(iface); IMoniker *moniker; TRACE("(%p) Moniker(%p)\n", This, This->Moniker); @@ -937,3 +922,26 @@ IPersistStream_fnSave, IPersistStream_fnGetSizeMax, }; + +HRESULT HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + HlinkImpl * hl; + + TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); + *ppv = NULL; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + hl = heap_alloc_zero(sizeof(HlinkImpl)); + if (!hl) + return E_OUTOFMEMORY; + + hl->ref = 1; + hl->IHlink_iface.lpVtbl = &hlvt; + hl->IPersistStream_iface.lpVtbl = &psvt; + hl->IDataObject_iface.lpVtbl = &dovt; + + *ppv = hl; + return S_OK; +} 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] Fri Jan 27 12:14:01 2012 @@ -63,7 +63,7 @@ reactos/dll/win32/fusion # Synced to Wine-1.3.37 reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync -reactos/dll/win32/hlink # Autosync +reactos/dll/win32/hlink # Synced to Wine-1.3.37 reactos/dll/win32/hnetcfg # Autosync reactos/dll/win32/httpapi # Synced to Wine-1.3.37 reactos/dll/win32/iccvid # Autosync

1 0

[akhaldi] 55235: [MSCMS_WINETEST] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 11:01:09 2012 New Revision: 55235 URL: http://svn.reactos.org/svn/reactos?rev=55235&view=rev Log: [MSCMS_WINETEST] * Sync to Wine 1.3.37. 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] Fri Jan 27 11:01:09 2012 @@ -30,8 +30,8 @@ #include "wine/test.h" -HMODULE hmscms; -HMODULE huser32; +static HMODULE hmscms; +static HMODULE huser32; static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); @@ -459,39 +459,42 @@ DWORD size; CHAR oldprofile[MAX_PATH]; CHAR newprofile[MAX_PATH]; - const CHAR emptyA[] = ""; - DWORD zero = 0; - DWORD sizeP = sizeof(newprofile); /* Parameter checks */ /* Single invalid parameter checks: */ + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ - ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ - ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &sizeP); + ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &zero); + ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ + size = 0; SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &zero); + ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); @@ -499,15 +502,17 @@ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &zero); + ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ - ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); - else ok( !lstrcmpiA( newprofile, emptyA ) && GetLastError() == 0xfaceabee, + else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Functional checks */ @@ -540,45 +545,55 @@ WCHAR oldprofile[MAX_PATH]; WCHAR newprofile[MAX_PATH]; CHAR newprofileA[MAX_PATH]; - const CHAR empty[] = ""; - DWORD zero = 0; - DWORD sizeP = sizeof(newprofile); /* Parameter checks */ /* Single invalid parameter checks: */ + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ - ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(ret), /* Win98 and WinME */ "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &sizeP); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); - + ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &size); + ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || + broken(GetLastError() == 0xfaceabee) /* win98 */, + "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ - ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, &zero); - ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, &size); + ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ok( GetLastError() == ERROR_MORE_DATA || + GetLastError() == ERROR_INSUFFICIENT_BUFFER || + broken(GetLastError() == 0xfaceabee) /* win98 */, + "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); /* Several invalid parameter checks: */ + size = 0; SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &zero); + ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); @@ -586,18 +601,23 @@ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, NULL, &zero); - ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); - + ret = pGetStandardColorSpaceProfileW(NULL, 0, NULL, &size); + ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == 0xfaceabee) /* win98 */, + "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + + size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); else { WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); - ok( !lstrcmpiA( newprofileA, empty ) && GetLastError() == 0xfaceabee, + ok( !lstrcmpiA( newprofileA, "" ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); } @@ -928,6 +948,16 @@ /* Functional checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + + ret = pCloseColorProfile( handle ); + ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; + profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); + + handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); ret = pCloseColorProfile( handle ); @@ -1328,10 +1358,10 @@ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); ok( lstrlenA(profilefile1) > 0 && lstrlenA(profilefile1) < MAX_PATH, - "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); ok( lstrlenW(profilefile1W) > 0 && lstrlenW(profilefile1W) < MAX_PATH, - "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenW(profilefile1W)); lstrcpyA(profilefile2, profilefile1); lstrcpyW(profilefile2W, profilefile1W);

1 0

[akhaldi] 55234: [MSCMS] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 11:01:06 2012 New Revision: 55234 URL: http://svn.reactos.org/svn/reactos?rev=55234&view=rev Log: [MSCMS] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/mscms/CMakeLists.txt trunk/reactos/dll/win32/mscms/handle.c trunk/reactos/dll/win32/mscms/icc.c trunk/reactos/dll/win32/mscms/mscms.rbuild trunk/reactos/dll/win32/mscms/mscms_priv.h trunk/reactos/dll/win32/mscms/profile.c trunk/reactos/dll/win32/mscms/stub.c trunk/reactos/dll/win32/mscms/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -21,5 +21,4 @@ set_module_type(mscms win32dll) target_link_libraries(mscms wine) add_importlibs(mscms msvcrt advapi32 kernel32 ntdll) -add_pch(mscms mscms_priv.h) add_cd_file(TARGET mscms DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mscms/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/handle.c?r… ============================================================================== --- trunk/reactos/dll/win32/mscms/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/handle.c [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -60,6 +60,8 @@ HeapFree( GetProcessHeap(), 0, transformtable ); transformtable = NULL; num_transform_handles = 0; + + DeleteCriticalSection( &MSCMS_handle_cs ); } struct profile *grab_profile( HPROFILE handle ) Modified: trunk/reactos/dll/win32/mscms/icc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/icc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/mscms/icc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/icc.c [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -33,7 +33,7 @@ #ifdef HAVE_LCMS -static inline void MSCMS_adjust_endianess32( ULONG *ptr ) +static inline void MSCMS_adjust_endianness32( ULONG *ptr ) { #ifndef WORDS_BIGENDIAN *ptr = RtlUlongByteSwap(*ptr); @@ -48,7 +48,7 @@ /* ICC format is big-endian, swap bytes if necessary */ for (i = 0; i < sizeof(PROFILEHEADER) / sizeof(ULONG); i++) - MSCMS_adjust_endianess32( (ULONG *)header + i ); + MSCMS_adjust_endianness32( (ULONG *)header + i ); } void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ) @@ -60,14 +60,14 @@ /* ICC format is big-endian, swap bytes if necessary */ for (i = 0; i < sizeof(icHeader) / sizeof(ULONG); i++) - MSCMS_adjust_endianess32( (ULONG *)iccheader + i ); + MSCMS_adjust_endianness32( (ULONG *)iccheader + i ); } DWORD MSCMS_get_tag_count( const icProfile *iccprofile ) { ULONG count = iccprofile->count; - MSCMS_adjust_endianess32( &count ); + MSCMS_adjust_endianness32( &count ); return count; } @@ -79,9 +79,9 @@ tag->offset = tmp->offset; tag->size = tmp->size; - MSCMS_adjust_endianess32( &tag->sig ); - MSCMS_adjust_endianess32( &tag->offset ); - MSCMS_adjust_endianess32( &tag->size ); + MSCMS_adjust_endianness32( &tag->sig ); + MSCMS_adjust_endianness32( &tag->offset ); + MSCMS_adjust_endianness32( &tag->size ); } void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ) @@ -98,7 +98,7 @@ { DWORD size = ((const icHeader *)iccprofile)->size; - MSCMS_adjust_endianess32( &size ); + MSCMS_adjust_endianness32( &size ); return size; } Modified: trunk/reactos/dll/win32/mscms/mscms.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms.rbui… ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms.rbuild [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -10,7 +10,6 @@ <file>stub.c</file> <file>transform.c</file> <file>version.rc</file> - <pch>mscms_priv.h</pch> <library>wine</library> <library>advapi32</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/mscms/mscms_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms_priv… ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms_priv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms_priv.h [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -87,28 +87,28 @@ cmsHTRANSFORM cmstransform; }; -extern HPROFILE create_profile( struct profile * ); -extern BOOL close_profile( HPROFILE ); +extern HPROFILE create_profile( struct profile * ) DECLSPEC_HIDDEN; +extern BOOL close_profile( HPROFILE ) DECLSPEC_HIDDEN; -extern HTRANSFORM create_transform( struct transform * ); -extern BOOL close_transform( HTRANSFORM ); +extern HTRANSFORM create_transform( struct transform * ) DECLSPEC_HIDDEN; +extern BOOL close_transform( HTRANSFORM ) DECLSPEC_HIDDEN; -struct profile *grab_profile( HPROFILE ); -struct transform *grab_transform( HTRANSFORM ); +struct profile *grab_profile( HPROFILE ) DECLSPEC_HIDDEN; +struct transform *grab_transform( HTRANSFORM ) DECLSPEC_HIDDEN; -void release_profile( struct profile * ); -void release_transform( struct transform * ); +void release_profile( struct profile * ) DECLSPEC_HIDDEN; +void release_transform( struct transform * ) DECLSPEC_HIDDEN; -extern void free_handle_tables( void ); +extern void free_handle_tables( void ) DECLSPEC_HIDDEN; -extern DWORD MSCMS_get_tag_count( const icProfile *iccprofile ); -extern void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ); -extern void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ); -extern void MSCMS_set_tag_data( icProfile *iccprofile, const icTag *tag, DWORD offset, const void *buffer ); -extern void MSCMS_get_profile_header( const icProfile *iccprofile, PROFILEHEADER *header ); -extern void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ); -extern DWORD MSCMS_get_profile_size( const icProfile *iccprofile ); - -extern const char *MSCMS_dbgstr_tag(DWORD); +extern DWORD MSCMS_get_tag_count( const icProfile *iccprofile ) DECLSPEC_HIDDEN; +extern void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ) DECLSPEC_HIDDEN; +extern void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ) DECLSPEC_HIDDEN; +extern void MSCMS_set_tag_data( icProfile *iccprofile, const icTag *tag, DWORD offset, const void *buffer ) DECLSPEC_HIDDEN; +extern void MSCMS_get_profile_header( const icProfile *iccprofile, PROFILEHEADER *header ) DECLSPEC_HIDDEN; +extern void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ) DECLSPEC_HIDDEN; +extern DWORD MSCMS_get_profile_size( const icProfile *iccprofile ) DECLSPEC_HIDDEN; #endif /* HAVE_LCMS */ + +extern const char *MSCMS_dbgstr_tag(DWORD) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?… ============================================================================== --- trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -30,6 +30,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "shlwapi.h" #include "icm.h" #include "mscms_priv.h" @@ -497,7 +498,7 @@ * Failure: FALSE * * NOTES - * The profile header returned will be adjusted for endianess. + * The profile header returned will be adjusted for endianness. */ BOOL WINAPI GetColorProfileHeader( HPROFILE handle, PPROFILEHEADER header ) { @@ -660,9 +661,9 @@ GetColorDirectoryW( machine, rgbprofile, &len ); switch (id) + { case LCS_sRGB: case LCS_WINDOWS_COLOR_SPACE: /* FIXME */ - { lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); @@ -1470,7 +1471,25 @@ if (!flags) return NULL; if (!sharing) sharing = FILE_SHARE_READ; - handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); + if (!PathIsRelativeW( profile->pProfileData )) + handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); + else + { + DWORD size; + WCHAR *path; + + if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) + { + size += (strlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); + if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + GetColorDirectoryW( NULL, path, &size ); + PathAddBackslashW( path ); + strcatW( path, profile->pProfileData ); + } + else return NULL; + handle = CreateFileW( path, flags, sharing, NULL, creation, 0, NULL ); + HeapFree( GetProcessHeap(), 0, path ); + } if (handle == INVALID_HANDLE_VALUE) { WARN( "Unable to open color profile %u\n", GetLastError() ); Modified: trunk/reactos/dll/win32/mscms/stub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/stub.c?rev… ============================================================================== --- trunk/reactos/dll/win32/mscms/stub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/stub.c [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -137,21 +137,21 @@ BOOL WINAPI RegisterCMMA( PCSTR machine, DWORD id, PCSTR dll ) { - FIXME( "( %p, 0x%08x, %p ) stub\n", machine, id, dll ); + FIXME( "( %p, %s, %p ) stub\n", machine, MSCMS_dbgstr_tag(id), dll ); return TRUE; } BOOL WINAPI RegisterCMMW( PCWSTR machine, DWORD id, PCWSTR dll ) { - FIXME( "( %p, 0x%08x, %p ) stub\n", machine, id, dll ); + FIXME( "( %p, %s, %p ) stub\n", machine, MSCMS_dbgstr_tag(id), dll ); return TRUE; } BOOL WINAPI SelectCMM( DWORD id ) { - FIXME( "(%x) stub\n", id ); + FIXME( "(%s) stub\n", MSCMS_dbgstr_tag(id) ); return TRUE; } @@ -190,14 +190,14 @@ BOOL WINAPI UnregisterCMMA( PCSTR machine, DWORD id ) { - FIXME( "( %p, 0x%08x ) stub\n", machine, id ); + FIXME( "( %p, %s ) stub\n", machine, MSCMS_dbgstr_tag(id) ); return TRUE; } BOOL WINAPI UnregisterCMMW( PCWSTR machine, DWORD id ) { - FIXME( "( %p, 0x%08x ) stub\n", machine, id ); - - return TRUE; -} + FIXME( "( %p, %s ) stub\n", machine, MSCMS_dbgstr_tag(id) ); + + return TRUE; +} Modified: trunk/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/transform.… ============================================================================== --- trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] Fri Jan 27 11:01:06 2012 @@ -238,7 +238,7 @@ if (out_format == TYPE_Lab_16) cmsconvert = cmsCreateLabProfile( NULL ); } - cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE *) ); + cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ); if (cmsprofiles) { cmsprofiles[0] = profile0->cmsprofile; @@ -355,8 +355,8 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, COLORTYPE input_type, PCOLOR out, COLORTYPE output_type ) { - BOOL ret = FALSE; -#ifdef HAVE_LCMS +#ifdef HAVE_LCMS + BOOL ret = TRUE; struct transform *transform = grab_transform( handle ); cmsHTRANSFORM xfrm; unsigned int i; @@ -374,78 +374,93 @@ { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].rgb, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; - } + ret = FALSE; + break; + } + break; } case COLOR_Lab: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].Lab, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; - } + ret = FALSE; + break; + } + break; } case COLOR_GRAY: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].gray, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; - } + ret = FALSE; + break; + } + break; } case COLOR_CMYK: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].cmyk, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; - } + ret = FALSE; + break; + } + break; } case COLOR_XYZ: { switch (output_type) { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].XYZ, 1 ); return TRUE; + case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].rgb, 1 ); goto done; + case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].Lab, 1 ); goto done; + case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].gray, 1 ); goto done; + case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].cmyk, 1 ); goto done; + case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( xfrm, &in[i].XYZ, &out[i].XYZ, 1 ); goto done; default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; - } + ret = FALSE; + break; + } + break; } default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - break; - } + ret = FALSE; + break; + } + +done: release_transform( transform ); - -#endif /* HAVE_LCMS */ return ret; -} + +#else /* HAVE_LCMS */ + return FALSE; +#endif /* HAVE_LCMS */ +} 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] Fri Jan 27 11:01:06 2012 @@ -94,7 +94,7 @@ reactos/dll/win32/msacm32 # Autosync reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37 reactos/dll/win32/mscat32 # Autosync -reactos/dll/win32/mscms # Autosync +reactos/dll/win32/mscms # Synced to Wine-1.3.37 reactos/dll/win32/mscoree # Autosync reactos/dll/win32/msctf # Autosync reactos/dll/win32/msftedit # Synced to Wine-1.3.37

1 0

[akhaldi] 55233: [MSFTEDIT] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: akhaldi Date: Fri Jan 27 10:32:23 2012 New Revision: 55233 URL: http://svn.reactos.org/svn/reactos?rev=55233&view=rev Log: [MSFTEDIT] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/msftedit/msftedit.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msftedit/msftedit.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msftedit/msftedi… ============================================================================== --- trunk/reactos/dll/win32/msftedit/msftedit.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msftedit/msftedit.spec [iso-8859-1] Fri Jan 27 10:32:23 2012 @@ -1,9 +1,9 @@ 2 extern IID_IRichEditOle 3 extern IID_IRichEditOleCallback 4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices -5 extern IID_ITextServices -6 extern IID_ITextHost -7 extern IID_ITextHost2 +5 extern IID_ITextServices riched20.IID_ITextServices +6 extern IID_ITextHost riched20.IID_ITextHost +7 extern IID_ITextHost2 riched20.IID_ITextHost2 8 stdcall REExtendedRegisterClass() riched20.REExtendedRegisterClass 9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc 10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc 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] Fri Jan 27 10:32:23 2012 @@ -97,7 +97,7 @@ reactos/dll/win32/mscms # Autosync reactos/dll/win32/mscoree # Autosync reactos/dll/win32/msctf # Autosync -reactos/dll/win32/msftedit # Autosync +reactos/dll/win32/msftedit # Synced to Wine-1.3.37 reactos/dll/win32/msg711.acm # Autosync reactos/dll/win32/msgsm32.acm # Autosync reactos/dll/win32/mshtml # Autosync

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs