https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d85a7bfbd665a4191d026...
commit 1d85a7bfbd665a4191d026280498c02387cd1848 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Mar 23 12:23:29 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Mar 23 12:23:29 2018 +0100
[SHDOCLC] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/shdoclc/rsrc.rc | 6 +----- dll/win32/shdoclc/shdoclc.h | 4 ++-- media/doc/README.WINE | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dll/win32/shdoclc/rsrc.rc b/dll/win32/shdoclc/rsrc.rc index 3e197a9b81..445bc2a94d 100644 --- a/dll/win32/shdoclc/rsrc.rc +++ b/dll/win32/shdoclc/rsrc.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban + * Copyright 2005-2006 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,10 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> -//#include "winuser.h" -#include <mshtmcid.h> - #include "shdoclc.h"
/* UTF-8 */ diff --git a/dll/win32/shdoclc/shdoclc.h b/dll/win32/shdoclc/shdoclc.h index cc0ab28d5c..b5492d6243 100644 --- a/dll/win32/shdoclc/shdoclc.h +++ b/dll/win32/shdoclc/shdoclc.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <windef.h> -//#include <mshtmcid.h> +#include <windef.h> +#include <mshtmcid.h>
#define IDS_MESSAGE_BOX_TITLE 2213
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0921d33275..a360d2838e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -170,7 +170,7 @@ reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-3.3 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 +reactos/dll/win32/shdoclc # Synced to WineStaging-3.3 reactos/dll/win32/shdocvw # Synced to Wine-3.0 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-2.9
-
Amine Khaldi