From c4b330cce6af62cd107f5c16b87de35cd4c4006d Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Tue, 10 Aug 2004 11:54:43 +0000 Subject: [PATCH] split up headers svn path=/trunk/; revision=10469 --- reactos/include/rosrtl/resstr.h | 43 +++++++++++++++++++++++++++++++++ reactos/include/rosrtl/string.h | 27 +-------------------- 2 files changed, 44 insertions(+), 26 deletions(-) create mode 100644 reactos/include/rosrtl/resstr.h diff --git a/reactos/include/rosrtl/resstr.h b/reactos/include/rosrtl/resstr.h new file mode 100644 index 00000000000..b5cdd8e25fc --- /dev/null +++ b/reactos/include/rosrtl/resstr.h @@ -0,0 +1,43 @@ +/* $Id: resstr.h,v 1.1 2004/08/10 11:54:43 weiden Exp $ + */ + +#ifndef ROSRTL_RESSTR_H__ +#define ROSRTL_RESSTR_H__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +int +RosLenOfStrResource(HINSTANCE hInst, UINT uID); +int +RosAllocAndLoadStringA(LPSTR *lpTarget, HINSTANCE hInst, UINT uID); +int +RosAllocAndLoadStringW(LPWSTR *lpTarget, HINSTANCE hInst, UINT uID); +DWORD +RosFormatStrA(LPSTR *lpTarget, LPSTR lpFormat, ...); +DWORD +RosFormatStrW(LPWSTR *lpTarget, LPWSTR lpFormat, ...); +DWORD +RosLoadAndFormatStrA(HINSTANCE hInst, UINT uID, LPSTR *lpTarget, ...); +DWORD +RosLoadAndFormatStrW(HINSTANCE hInst, UINT uID, LPWSTR *lpTarget, ...); + +#ifdef UNICODE +# define RosFmtString RosFmtStringW +# define RosAllocAndLoadString RosAllocAndLoadStringW +# define RosLoadAndFormatStr RosLoadAndFormatStrW +#else +# define RosFmtString RosFmtStringA +# define RosAllocAndLoadString RosAllocAndLoadStringA +# define RosLoadAndFormatStr RosLoadAndFormatStrA +#endif + +#ifdef __cplusplus +} +#endif + +#endif + +/* EOF */ diff --git a/reactos/include/rosrtl/string.h b/reactos/include/rosrtl/string.h index efef777b1aa..0ee17c96b45 100644 --- a/reactos/include/rosrtl/string.h +++ b/reactos/include/rosrtl/string.h @@ -1,4 +1,4 @@ -/* $Id: string.h,v 1.3 2004/08/10 10:57:54 weiden Exp $ +/* $Id: string.h,v 1.4 2004/08/10 11:54:43 weiden Exp $ */ #ifndef ROSRTL_STRING_H__ @@ -46,31 +46,6 @@ NTSTATUS NTAPI RosAppendUnicodeString( PUNICODE_STRING ResultFirst, PUNICODE_STRING Second, BOOL Deallocate ); -int -RosLenOfStrResource(HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringA(LPSTR *lpTarget, HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringW(LPWSTR *lpTarget, HINSTANCE hInst, UINT uID); -DWORD -RosFormatStrA(LPSTR *lpTarget, LPSTR lpFormat, ...); -DWORD -RosFormatStrW(LPWSTR *lpTarget, LPWSTR lpFormat, ...); -DWORD -RosLoadAndFormatStrA(HINSTANCE hInst, UINT uID, LPSTR *lpTarget, ...); -DWORD -RosLoadAndFormatStrW(HINSTANCE hInst, UINT uID, LPWSTR *lpTarget, ...); - -#ifdef UNICODE -# define RosFmtString RosFmtStringW -# define RosAllocAndLoadString RosAllocAndLoadStringW -# define RosLoadAndFormatStr RosLoadAndFormatStrW -#else -# define RosFmtString RosFmtStringA -# define RosAllocAndLoadString RosAllocAndLoadStringA -# define RosLoadAndFormatStr RosLoadAndFormatStrA -#endif - #ifdef __cplusplus } #endif