mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 18:54:25 +00:00
Cleanup header usage in USER32.
svn path=/trunk/; revision=16099
This commit is contained in:
parent
3dcd5f1ff6
commit
8b3da072dd
|
@ -19,11 +19,8 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __USE_W32API
|
#define __WINE__
|
||||||
#define __USE_W32API
|
#include <user32.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "user32.h"
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
* FIXME: roll up in Netscape 3.01.
|
* FIXME: roll up in Netscape 3.01.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#define __WINE__
|
||||||
|
#include <user32.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -36,11 +36,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __USE_W32API
|
#define __WINE__
|
||||||
#define __USE_W32API
|
#include <user32.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "user32.h"
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -17,8 +17,9 @@
|
||||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
#include "user32.h"
|
|
||||||
#define NDEBUG
|
#define __WINE__
|
||||||
|
#include <user32.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "controls.h"
|
#include "controls.h"
|
||||||
|
|
|
@ -9,9 +9,7 @@
|
||||||
* NOTES: Adapted from Wine
|
* NOTES: Adapted from Wine
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <wchar.h>
|
|
||||||
#include "win32k/ntuser.h"
|
|
||||||
|
|
||||||
static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
|
static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
|
||||||
{
|
{
|
||||||
|
|
|
@ -30,13 +30,8 @@
|
||||||
|
|
||||||
/* INCLUDES *******************************************************************/
|
/* INCLUDES *******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
#include <draw.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <oleacc.h>
|
#include <oleacc.h>
|
||||||
#include <rosrtl/minmax.h>
|
|
||||||
|
|
||||||
/* GLOBAL VARIABLES ***********************************************************/
|
/* GLOBAL VARIABLES ***********************************************************/
|
||||||
|
|
||||||
|
@ -655,7 +650,11 @@ IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo,
|
||||||
return si.nMin;
|
return si.nMin;
|
||||||
}
|
}
|
||||||
|
|
||||||
Pos = RtlRosMax(0, Pos - ScrollBarInfo->dxyLineButton);
|
Pos = Pos - ScrollBarInfo->dxyLineButton;
|
||||||
|
if (Pos < 0)
|
||||||
|
{
|
||||||
|
Pos = 0;
|
||||||
|
}
|
||||||
if (Pixels < Pos)
|
if (Pixels < Pos)
|
||||||
{
|
{
|
||||||
Pos = Pixels;
|
Pos = Pixels;
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
|
|
||||||
#ifndef __REACTOS__
|
#ifndef __REACTOS__
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(static);
|
WINE_DEFAULT_DEBUG_CHANNEL(static);
|
||||||
|
|
|
@ -4,12 +4,34 @@
|
||||||
* FILE: include/user32.h
|
* FILE: include/user32.h
|
||||||
* PURPOSE: Global user32 definitions
|
* PURPOSE: Global user32 definitions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef USER32_H
|
||||||
|
#define USER32_H
|
||||||
|
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <limits.h>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#include <windowsx.h>
|
||||||
#define NTOS_MODE_USER
|
#define NTOS_MODE_USER
|
||||||
#include <ntos.h>
|
#include <ntos.h>
|
||||||
#include <win32k/win32k.h>
|
#include <win32k/win32k.h>
|
||||||
|
#include <win32k/callback.h>
|
||||||
|
#include "accel.h"
|
||||||
|
#include "cursor.h"
|
||||||
|
#ifndef __WINE__
|
||||||
|
#include "debug.h"
|
||||||
|
#endif
|
||||||
|
#include "draw.h"
|
||||||
|
#include "menu.h"
|
||||||
|
#include "message.h"
|
||||||
#include "regcontrol.h"
|
#include "regcontrol.h"
|
||||||
|
#include "resource.h"
|
||||||
|
#include "scroll.h"
|
||||||
|
#include "strpool.h"
|
||||||
|
#include "window.h"
|
||||||
|
#include "winpos.h"
|
||||||
|
#include "winsta.h"
|
||||||
|
|
||||||
extern HINSTANCE User32Instance;
|
extern HINSTANCE User32Instance;
|
||||||
|
|
||||||
|
@ -131,3 +153,4 @@ NTSTATUS STDCALL ZwCallbackReturn(PVOID Result,
|
||||||
#define NtUserEnableProcessWindowGhosting(bEnable) \
|
#define NtUserEnableProcessWindowGhosting(bEnable) \
|
||||||
NtUserCallOneParam((DWORD)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING)
|
NtUserCallOneParam((DWORD)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING)
|
||||||
|
|
||||||
|
#endif /* USER32_H */
|
||||||
|
|
|
@ -22,10 +22,6 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __USE_W32API
|
|
||||||
#define __USE_W32API
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "wine/config.h"
|
#include "wine/config.h"
|
||||||
#include "wine/port.h"
|
#include "wine/port.h"
|
||||||
|
|
||||||
|
|
|
@ -9,14 +9,9 @@
|
||||||
* 06-06-2001 CSH Created
|
* 06-06-2001 CSH Created
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include "winsta.h"
|
|
||||||
#include <string.h>
|
|
||||||
#include <debug.h>
|
|
||||||
#include <rosrtl/devmode.h>
|
#include <rosrtl/devmode.h>
|
||||||
#include <rosrtl/logfont.h>
|
#include <rosrtl/logfont.h>
|
||||||
#include <malloc.h>
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @implemented
|
* @implemented
|
||||||
|
|
|
@ -28,11 +28,8 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <rosrtl/devmode.h>
|
#include <rosrtl/devmode.h>
|
||||||
#include <win32k/ntuser.h>
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,4 @@
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include "menu.h"
|
|
||||||
#include "message.h"
|
|
||||||
#include "accel.h"
|
|
||||||
#include "strpool.h"
|
|
||||||
#include <win32k/callback.h>
|
|
||||||
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FIXME: Belongs to some header. */
|
/* FIXME: Belongs to some header. */
|
||||||
WINBOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID);
|
WINBOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* PROGRAMMER: Eric Kohl (ekohl@rz-online.de)
|
* PROGRAMMER: Eric Kohl (ekohl@rz-online.de)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <ntdll/csr.h>
|
#include <ntdll/csr.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -22,15 +22,6 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Remove this once w32api conversion is done */
|
|
||||||
#ifndef __USE_W32API
|
|
||||||
#define __USE_W32API
|
|
||||||
#define _WIN32_IE 0x600
|
|
||||||
#define _WIN32_WINNT 0x501
|
|
||||||
#define WINVER 0x501
|
|
||||||
#define __need_offsetof
|
|
||||||
#endif /* __USE_W32API */
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h> /* abs() */
|
#include <stdlib.h> /* abs() */
|
||||||
|
|
|
@ -28,8 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
#include <ntdll/csr.h>
|
#include <ntdll/csr.h>
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
|
@ -28,8 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
/* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
|
/* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
|
||||||
does not seem to work properly for stack address space. */
|
does not seem to work properly for stack address space. */
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
// strpool.c
|
// strpool.c
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <strpool.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
typedef struct tagHEAP_STRING_POOLA
|
typedef struct tagHEAP_STRING_POOLA
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,10 +10,7 @@
|
||||||
* 08-F05-2001 CSH Created
|
* 08-F05-2001 CSH Created
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <mmsystem.h>
|
|
||||||
#ifdef __USE_W32API
|
#ifdef __USE_W32API
|
||||||
typedef PVOID LPIMEPROW, LPIMEPROA;
|
typedef PVOID LPIMEPROW, LPIMEPROA;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -28,8 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -28,9 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* WinHelp internal structure */
|
/* WinHelp internal structure */
|
||||||
typedef struct
|
typedef struct
|
||||||
|
|
|
@ -9,9 +9,7 @@
|
||||||
* 04-06-2001 CSH Created
|
* 04-06-2001 CSH Created
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @implemented
|
* @implemented
|
||||||
|
|
|
@ -31,11 +31,7 @@
|
||||||
* NOTES: Adapted from Wine
|
* NOTES: Adapted from Wine
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <stdarg.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "strpool.h"
|
|
||||||
|
|
||||||
#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) */
|
||||||
|
|
|
@ -29,9 +29,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include "accel.h"
|
|
||||||
#include <win32k/ntuser.h>
|
|
||||||
|
|
||||||
/* this is the 8 byte accel struct used in Win32 resources (internal only) */
|
/* this is the 8 byte accel struct used in Win32 resources (internal only) */
|
||||||
typedef struct
|
typedef struct
|
||||||
|
|
|
@ -28,10 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <debug.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
/*forward declerations... actualy in user32\windows\icon.c but usful here****/
|
/*forward declerations... actualy in user32\windows\icon.c but usful here****/
|
||||||
HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot);
|
HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot);
|
||||||
|
|
|
@ -28,8 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -9,13 +9,7 @@
|
||||||
* 09-05-2001 CSH Created
|
* 09-05-2001 CSH Created
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <debug.h>
|
|
||||||
#include <window.h>
|
|
||||||
#include <strpool.h>
|
|
||||||
|
|
||||||
|
|
||||||
static BOOL GetClassInfoExCommon(
|
static BOOL GetClassInfoExCommon(
|
||||||
HINSTANCE hInst,
|
HINSTANCE hInst,
|
||||||
|
|
|
@ -28,10 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <strpool.h>
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -28,9 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <debug.h>
|
|
||||||
#undef CopyCursor
|
#undef CopyCursor
|
||||||
|
|
||||||
HBITMAP
|
HBITMAP
|
||||||
|
|
|
@ -28,8 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -11,17 +11,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <windowsx.h>
|
|
||||||
#include <window.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <cursor.h>
|
|
||||||
#include <menu.h>
|
|
||||||
#include <scroll.h>
|
|
||||||
#include <winpos.h>
|
|
||||||
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
#ifndef WM_SETVISIBLE
|
#ifndef WM_SETVISIBLE
|
||||||
#define WM_SETVISIBLE 9
|
#define WM_SETVISIBLE 9
|
||||||
|
|
|
@ -31,13 +31,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* MACROS/DEFINITIONS ********************************************************/
|
/* MACROS/DEFINITIONS ********************************************************/
|
||||||
|
|
||||||
|
@ -1235,24 +1229,6 @@ static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
|
||||||
#undef SENDMSG
|
#undef SENDMSG
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hack - We dont define this anywhere and we shouldn't
|
|
||||||
* Its only used to port buggy WINE code in to our buggy code.
|
|
||||||
* Make it go away - sedwards
|
|
||||||
*/
|
|
||||||
/* strdup macros */
|
|
||||||
/* DO NOT USE IT!! it will go away soon */
|
|
||||||
inline static LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str )
|
|
||||||
{
|
|
||||||
LPSTR ret;
|
|
||||||
INT len;
|
|
||||||
|
|
||||||
if (!str) return NULL;
|
|
||||||
len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL );
|
|
||||||
ret = RtlAllocateHeap(GetProcessHeap(), flags, len );
|
|
||||||
if(ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL );
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* DIALOG_DlgDirListW
|
* DIALOG_DlgDirListW
|
||||||
*
|
*
|
||||||
|
@ -1263,11 +1239,14 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
|
||||||
{
|
{
|
||||||
if (spec)
|
if (spec)
|
||||||
{
|
{
|
||||||
LPSTR specA = HEAP_strdupWtoA( GetProcessHeap(), 0, spec );
|
LPSTR specA;
|
||||||
INT ret = DIALOG_DlgDirList( hDlg, specA, idLBox, idStatic,
|
INT ret;
|
||||||
attrib, combo );
|
|
||||||
|
HEAP_strdupWtoA ( &specA, spec, lstrlenW(spec) );
|
||||||
|
ret = DIALOG_DlgDirList( hDlg, specA, idLBox, idStatic,
|
||||||
|
attrib, combo );
|
||||||
MultiByteToWideChar( CP_ACP, 0, specA, -1, spec, 0x7fffffff );
|
MultiByteToWideChar( CP_ACP, 0, specA, -1, spec, 0x7fffffff );
|
||||||
HeapFree( GetProcessHeap(), 0, specA );
|
HEAP_free( specA );
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
return DIALOG_DlgDirList( hDlg, NULL, idLBox, idStatic, attrib, combo );
|
return DIALOG_DlgDirList( hDlg, NULL, idLBox, idStatic, attrib, combo );
|
||||||
|
|
|
@ -28,17 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES *******************************************************************/
|
/* INCLUDES *******************************************************************/
|
||||||
|
|
||||||
#ifndef __USE_W32API
|
|
||||||
#define __USE_W32API
|
|
||||||
#define _WIN32_WINNT 0x0500
|
|
||||||
#define WINVER 0x0500
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <user32.h>
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* GLOBALS *******************************************************************/
|
/* GLOBALS *******************************************************************/
|
||||||
|
|
||||||
|
@ -1388,7 +1378,7 @@ IntGrayString(
|
||||||
if (unicode)
|
if (unicode)
|
||||||
nCount = lstrlenW((WCHAR*)lpData);
|
nCount = lstrlenW((WCHAR*)lpData);
|
||||||
else
|
else
|
||||||
nCount = strlen((CHAR*)lpData);
|
nCount = lstrlenA((CHAR*)lpData);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! nWidth || ! nHeight)
|
if (! nWidth || ! nHeight)
|
||||||
|
@ -1545,9 +1535,9 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
||||||
if((opcode == DST_TEXT || opcode == DST_PREFIXTEXT) && !len) /* The string is '\0' terminated */
|
if((opcode == DST_TEXT || opcode == DST_PREFIXTEXT) && !len) /* The string is '\0' terminated */
|
||||||
{
|
{
|
||||||
if(unicode)
|
if(unicode)
|
||||||
len = strlenW((LPWSTR)lp);
|
len = lstrlenW((LPWSTR)lp);
|
||||||
else
|
else
|
||||||
len = strlen((LPSTR)lp);
|
len = lstrlenA((LPSTR)lp);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Find out what size the image has if not given by caller */
|
/* Find out what size the image has if not given by caller */
|
||||||
|
|
|
@ -28,9 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -28,10 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <win32k/callback.h>
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -28,10 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -28,9 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
#include <wchar.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define __WINE__
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -33,18 +33,9 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <ctype.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <draw.h>
|
|
||||||
#include <window.h>
|
|
||||||
#include <strpool.h>
|
|
||||||
#include <win32k/callback.h>
|
|
||||||
#include "../controls/controls.h"
|
#include "../controls/controls.h"
|
||||||
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* internal popup menu window messages */
|
/* internal popup menu window messages */
|
||||||
#define MM_SETMENUHANDLE (WM_USER + 0)
|
#define MM_SETMENUHANDLE (WM_USER + 0)
|
||||||
#define MM_GETMENUHANDLE (WM_USER + 1)
|
#define MM_GETMENUHANDLE (WM_USER + 1)
|
||||||
|
|
|
@ -8,11 +8,7 @@
|
||||||
* 06-06-2001 CSH Created
|
* 06-06-2001 CSH Created
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <debug.h>
|
|
||||||
#include <win32k/callback.h>
|
|
||||||
#include <message.h>
|
|
||||||
|
|
||||||
/* DDE message exchange
|
/* DDE message exchange
|
||||||
*
|
*
|
||||||
|
|
|
@ -31,14 +31,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <debug.h>
|
|
||||||
#include "resource.h"
|
|
||||||
|
|
||||||
#include <mmsystem.h>
|
|
||||||
|
|
||||||
/* DEFINES *******************************************************************/
|
/* DEFINES *******************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -30,24 +30,7 @@ Already defined in makefile now.
|
||||||
#define __REACTOS__
|
#define __REACTOS__
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* Use w32api headers
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
#define __USE_W32API
|
|
||||||
#define _WIN32_WINNT 0x0501
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
#include <windowsx.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <menu.h>
|
|
||||||
#include <winpos.h>
|
|
||||||
#include <user32.h>
|
#include <user32.h>
|
||||||
#include "window.h"
|
|
||||||
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
#define HAS_DLGFRAME(Style, ExStyle) \
|
#define HAS_DLGFRAME(Style, ExStyle) \
|
||||||
(((ExStyle) & WS_EX_DLGMODALFRAME) || \
|
(((ExStyle) & WS_EX_DLGMODALFRAME) || \
|
||||||
|
|
|
@ -28,10 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <resource.h>
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
static HBRUSH FrameBrushes[13];
|
static HBRUSH FrameBrushes[13];
|
||||||
static HBITMAP hHatch;
|
static HBITMAP hHatch;
|
||||||
|
|
|
@ -28,9 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <strpool.h>
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
typedef struct _PROPLISTITEM
|
typedef struct _PROPLISTITEM
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,8 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -28,10 +28,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <ctype.h>
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -11,13 +11,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <window.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <strpool.h>
|
|
||||||
#include <win32k/callback.h>
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
BOOL ControlsInitialized = FALSE;
|
BOOL ControlsInitialized = FALSE;
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,7 @@
|
||||||
|
|
||||||
/* INCLUDES ******************************************************************/
|
/* INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#include "user32.h"
|
#include <user32.h>
|
||||||
#include <window.h>
|
|
||||||
#include <win32k/callback.h>
|
|
||||||
#include <window.h>
|
|
||||||
#define NDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue