Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-11-03 19:05:48 +00:00
parent 0f48f23d19
commit 6a6f52bf66
2 changed files with 71 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/shell32/CMakeLists.txt
View file

@ -43,7 +43,6 @@ list(APPEND SOURCE
shell32.cpp shell32.cpp
shellitem.cpp shellitem.cpp
shelllink.cpp shelllink.cpp
shellreg.cpp
folders/desktop.cpp folders/desktop.cpp
folders/fs.cpp folders/fs.cpp
folders/mycomp.cpp folders/mycomp.cpp
@ -76,6 +75,7 @@ add_library(shell32 SHARED
wine/shellole.c wine/shellole.c
wine/shellord.c wine/shellord.c
wine/shellpath.c wine/shellpath.c
wine/shellreg.c
wine/shellstring.c wine/shellstring.c
wine/shpolicy.c wine/shpolicy.c
vista.c vista.c

43
dll/win32/shell32/shellreg.cpp → dll/win32/shell32/wine/shellreg.c
View file

@ -18,7 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "precomp.h" #include <wine/config.h>
#include <stdio.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <windef.h>
#include <winbase.h>
#include <shlobj.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
@ -26,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
* SHRegOpenKeyA [SHELL32.506] * SHRegOpenKeyA [SHELL32.506]
* *
*/ */
EXTERN_C HRESULT WINAPI SHRegOpenKeyA( HRESULT WINAPI SHRegOpenKeyA(
HKEY hKey, HKEY hKey,
LPSTR lpSubKey, LPSTR lpSubKey,
PHKEY phkResult) PHKEY phkResult)
@ -39,7 +50,7 @@ EXTERN_C HRESULT WINAPI SHRegOpenKeyA(
* SHRegOpenKeyW [SHELL32.507] NT 4.0 * SHRegOpenKeyW [SHELL32.507] NT 4.0
* *
*/ */
EXTERN_C HRESULT WINAPI SHRegOpenKeyW ( HRESULT WINAPI SHRegOpenKeyW (
HKEY hkey, HKEY hkey,
LPCWSTR lpszSubKey, LPCWSTR lpszSubKey,
PHKEY retkey) PHKEY retkey)
@ -52,7 +63,7 @@ EXTERN_C HRESULT WINAPI SHRegOpenKeyW (
* SHRegQueryValueA [SHELL32.508] * 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); TRACE("(%p %s %p %p)\n", hkey, debugstr_a(lpSubKey), lpValue, lpcbValue);
return RegQueryValueA(hkey, lpSubKey, lpValue, (LONG*)lpcbValue); return RegQueryValueA(hkey, lpSubKey, lpValue, (LONG*)lpcbValue);
@ -62,7 +73,7 @@ EXTERN_C HRESULT WINAPI SHRegQueryValueA(HKEY hkey, LPSTR lpSubKey, LPSTR lpValu
* SHRegQueryValueExA [SHELL32.509] * SHRegQueryValueExA [SHELL32.509]
* *
*/ */
EXTERN_C HRESULT WINAPI SHRegQueryValueExA( HRESULT WINAPI SHRegQueryValueExA(
HKEY hkey, HKEY hkey,
LPSTR lpValueName, LPSTR lpValueName,
LPDWORD lpReserved, LPDWORD lpReserved,
@ -78,7 +89,7 @@ EXTERN_C HRESULT WINAPI SHRegQueryValueExA(
* SHRegQueryValueW [SHELL32.510] NT4.0 * SHRegQueryValueW [SHELL32.510] NT4.0
* *
*/ */
EXTERN_C HRESULT WINAPI SHRegQueryValueW( HRESULT WINAPI SHRegQueryValueW(
HKEY hkey, HKEY hkey,
LPWSTR lpszSubKey, LPWSTR lpszSubKey,
LPWSTR lpszData, LPWSTR lpszData,
@ -96,7 +107,7 @@ EXTERN_C HRESULT WINAPI SHRegQueryValueW(
* if the datatype REG_EXPAND_SZ then expand the string and change * if the datatype REG_EXPAND_SZ then expand the string and change
* *pdwType to REG_SZ. * *pdwType to REG_SZ.
*/ */
EXTERN_C HRESULT WINAPI SHRegQueryValueExW ( HRESULT WINAPI SHRegQueryValueExW (
HKEY hkey, HKEY hkey,
LPWSTR pszValue, LPWSTR pszValue,
LPDWORD pdwReserved, LPDWORD pdwReserved,
@ -107,25 +118,14 @@ EXTERN_C HRESULT WINAPI SHRegQueryValueExW (
DWORD ret; DWORD ret;
WARN("%p %s %p %p %p %p semi-stub\n", WARN("%p %s %p %p %p %p semi-stub\n",
hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData); hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData);
ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, (LPBYTE)pvData, pcbData); ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, pvData, pcbData);
return ret; return ret;
} }
/*************************************************************************
* SHRegDeleteKeyA [SHELL32.?]
*/
HRESULT WINAPI SHRegDeleteKeyA(
HKEY hkey,
LPCSTR pszSubKey)
{
FIXME("hkey=%p, %s\n", hkey, debugstr_a(pszSubKey));
return 0;
}
/************************************************************************* /*************************************************************************
* SHRegDeleteKeyW [SHELL32.512] * SHRegDeleteKeyW [SHELL32.512]
*/ */
EXTERN_C HRESULT WINAPI SHRegDeleteKeyW( HRESULT WINAPI SHRegDeleteKeyW(
HKEY hkey, HKEY hkey,
LPCWSTR pszSubKey) LPCWSTR pszSubKey)
{ {
@ -135,8 +135,9 @@ EXTERN_C HRESULT WINAPI SHRegDeleteKeyW(
/************************************************************************* /*************************************************************************
* 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); TRACE("%p\n",hkey);
return RegCloseKey( hkey ); return RegCloseKey( hkey );