projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d44df9b
)
[SHDOCVW] Sync with Wine Staging 4.18. CORE-16441
author
Amine Khaldi
<amine.khaldi@reactos.org>
Sat, 30 Nov 2019 13:49:41 +0000
(14:49 +0100)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Sat, 30 Nov 2019 13:49:41 +0000
(14:49 +0100)
dll/win32/shdocvw/precomp.h
patch
|
blob
|
history
dll/win32/shdocvw/shdocvw.h
patch
|
blob
|
history
dll/win32/shdocvw/shdocvw_main.c
patch
|
blob
|
history
dll/win32/shdocvw/shlinstobj.c
patch
|
blob
|
history
media/doc/README.WINE
patch
|
blob
|
history
diff --git
a/dll/win32/shdocvw/precomp.h
b/dll/win32/shdocvw/precomp.h
index
48f0f29
..
d506e87
100644
(file)
--- a/
dll/win32/shdocvw/precomp.h
+++ b/
dll/win32/shdocvw/precomp.h
@@
-2,8
+2,6
@@
#ifndef _SHDOCVW_PRECOMP_H
#define _SHDOCVW_PRECOMP_H
#ifndef _SHDOCVW_PRECOMP_H
#define _SHDOCVW_PRECOMP_H
-#include <wine/config.h>
-
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
diff --git
a/dll/win32/shdocvw/shdocvw.h
b/dll/win32/shdocvw/shdocvw.h
index
8cac507
..
568fbad
100644
(file)
--- a/
dll/win32/shdocvw/shdocvw.h
+++ b/
dll/win32/shdocvw/shdocvw.h
@@
-34,7
+34,6
@@
#include "shlobj.h"
#include "exdisp.h"
#include "shlobj.h"
#include "exdisp.h"
-#include "wine/unicode.h"
#include "wine/heap.h"
#include "wine/list.h"
#include "wine/heap.h"
#include "wine/list.h"
diff --git
a/dll/win32/shdocvw/shdocvw_main.c
b/dll/win32/shdocvw/shdocvw_main.c
index
e699b4c
..
d529619
100644
(file)
--- a/
dll/win32/shdocvw/shdocvw_main.c
+++ b/
dll/win32/shdocvw/shdocvw_main.c
@@
-20,17
+20,17
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "shdocvw.h"
#include "winreg.h"
#include "wine/debug.h"
#include "shdocvw.h"
#include "winreg.h"
+#ifdef __REACTOS__
+#include "winnls.h"
+#endif
#include "shlwapi.h"
#include "wininet.h"
#include "isguids.h"
#include "shlwapi.h"
#include "wininet.h"
#include "isguids.h"
diff --git
a/dll/win32/shdocvw/shlinstobj.c
b/dll/win32/shdocvw/shlinstobj.c
index
6f6786b
..
189c27c
100644
(file)
--- a/
dll/win32/shdocvw/shlinstobj.c
+++ b/
dll/win32/shdocvw/shlinstobj.c
@@
-35,7
+35,6
@@
#include "shdocvw.h"
#include "shdocvw.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
diff --git
a/media/doc/README.WINE
b/media/doc/README.WINE
index
8663447
..
4336f2d
100644
(file)
--- a/
media/doc/README.WINE
+++ b/
media/doc/README.WINE
@@
-172,7
+172,7
@@
dll/win32/security # Forked (different .spec)
dll/win32/sensapi # Synced to WineStaging-4.18
dll/win32/setupapi # Forked at Wine-20050524
dll/win32/shdoclc # Synced to WineStaging-3.3
dll/win32/sensapi # Synced to WineStaging-4.18
dll/win32/setupapi # Forked at Wine-20050524
dll/win32/shdoclc # Synced to WineStaging-3.3
-dll/win32/shdocvw # Synced to WineStaging-4.
0
+dll/win32/shdocvw # Synced to WineStaging-4.
18
dll/win32/shell32 # Forked at Wine-20071011
dll/win32/shfolder # Synced to WineStaging-3.3
dll/win32/shlwapi # Synced to WineStaging-3.3
dll/win32/shell32 # Forked at Wine-20071011
dll/win32/shfolder # Synced to WineStaging-3.3
dll/win32/shlwapi # Synced to WineStaging-3.3