Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REGEDIT] import Wine commit f5fe9a6 by Hugh McMaster.

Browse source 
f5fe9a6cf9
This removes the ROS-diff caused by CORE-18603's fix
This commit is contained in:
Robert Naumann 2023-03-14 20:09:19 +01:00
parent 3625f55fbb
commit 75ac9f8477
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
base/applications/regedit/regproc.c
View file

@ -1370,7 +1370,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode)
#define MAX_SUBKEY_LEN 257
static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode)
static void export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode)
{
LONG rc;
DWORD max_value_len = 256, value_len;
@ -1440,7 +1440,6 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode)
}
free(subkey_name);
return 0;
}
static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode)
@ -1492,7 +1491,6 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode)
HKEY key_class, key;
WCHAR *subkey;
FILE *fp;
BOOL ret;
if (!(key_class = parse_key_name(path, &subkey)))
{
@ -1505,15 +1503,12 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode)
return FALSE;
fp = REGPROC_open_export_file(file_name, unicode);
ret = export_registry_data(fp, key, path, unicode);
export_registry_data(fp, key, path, unicode);
export_newline(fp, unicode);
fclose(fp);
RegCloseKey(key);
#ifdef __REACTOS__ /* Fixes CORE-18603: Remove this when Wine Bug 54491 is fixed and synched back */
ret = TRUE;
#endif
return ret;
return TRUE;
}
static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode)