[fireball] 48395: - Fix user32 build by merging header updates (44999-48394).

Author: fireball
Date: Sun Aug  1 13:20:30 2010
New Revision: 48395

URL: http://svn.reactos.org/svn/reactos?rev=48395&view=rev
Log:
- Fix user32 build by merging header updates (44999-48394).

Modified:
    branches/arwinss/reactos/dll/win32/version/   (props changed)
    branches/arwinss/reactos/dll/win32/version/resource.c
    branches/arwinss/reactos/include/psdk/winnt.h
    branches/arwinss/reactos/include/psdk/winuser.h   (contents, props changed)

Propchange: branches/arwinss/reactos/dll/win32/version/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug  1 13:20:30 2010
@@ -1,0 +1,2 @@
+/branches/ros-amd64-bringup/reactos/dll/win32/version:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
+/trunk/reactos/dll/win32/version:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605,48386

Modified: branches/arwinss/reactos/dll/win32/version/resource.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/versio...
==============================================================================
--- branches/arwinss/reactos/dll/win32/version/resource.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/version/resource.c [iso-8859-1] Sun Aug  1 13:20:30 2010
@@ -66,9 +66,9 @@
     while (min <= max)
     {
         pos = (min + max) / 2;
-        if (entry[pos].u1.s2.Id == id)
+        if (entry[pos].u1.Id == id)
             return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory);
-        if (entry[pos].u1.s2.Id > id) max = pos - 1;
+        if (entry[pos].u1.Id > id) max = pos - 1;
         else min = pos + 1;
     }
     return NULL;

Modified: branches/arwinss/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/win...
==============================================================================
--- branches/arwinss/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/winnt.h [iso-8859-1] Sun Aug  1 13:20:30 2010
@@ -4001,26 +4001,24 @@
    WORD NumberOfNamedEntries;
    WORD NumberOfIdEntries;
 } IMAGE_RESOURCE_DIRECTORY,*PIMAGE_RESOURCE_DIRECTORY;
-_ANONYMOUS_STRUCT typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY {
-	_ANONYMOUS_UNION union {
-		_ANONYMOUS_STRUCT struct {
-			DWORD NameOffset:31;
-			DWORD NameIsString:1;
-		}DUMMYSTRUCTNAME1;
-		DWORD Name;
-		_ANONYMOUS_STRUCT struct {
-			WORD Id;
-			WORD __pad;
-		}DUMMYSTRUCTNAME2;
-	} DUMMYUNIONNAME1;
-	_ANONYMOUS_UNION union {
-		DWORD OffsetToData;
-		_ANONYMOUS_STRUCT struct {
-			DWORD OffsetToDirectory:31;
-			DWORD DataIsDirectory:1;
-		} DUMMYSTRUCTNAME3;
-	} DUMMYUNIONNAME2;
-} IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY;
+
+typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY {
+  _ANONYMOUS_UNION union {
+    _ANONYMOUS_STRUCT struct {
+      DWORD NameOffset:31;
+      DWORD NameIsString:1;
+    } DUMMYSTRUCTNAME1;
+    DWORD Name;
+    WORD Id;
+  } DUMMYUNIONNAME1;
+  _ANONYMOUS_UNION union {
+    DWORD OffsetToData;
+    _ANONYMOUS_STRUCT struct {
+      DWORD OffsetToDirectory:31;
+      DWORD DataIsDirectory:1;
+    } DUMMYSTRUCTNAME3;
+  } DUMMYUNIONNAME2;
+} IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY;

typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING {
    WORD Length;

Modified: branches/arwinss/reactos/include/psdk/winuser.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/win...
==============================================================================
--- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Sun Aug  1 13:20:30 2010
@@ -299,6 +299,9 @@
 #define ES_LOWERCASE 16
 #define ES_MULTILINE 4
 #define ES_NOHIDESEL 256
+#ifdef _WINE
+#define ES_COMBO 0x200   /* Undocumented. Parent is a combobox */
+#endif
 #define ES_NUMBER 0x2000
 #define ES_OEMCONVERT 0x400
 #define ES_PASSWORD 32
@@ -306,7 +309,6 @@
 #define ES_RIGHT 2
 #define ES_UPPERCASE 8
 #define ES_WANTRETURN 4096
-#define ES_COMBO        0x00000200   /* Undocumented. Parent is a combobox */
 #define LBS_DISABLENOSCROLL 4096
 #define LBS_EXTENDEDSEL 0x800
 #define LBS_HASSTRINGS 64
@@ -868,7 +870,7 @@
 #define QS_SENDMESSAGE 64
 #define QS_TIMER 16
 /* Extra (undocumented) queue wake bits - see "Undoc. Windows" */
-#define QS_SMRESULT      0x8000
+#define QS_SMRESULT 0x8000

#define USER_TIMER_MAXIMUM  2147483647
 #define USER_TIMER_MINIMUM  10
@@ -1148,8 +1150,8 @@
 #define MOUSEEVENTF_RIGHTUP 16
 #define MOUSEEVENTF_MIDDLEDOWN 32
 #define MOUSEEVENTF_MIDDLEUP 64
-#define MOUSEEVENTF_XDOWN 0x0080
-#define MOUSEEVENTF_XUP 0x0100
+#define MOUSEEVENTF_XDOWN 128
+#define MOUSEEVENTF_XUP 256
 #define MOUSEEVENTF_WHEEL 0x0800
 #define MOUSEEVENTF_ABSOLUTE 32768
 #define PM_NOREMOVE 0
@@ -1211,9 +1213,9 @@
 #define SWP_DEFERERASE 8192
 #define SWP_ASYNCWINDOWPOS  16384
 /* undocumented SWP flags - from SDK 3.1 */
-#define SWP_NOCLIENTSIZE    0x0800
-#define SWP_NOCLIENTMOVE    0x1000
-#define SWP_STATECHANGED    0x8000
+#define SWP_NOCLIENTSIZE 0x0800
+#define SWP_NOCLIENTMOVE 0x1000
+#define SWP_STATECHANGED 0x8000

#define HSHELL_WINDOWCREATED 1
 #define HSHELL_WINDOWDESTROYED 2
@@ -1572,7 +1574,9 @@
 #define WM_ACTIVATE 6
 #define WM_SETFOCUS 7
 #define WM_KILLFOCUS 8
+#ifdef _WINE
 #define WM_SETVISIBLE 9
+#endif
 #define WM_ENABLE 10
 #define WM_SETREDRAW 11
 #define WM_SETTEXT 12
@@ -1612,6 +1616,7 @@
 #define WM_GETFONT 49
 #define WM_SETHOTKEY 50
 #define WM_GETHOTKEY 51
+#define WM_ISACTIVEICON 53
 #define WM_QUERYPARKICON 54
 #define WM_QUERYDRAGICON 55
 #define WM_COMPAREITEM 57
@@ -1630,7 +1635,6 @@
 #define WM_NOTIFY 78
 #define WM_INPUTLANGCHANGEREQUEST 80
 #define WM_INPUTLANGCHANGE 81
-#define WM_ISACTIVEICON 0x0035
 #define WM_TCARD 82
 #define WM_HELP 83
 #define WM_USERCHANGED 84
@@ -1722,7 +1726,7 @@
 #endif /* _WIN32_WCE */
 #endif /* (WINVER >= 0x0500) */

-  /* D&D messages */
+/* D&D messages */
 #define WM_DROPOBJECT	    0x022A
 #define WM_QUERYDROPOBJECT  0x022B
 #define WM_BEGINDRAG	    0x022C
@@ -1730,6 +1734,7 @@
 #define WM_DRAGSELECT	    0x022E
 #define WM_DRAGMOVE	    0x022F

+#define WM_CTLCOLOR 25
 #define WM_CTLCOLORMSGBOX 306
 #define WM_CTLCOLOREDIT 307
 #define WM_CTLCOLORLISTBOX 308
@@ -1738,7 +1743,6 @@
 #define WM_CTLCOLORSCROLLBAR 311
 #define WM_CTLCOLORSTATIC 312
 #define MN_GETHMENU 481
-#define WM_CTLCOLOR 25
 #define WM_MOUSEFIRST 512
 #define WM_MOUSEMOVE 512
 #define WM_LBTRACKPOINT 0x0131
@@ -1831,6 +1835,12 @@
 #define WM_PRINT 791
 #define WM_PRINTCLIENT 792
 #define WM_APPCOMMAND 793
+
+#define WM_DWMCOMPOSITIONCHANGED 0x031E
+#define WM_DWMNCRENDERINGCHANGED 0x031F
+#define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320
+#define WM_DWMWINDOWMAXIMIZEDCHANGE 0x0321
+
 #define WM_HANDHELDFIRST 856
 #define WM_HANDHELDLAST 863
 #define WM_AFXFIRST 864
@@ -1906,7 +1916,7 @@
 #define CB_SETLOCALE 345
 #define CB_SETTOPINDEX 348
 #define CB_SHOWDROPDOWN 335
-#define CB_MSGMAX 0x0165
+#define CB_MSGMAX 357
 #define CBN_CLOSEUP 8
 #define CBN_DBLCLK 2
 #define CBN_DROPDOWN 7
@@ -1967,8 +1977,10 @@
 #define EN_VSCROLL 1538
 #define LB_ADDFILE 406
 #define LB_ADDSTRING 384
-#define LB_CARETON             0x01a3
-#define LB_CARETOFF            0x01a4
+#ifdef _WINE
+#define LB_CARETON 419
+#define LB_CARETOFF 420
+#endif
 #define LB_DELETESTRING 386
 #define LB_DIR 397
 #define LB_FINDSTRING 399
@@ -2017,12 +2029,16 @@
 #define SBM_ENABLE_ARROWS 228
 #define SBM_GETPOS 225
 #define SBM_GETRANGE 227
-#define SBM_SETSCROLLINFO 233
-#define SBM_GETSCROLLINFO 234
-#define SBM_GETSCROLLBARINFO 235
 #define SBM_SETPOS 224
 #define SBM_SETRANGE 226
 #define SBM_SETRANGEREDRAW 230
+#if (_WIN32_WINNT >= 0x0400)
+#define SBM_GETSCROLLINFO 234
+#define SBM_SETSCROLLINFO 233
+#endif
+#if (_WIN32_WINNT >= 0x0501)
+#define SBM_GETSCROLLBARINFO 235
+#endif
 #define STM_GETICON 369
 #define STM_GETIMAGE 371
 #define STM_SETICON 368
@@ -2467,8 +2483,18 @@
 #define ODS_DISABLED 4
 #define ODS_CHECKED 8
 #define ODS_FOCUS 16
+#if(WINVER >= 0x0400)
 #define ODS_DEFAULT 32
 #define ODS_COMBOBOXEDIT 4096
+#endif
+#if(WINVER >= 0x0500)
+#define ODS_HOTLIGHT        0x0040
+#define ODS_INACTIVE        0x0080
+#if(_WIN32_WINNT >= 0x0500)
+#define ODS_NOACCEL         0x0100
+#define ODS_NOFOCUSRECT     0x0200
+#endif
+#endif
 #define IDHOT_SNAPWINDOW (-1)
 #define IDHOT_SNAPDESKTOP (-2)
 #define DBWF_LPARAMPOINTER 0x8000
@@ -3227,7 +3253,7 @@
    int iVertSpacing;
    int iTitleWrap;
    LOGFONTA lfFont;
-} ICONMETRICSA,*LPICONMETRICSA;
+} ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA;

typedef struct tagICONMETRICSW {
    UINT cbSize;
@@ -3235,7 +3261,7 @@
    int iVertSpacing;
    int iTitleWrap;
    LOGFONTW lfFont;
-} ICONMETRICSW,*LPICONMETRICSW;
+} ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW;

#ifdef UNICODE
 typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
@@ -3891,7 +3917,7 @@
 HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int);
 HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
 BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
-HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
+HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,CONST VOID*,CONST VOID*);
 #if defined(_WINGDI_) && !defined(NOGDI)
 HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
 HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
@@ -3904,7 +3930,7 @@
 HWND WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
 HWND WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
 HWND WINAPI CreateDialogParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
-HICON WINAPI CreateIcon(HINSTANCE,INT,INT,BYTE,BYTE,LPCVOID,LPCVOID);
+HICON WINAPI CreateIcon(HINSTANCE,int,int,BYTE,BYTE,const BYTE*,const BYTE*);
 HICON WINAPI CreateIconFromResource(PBYTE,DWORD,BOOL,DWORD);
 HICON WINAPI CreateIconFromResourceEx(PBYTE,DWORD,BOOL,DWORD,int,int,UINT);
 HICON WINAPI CreateIconIndirect(PICONINFO);
@@ -3994,7 +4020,7 @@
 BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
 BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
 BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM);
