Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 12:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHLWAPI]

Browse source 
* Create a main header and move some inclusions to it.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61445
This commit is contained in:
Amine Khaldi 2013-12-27 13:34:32 +00:00
parent 8cd89d310a
commit 7a5843139d
41 changed files with 52 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/dll/win32/shlwapi/assoc.c
View file

@ -17,25 +17,8 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h> #include "precomp.h"
//#include <assert.h>
#include <windef.h>
#include <winbase.h>
#include <winnls.h>
#include <winreg.h>
//#include "objbase.h"
//#include "shlguid.h"
#include <shlobj.h>
#include <shlwapi.h>
//#include "wine/unicode.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* Default IQueryAssociations::Init() flags */ /* Default IQueryAssociations::Init() flags */
#define SHLWAPI_DEF_ASSOCF (ASSOCF_INIT_BYEXENAME|ASSOCF_INIT_DEFAULTTOSTAR| \ #define SHLWAPI_DEF_ASSOCF (ASSOCF_INIT_BYEXENAME|ASSOCF_INIT_DEFAULTTOSTAR| \

17
reactos/dll/win32/shlwapi/clist.c
View file

@ -17,23 +17,8 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h> #include "precomp.h"
//#include <string.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "objbase.h"
#include <shlobj.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* dwSignature for contained DATABLOCK_HEADER items */ /* dwSignature for contained DATABLOCK_HEADER items */
#define CLIST_ID_CONTAINER (~0U) #define CLIST_ID_CONTAINER (~0U)

21
reactos/dll/win32/shlwapi/istream.c
View file

@ -17,27 +17,8 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h> #include "precomp.h"
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winerror.h"
#include <winnls.h>
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_PATH
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define STGM_ACCESS_MODE(stgm) ((stgm)&0x0000f) #define STGM_ACCESS_MODE(stgm) ((stgm)&0x0000f)
#define STGM_SHARE_MODE(stgm) ((stgm)&0x000f0) #define STGM_SHARE_MODE(stgm) ((stgm)&0x000f0)

2
reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_De.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

2
reactos/dll/win32/shlwapi/lang/shlwapi_En.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/shlwapi/lang/shlwapi_He.rc
View file

@ -20,8 +20,6 @@
* 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 "resource.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/shlwapi/lang/shlwapi_It.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_No.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc
View file

@ -19,8 +19,6 @@
* 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 "resource.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc
View file

@ -20,8 +20,6 @@
* 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 "resource.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

2
reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc
View file

@ -17,8 +17,6 @@
* 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 "resource.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

2
reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

2
reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc
View file

@ -18,8 +18,6 @@
* 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 "resource.h"
/* Chinese text is encoded in UTF-8 */ /* Chinese text is encoded in UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

25
reactos/dll/win32/shlwapi/msgbox.c
View file

@ -18,30 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <config.h>
//#include "wine/port.h"
#include <stdarg.h>
//#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <winreg.h>
#include <shlwapi.h>
#include <wine/unicode.h>
#include <wine/debug.h>
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
extern HINSTANCE shlwapi_hInstance; /* in shlwapi_main.c */ extern HINSTANCE shlwapi_hInstance; /* in shlwapi_main.c */

31
reactos/dll/win32/shlwapi/ordinal.c
View file

@ -20,45 +20,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <config.h>
//#include "wine/port.h"
//#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winnls.h"
#include <winreg.h>
#include <wingdi.h>
//#include "winuser.h"
#include <winver.h> #include <winver.h>
#include <winnetwk.h> #include <winnetwk.h>
#include <wincon.h>
#include <mmsystem.h> #include <mmsystem.h>
#include "objbase.h" #include <shdeprecated.h>
//#include "exdisp.h"
#include "shdeprecated.h"
#include <shlobj.h>
#include <shlwapi.h>
#include <shellapi.h> #include <shellapi.h>
#include <commdlg.h> #include <commdlg.h>
#include <mlang.h> #include <mlang.h>
#include <mshtmhst.h> #include <mshtmhst.h>
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* DLL handles for late bound calls */ /* DLL handles for late bound calls */
extern HINSTANCE shlwapi_hInstance; extern HINSTANCE shlwapi_hInstance;

24
reactos/dll/win32/shlwapi/path.c
View file

@ -19,29 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <config.h>
//#include "wine/port.h"
//#include <stdarg.h>
//#include <string.h>
//#include <stdlib.h>
#include <wine/unicode.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <winreg.h>
#include <winternl.h>
#define NO_SHLWAPI_STREAM
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* Get a function pointer from a DLL handle */ /* Get a function pointer from a DLL handle */
#define GET_FUNC(func, module, name, fail) \ #define GET_FUNC(func, module, name, fail) \

34
reactos/dll/win32/shlwapi/precomp.h Normal file
View file

@ -0,0 +1,34 @@
#ifndef _SHLWAPI_PCH_
#define _SHLWAPI_PCH_
#include <wine/config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#include <winreg.h>
#include <wingdi.h>
#include <wincon.h>
#include <winternl.h>
#define NO_SHLWAPI_STREAM
#define NO_SHLWAPI_USER
#include <shlwapi.h>
#include <shlobj.h>
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
#include "resource.h"
#endif /* _SHLWAPI_PCH_ */

17
reactos/dll/win32/shlwapi/reg.c
View file

