notepad: create missing file (try2)

André Hentschel nerv at dawncrow.de
Tue Aug 11 13:52:13 CDT 2009


---
 programs/notepad/dialog.c |    9 +--------
 programs/notepad/dialog.h |    8 ++++++++
 programs/notepad/main.c   |    1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 5594069..b2b6497 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -183,13 +183,6 @@ static inline BOOL is_conversion_to_ansi_lossy(LPCWSTR textW, int lenW)
     return ret;
 }
 
-typedef enum
-{
-    SAVED_OK,
-    SAVE_FAILED,
-    SHOW_SAVEAS_DIALOG
-} SAVE_STATUS;
-
 /* szFileName is the filename to save under; enc is the encoding to use.
  *
  * If the function succeeds, it returns SAVED_OK.
@@ -198,7 +191,7 @@ typedef enum
  * set, a warning is displayed. The user can continue (and the function carries
  * on), or cancel (and the function returns SHOW_SAVEAS_DIALOG).
  */
-static SAVE_STATUS DoSaveFile(LPCWSTR szFileName, ENCODING enc)
+SAVE_STATUS DoSaveFile(LPCWSTR szFileName, ENCODING enc)
 {
     int lenW;
     WCHAR* textW;
diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h
index 8a78427..3b95437 100644
--- a/programs/notepad/dialog.h
+++ b/programs/notepad/dialog.h
@@ -18,6 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+typedef enum
+{
+    SAVED_OK,
+    SAVE_FAILED,
+    SHOW_SAVEAS_DIALOG
+} SAVE_STATUS;
+
 VOID DIALOG_FileNew(VOID);
 VOID DIALOG_FileOpen(VOID);
 BOOL DIALOG_FileSave(VOID);
@@ -56,3 +63,4 @@ void UpdateWindowCaption(void);
 BOOL FileExists(LPCWSTR szFilename);
 BOOL DoCloseFile(void);
 void DoOpenFile(LPCWSTR szFileName, ENCODING enc);
+SAVE_STATUS DoSaveFile(LPCWSTR szFileName, ENCODING enc);
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index d45fac7..573a539 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -703,6 +703,7 @@ static void HandleCommandLine(LPWSTR cmdline)
             case IDYES:
                 SetFileNameAndEncoding(file_name, ENCODING_ANSI);
                 UpdateWindowCaption();
+                DoSaveFile(file_name, ENCODING_ANSI);
                 break;
 
             case IDNO:
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list