-BOOL WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM);
+BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
 #if defined(_WINGDI_) && !defined(NOGDI)
 BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
 BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
@@ -4063,7 +4089,7 @@
 HDC WINAPI GetDC(HWND);
 HDC WINAPI GetDCEx(HWND,HRGN,DWORD);
 HWND WINAPI GetDesktopWindow(void);
-DWORD WINAPI GetDialogBaseUnits(void);
+LONG WINAPI GetDialogBaseUnits(void);
 int WINAPI GetDlgCtrlID(HWND);
 HWND WINAPI GetDlgItem(HWND,int);
 UINT WINAPI GetDlgItemInt(HWND,int,PBOOL,BOOL);
@@ -4137,8 +4163,8 @@
 #define GetSysModalWindow() (NULL)
 HMENU WINAPI GetSystemMenu(HWND,BOOL);
 int WINAPI GetSystemMetrics(int);
-DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,const INT *);
-DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,const INT *);
+DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST INT*);
+DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST INT*);
 LONG WINAPI GetWindowLongA(HWND,int);
 LONG WINAPI GetWindowLongW(HWND,int);
 #ifdef _WIN64
@@ -4278,8 +4304,8 @@
 int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
 int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
 int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
-INT WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
-INT WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
+int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
+int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
 BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
 BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
 HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);
@@ -4320,6 +4346,8 @@
 #endif
 UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT);
 UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT);
+UINT WINAPI WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
+UINT WINAPI WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
 BOOL WINAPI PtInRect(LPCRECT,POINT);
 HWND WINAPI RealChildWindowFromPoint(HWND,POINT);
 UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT);
@@ -4338,7 +4366,7 @@
 BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT);
 BOOL WINAPI RegisterLogonProcess(DWORD,BOOL);
 #if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT);
+BOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE,UINT,UINT);
 #endif
 BOOL WINAPI RegisterShellHookWindow(HWND);
 UINT WINAPI RegisterWindowMessageA(LPCSTR);
@@ -4463,13 +4491,13 @@
 #endif /* (_WIN32_WINNT >= 0x0500) */
 BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT);
 BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT);
-LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,const INT *,int);
-LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,const INT *,int);
+LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST INT*,int);
+LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST INT*,int);
 WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *);
-int WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT);
-int WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL);
-INT WINAPI ToUnicode(UINT,UINT,const BYTE *,LPWSTR,int,UINT);
-INT WINAPI ToUnicodeEx(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL);
+int WINAPI ToAscii(UINT,UINT,CONST BYTE*,LPWORD,UINT);
+int WINAPI ToAsciiEx(UINT,UINT,CONST BYTE*,LPWORD,UINT,HKL);
+int WINAPI ToUnicode(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT);
+int WINAPI ToUnicodeEx(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT,HKL);
 BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
 BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT);
 BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);
@@ -4494,8 +4522,8 @@
 BOOL WINAPI ValidateRect(HWND,LPCRECT);
 BOOL WINAPI ValidateRgn(HWND,HRGN);
 SHORT WINAPI VkKeyScanA(CHAR);
-WORD WINAPI VkKeyScanExA(CHAR,HKL);
-WORD WINAPI VkKeyScanExW(WCHAR,HKL);
+SHORT WINAPI VkKeyScanExA(CHAR,HKL);
+SHORT WINAPI VkKeyScanExW(WCHAR,HKL);
 SHORT WINAPI VkKeyScanW(WCHAR);
 DWORD WINAPI WaitForInputIdle(HANDLE,DWORD);
 BOOL WINAPI WaitMessage(void);

Propchange: branches/arwinss/reactos/include/psdk/winuser.h
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug  1 13:20:30 2010
@@ -1,0 +1,2 @@
+/branches/ros-amd64-bringup/reactos/include/psdk/winuser.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
+/trunk/reactos/include/psdk/winuser.h:42000-48394