Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compilation of shlwapi.dll.

Browse source 
svn path=/trunk/; revision=6933
This commit is contained in:
Filip Navara 2003-12-09 19:07:29 +00:00
parent 23cb2784b6
commit 6bb203a698
7 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reactos/include/wine/shlguid.h
View file

@ -58,19 +58,21 @@ DEFINE_SHLGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0);
DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0); DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0);
/* avoid duplicate definitions with shobjidl.h (FIXME) */ /* avoid duplicate definitions with shobjidl.h (FIXME) */
/* DEFINE_SHLGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ #ifdef __REACTOS__
/* DEFINE_SHLGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ DEFINE_SHLGUID(IID_IExtractIconA, 0x000214EBL, 0, 0);
/* DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ DEFINE_SHLGUID(IID_IExtractIconW, 0x000214FAL, 0, 0);
/* DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0);
/* DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0);
/* DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0);
/* DEFINE_SHLGUID(IID_IShellView, 0x000214E3L, 0, 0); */ DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0);
/* DEFINE_SHLGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ DEFINE_SHLGUID(IID_IShellView, 0x000214E3L, 0, 0);
/* DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ DEFINE_SHLGUID(IID_IShellFolder, 0x000214E6L, 0, 0);
/* DEFINE_SHLGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0);
/* DEFINE_SHLGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ DEFINE_SHLGUID(IID_IPersistFolder, 0x000214EAL, 0, 0);
/* DEFINE_SHLGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ DEFINE_SHLGUID(IID_IShellLinkA, 0x000214EEL, 0, 0);
/* DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ DEFINE_SHLGUID(IID_IEnumIDList, 0x000214F2L, 0, 0);
DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0);
#endif
DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37);

4
reactos/include/wine/unicode.h
View file

@ -11,8 +11,8 @@
#define strncmpW(s1,s2,n) wcsncmp((const wchar_t *)s1,(const wchar_t *)s2,n) #define strncmpW(s1,s2,n) wcsncmp((const wchar_t *)s1,(const wchar_t *)s2,n)
#define strncpyW(s1,s2,n) wcsncpy((wchar_t *)s1,(const wchar_t *)s2,n) #define strncpyW(s1,s2,n) wcsncpy((wchar_t *)s1,(const wchar_t *)s2,n)
#define strcmpW(s1,s2) wcscmp((const wchar_t *)s1,(const wchar_t *)s2) #define strcmpW(s1,s2) wcscmp((const wchar_t *)s1,(const wchar_t *)s2)
#define strcmpiW(s1,s2) wcsicmp((const wchar_t *)s1,(const wchar_t *)s2) #define strcmpiW(s1,s2) _wcsicmp((const wchar_t *)s1,(const wchar_t *)s2)
#define strncmpiW(s1,s2,n) wcsnicmp((const wchar_t *)s1,(const wchar_t *)s2,n) #define strncmpiW(s1,s2,n) _wcsnicmp((const wchar_t *)s1,(const wchar_t *)s2,n)
#define tolowerW(n) towlower((wint_t)n) #define tolowerW(n) towlower((wint_t)n)
#define toupperW(n) towupper((wint_t)n) #define toupperW(n) towupper((wint_t)n)
#define islowerW(n) iswlower((wint_t)n) #define islowerW(n) iswlower((wint_t)n)

2
reactos/lib/kernel32/kernel32.def
View file

@ -474,6 +474,8 @@ GetSystemTimeAsFileTime@4
GetSystemTimes@12 GetSystemTimes@12
GetSystemWow64DirectoryA@8 GetSystemWow64DirectoryA@8
GetSystemWow64DirectoryW@8 GetSystemWow64DirectoryW@8
GetSystemWindowsDirectoryA@8
GetSystemWindowsDirectoryW@8
GetWindowsDirectoryA@8 GetWindowsDirectoryA@8
GetWindowsDirectoryW@8 GetWindowsDirectoryW@8
GetTapeParameters@16 GetTapeParameters@16

1
reactos/lib/shlwapi/assoc.c
View file

@ -19,6 +19,7 @@
*/ */
#include <stdarg.h> #include <stdarg.h>
#define INITGUID
#ifdef __REACTOS__ #ifdef __REACTOS__
#include "wine/icom.h" #include "wine/icom.h"
#endif #endif

4
reactos/lib/shlwapi/makefile
View file

@ -33,7 +33,9 @@ TARGET_RCFLAGS += -D__REACTOS__ -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501
TARGET_LFLAGS = -nostartfiles -nostdlib TARGET_LFLAGS = -nostartfiles -nostdlib
TARGET_SDKLIBS = libwine.a ole32.a user32.a gdi32.a advapi32.a kernel32.a msvcrt.a TARGET_SDKLIBS = libwine.a ntdll.a user32.a gdi32.a ole32.a kernel32.a msvcrt.a
TARGET_GCCLIBS = advapi32 uuid shell32 gcc
TARGET_BASE = 0x76120000 TARGET_BASE = 0x76120000

3
reactos/lib/shlwapi/path.c
View file

@ -38,6 +38,9 @@
#define NO_SHLWAPI_STREAM #define NO_SHLWAPI_STREAM
#include "shlwapi.h" #include "shlwapi.h"
#include "wine/debug.h" #include "wine/debug.h"
#ifdef __REACTOS__
UINT WINAPI GetSystemWindowsDirectoryW(LPWSTR,UINT);
#endif
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);

2
reactos/lib/shlwapi/string.c
View file

@ -678,7 +678,7 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch)
TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch));
#ifdef __REACTOS__ #ifdef __REACTOS__
return SHLWAPI_StrStrHelperW(lpszStr, lpszSearch, wcsnicmp); return SHLWAPI_StrStrHelperW(lpszStr, lpszSearch, _wcsnicmp);
#else #else
return SHLWAPI_StrStrHelperW(lpszStr, lpszSearch, strncmpiW); return SHLWAPI_StrStrHelperW(lpszStr, lpszSearch, strncmpiW);
#endif #endif