@ -19,22 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
//#include <string.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
#include <winreg.h>
#include <wine/debug.h>
#define NO_SHLWAPI_STREAM
#include <shlwapi.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* Key/Value names for MIME content types */ /* Key/Value names for MIME content types */
static const char lpszContentTypeA[] = "Content Type"; static const char lpszContentTypeA[] = "Content Type";

20
reactos/dll/win32/shlwapi/regstream.c
View file

@ -19,25 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
//#include <string.h>
#define COBJMACROS
//#include "winerror.h"
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <winreg.h>
//#include "shlwapi.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct typedef struct
{ {

4
reactos/dll/win32/shlwapi/resource.h
View file

@ -17,12 +17,10 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef WINE_SHLWAPI_RESOURCE_H #ifndef WINE_SHLWAPI_RESOURCE_H
#define WINE_SHLWAPI_RESOURCE_H #define WINE_SHLWAPI_RESOURCE_H
//#include <windef.h>
#include <winuser.h>
#define IDS_BYTES_FORMAT 64 #define IDS_BYTES_FORMAT 64
#define IDS_TIME_INTERVAL_HOURS 65 #define IDS_TIME_INTERVAL_HOURS 65
#define IDS_TIME_INTERVAL_MINUTES 66 #define IDS_TIME_INTERVAL_MINUTES 66

7
reactos/dll/win32/shlwapi/shlwapi.rc
View file

@ -18,10 +18,9 @@
* 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 "windef.h" #include <winuser.h>
//#include "winbase.h"
//#include "winuser.h" #include "resource.h"
//#include "resource.h"
#include "version.rc" #include "version.rc"

15
reactos/dll/win32/shlwapi/shlwapi_main.c
View file

@ -19,20 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_STREAM
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0;
DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES;

19
reactos/dll/win32/shlwapi/stopwatch.c
View file

@ -23,24 +23,7 @@
* B) Want to use a substandard API to tune its performance. * B) Want to use a substandard API to tune its performance.
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#include <config.h>
//#include "wine/port.h"
#include <stdarg.h>
//#include <string.h>
//#include <stdlib.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winreg.h"
#include <winternl.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/************************************************************************* /*************************************************************************
* @ [SHLWAPI.241] * @ [SHLWAPI.241]

27
reactos/dll/win32/shlwapi/string.c
View file

@ -19,36 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <config.h>
//#include "wine/port.h"
#include <math.h> #include <math.h>
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_STREAM
#include <shlwapi.h>
//#include "wingdi.h"
//#include "winuser.h"
#include <shlobj.h>
#include <mlang.h> #include <mlang.h>
#include <ddeml.h> #include <ddeml.h>
#include <wine/unicode.h>
#include <wine/debug.h>
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
extern HINSTANCE shlwapi_hInstance; extern HINSTANCE shlwapi_hInstance;

23
reactos/dll/win32/shlwapi/thread.c
View file

@ -18,29 +18,8 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h> #include "precomp.h"
//#include <string.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <winnls.h>
//#include "winuser.h"
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_PATH
#define NO_SHLWAPI_GDI
#define NO_SHLWAPI_STREAM
#define NO_SHLWAPI_USER
#include <shlwapi.h>
#include <shlobj.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(shell);
extern DWORD SHLWAPI_ThreadRef_index; /* Initialised in shlwapi_main.c */ extern DWORD SHLWAPI_ThreadRef_index; /* Initialised in shlwapi_main.c */

21
reactos/dll/win32/shlwapi/url.c
View file

@ -18,34 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <config.h>
//#include "wine/port.h"
#include <stdarg.h>
//#include <string.h>
//#include <stdlib.h>
#include <windef.h>
#include <winbase.h>
//#include "winnls.h"
//#include "winerror.h"
#include <wine/unicode.h>
#include <wininet.h> #include <wininet.h>
#include <winreg.h>
#include <winternl.h>
#define NO_SHLWAPI_STREAM
#include <shlwapi.h>
#include <intshcut.h> #include <intshcut.h>
#include <wine/debug.h>
HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD);
BOOL WINAPI MLFreeLibrary(HMODULE); BOOL WINAPI MLFreeLibrary(HMODULE);
HRESULT WINAPI MLBuildResURLW(LPCWSTR,HMODULE,DWORD,LPCWSTR,LPWSTR,DWORD); HRESULT WINAPI MLBuildResURLW(LPCWSTR,HMODULE,DWORD,LPCWSTR,LPWSTR,DWORD);
WINE_DEFAULT_DEBUG_CHANNEL(shell);
static inline WCHAR *heap_strdupAtoW(const char *str) static inline WCHAR *heap_strdupAtoW(const char *str)
{ {
LPWSTR ret = NULL; LPWSTR ret = NULL;

11
reactos/dll/win32/shlwapi/wsprintf.c
View file

@ -23,21 +23,10 @@
*/ */
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
//#include <stdarg.h>
//#include <string.h>
//#include <stdio.h>
//#include "windef.h"
//#include "winbase.h"
#define NO_SHLWAPI_REG
//#include "shlwapi.h"
#include <wine/debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(string); WINE_DEFAULT_DEBUG_CHANNEL(string);
#define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */ #define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */
#define WPRINTF_PREFIX_HEX 0x0002 /* Prefix hex with 0x ('#' prefix) */ #define WPRINTF_PREFIX_HEX 0x0002 /* Prefix hex with 0x ('#' prefix) */
#define WPRINTF_ZEROPAD 0x0004 /* Pad with zeros ('0' prefix) */ #define WPRINTF_ZEROPAD 0x0004 /* Pad with zeros ('0' prefix) */