From 6a6f52bf662020afbb20d4b7da6fcee1046cd5dc Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 3 Nov 2014 19:05:48 +0000 Subject: [PATCH] [SHELL32] * Move shellreg.cpp to the wine folder. * Rename shellreg.cpp to shellreg.c. * Sync shellreg.c with Wine 1.7.27. CORE-8540 svn path=/branches/shell-experiments/; revision=65232 --- dll/win32/shell32/CMakeLists.txt | 2 +- .../shell32/{shellreg.cpp => wine/shellreg.c} | 139 +++++++++--------- 2 files changed, 71 insertions(+), 70 deletions(-) rename dll/win32/shell32/{shellreg.cpp => wine/shellreg.c} (55%) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 5f6592e3090..c34883d7eb6 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -43,7 +43,6 @@ list(APPEND SOURCE shell32.cpp shellitem.cpp shelllink.cpp - shellreg.cpp folders/desktop.cpp folders/fs.cpp folders/mycomp.cpp @@ -76,6 +75,7 @@ add_library(shell32 SHARED wine/shellole.c wine/shellord.c wine/shellpath.c + wine/shellreg.c wine/shellstring.c wine/shpolicy.c vista.c diff --git a/dll/win32/shell32/shellreg.cpp b/dll/win32/shell32/wine/shellreg.c similarity index 55% rename from dll/win32/shell32/shellreg.cpp rename to dll/win32/shell32/wine/shellreg.c index 600336913b0..297e27ba7bb 100644 --- a/dll/win32/shell32/shellreg.cpp +++ b/dll/win32/shell32/wine/shellreg.c @@ -18,128 +18,129 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include +#include +#include + +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************* - * SHRegOpenKeyA [SHELL32.506] + * SHRegOpenKeyA [SHELL32.506] * */ -EXTERN_C HRESULT WINAPI SHRegOpenKeyA( - HKEY hKey, - LPSTR lpSubKey, - PHKEY phkResult) +HRESULT WINAPI SHRegOpenKeyA( + HKEY hKey, + LPSTR lpSubKey, + PHKEY phkResult) { - TRACE("(%p, %s, %p)\n", hKey, debugstr_a(lpSubKey), phkResult); - return RegOpenKeyA(hKey, lpSubKey, phkResult); + TRACE("(%p, %s, %p)\n", hKey, debugstr_a(lpSubKey), phkResult); + return RegOpenKeyA(hKey, lpSubKey, phkResult); } /************************************************************************* - * SHRegOpenKeyW [SHELL32.507] NT 4.0 + * SHRegOpenKeyW [SHELL32.507] NT 4.0 * */ -EXTERN_C HRESULT WINAPI SHRegOpenKeyW ( - HKEY hkey, - LPCWSTR lpszSubKey, - PHKEY retkey) +HRESULT WINAPI SHRegOpenKeyW ( + HKEY hkey, + LPCWSTR lpszSubKey, + PHKEY retkey) { - WARN("%p %s %p\n",hkey,debugstr_w(lpszSubKey),retkey); - return RegOpenKeyW( hkey, lpszSubKey, retkey ); + WARN("%p %s %p\n",hkey,debugstr_w(lpszSubKey),retkey); + return RegOpenKeyW( hkey, lpszSubKey, retkey ); } /************************************************************************* * SHRegQueryValueA [SHELL32.508] * */ -EXTERN_C HRESULT WINAPI SHRegQueryValueA(HKEY hkey, LPSTR lpSubKey, LPSTR lpValue, LPDWORD lpcbValue) +HRESULT WINAPI SHRegQueryValueA(HKEY hkey, LPSTR lpSubKey, LPSTR lpValue, LPDWORD lpcbValue) { - TRACE("(%p %s %p %p)\n", hkey, debugstr_a(lpSubKey), lpValue, lpcbValue); - return RegQueryValueA(hkey, lpSubKey, lpValue, (LONG*)lpcbValue); + TRACE("(%p %s %p %p)\n", hkey, debugstr_a(lpSubKey), lpValue, lpcbValue); + return RegQueryValueA(hkey, lpSubKey, lpValue, (LONG*)lpcbValue); } /************************************************************************* * SHRegQueryValueExA [SHELL32.509] * */ -EXTERN_C HRESULT WINAPI SHRegQueryValueExA( - HKEY hkey, - LPSTR lpValueName, - LPDWORD lpReserved, - LPDWORD lpType, - LPBYTE lpData, - LPDWORD lpcbData) +HRESULT WINAPI SHRegQueryValueExA( + HKEY hkey, + LPSTR lpValueName, + LPDWORD lpReserved, + LPDWORD lpType, + LPBYTE lpData, + LPDWORD lpcbData) { - TRACE("%p %s %p %p %p %p\n", hkey, lpValueName, lpReserved, lpType, lpData, lpcbData); - return RegQueryValueExA (hkey, lpValueName, lpReserved, lpType, lpData, lpcbData); + TRACE("%p %s %p %p %p %p\n", hkey, lpValueName, lpReserved, lpType, lpData, lpcbData); + return RegQueryValueExA (hkey, lpValueName, lpReserved, lpType, lpData, lpcbData); } /************************************************************************* - * SHRegQueryValueW [SHELL32.510] NT4.0 + * SHRegQueryValueW [SHELL32.510] NT4.0 * */ -EXTERN_C HRESULT WINAPI SHRegQueryValueW( - HKEY hkey, - LPWSTR lpszSubKey, - LPWSTR lpszData, - LPDWORD lpcbData ) +HRESULT WINAPI SHRegQueryValueW( + HKEY hkey, + LPWSTR lpszSubKey, + LPWSTR lpszData, + LPDWORD lpcbData ) { - WARN("%p %s %p %p semi-stub\n", - hkey, debugstr_w(lpszSubKey), lpszData, lpcbData); - return RegQueryValueW( hkey, lpszSubKey, lpszData, (LONG*)lpcbData ); + WARN("%p %s %p %p semi-stub\n", + hkey, debugstr_w(lpszSubKey), lpszData, lpcbData); + return RegQueryValueW( hkey, lpszSubKey, lpszData, (LONG*)lpcbData ); } /************************************************************************* - * SHRegQueryValueExW [SHELL32.511] NT4.0 + * SHRegQueryValueExW [SHELL32.511] NT4.0 * * FIXME * if the datatype REG_EXPAND_SZ then expand the string and change * *pdwType to REG_SZ. */ -EXTERN_C HRESULT WINAPI SHRegQueryValueExW ( - HKEY hkey, - LPWSTR pszValue, - LPDWORD pdwReserved, - LPDWORD pdwType, - LPVOID pvData, - LPDWORD pcbData) +HRESULT WINAPI SHRegQueryValueExW ( + HKEY hkey, + LPWSTR pszValue, + LPDWORD pdwReserved, + LPDWORD pdwType, + LPVOID pvData, + LPDWORD pcbData) { - DWORD ret; - WARN("%p %s %p %p %p %p semi-stub\n", - hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData); - ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, (LPBYTE)pvData, pcbData); - return ret; -} - -/************************************************************************* - * SHRegDeleteKeyA [SHELL32.?] - */ -HRESULT WINAPI SHRegDeleteKeyA( - HKEY hkey, - LPCSTR pszSubKey) -{ - FIXME("hkey=%p, %s\n", hkey, debugstr_a(pszSubKey)); - return 0; + DWORD ret; + WARN("%p %s %p %p %p %p semi-stub\n", + hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData); + ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, pvData, pcbData); + return ret; } /************************************************************************* * SHRegDeleteKeyW [SHELL32.512] */ -EXTERN_C HRESULT WINAPI SHRegDeleteKeyW( - HKEY hkey, - LPCWSTR pszSubKey) +HRESULT WINAPI SHRegDeleteKeyW( + HKEY hkey, + LPCWSTR pszSubKey) { - FIXME("hkey=%p, %s\n", hkey, debugstr_w(pszSubKey)); - return 0; + FIXME("hkey=%p, %s\n", hkey, debugstr_w(pszSubKey)); + return 0; } /************************************************************************* - * SHRegCloseKey [SHELL32.505] NT 4.0 + * SHRegCloseKey [SHELL32.505] NT 4.0 + * */ -EXTERN_C HRESULT WINAPI SHRegCloseKey (HKEY hkey) +HRESULT WINAPI SHRegCloseKey (HKEY hkey) { - TRACE("%p\n",hkey); - return RegCloseKey( hkey ); + TRACE("%p\n",hkey); + return RegCloseKey( hkey ); } /*************************************************************************