marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Janitorial. Get rid of W->A calls.

oldstable
Tony Lambregts 2003-03-14 04:50:34 +00:00 committed by Alexandre Julliard
parent 7ce3a5ad63
commit 4550b8b7cf
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/advapi32/Makefile.in
View File

@ -5,6 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = advapi32.dll MODULE = advapi32.dll
IMPORTS = kernel32 ntdll IMPORTS = kernel32 ntdll
EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o

46
dlls/advapi32/registry.c
View File

@ -1536,39 +1536,42 @@ LONG WINAPI RegLoadKeyA( HKEY hkey, LPCSTR subkey, LPCSTR filename )
/****************************************************************************** /******************************************************************************
* RegSaveKeyA [ADVAPI32.@] * RegSaveKeyW [ADVAPI32.@]
* *
* PARAMS * PARAMS
* hkey [I] Handle of key where save begins * hkey [I] Handle of key where save begins
* lpFile [I] Address of filename to save to * lpFile [I] Address of filename to save to
* sa [I] Address of security structure * sa [I] Address of security structure
*/ */
LONG WINAPI RegSaveKeyA( HKEY hkey, LPCSTR file, LPSECURITY_ATTRIBUTES sa ) LONG WINAPI RegSaveKeyW( HKEY hkey, LPCWSTR file, LPSECURITY_ATTRIBUTES sa )
{ {
char buffer[1024]; static const WCHAR format[] =
{'r','e','g','%','0','4','x','.','t','m','p',0};
WCHAR buffer[MAX_PATH];
int count = 0; int count = 0;
LPSTR name; LPWSTR nameW;
DWORD ret, err; DWORD ret, err;
HANDLE handle; HANDLE handle;
TRACE( "(%p,%s,%p)\n", hkey, debugstr_a(file), sa ); TRACE( "(%p,%s,%p)\n", hkey, debugstr_w(file), sa );
if (!file || !*file) return ERROR_INVALID_PARAMETER; if (!file || !*file) return ERROR_INVALID_PARAMETER;
if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;
err = GetLastError(); err = GetLastError();
GetFullPathNameA( file, sizeof(buffer), buffer, &name ); GetFullPathNameW( file, sizeof(buffer)/sizeof(WCHAR), buffer, &nameW );
for (;;) for (;;)
{ {
sprintf( name, "reg%04x.tmp", count++ ); snprintfW( nameW, 16, format, count++ );
handle = CreateFileA( buffer, GENERIC_WRITE, 0, NULL, handle = CreateFileW( buffer, GENERIC_WRITE, 0, NULL,
CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 );
if (handle != INVALID_HANDLE_VALUE) break; if (handle != INVALID_HANDLE_VALUE) break;
if ((ret = GetLastError()) != ERROR_ALREADY_EXISTS) goto done; if ((ret = GetLastError()) != ERROR_ALREADY_EXISTS) goto done;
/* Something gone haywire ? Please report if this happens abnormally */ /* Something gone haywire ? Please report if this happens abnormally */
if (count >= 100) if (count >= 100)
MESSAGE("Wow, we are already fiddling with a temp file %s with an ordinal as high as %d !\nYou might want to delete all corresponding temp files in that directory.\n", buffer, count); MESSAGE("Wow, we are already fiddling with a temp file %s with an ordinal as high as %d !\nYou might want to delete all corresponding temp files in that directory.\n", debugstr_w(buffer), count);
} }
SERVER_START_REQ( save_registry ) SERVER_START_REQ( save_registry )
@ -1582,13 +1585,14 @@ LONG WINAPI RegSaveKeyA( HKEY hkey, LPCSTR file, LPSECURITY_ATTRIBUTES sa )
CloseHandle( handle ); CloseHandle( handle );
if (!ret) if (!ret)
{ {
if (!MoveFileExA( buffer, file, MOVEFILE_REPLACE_EXISTING )) if (!MoveFileExW( buffer, file, MOVEFILE_REPLACE_EXISTING ))
{ {
ERR( "Failed to move %s to %s\n", buffer, file ); ERR( "Failed to move %s to %s\n", debugstr_w(buffer),
debugstr_w(file) );
ret = GetLastError(); ret = GetLastError();
} }
} }
if (ret) DeleteFileA( buffer ); if (ret) DeleteFileW( buffer );
done: done:
SetLastError( err ); /* restore last error code */ SetLastError( err ); /* restore last error code */
@ -1597,14 +1601,18 @@ done:
/****************************************************************************** /******************************************************************************
* RegSaveKeyW [ADVAPI32.@] * RegSaveKeyA [ADVAPI32.@]
*/ */
LONG WINAPI RegSaveKeyW( HKEY hkey, LPCWSTR file, LPSECURITY_ATTRIBUTES sa ) LONG WINAPI RegSaveKeyA( HKEY hkey, LPCSTR file, LPSECURITY_ATTRIBUTES sa )
{ {
LPSTR fileA = HEAP_strdupWtoA( GetProcessHeap(), 0, file ); UNICODE_STRING *fileW = &NtCurrentTeb()->StaticUnicodeString;
DWORD ret = RegSaveKeyA( hkey, fileA, sa ); NTSTATUS status;
if (fileA) HeapFree( GetProcessHeap(), 0, fileA ); STRING fileA;
return ret;
RtlInitAnsiString(&fileA, file);
if ((status = RtlAnsiStringToUnicodeString(fileW, &fileA, FALSE)))
return RtlNtStatusToDosError( status );
return RegSaveKeyW(hkey, fileW->Buffer, sa);
} }
@ -1819,7 +1827,7 @@ LONG WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey,
if (!lpMachineName || !*lpMachineName) { if (!lpMachineName || !*lpMachineName) {
/* Use the local machine name */ /* Use the local machine name */
return RegOpenKeyA( hKey, "", phkResult ); return RegOpenKeyW( hKey, NULL, phkResult );
} }
FIXME("Cannot connect to %s\n",debugstr_w(lpMachineName)); FIXME("Cannot connect to %s\n",debugstr_w(lpMachineName));