regedit: use binary mode when doing file import/export

Damjan Jovanovic damjan.jov at gmail.com
Mon Jun 7 06:29:25 CDT 2010


Changelog:
* regedit: use binary mode when doing file import/export

Fixes #18554.

Damjan Jovanovic
-------------- next part --------------
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 74e873b..f4ae04b 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1311,6 +1311,8 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name,
     }
 
     RtlLeaveCriticalSection( &loader_section );
+    if (ret == STATUS_PROCEDURE_NOT_FOUND)
+        TRACE_(imports)("lookup for unimplemented function %s\n", name->Buffer);
     return ret;
 }
 
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index c5eba38..8a27471 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -322,7 +322,7 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAMEW *pofn)
 static BOOL import_registry_filename(LPTSTR filename)
 {
     BOOL Success;
-    FILE* reg_file = fopen(filename, "r");
+    FILE* reg_file = fopen(filename, "rb");
 
     if(!reg_file)
         return FALSE;
diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c
index 0de71cf..05ff174 100644
--- a/programs/regedit/regedit.c
+++ b/programs/regedit/regedit.c
@@ -159,7 +159,7 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s)
                                 getAppName(), filename, GetLastError());
                         exit(1);
                     }
-                    reg_file = fopen(realname, "r");
+                    reg_file = fopen(realname, "rb");
                     if (reg_file==NULL)
                     {
                         perror("");
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index c46edc6..448252f 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -1244,7 +1244,7 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode)
     else
     {
         CHAR* file_nameA = GetMultiByteString(file_name);
-        file = fopen(file_nameA, "w");
+        file = fopen(file_nameA, "wb");
         if (!file) {
             perror("");
             fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_nameA);


More information about the wine-patches mailing list