https://git.reactos.org/?p=reactos.git;a=commitdiff;h=434c1cef181df5e20dc2f5...
commit 434c1cef181df5e20dc2f5fd4a8a16457d281fe6 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Tue Mar 20 12:31:48 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Tue Mar 20 12:31:48 2018 +0100
[NDDEAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/nddeapi/nddeapi.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dll/win32/nddeapi/nddeapi.c b/dll/win32/nddeapi/nddeapi.c index 6f20bcc1db..84c636affb 100644 --- a/dll/win32/nddeapi/nddeapi.c +++ b/dll/win32/nddeapi/nddeapi.c @@ -18,13 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS +#include <stdarg.h>
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(nddeapi);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index ec230821e3..8bddd08f15 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -132,7 +132,7 @@ reactos/dll/win32/msxml2 # Synced to WineStaging-3.3 reactos/dll/win32/msxml3 # Synced to WineStaging-3.3 reactos/dll/win32/msxml4 # Synced to WineStaging-3.3 reactos/dll/win32/msxml6 # Synced to WineStaging-3.3 -reactos/dll/win32/nddeapi # Synced to WineStaging-2.9 +reactos/dll/win32/nddeapi # Synced to WineStaging-3.3 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to WineStaging-2.9 reactos/dll/win32/ntdsapi # Synced to WineStaging-2.9