Alexandre Julliard : regedit: Don't use tchar.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 65dfc51b2e771ad5e0adb1314905c60dd95e6400
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=65dfc51b2e771ad5e0adb13149...

Author: Alexandre Julliard 
Date:   Mon Jan 23 12:02:39 2012 +0100

regedit: Don't use tchar.h.

---

programs/regedit/about.c    |    1 -
 programs/regedit/edit.c     |    3 +--
 programs/regedit/framewnd.c |    1 -
 programs/regedit/main.c     |    1 -
 programs/regedit/regedit.c  |    1 +
 programs/regedit/regproc.c  |    1 +
 6 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/programs/regedit/about.c b/programs/regedit/about.c
index 89960ad..e0e469e 100644
--- a/programs/regedit/about.c
+++ b/programs/regedit/about.c
@@ -22,7 +22,6 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
-#include <tchar.h>

#include "main.h"

diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index 57edbb5..e211ff8 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -21,7 +21,6 @@
 #define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */

#include <windows.h>
-#include <tchar.h>
 #include <commctrl.h>
 #include <commdlg.h>
 #include <cderr.h>
@@ -320,7 +319,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName)
    if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) {
        DWORD val;
        CHAR* valueA = GetMultiByteString(stringValueData);
-	    if (_stscanf(valueA, isDecimal ? "%u" : "%x", &val)) {
+	    if (sscanf(valueA, isDecimal ? "%u" : "%x", &val)) {
    	lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val));
    	if (lRet == ERROR_SUCCESS) result = TRUE;
    	else error_code_messagebox(hwnd, lRet);
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 0cdedec..b3ca594 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -21,7 +21,6 @@
 #define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */

#include <windows.h>
-#include <tchar.h>
 #include <commctrl.h>
 #include <commdlg.h>
 #include <cderr.h>
diff --git a/programs/regedit/main.c b/programs/regedit/main.c
index d764702..593ffef 100644
--- a/programs/regedit/main.c
+++ b/programs/regedit/main.c
@@ -22,7 +22,6 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <stdlib.h>
-#include <tchar.h>
 #include <stdio.h>
 #include <fcntl.h>

diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c
index fe08501..acff701 100644
--- a/programs/regedit/regedit.c
+++ b/programs/regedit/regedit.c
@@ -20,6 +20,7 @@

#include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <windows.h>
 #include "regproc.h"

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index e566c5d..1a87442 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -23,6 +23,7 @@

#include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <io.h>
 #include <windows.h>