https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98e90aa94965117880e1aa...
commit 98e90aa94965117880e1aa826feb099919e545cb Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Mar 9 12:57:13 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Mar 9 12:57:13 2018 +0100
[CREDUI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/credui/credui.rc | 3 --- dll/win32/credui/credui_main.c | 23 +++++++++++------------ dll/win32/credui/credui_resources.h | 3 ++- media/doc/README.WINE | 2 +- 4 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/dll/win32/credui/credui.rc b/dll/win32/credui/credui.rc index 6ed8d26641..61be6fa459 100644 --- a/dll/win32/credui/credui.rc +++ b/dll/win32/credui/credui.rc @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> -#include <winuser.h> - #include "credui_resources.h"
/* @makedep: banner.bmp */ diff --git a/dll/win32/credui/credui_main.c b/dll/win32/credui/credui_main.c index b5cb48c46c..a4df9fe433 100644 --- a/dll/win32/credui/credui_main.c +++ b/dll/win32/credui/credui_main.c @@ -18,23 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS - #include <stdarg.h>
-#include <windef.h> -#include <winbase.h> -//#include "winnt.h" -#include <winuser.h> -#include <wincred.h> -#include <sspi.h> -#include <commctrl.h> +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winuser.h" +#include "wincred.h" +#include "rpc.h" +#include "sspi.h" +#include "commctrl.h"
#include "credui_resources.h"
-#include <wine/debug.h> -#include <wine/unicode.h> -#include <wine/list.h> +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL(credui);
diff --git a/dll/win32/credui/credui_resources.h b/dll/win32/credui/credui_resources.h index e3994abe68..0a6ab72b09 100644 --- a/dll/win32/credui/credui_resources.h +++ b/dll/win32/credui/credui_resources.h @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#pragma once +#include <windef.h> +#include <winuser.h>
#define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 193e1ad1fd..50402e4320 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -57,7 +57,7 @@ reactos/dll/win32/comcat # Synced to WineStaging-3.3 reactos/dll/win32/comctl32 # Synced to Wine-3.0 reactos/dll/win32/comdlg32 # Synced to WineStaging-3.3 reactos/dll/win32/compstui # Synced to WineStaging-3.3 -reactos/dll/win32/credui # Synced to WineStaging-2.9 +reactos/dll/win32/credui # Synced to WineStaging-3.3 reactos/dll/win32/crypt32 # Synced to WineStaging-2.16 reactos/dll/win32/cryptdlg # Synced to WineStaging-2.9 reactos/dll/win32/cryptdll # Synced to WineStaging-2.9
-
Amine Khaldi