Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 66000: [Win32s] - Implement DDE from wine. Leaving debug errors on the run and later move to trace. See CORE-7447. - Use callbacks to User32 to convert the data and track it in Win32k. -...
by jimtabor＠svn.reactos.org 08 Jan '15

08 Jan '15

Author: jimtabor Date: Thu Jan 8 00:56:51 2015 New Revision: 66000 URL: http://svn.reactos.org/svn/reactos?rev=66000&view=rev Log: [Win32s] - Implement DDE from wine. Leaving debug errors on the run and later move to trace. See CORE-7447. - Use callbacks to User32 to convert the data and track it in Win32k. - Add a new Quality of Service atom. - Add things to class.c. - Shell32 tests run now too, or only 4 run. This might be fixed too, since locating a lParam write back issue. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/user32/misc/dde.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -14,7 +14,9 @@ #define USER32_CALLBACK_COPYIMAGE (10) #define USER32_CALLBACK_SETWNDICONS (11) #define USER32_CALLBACK_DELIVERUSERAPC (12) -#define USER32_CALLBACK_MAXIMUM (12) +#define USER32_CALLBACK_DDEPOST (13) +#define USER32_CALLBACK_DDEGET (14) +#define USER32_CALLBACK_MAXIMUM (14) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -115,6 +117,14 @@ HICON hIconWindows; } SETWNDICONS_CALLBACK_ARGUMENTS, *PSETWNDICONS_CALLBACK_ARGUMENTS; +typedef struct _DDEPOSTGET_CALLBACK_ARGUMENTS +{ + INT Type; + MSG; + int size; + BYTE buffer[1]; +} DDEPOSTGET_CALLBACK_ARGUMENTS, *PDDEPOSTGET_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -141,4 +151,8 @@ User32CallGetCharsetInfo(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32DeliverUserAPC(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallDDEPostFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallDDEGetFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -300,6 +300,12 @@ C_ASSERT(sizeof(CLIENTINFO) <= sizeof(((PTEB)0)->Win32ClientInfo)); #define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)) + +typedef struct tagDDEPACK +{ + UINT_PTR uiLo; + UINT_PTR uiHi; +} DDEPACK, *PDDEPACK; #define HRGN_NULL ( (HRGN) 0) // NULL empty region #define HRGN_WINDOW ( (HRGN) 1) // region from window rcWindow @@ -3417,19 +3423,7 @@ NTAPI NtUserYieldTask(VOID); -/* lParam of DDE messages */ -typedef struct tagKMDDEEXECUTEDATA -{ - HWND Sender; - HGLOBAL ClientMem; - /* BYTE Data[DataSize] */ -} KMDDEEXECUTEDATA, *PKMDDEEXECUTEDATA; - -typedef struct tagDDEPACK -{ - UINT_PTR uiLo; - UINT_PTR uiHi; -} DDEPACK, *PDDEPACK; + Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -1052,6 +1052,7 @@ /* FIXME: The class was created before being connected to a desktop. It is possible for the desktop window, but should it be allowed for any other case? */ + TRACE("This CLASS has no Desktop to heap from! Atom %d\n",Atom); Class = UserHeapAlloc(ClassSize); } @@ -2367,7 +2368,7 @@ } // -// ??? +// Register System Classes.... // BOOL FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -5,14 +5,348 @@ DBG_DEFAULT_CHANNEL(UserMisc); +typedef struct _DDE_DATA +{ + LPARAM lParam; + int cbSize; + PVOID pvBuffer; +} DDE_DATA, *PDDE_DATA; + +typedef struct _DDE_PROP +{ + PWND spwnd; + PWND spwndPartner; +} DDE_PROP, *PDDE_PROP; + + + +int +APIENTRY +IntDDEPostCallback( + IN PWND pWnd, + IN UINT Msg, + IN WPARAM wParam, + IN OUT LPARAM *lParam, + IN PVOID Buffer, + IN int size) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common; + int origSize = size; + + ResultPointer = NULL; + ResultLength = ArgumentLength = sizeof(DDEPOSTGET_CALLBACK_ARGUMENTS)+size; + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + return FALSE; + } + + Common = (PDDEPOSTGET_CALLBACK_ARGUMENTS) Argument; + + Common->size = size; + Common->hwnd = UserHMGetHandle(pWnd); + Common->message = Msg; + Common->wParam = wParam; + Common->lParam = *lParam; + RtlCopyMemory(&Common->buffer, Buffer, size); + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_DDEPOST, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + if (!NT_SUCCESS(Status) || ResultPointer == NULL ) + { + ERR("DDE Post callback failed!\n"); + IntCbFreeMemory(Argument); + return 0; + } + + RtlCopyMemory(Common, ResultPointer, ArgumentLength); + + if (Common->size != 0 && size <= origSize) + { + RtlCopyMemory(Buffer, &Common->buffer, size); // ResultLength); + } + + size = Common->size; + *lParam = Common->lParam; + + IntCbFreeMemory(Argument); + + return size ? size : -1; +} + +BOOL +APIENTRY +IntDDEGetCallback( + IN PWND pWnd, + IN OUT PMSG pMsg, + IN PVOID Buffer, + IN int size) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common; + + ResultPointer = NULL; + ResultLength = ArgumentLength = sizeof(DDEPOSTGET_CALLBACK_ARGUMENTS)+size; + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + return FALSE; + } + + Common = (PDDEPOSTGET_CALLBACK_ARGUMENTS) Argument; + + Common->size = size; + Common->hwnd = pMsg->hwnd; + Common->message = pMsg->message; + Common->wParam = pMsg->wParam; + Common->lParam = pMsg->lParam; + + if (size && Buffer) RtlCopyMemory(&Common->buffer, Buffer, size); + + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_DDEGET, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + if (!NT_SUCCESS(Status) || ResultPointer == NULL ) + { + ERR("DDE Get callback failed!\n"); + IntCbFreeMemory(Argument); + return FALSE; + } + + RtlMoveMemory(Common, ResultPointer, ArgumentLength); + + pMsg->lParam = Common->lParam; + + IntCbFreeMemory(Argument); + + return TRUE; +} + + + +BOOL +APIENTRY +IntDdePostMessageHook( + IN PWND pWnd, + IN UINT Msg, + IN WPARAM wParam, + IN OUT LPARAM *lParam, + IN OUT LONG_PTR *ExtraInfo) +{ + PWND pWndClient; + PDDE_DATA pddeData; + HGDIOBJ Object = NULL; + PVOID Buffer = NULL; + int size = 128; + LPARAM lp = *lParam; + + if (pWnd->head.pti->ppi != gptiCurrent->ppi) + { + ERR("Posting long DDE 0x%x\n",Msg); + // Initiate is sent only across borders. + if (Msg == WM_DDE_INITIATE) + { + return FALSE; + } + + pWndClient = UserGetWindowObject((HWND)wParam); + if (pWndClient == NULL) + { + // This is terminating so post it. + if ( Msg == WM_DDE_TERMINATE) + { + ERR("DDE Posted WM_DDE_TERMINATE\n"); + return TRUE; + } + ERR("Invalid DDE Client Window handle\n"); + return FALSE; + } + + if (Msg == WM_DDE_TERMINATE ) + { + //// FIXME Remove Stuff if any... + + // Do not bother to callback. + return TRUE; + } + + Buffer = ExAllocatePoolWithTag(PagedPool, size, USERTAG_DDE); + + if ((size = IntDDEPostCallback(pWnd, Msg, wParam, &lp, Buffer, size)) == 0) + { + ERR("DDE Post Callback return 0 0x%x\n", Msg); + } + + if (size != -1 && size > 128) + { + ERR("FIXME: DDE Post need more bytes %d\n",size); + } + + if (size == -1) + { + size = 0; + ExFreePoolWithTag(Buffer, USERTAG_DDE); + Buffer = NULL; + } + + ERR("DDE Post size %d 0x%x\n",size, Msg); + + switch(Msg) + { + case WM_DDE_POKE: + { + DDEPOKE *pddePoke = Buffer; + switch(pddePoke->cfFormat) + { + case CF_BITMAP: + case CF_DIB: + case CF_PALETTE: + RtlCopyMemory(&Object, pddePoke->Value, sizeof(HGDIOBJ)); + break; + default: + break; + } + break; + } + case WM_DDE_DATA: + { + DDEDATA *pddeData = Buffer; + switch(pddeData->cfFormat) + { + case CF_BITMAP: + case CF_DIB: + case CF_PALETTE: + RtlCopyMemory(&Object, pddeData->Value, sizeof(HGDIOBJ)); + break; + default: + break; + } + break; + + } + default: + break; + } + + if (Object) + { + // Give gdi object to the other process. + GreSetObjectOwner(Object, pWnd->head.pti->ppi->W32Pid); + } + + pddeData = ExAllocatePoolWithTag(PagedPool, sizeof(DDE_DATA), USERTAG_DDE2); + + pddeData->cbSize = size; + pddeData->pvBuffer = Buffer; + pddeData->lParam = lp; + + ERR("DDE Post lParam c=%08lx\n",lp); + *lParam = lp; + + // Attach this data packet to the user message. + *ExtraInfo = (LONG_PTR)pddeData; + } + return TRUE; +} + +VOID APIENTRY +IntDdeGetMessageHook(PMSG pMsg, LONG_PTR ExtraInfo) +{ + PWND pWnd, pWndClient; + PDDE_DATA pddeData; + PDDE_PROP pddeProp; + BOOL Ret; + + pWnd = UserGetWindowObject(pMsg->hwnd); + if (pWnd == NULL) + { + ERR("DDE Get Window is dead. %p\n", pMsg->hwnd); + return; + } + + if (pMsg->message == WM_DDE_TERMINATE) + { + pddeProp = (PDDE_PROP)UserGetProp(pWnd, AtomDDETrack); + if (pddeProp) + { + pWndClient = UserGetWindowObject((HWND)pMsg->wParam); + if (pWndClient == NULL) + { + ERR("DDE Get Client WM_DDE_TERMINATE\n"); + } + + IntRemoveProp(pWnd, AtomDDETrack); + ExFreePoolWithTag(pddeProp, USERTAG_DDE1); + } + return; + } + + ERR("DDE Get Msg 0x%x\n",pMsg->message); + + pddeData = (PDDE_DATA)ExtraInfo; + + if ( pddeData ) + { + ERR("DDE Get 1 size %d lParam c=%08lx lp c=%08lx\n",pddeData->cbSize, pMsg->lParam, pddeData->lParam); + + pMsg->lParam = pddeData->lParam; // This might be a hack... Need to backtrace lParam from post queue. + + Ret = IntDDEGetCallback( pWnd, pMsg, pddeData->pvBuffer, pddeData->cbSize); + if (!Ret) + { + ERR("DDE Get CB failed\n"); + } + + ERR("DDE Get 2 size %d lParam c=%08lx\n",pddeData->cbSize, pMsg->lParam); + + if (pddeData->pvBuffer) ExFreePoolWithTag(pddeData->pvBuffer, USERTAG_DDE); + + ExFreePoolWithTag(pddeData, USERTAG_DDE2); + + return; + } + ERR("DDE Get No DDE Data found!\n"); + return; +} BOOL FASTCALL IntDdeSendMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { PWND pWndServer; + PDDE_PROP pddeProp; + + if (Msg == WM_DDE_ACK) + { + ERR("Sending WM_DDE_ACK Client hwnd %p\n",pWnd->head.h); + } if (pWnd->head.pti->ppi != gptiCurrent->ppi) { + ERR("Sending long DDE 0x%x\n",Msg); + // Allow only Acknowledge and Initiate to be sent across borders. if (Msg != WM_DDE_ACK ) { @@ -20,52 +354,26 @@ return FALSE; } + ERR("Sending long WM_DDE_ACK\n"); + pWndServer = UserGetWindowObject((HWND)wParam); if (pWndServer == NULL) { ERR("Invalid DDE Server Window handle\n"); return FALSE; } - ERR("Sending DDE 0x%x\n",Msg); + + // Setup property so this conversation can be tracked. + pddeProp = ExAllocatePoolWithTag(PagedPool, sizeof(DDE_PROP), USERTAG_DDE1); + + pddeProp->spwnd = pWndServer; + pddeProp->spwndPartner = pWnd; + + IntSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); } return TRUE; } -BOOL FASTCALL -IntDdePostMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - PWND pWndClient; - - if (pWnd->head.pti->ppi != gptiCurrent->ppi) - { - // Initiate is sent only across borders. - if (Msg == WM_DDE_INITIATE) - { - return FALSE; - } - - pWndClient = UserGetWindowObject((HWND)wParam); - if (pWndClient == NULL) - { - // This is terminating so post it. - if ( Msg == WM_DDE_TERMINATE) return TRUE; - ERR("Invalid DDE Client Window handle\n"); - return FALSE; - } - ERR("Posting and do CB DDE 0x%x\n",Msg); - } - return TRUE; -} - -VOID FASTCALL -IntDdeGetMessageHook(PMSG pMsg) -{ - if (pMsg->message == WM_DDE_TERMINATE) - { - return; - } - ERR("Do Callback Msg 0x%x\n",pMsg->message); -} BOOL APIENTRY Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -122,8 +122,6 @@ static MSGMEMORY g_MsgMemory[] = { { WM_CREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, - { WM_DDE_ACK, sizeof(DDEPACK), MMS_FLAG_READ }, - { WM_DDE_EXECUTE, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_GETMINMAXINFO, sizeof(MINMAXINFO), MMS_FLAG_READWRITE }, { WM_GETTEXT, MMS_SIZE_WPARAMWCHAR, MMS_FLAG_WRITE }, { WM_NCCALCSIZE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, @@ -1014,14 +1012,12 @@ bGMSG ); if (Present) { + /* GetMessage or PostMessage must never get messages that contain pointers */ + ASSERT(FindMsgMemory(pMsg->message) == NULL); + if ( pMsg->message >= WM_DDE_FIRST && pMsg->message <= WM_DDE_LAST ) { - IntDdeGetMessageHook(pMsg); - } - else - { - /* GetMessage or PostMessage must never get messages that contain pointers */ - ASSERT(FindMsgMemory(pMsg->message) == NULL); + IntDdeGetMessageHook(pMsg, ExtraInfo); } if (pMsg->message != WM_PAINT && pMsg->message != WM_QUIT) @@ -1206,11 +1202,12 @@ if ( Msg >= WM_DDE_FIRST && Msg <= WM_DDE_LAST ) { - if (!IntDdePostMessageHook(Window, Msg, wParam, lParam)) + if (!IntDdePostMessageHook(Window, Msg, wParam, &lParam, &ExtraInfo)) { ERR("Posting Exit DDE 0x%x\n",Msg); return FALSE; } + ERR("DDE Post lParam c=%08lx\n",lParam); } if (WM_QUIT == Msg) Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -1,4 +1,4 @@ -/* +ATOM AtomQOS;/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: ntuser init. and main funcs. @@ -15,11 +15,12 @@ PTHREADINFO gptiCurrent = NULL; PPROCESSINFO gppiInputProvider = NULL; ERESOURCE UserLock; -ATOM AtomMessage; // Window Message atom. -ATOM AtomWndObj; // Window Object atom. -ATOM AtomLayer; // Window Layer atom. +ATOM AtomMessage; // Window Message atom. +ATOM AtomWndObj; // Window Object atom. +ATOM AtomLayer; // Window Layer atom. ATOM AtomFlashWndState; // Window Flash State atom. -ATOM AtomDDETrack; // Window DDE Tracking atom. +ATOM AtomDDETrack; // Window DDE Tracking atom. +ATOM AtomQOS; // Window DDE Quality of Service atom. HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; ATOM gaGuiConsoleWndClass; @@ -52,6 +53,7 @@ gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); AtomDDETrack = IntAddGlobalAtom(L"SysDT", TRUE); + AtomQOS = IntAddGlobalAtom(L"SysQOS", TRUE); /* * FIXME: AddPropW uses the global kernel atom table, thus leading to conflicts if we use Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -15,6 +15,8 @@ extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; extern ATOM gaGuiConsoleWndClass; +extern ATOM AtomDDETrack; +extern ATOM AtomQOS; INIT_FUNCTION NTSTATUS NTAPI InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID); Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -43,8 +43,8 @@ /*************** DDE.C ****************/ BOOL FASTCALL IntDdeSendMessageHook(PWND,UINT,WPARAM,LPARAM); -BOOL FASTCALL IntDdePostMessageHook(PWND,UINT,WPARAM,LPARAM); -VOID FASTCALL IntDdeGetMessageHook(PMSG); +BOOL APIENTRY IntDdePostMessageHook(IN PWND,IN UINT,IN WPARAM,IN OUT LPARAM*,IN OUT LONG_PTR*); +VOID APIENTRY IntDdeGetMessageHook(PMSG,LONG_PTR); /*************** MAIN.C ***************/ Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -3,6 +3,286 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ddeml); + + +BOOL FASTCALL DdeAddPair(HGLOBAL ClientMem, HGLOBAL ServerMem); +HGLOBAL FASTCALL DdeGetPair(HGLOBAL ServerMem); + + +/* description of the data fields that need to be packed along with a sent message */ +struct packed_message +{ + //union packed_structs ps; + int count; + const void *data; + int size; +}; + +/* add a data field to a packed message */ +static inline void push_data( struct packed_message *data, const void *ptr, int size ) +{ + data->data = ptr; + data->size = size; + data->count++; +} + +/* pack a pointer into a 32/64 portable format */ +static inline ULONGLONG pack_ptr( const void *ptr ) +{ + return (ULONG_PTR)ptr; +} + +/* unpack a potentially 64-bit pointer, returning 0 when truncated */ +static inline void *unpack_ptr( ULONGLONG ptr64 ) +{ + if ((ULONG_PTR)ptr64 != ptr64) return 0; + return (void *)(ULONG_PTR)ptr64; +} + + +/*********************************************************************** + * post_dde_message + * + * Post a DDE message + */ +BOOL post_dde_message( struct packed_message *data, UINT message, LPARAM lParam , LPARAM *lp) +{ + void* ptr = NULL; + int size = 0; + UINT_PTR uiLo, uiHi; + HGLOBAL hunlock = 0; + ULONGLONG hpack; + + if (!UnpackDDElParam( message, lParam, &uiLo, &uiHi )) + { + ERR("Unpack failed %x\n",message); + return FALSE; + } + + *lp = lParam; + switch (message) + { + /* DDE messages which don't require packing are: + * WM_DDE_INITIATE + * WM_DDE_TERMINATE + * WM_DDE_REQUEST + * WM_DDE_UNADVISE + */ + case WM_DDE_ACK: + if (HIWORD(uiHi)) + { + /* uiHi should contain a hMem from WM_DDE_EXECUTE */ + HGLOBAL h = DdeGetPair( (HANDLE)uiHi ); + if (h) + { + hpack = pack_ptr( h ); + /* send back the value of h on the other side */ + push_data( data, &hpack, sizeof(hpack) ); + *lp = uiLo; + ERR( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h ); + } + } + else + { + /* uiHi should contain either an atom or 0 */ + ERR( "send dde-ack %lx atom=%lx\n", uiLo, uiHi ); + *lp = MAKELONG( uiLo, uiHi ); + } + break; + case WM_DDE_ADVISE: + case WM_DDE_DATA: + case WM_DDE_POKE: + size = 0; + if (uiLo) + { + size = GlobalSize( (HGLOBAL)uiLo ) ; + if ( (message == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || + (message == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || + (message == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value)) ) + return FALSE; + } + else if (message != WM_DDE_DATA) return FALSE; + + *lp = uiHi; + if (uiLo) + { + if ((ptr = GlobalLock( (HGLOBAL)uiLo) )) + { + DDEDATA *dde_data = ptr; + ERR("unused %d, fResponse %d, fRelease %d, fDeferUpd %d, fAckReq %d, cfFormat %d\n", + dde_data->unused, dde_data->fResponse, dde_data->fRelease, + dde_data->reserved, dde_data->fAckReq, dde_data->cfFormat); + push_data( data, ptr, size ); + hunlock = (HGLOBAL)uiLo; + } + } + ERR( "send ddepack %u %lx\n", size, uiHi ); + break; + case WM_DDE_EXECUTE: + if (lParam) + { + if ((ptr = GlobalLock( (HGLOBAL)lParam) )) + { + size = GlobalSize( (HGLOBAL)lParam ); + push_data(data, ptr, size); + /* so that the other side can send it back on ACK */ + *lp = lParam; + hunlock = (HGLOBAL)lParam; + ERR("WM_DDE_EXECUTE text size %d\n",GlobalSize( (HGLOBAL)lParam )); + } + } + break; + } + + FreeDDElParam(message, lParam); + + if (hunlock) GlobalUnlock(hunlock); + + return TRUE; +} + +/*********************************************************************** + * unpack_dde_message + * + * Unpack a posted DDE message received from another process. + */ +BOOL unpack_dde_message( HWND hwnd, UINT message, LPARAM *lparam, PVOID buffer, int size ) +{ + UINT_PTR uiLo, uiHi; + HGLOBAL hMem = 0; + void* ptr; + + ERR("udm : Size %d\n",size); + + switch (message) + { + case WM_DDE_ACK: + if (size) + { + ULONGLONG hpack; + /* hMem is being passed */ + if (size != sizeof(hpack)) return FALSE; + if (!buffer) return FALSE; + uiLo = *lparam; + memcpy( &hpack, buffer, size ); + hMem = unpack_ptr( hpack ); + uiHi = (UINT_PTR)hMem; + ERR("recv dde-ack %lx mem=%lx[%lx]\n", uiLo, uiHi, GlobalSize( hMem )); + } + else + { + uiLo = LOWORD( *lparam ); + uiHi = HIWORD( *lparam ); + ERR("recv dde-ack %lx atom=%lx\n", uiLo, uiHi); + } + *lparam = PackDDElParam( WM_DDE_ACK, uiLo, uiHi ); + break; + case WM_DDE_ADVISE: + case WM_DDE_DATA: + case WM_DDE_POKE: + if ((!buffer) && message != WM_DDE_DATA) return FALSE; + uiHi = *lparam; + if (size) + { + if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) + return FALSE; + if ((ptr = GlobalLock( hMem ))) + { + memcpy( ptr, buffer, size ); + GlobalUnlock( hMem ); + } + else + { + GlobalFree( hMem ); + return FALSE; + } + } + uiLo = (UINT_PTR)hMem; + + *lparam = PackDDElParam( message, uiLo, uiHi ); + break; + case WM_DDE_EXECUTE: + if (size) + { + if (!buffer) return FALSE; + if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) return FALSE; + if ((ptr = GlobalLock( hMem ))) + { + memcpy( ptr, buffer, size ); + GlobalUnlock( hMem ); + ERR( "exec: pairing c=%08lx s=%p\n", *lparam, hMem ); + if (!DdeAddPair( (HGLOBAL)*lparam, hMem )) + { + GlobalFree( hMem ); + ERR("udm exec: GF 1\n"); + return FALSE; + } + } + else + { + GlobalFree( hMem ); + ERR("udm exec: GF 2\n"); + return FALSE; + } + } + else + { + ERR("udm exec: No Size\n"); + return FALSE; + } + + ERR( "exec: exit c=%08lx s=%p\n", *lparam, hMem ); + *lparam = (LPARAM)hMem; + break; + } + return TRUE; +} + +NTSTATUS +WINAPI +User32CallDDEPostFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + struct packed_message data; + BOOL Ret; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common = Arguments; + + data.data = 0; + data.size = 0; + ERR("DDE Post CB\n"); + Ret = post_dde_message( &data, Common->message, Common->lParam, &Common->lParam); + + if (Ret) + { + if (Common->size >= data.size) + { + if (data.data) RtlCopyMemory(&Common->buffer, data.data, data.size); + } + Common->size = data.size; + ERR("DDE Post CB size %d\n",data.size); + } + else + { + ERR("Return bad msg 0x%x Size %d\n",Common->message,Common->size); + } + + return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +} + +NTSTATUS +WINAPI +User32CallDDEGetFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + BOOL Ret; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common = Arguments; + + ERR("DDE Get CB size %d\n",Common->size); + + Ret = unpack_dde_message( Common->hwnd, Common->message, &Common->lParam, Common->buffer, Common->size ); + + return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +} + + /* * @unimplemented Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -203,6 +203,8 @@ User32CallCopyImageFromKernel, User32CallSetWndIconsFromKernel, User32DeliverUserAPC, + User32CallDDEPostFromKernel, + User32CallDDEGetFromKernel, }; Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -163,7 +163,7 @@ static unsigned DdeNumUsed = 0; static CRITICAL_SECTION DdeCrst; -static BOOL FASTCALL +BOOL FASTCALL DdeAddPair(HGLOBAL ClientMem, HGLOBAL ServerMem) { unsigned i; @@ -213,7 +213,7 @@ return TRUE; } -static HGLOBAL FASTCALL +HGLOBAL FASTCALL DdeGetPair(HGLOBAL ServerMem) { unsigned i; @@ -357,67 +357,12 @@ switch (UMMsg->message) { - case WM_DDE_ACK: - { - PDDEPACK DdeLparam; - DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(DDEPACK)); - if (!DdeLparam || - !UnpackDDElParam( UMMsg->message, UMMsg->lParam, &DdeLparam->uiLo, &DdeLparam->uiHi)) - return FALSE; - /* - If this is a reply to WM_DDE_EXECUTE then - uiHi will contain a hMem, hence >= 0x10000. - Otherwise, it will be be an atom, a 16-bit value. - */ - if (!IS_ATOM(DdeLparam->uiHi)) - { - HGLOBAL h = DdeGetPair((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); - if (h) - { - GlobalFree((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); - DdeLparam->uiHi = (UINT_PTR) h; - } - } - FreeDDElParam(UMMsg->message, UMMsg->lParam); - KMMsg->lParam = (LPARAM) DdeLparam; - } - break; - - case WM_DDE_EXECUTE: - { - SIZE_T Size; - PKMDDEEXECUTEDATA KMDdeExecuteData; - PVOID Data; - - Size = GlobalSize((HGLOBAL) UMMsg->lParam); - Data = GlobalLock((HGLOBAL) UMMsg->lParam); - if (!Data) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - KMDdeExecuteData = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDEEXECUTEDATA) + Size); - if (!KMDdeExecuteData) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - KMDdeExecuteData->Sender = (HWND) UMMsg->wParam; - KMDdeExecuteData->ClientMem = (HGLOBAL) UMMsg->lParam; - memcpy((PVOID) (KMDdeExecuteData + 1), Data, Size); - KMMsg->wParam = sizeof(KMDDEEXECUTEDATA) + Size; - KMMsg->lParam = (LPARAM) KMDdeExecuteData; - GlobalUnlock((HGLOBAL) UMMsg->lParam); - } - break; - case WM_COPYDATA: { PCOPYDATASTRUCT pUMCopyData = (PCOPYDATASTRUCT)UMMsg->lParam; PCOPYDATASTRUCT pKMCopyData; - pKMCopyData = HeapAlloc(GetProcessHeap(), 0, - sizeof(COPYDATASTRUCT) + pUMCopyData->cbData); + pKMCopyData = HeapAlloc(GetProcessHeap(), 0, sizeof(COPYDATASTRUCT) + pUMCopyData->cbData); if (!pKMCopyData) { SetLastError(ERROR_OUTOFMEMORY); @@ -428,8 +373,7 @@ pKMCopyData->cbData = pUMCopyData->cbData; pKMCopyData->lpData = pKMCopyData + 1; - RtlCopyMemory(pKMCopyData + 1, pUMCopyData->lpData, - pUMCopyData->cbData); + RtlCopyMemory(pKMCopyData + 1, pUMCopyData->lpData, pUMCopyData->cbData); KMMsg->lParam = (LPARAM)pKMCopyData; } @@ -448,8 +392,6 @@ { switch (KMMsg->message) { - case WM_DDE_ACK: - case WM_DDE_EXECUTE: case WM_COPYDATA: HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); break; @@ -464,6 +406,8 @@ MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) { *UMMsg = *KMMsg; + + if (KMMsg->lParam == 0) return TRUE; switch (UMMsg->message) { @@ -485,43 +429,6 @@ Class += sizeof(WCHAR); Cs->lpszClass = (LPCWSTR) Class; } - } - break; - - case WM_DDE_ACK: - { - PDDEPACK DdeLparam = (PDDEPACK) KMMsg->lParam; - UMMsg->lParam = PackDDElParam(KMMsg->message, DdeLparam->uiLo, DdeLparam->uiHi); - } - break; - - case WM_DDE_EXECUTE: - { - PKMDDEEXECUTEDATA KMDdeExecuteData; - HGLOBAL GlobalData; - PVOID Data; - - KMDdeExecuteData = (PKMDDEEXECUTEDATA) KMMsg->lParam; - GlobalData = GlobalAlloc(GMEM_MOVEABLE, KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); - if (!GlobalData) - { - return FALSE; - } - Data = GlobalLock(GlobalData); - if (!Data) - { - GlobalFree(GlobalData); - return FALSE; - } - memcpy(Data, (PVOID) (KMDdeExecuteData + 1), KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); - GlobalUnlock(GlobalData); - if (!DdeAddPair(KMDdeExecuteData->ClientMem, GlobalData)) - { - GlobalFree(GlobalData); - return FALSE; - } - UMMsg->wParam = (WPARAM) KMDdeExecuteData->Sender; - UMMsg->lParam = (LPARAM) GlobalData; } break; @@ -2967,6 +2874,11 @@ KMMsg.lParam = (LPARAM) ((char *) CallbackArgs + sizeof(WINDOWPROC_CALLBACK_ARGUMENTS)); switch(KMMsg.message) { + case WM_SYSTIMER: + { + ERR("WM_SYSTIMER %p\n",KMMsg.hwnd); + break; + } case WM_SIZING: { PRECT prect = (PRECT) KMMsg.lParam;

1 0

[jimtabor] 65999: [User32] - Fix DDE Server Class names to match system Atoms.
by jimtabor＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: jimtabor Date: Wed Jan 7 21:47:33 2015 New Revision: 65999 URL: http://svn.reactos.org/svn/reactos?rev=65999&view=rev Log: [User32] - Fix DDE Server Class names to match system Atoms. Modified: trunk/reactos/win32ss/user/user32/misc/ddeserver.c Modified: trunk/reactos/win32ss/user/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] Wed Jan 7 21:47:33 2015 @@ -29,9 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddeml); -static const WCHAR szServerNameClass[] = {'D','d','e','S','e','r','v','e','r','N','a','m','e',0}; -const char WDML_szServerConvClassA[] = "DdeServerConvA"; -const WCHAR WDML_szServerConvClassW[] = {'D','d','e','S','e','r','v','e','r','C','o','n','v','W',0}; +static const WCHAR szServerNameClass[] = L"DDEMLMom"; +const char WDML_szServerConvClassA[] = "DDEMLAnsiServer"; +const WCHAR WDML_szServerConvClassW[] = L"DDEMLUnicodeServer"; static LRESULT CALLBACK WDML_ServerNameProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK WDML_ServerConvProc(HWND, UINT, WPARAM, LPARAM);

1 0

[hbelusca] 65998: [TOOLS]: Slap some sense in the indentation of some files. Next time: PLEASE CHECK YOUR F*CKING EDITOR's TABS AND SET THEM TO 4 SPACES BEFORE DOING ANYTHING ELSE!!!! (and not to 8...
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 19:26:49 2015 New Revision: 65998 URL: http://svn.reactos.org/svn/reactos?rev=65998&view=rev Log: [TOOLS]: Slap some sense in the indentation of some files. Next time: PLEASE CHECK YOUR F*CKING EDITOR's TABS AND SET THEM TO 4 SPACES BEFORE DOING ANYTHING ELSE!!!! (and not to 8 spaces and then use 4 space indentation and complete with tabs). Removed: trunk/reactos/tools/cabman/makefile.win32 Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dff.txt trunk/reactos/tools/cabman/dfp.h trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.h trunk/reactos/tools/cabman/raw.h trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.h trunk/reactos/tools/create_nls/Readme trunk/reactos/tools/create_nls/create_nls.c trunk/reactos/tools/log2lines/CMakeLists.txt trunk/reactos/tools/log2lines/cache.c trunk/reactos/tools/log2lines/cmd.c trunk/reactos/tools/log2lines/config.h trunk/reactos/tools/log2lines/list.c trunk/reactos/tools/log2lines/options.c trunk/reactos/tools/log2lines/revision.h trunk/reactos/tools/log2lines/stat.c trunk/reactos/tools/mkhive/binhive.c trunk/reactos/tools/mkhive/binhive.h trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/cmi.h trunk/reactos/tools/mkhive/mkhive.c trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/registry.h trunk/reactos/tools/mkhive/rtl.c trunk/reactos/tools/mkshelllink/mkshelllink.c trunk/reactos/tools/ms2ps/ms2ps.cpp trunk/reactos/tools/nandflash/main.c trunk/reactos/tools/ofw_interface/calls.ofw trunk/reactos/tools/ofw_interface/ofw_interface.cpp trunk/reactos/tools/pipetools/piperead.cpp trunk/reactos/tools/pipetools/pipespy.cpp trunk/reactos/tools/pipetools/pipetunnel.cpp trunk/reactos/tools/stubgen.c trunk/reactos/tools/utf16le/utf16le.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… Modified: trunk/reactos/tools/cabman/dff.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dff.txt?rev=6… Modified: trunk/reactos/tools/cabman/dfp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.h?rev=659… Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… Removed: trunk/reactos/tools/cabman/makefile.win32 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/makefile.win3… Modified: trunk/reactos/tools/cabman/mszip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.h?rev=6… Modified: trunk/reactos/tools/cabman/raw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.h?rev=659… Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… Modified: trunk/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.h?rev… Modified: trunk/reactos/tools/create_nls/Readme URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/create_nls/Readme?re… Modified: trunk/reactos/tools/create_nls/create_nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/create_nls/create_nl… Modified: trunk/reactos/tools/log2lines/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/CMakeLists… Modified: trunk/reactos/tools/log2lines/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/cache.c?re… Modified: trunk/reactos/tools/log2lines/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/cmd.c?rev=… Modified: trunk/reactos/tools/log2lines/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/config.h?r… Modified: trunk/reactos/tools/log2lines/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/list.c?rev… Modified: trunk/reactos/tools/log2lines/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/options.c?… Modified: trunk/reactos/tools/log2lines/revision.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/revision.h… Modified: trunk/reactos/tools/log2lines/stat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/stat.c?rev… Modified: trunk/reactos/tools/mkhive/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/binhive.c?rev… Modified: trunk/reactos/tools/mkhive/binhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/binhive.h?rev… Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=659… Modified: trunk/reactos/tools/mkhive/cmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.h?rev=659… Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=659… Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… Modified: trunk/reactos/tools/ms2ps/ms2ps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ms2ps/ms2ps.cpp?rev=… Modified: trunk/reactos/tools/nandflash/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/main.c?rev… Modified: trunk/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/calls.… Modified: trunk/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_in… Modified: trunk/reactos/tools/pipetools/piperead.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/piperead.c… Modified: trunk/reactos/tools/pipetools/pipespy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/pipespy.cp… Modified: trunk/reactos/tools/pipetools/pipetunnel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/pipetunnel… Modified: trunk/reactos/tools/stubgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/stubgen.c?rev=65998&… Modified: trunk/reactos/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.cpp?…

1 0

[hbelusca] 65997: [SPEC2DEF]: Turn the tab character into its control code. Timo, is this tab really needed for ARM stubs, or not? (in that case maybe removing it would be better?)
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 18:45:46 2015 New Revision: 65997 URL: http://svn.reactos.org/svn/reactos?rev=65997&view=rev Log: [SPEC2DEF]: Turn the tab character into its control code. Timo, is this tab really needed for ARM stubs, or not? (in that case maybe removing it would be better?) Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Wed Jan 7 18:45:46 2015 @@ -391,7 +391,7 @@ if (giArch == ARCH_ARM) { fprintf(fileDest, - " EXPORT %s [FUNC]\n%s\n", + "\tEXPORT %s [FUNC]\n%s\n", pszSymbolName, pszSymbolName); }

1 0

[hbelusca] 65996: [HPP]: tab2space fixes.
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 18:25:21 2015 New Revision: 65996 URL: http://svn.reactos.org/svn/reactos?rev=65996&view=rev Log: [HPP]: tab2space fixes. Modified: trunk/reactos/tools/hpp/hpp.c Modified: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=65996&… ============================================================================== --- trunk/reactos/tools/hpp/hpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Wed Jan 7 18:25:21 2015 @@ -38,30 +38,30 @@ char* convert_path(const char* origpath) { - char* newpath; - int i; - - newpath = strdup(origpath); - - i = 0; - while (newpath[i] != 0) - { + char* newpath; + int i; + + newpath = strdup(origpath); + + i = 0; + while (newpath[i] != 0) + { #ifdef UNIX_PATHS - if (newpath[i] == '\\') - { - newpath[i] = '/'; - } + if (newpath[i] == '\\') + { + newpath[i] = '/'; + } #else #ifdef DOS_PATHS - if (newpath[i] == '/') - { - newpath[i] = '\\'; - } + if (newpath[i] == '/') + { + newpath[i] = '\\'; + } #endif #endif - i++; - } - return newpath; + i++; + } + return newpath; } char* @@ -73,18 +73,18 @@ void* LoadFile(const char* pszFileName, size_t* pFileSize) { - FILE* file; - void* pFileData = NULL; - int iFileSize; + FILE* file; + void* pFileData = NULL; + int iFileSize; trace("Loading file..."); - file = fopen(pszFileName, "rb"); - if (!file) - { - trace("Could not open file\n"); - return NULL; - } + file = fopen(pszFileName, "rb"); + if (!file) + { + trace("Could not open file\n"); + return NULL; + } fseek(file, 0L, SEEK_END); iFileSize = ftell(file); @@ -109,7 +109,7 @@ fclose(file); - return pFileData; + return pFileData; }

1 0

[hbelusca] 65995: [KBDTOOL]: Whitespace fixes.
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 18:24:14 2015 New Revision: 65995 URL: http://svn.reactos.org/svn/reactos?rev=65995&view=rev Log: [KBDTOOL]: Whitespace fixes. Modified: trunk/reactos/tools/kbdtool/main.c trunk/reactos/tools/kbdtool/output.c trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=6… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Wed Jan 7 18:24:14 2015 @@ -26,13 +26,13 @@ /* FUNCTIONS ******************************************************************/ -VOID +VOID PrintUsage(VOID) { /* This is who we are */ printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", gVersion, gSubVersion); - + /* This is what we do */ printf("Usage: KbdTool [-v] [-n] [-w] [-k] [-n] [-u|a] [-i|x|m|o|s] FILE\n\n"); printf("\t[-?] display this message\n"); @@ -47,11 +47,11 @@ printf("\t[-o] Builds for WOW64\n"); printf("\t[-s] Generate Source files (no build)\n\n"); printf("\tFILE The source keyboard file (required)\n\n"); - + /* Extra hints */ printf("\t-u/-a are mutually exclusive; kbdutool will use the last one if you specify more than one.\n"); printf("\t-i/-x/-m/-o-s will exhibit the same behavior when than one of them is specified.\n\n"); - + /* Quit */ exit(1); printf("should not be here"); @@ -65,18 +65,18 @@ CHAR Option; PCHAR OpenFlags; CHAR BuildOptions[16] = {0}; - + /* Loop for parameter */ for (i = 1; i < argc; ++i) { if (argv[i][0] != '/' && argv[i][0] != '-') break; - + if (argv[i][1] && !argv[i][2]) Option = argv[i][1]; else Option = 0; - + /* Check supported options */ switch (Option) { @@ -85,74 +85,74 @@ case 'a': UnicodeFile = 0; break; - + /* UNICODE File */ case 'U': case 'u': UnicodeFile = 1; break; - + /* Verbose */ case 'V': case 'v': Verbose = 1; break; - + /* No logo */ case 'N': case 'n': NoLogo = 1; break; - + /* Fallback driver */ case 'K': case 'k': FallbackDriver = 1; break; - + /* Sanity Check */ case 'W': case 'w': SanityCheck = 1; break; - + /* Itanium */ case 'I': case 'i': BuildType = 1; break; - + /* X86 */ case 'X': case 'x': BuildType = 0; break; - + /* AMD64 */ case 'M': case 'm': BuildType = 2; break; - + /* WOW64 */ case 'O': case 'o': BuildType = 3; break; - + /* Source only */ case 'S': case 's': SourceOnly = 1; break; - + default: /* If you got here, the options are invalid or missing */ PrintUsage(); break; } } - + /* Do we have no options? */ if (i == argc) PrintUsage(); @@ -163,14 +163,14 @@ printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", gVersion, gSubVersion); } - + /* Save the file name */ gpszFileName = argv[i]; - + /* Open either as binary or text */ OpenFlags = "rb"; if (!UnicodeFile) OpenFlags = "rt"; - + /* Open a handle to the file */ gfpInput = fopen(gpszFileName, OpenFlags); if (!gfpInput) @@ -179,7 +179,7 @@ printf("Unable to open '%s' for read.\n", gpszFileName); exit(1); } - + /* Should we print out what we're doing? */ if (!NoLogo) { @@ -197,7 +197,7 @@ /* Print the appropriate message depending on what was chosen */ case 0: strcpy(BuildOptions, "i386/x86"); - break; + break; case 1: strcpy(BuildOptions, "ia64"); break; @@ -212,17 +212,17 @@ break; } } - + /* Now inform the user */ printf("Compiling layout information from '%s' for %s.\n", gpszFileName, BuildOptions); } - + /* Now parse the keywords */ FailureCode = DoParsing(); - + /* Should we build? */ if (!(SourceOnly) && !(FallbackDriver)) ErrorCode = 0;//DoBuild(); - + /* Did everything work? */ if (FailureCode == 0) { @@ -234,7 +234,7 @@ /* Print the failure code */ printf("\n %13d\n", FailureCode); } - + /* Return the error code */ return ErrorCode; } Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Wed Jan 7 18:24:14 2015 @@ -26,7 +26,7 @@ IN BOOLEAN AddZero) { PCHAR p; - + /* Check for invalid character */ if (Char == -1) { @@ -37,19 +37,19 @@ { /* Use our global buffer */ p = gCharName; - + /* Add the first quote unless this was a zero-string */ if (!AddZero) *p++ = '\''; - + /* Now replace any other quote or comment character with a slash */ if ((Char == '\"') || (Char == '\'') || (Char == '\\')) *p++ = '\\'; - + /* Now plug in the character */ *p++ = Char; - + /* And add the terminating quote, unless this was a zero-string */ if (!AddZero) *p++ = '\''; - + /* Terminate the buffer */ *p = '\0'; } @@ -82,7 +82,7 @@ sprintf(gCharName, "\\x%04x", Char); } } - + /* Return the name */ return gCharName; } @@ -93,26 +93,26 @@ BOOL DeadKey) { CHAR CharBuffer[255]; - PKEYNAME NextName; + PKEYNAME NextName; PCHAR Name, Buffer; ULONG i; - + /* Loop all key names */ while (KeyName) { /* Go to the next key name */ NextName = KeyName->Next; - + /* Remember the name and our buffer address */ Name = KeyName->Name; Buffer = CharBuffer; - + /* Check if it's an IDS name */ if (strncmp(Name, "IDS_", 4)) { /* No, so start parsing it. First, handle initial quote */ if (*Name != '\"') *Buffer++ = '\"'; - + /* Next, parse the name */ while (*Name) { @@ -130,7 +130,7 @@ /* Copy 6 characters */ for (i = 0; (*Name) && (i < 6); i++) *Buffer++ = *Name++; } - + /* Check if we still have something at the end */ if (*Name) { @@ -142,10 +142,10 @@ } } } - + /* Check for terminating quote */ if (*(Buffer - 1) != '\"') *Buffer++ = '\"'; - + /* Terminate the buffer */ *Buffer++ = '\0'; } @@ -168,15 +168,15 @@ /* Print the entry */ fprintf(FileHandle, " 0x%02x, L%s,\n", KeyName->Code, CharBuffer); } - + /* Cleanup allocation */ free(KeyName->Name); free(KeyName); - + /* Move on */ KeyName = NextName; } - + /* Is this a dead key? */ if (DeadKey) { @@ -199,11 +199,11 @@ ULONG i; CHAR UndefChar; USHORT SubCode; - + /* Build the keyboard name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".H"); - + /* Open it */ FileHandle = fopen(OutputFile, "wt"); if (!FileHandle) @@ -212,7 +212,7 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Print the module header */ fprintf(FileHandle, "/****************************** Module Header ******************************\\\n" @@ -228,7 +228,7 @@ gVersion, gSubVersion, asctime(Now)); - + /* Print out the includes and defines */ fprintf(FileHandle, "/*\n" @@ -239,7 +239,7 @@ "* Include the basis of all keyboard table values\n" "*/\n" "#include \"kbd.h\"\n"); - + /* Now print out the virtual key conversion table */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -253,7 +253,7 @@ "* | Scan | | kbd | kbd | kbd | kbd | kbd | kbd |\n" "* | code | | type 1 | type 2 | type 3 | type 4 | type 5 | type 6 |\n" "\\****+-------+_+----------+----------+----------+----------+----------+----------+*/\n\n"); - + /* Loop all keys */ for (i = 0; i < 110; i++) { @@ -282,7 +282,7 @@ printf("Weird scancode value %04x: expected xx, E0xx, or E1xx\n", SubCode); exit(1); } - + /* Extended 1 */ UndefChar = 'Y'; } @@ -292,7 +292,7 @@ /* Normal key */ UndefChar = 'T'; } - + /* Print out the virtual key redefinition */ fprintf(FileHandle, "#undef %c%02X\n#define %c%02X _EQ(%43s%23s\n", @@ -302,14 +302,14 @@ Layout->Entry[i].ScanCode, getVKName(Layout->Entry[i].VirtualKey, 0), ")"); - } - } - } - + } + } + } + /* Cleanup and close */ fprintf(FileHandle,"\n"); fclose(FileHandle); - + /* We made it */ return TRUE; } @@ -325,13 +325,13 @@ ULONG Length; PCHAR p; PKEYNAME NextDescription, NextLanguage; - + /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".RC"); strcpy(InternalName, gKBDName); for (p = InternalName; *p; p++) *p = tolower(*p); - + /* Open it */ FileHandle = fopen(OutputFile, "wb"); if (!FileHandle) @@ -340,24 +340,24 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Check if we have copyright */ Length = strlen(gCopyright); if (!Length) { /* Set time string */ strftime(TimeBuffer, 5, "%Y", Now); - + /* Add copyright character */ strcpy(gCopyright, "(C)"); - + /* Add the year */ strcat(gCopyright, TimeBuffer); - + /* Add blank company */ strcat(gCopyright, " "); } - + /* Write the resource file header */ fprintf(FileHandle, "#include \"winver.h\"\r\n" @@ -385,7 +385,7 @@ gDescription, gVersion, gSubVersion); - + /* Continue writing it */ fprintf(FileHandle, " VALUE \"InternalName\", \"%s (%d.%d)\\0\"\r\n" @@ -410,7 +410,7 @@ InternalName, gVersion, gSubVersion); - + /* Now check if we have a locale name */ Length = strlen(gLocaleName); if (Length) @@ -421,7 +421,7 @@ 9, 1); fprintf(FileHandle, "BEGIN\r\n"); - + /* Language or locale? */ if (strchr(gLocaleName, '\"')) { @@ -433,24 +433,24 @@ /* Write the locale name */ fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForLocaleName, gLocaleName); } - + /* Terminate the entry */ fprintf(FileHandle, "END\r\n\r\n"); } - + /* Check for description information */ while (DescriptionData) { /* Remember the next pointer */ NextDescription = DescriptionData->Next; - + /* Write the header */ fprintf(FileHandle, "\r\nSTRINGTABLE DISCARDABLE\r\nLANGUAGE %d, %d\r\n", DescriptionData->Code & 0x3FF, DescriptionData->Code >> 10); fprintf(FileHandle, "BEGIN\r\n"); - + /* Quoted string or not? */ if (strchr(DescriptionData->Name, '\"')) { @@ -462,31 +462,31 @@ /* Write the description name */ fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForDescriptions, DescriptionData->Name); } - + /* Terminate the entry */ fprintf(FileHandle, "END\r\n\r\n"); - + /* Free the allocation */ free(DescriptionData->Name); free(DescriptionData); - + /* Move to the next entry */ DescriptionData = NextDescription; } - + /* Check for language information */ while (LanguageData) { /* Remember the next pointer */ NextLanguage = LanguageData->Next; - + /* Write the header */ fprintf(FileHandle, "\r\nSTRINGTABLE DISCARDABLE\r\nLANGUAGE %d, %d\r\n", LanguageData->Code & 0x3FF, LanguageData->Code >> 10); fprintf(FileHandle, "BEGIN\r\n"); - + /* Quoted string or not? */ if (strchr(LanguageData->Name, '\"')) { @@ -498,18 +498,18 @@ /* Write the language name */ fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForLanguageNames, LanguageData->Name); } - + /* Terminate the entry */ fprintf(FileHandle, "END\r\n\r\n"); - + /* Free the allocation */ free(LanguageData->Name); free(LanguageData); - + /* Move to the next entry */ LanguageData = NextLanguage; } - + /* We're done! */ fclose(FileHandle); return TRUE; @@ -520,11 +520,11 @@ { CHAR OutputFile[13]; FILE *FileHandle; - + /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".DEF"); - + /* Open it */ FileHandle = fopen(OutputFile, "wt"); if (!FileHandle) @@ -533,14 +533,14 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Write the file exports */ fprintf(FileHandle, "LIBRARY %s\n\n" "EXPORTS\n" " KbdLayerDescriptor @1\n", gKBDName); - + /* Clean up */ fclose(FileHandle); return TRUE; @@ -567,11 +567,11 @@ ULONG HighestState; PVKNAME Entry; PCHAR p; - + /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".C"); - + /* Open it */ FileHandle = fopen(OutputFile, "wt"); if (!FileHandle) @@ -580,7 +580,7 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Print the header */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -595,7 +595,7 @@ gVersion, gSubVersion, asctime(Now)); - + /* What kind of driver is this? */ if (FallbackDriver) { @@ -609,7 +609,7 @@ "#include <windows.h>\n" "#include \"kbd.h\"\n" "#include \"%s.h\"\n\n", - gKBDName); + gKBDName); } /* What kind of driver is this? */ @@ -641,7 +641,7 @@ "/***************************************************************************\\\n" "* ausVK[] - Virtual Scan Code to Virtual Key conversion table\n" "\\***************************************************************************/\n\n"); - + /* Table begin */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA USHORT ausVK[] = {\n" @@ -652,7 +652,7 @@ " T20, T21, T22, T23, T24, T25, T26, T27,\n" " T28, T29, T2A, T2B, T2C, T2D, T2E, T2F,\n" " T30, T31, T32, T33, T34, T35,\n\n"); - + /* Table continue */ fprintf(FileHandle, " /*\n" @@ -662,7 +662,7 @@ " T37 | KBDMULTIVK, // numpad_* + Shift/Alt -> SnapShot\n\n" " T38, T39, T3A, T3B, T3C, T3D, T3E,\n" " T3F, T40, T41, T42, T43, T44,\n\n"); - + /* Table continue */ fprintf(FileHandle, " /*\n" @@ -672,7 +672,7 @@ " */\n" " T45 | KBDEXT | KBDMULTIVK,\n\n" " T46 | KBDMULTIVK,\n\n"); - + /* Numpad table */ fprintf(FileHandle, " /*\n" @@ -693,7 +693,7 @@ " T51 | KBDNUMPAD | KBDSPECIAL, // Numpad 3 (PgDn),\n" " T52 | KBDNUMPAD | KBDSPECIAL, // Numpad 0 (Ins),\n" " T53 | KBDNUMPAD | KBDSPECIAL, // Numpad . (Del),\n\n"); - + /* Table finish */ fprintf(FileHandle, " T54, T55, T56, T57, T58, T59, T5A, T5B,\n" @@ -703,10 +703,10 @@ " T74, T75, T76, T77, T78, T79, T7A, T7B,\n" " T7C, T7D, T7E\n\n" "};\n\n"); - + /* Key name table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE0VscToVk[] = {\n"); - + /* Loop 110-key table */ for (i = 0; i < 110; i++) { @@ -729,13 +729,13 @@ } } } - + /* Key name table finish */ fprintf(FileHandle, " { 0, 0 }\n};\n\n"); - + /* Extended key name table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE1VscToVk[] = {\n"); - + /* Loop 110-key table */ for (i = 0; i < 110; i++) { @@ -758,12 +758,12 @@ } } } - + /* Extended key name table finish */ fprintf(FileHandle, " { 0x1D, Y1D }, // Pause\n" " { 0 , 0 }\n};\n\n"); - + /* Modifier table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -776,10 +776,10 @@ "* CTRL (L & R) is used to generate control characters\n" "* ALT (L & R) used for generating characters by number with numpad\n" "\\***************************************************************************/\n"); - + /* Modifier table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VK_TO_BIT aVkToBits[] = {\n"); - + /* Loop modifier table */ i = 0; Entry = &Modifiers[0]; @@ -790,14 +790,14 @@ " { %-12s, %-12s },\n", getVKName(Entry->VirtualKey, 1), Entry->Name); - + /* Move to the next one */ Entry = &Modifiers[++i]; } - + /* Modifier table finish */ fprintf(FileHandle, " { 0, 0 }\n};\n\n"); - + /* Modifier conversion table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -806,10 +806,10 @@ "* See kbd.h for a full description.\n" "*\n" "\\***************************************************************************/\n\n"); - + /* Zero out local state data */ for (i = 0; i < 8; i++) States[i] = -1; - + /* Find the highest set state */ for (HighestState = 1, i = 0; (i < 8) && (ShiftStates[i] != -1); i++) { @@ -817,7 +817,7 @@ States[ShiftStates[i]] = i; if (ShiftStates[i] > HighestState) HighestState = ShiftStates[i]; } - + /* Modifier conversion table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA MODIFIERS CharModifiers = {\n" @@ -827,7 +827,7 @@ " // Modification# // Keys Pressed\n" " // ============= // =============\n", HighestState); - + /* Loop states */ for (i = 0; i <= HighestState; i++) { @@ -843,14 +843,14 @@ if (i == HighestState) { /* Last state header */ - fprintf(FileHandle, " %d // ", States[i]); + fprintf(FileHandle, " %d // ", States[i]); } else { /* Normal state header */ - fprintf(FileHandle, " %d, // ", States[i]); + fprintf(FileHandle, " %d, // ", States[i]); } - + /* State 1 or higher? */ if (i >= 1) { @@ -864,34 +864,34 @@ fprintf(FileHandle, "+"); NeedPlus = FALSE; } - + /* Check if it's time to add a modifier */ if (i & k) { /* Get the key state name and copy it into our buffer */ strcpy(KeyNameBuffer, getVKName(Modifiers[j].VirtualKey, 1)); - + /* Go go the 4th char (past the "KBD") and lower name */ for (p = &KeyNameBuffer[4]; *p; p++) *p = tolower(*p); - + /* Print it */ fprintf(FileHandle, "%s", &KeyNameBuffer[3]); - + /* We'll need a plus sign next */ NeedPlus = TRUE; } } } - + /* Terminate the entry */ fprintf(FileHandle, "\n"); } } - - + + /* Modifier conversion table end */ fprintf(FileHandle," }\n" "};\n\n"); - + /* Shift state translation table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -899,7 +899,7 @@ "* aVkToWch2[] - Virtual Key to WCHAR translation for 2 shift states\n" "* aVkToWch3[] - Virtual Key to WCHAR translation for 3 shift states\n" "* aVkToWch4[] - Virtual Key to WCHAR translation for 4 shift states\n"); - + /* Check if there's exta shift states */ for (i = 5; i < HighestState; i++) { @@ -909,7 +909,7 @@ i, i); } - + /* Shift state translation table description continue */ fprintf(FileHandle, "*\n" @@ -931,7 +931,7 @@ "* WCH_LGTR - Ligature (generates multiple characters)\n" "*\n" "\\***************************************************************************/\n\n"); - + /* Loop all the states */ for (i = 2; i <= StateCount; i++) { @@ -945,42 +945,42 @@ if (i == Layout->Entry[j].StateCount) break; } } - + /* Print the table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VK_TO_WCHARS%d aVkToWch%d[] = {\n" "// | | Shift |", i, i); - + /* Print the correct state label */ for (k = 2; k < i; k++) fprintf(FileHandle, "%-9.9s|", StateLabel[ShiftStates[k]]); - + /* Print the next separator */ fprintf(FileHandle, "\n// |=========|=========|"); - + /* Check for extra states and print their separators too */ for (k = 2; k < i; k++) fprintf(FileHandle, "=========|"); - + /* Finalize the separator header */ fprintf(FileHandle, "\n"); - + /* Loop all the scan codes */ for (j = 0; j < 110; j++) { /* Check if this is the state for the entry */ if (i != Layout->Entry[j].StateCount) continue; - + /* Print out the entry for this key */ fprintf(FileHandle, " {%-13s,%-7s", getVKName(Layout->Entry[j].VirtualKey, 1), CapState[Layout->Entry[j].Cap]); - + /* Initialize the buffer for this line */ *LineBuffer = '\0'; - + /* Loop states */ for (k = 0; k < i; k++) { @@ -991,7 +991,7 @@ printf("Dead key data not supported!\n"); exit(1); } - + /* Check if it's a ligature key */ if (Layout->Entry[j].LigatureCharData[k]) { @@ -999,19 +999,19 @@ printf("Ligature key data not supported!\n"); exit(1); } - + /* Print out the WCH_ name */ fprintf(FileHandle, ",%-9s", WChName(Layout->Entry[j].CharData[k], 0)); - + /* If we have something on the line buffer by now, add WCH_NONE */ if (*LineBuffer != '\0') strcpy(LineBuffer, "WCH_NONE "); } - + /* Finish the line */ fprintf(FileHandle, "},\n"); - + /* Do we have any data at all? */ if (*LineBuffer != '\0') { @@ -1019,15 +1019,15 @@ fprintf(FileHandle, "%s},\n", LineBuffer); continue; } - + /* Otherwise, we're done, unless this requires SGCAP data */ if (Layout->Entry[j].Cap != 2) continue; - + /* Not yet supported */ printf("SGCAP not yet supported!\n"); exit(1); } - + /* Did we only have two states? */ if (i == 2) { @@ -1039,7 +1039,7 @@ " {VK_MULTIPLY ,0 ,'*' ,'*' },\n" " {VK_SUBTRACT ,0 ,'-' ,'-' },\n"); } - + /* Terminate the table */ fprintf(FileHandle, " {0 ,0 "); for (k = 0; k < i; k++) fprintf(FileHandle, ",0 "); @@ -1047,7 +1047,7 @@ /* Terminate the structure */ fprintf(FileHandle, "}\n" "};\n\n"); } - + /* Numpad translation table */ fprintf(FileHandle, "// Put this last so that VkKeyScan interprets number characters\n" @@ -1066,10 +1066,10 @@ " { VK_NUMPAD9 , 0 , '9' },\n" " { 0 , 0 , '\\0' }\n" "};\n\n"); - + /* Translation tables header */ fprintf(FileHandle,"static ALLOC_SECTION_LDATA VK_TO_WCHAR_TABLE aVkToWcharTable[] = {\n"); - + /* Loop states higher than 3 */ for (i = 3; i <= StateCount; i++) { @@ -1080,14 +1080,14 @@ i, i); } - + /* Array of translation tables */ fprintf(FileHandle, " { (PVK_TO_WCHARS1)aVkToWch2, 2, sizeof(aVkToWch2[0]) },\n" " { (PVK_TO_WCHARS1)aVkToWch1, 1, sizeof(aVkToWch1[0]) },\n" " { NULL, 0, 0 },\n" "};\n\n"); - + /* Scan code to key name conversion table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -1098,33 +1098,33 @@ "* Only the names of Extended, NumPad, Dead and Non-Printable keys are here.\n" "* (Keys producing printable characters are named by that character)\n" "\\***************************************************************************/\n\n"); - + /* Check for key name data */ if (KeyNameData) { /* Table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNames[] = {\n"); - + /* Print table */ PrintNameTable(FileHandle, KeyNameData, FALSE); - + /* Table end */ fprintf(FileHandle, "};\n\n"); } - + /* Check for extended key name data */ if (KeyNameExtData) { /* Table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNamesExt[] = {\n"); - + /* Print table */ PrintNameTable(FileHandle, KeyNameExtData, FALSE); - + /* Table end */ fprintf(FileHandle, "};\n\n"); } - + /* Check for dead key name data */ if (KeyNameDeadData) { @@ -1132,7 +1132,7 @@ printf("Dead key name data not supported!\n"); exit(1); } - + /* Check for dead key data */ if (DeadKeyData) { @@ -1140,7 +1140,7 @@ printf("Dead key data not supported!\n"); exit(1); } - + /* Check for ligature data */ if (LigatureData) { @@ -1148,10 +1148,10 @@ printf("Ligature key data not supported!\n"); exit(1); } - + /* Main keyboard table descriptor type */ fprintf(FileHandle, "static "); - + /* FIXME? */ /* Main keyboard table descriptor header */ @@ -1169,7 +1169,7 @@ " * Diacritics\n" " */\n", FallbackDriver ? "Fallback" : "" ); - + /* Descriptor dead key data section */ if (DeadKeyData) { @@ -1179,13 +1179,13 @@ { fprintf(FileHandle, " NULL,\n\n"); } - + /* Descriptor key name comment */ fprintf(FileHandle, " /*\n" " * Names of Keys\n" " */\n"); - + /* Descriptor key name section */ if (KeyNameData) { @@ -1195,7 +1195,7 @@ { fprintf(FileHandle, " NULL,\n"); } - + /* Descriptor extended key name section */ if (KeyNameExtData) { @@ -1205,7 +1205,7 @@ { fprintf(FileHandle, " NULL,\n"); } - + /* Descriptor dead key name section */ if ((DeadKeyData) && (KeyNameDeadData)) { @@ -1215,7 +1215,7 @@ { fprintf(FileHandle, " NULL,\n\n"); } - + /* Descriptor conversion table section */ fprintf(FileHandle, " /*\n" @@ -1228,15 +1228,15 @@ " /*\n" " * Locale-specific special processing\n" " */\n"); - + /* FIXME: AttributeData and KLLF_ALTGR stuff */ - + /* Descriptor locale-specific section */ fprintf(FileHandle, " MAKELONG(%s, KBD_VERSION),\n\n", "0"); /* FIXME */ - + /* Descriptor ligature data comment */ fprintf(FileHandle, " /*\n * Ligatures\n */\n %d,\n", 0); /* FIXME */ - + /* Descriptor ligature data section */ if (!LigatureData) { @@ -1251,7 +1251,7 @@ /* Descriptor finish */ fprintf(FileHandle, "};\n\n"); - + /* Keyboard layout callback function */ if (!FallbackDriver) fprintf(FileHandle, "PKBDTABLES KbdLayerDescriptor(VOID)\n" @@ -1287,11 +1287,11 @@ { /* It's not, create header file */ if (!kbd_h(&g_Layout)) FailureCode = 1; - + /* Create the resource file */ if (!kbd_rc(DescriptionData, LanguageData)) FailureCode = 2; } - + /* Create the C file */ if (!kbd_c(StateCount, ShiftStates, @@ -1306,14 +1306,14 @@ /* Failed in C file generation */ FailureCode = 3; } - + /* Check if this just a fallback driver*/ if (!FallbackDriver) { /* Generate the definition file */ if (!kbd_def()) FailureCode = 4; } - + /* Done */ return FailureCode; } Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Wed Jan 7 18:24:14 2015 @@ -53,10 +53,10 @@ isKeyWord(PCHAR p) { ULONG i; - + /* Check if we know this keyword */ for (i = 0; i < KEYWORD_COUNT; i++) if (strcmp(KeyWordList[i], p) == 0) break; - + /* If we didn't find anything, i will be KEYWORD_COUNT, which is invalid */ return i; } @@ -66,7 +66,7 @@ IN BOOLEAN Prefix) { ULONG i; - + /* Loop for standard virtual key */ if (((VirtualKey >= 'A') && (VirtualKey <= 'Z')) || ((VirtualKey >= '0') && (VirtualKey <= '9'))) @@ -78,7 +78,7 @@ gVKeyName[3] = '\0'; return gVKeyName; } - + /* Check if a prefix is required */ if (Prefix) { @@ -90,7 +90,7 @@ /* Otherwise, don't add anything */ strcpy(gVKeyName, ""); } - + /* Loop all virtual keys */ for (i = 0; i < 36; i++) { @@ -102,7 +102,7 @@ return gVKeyName; } } - + /* If we got here, then we failed, so print out an error name */ strcpy(gVKeyName, "#ERROR#"); return gVKeyName; @@ -114,11 +114,11 @@ ULONG Length; ULONG i; ULONG KeyNumber; - + /* Compute the length of the string */ Length = strlen(p); if (!Length) return -1; - + /* Check if this is is a simple key */ if (Length == 1) { @@ -127,10 +127,10 @@ /* Otherwise, convert the letter to upper case */ *p = toupper(*p); - + /* And make sure it's a valid letter */ if ((*p >= 'A') && (*p <='Z')) return *p; - + /* Otherwise, fail */ return -1; } @@ -141,7 +141,7 @@ /* Check if we have a match */ if (!strcmp(VKName[i].Name, p)) return VKName[i].VirtualKey; } - + /* Check if this is a hex string */ if ((*p == '0') && ((*(p + 1) == 'x') || (*(p + 1) == 'X'))) { @@ -163,10 +163,10 @@ ULONG CharInfo = CHAR_NORMAL_KEY; UCHAR StateChar; ULONG CharCode; - + /* Calculate the length of the state */ Length = strlen(State); - + /* Check if this is at least a simple key state */ if (Length > 1) { @@ -183,7 +183,7 @@ CharInfo = CHAR_OTHER_KEY; } } - + /* Check if this is a numerical key state */ if ((Length - 1) >= 2) { @@ -194,7 +194,7 @@ { /* Handle a ligature key */ CharInfo = CHAR_LIGATURE_KEY; - + /* Not yet handled */ printf("Ligatured character entries not yet supported!\n"); exit(1); @@ -225,29 +225,29 @@ /* Return the type of character this is */ return CharInfo; } - + BOOLEAN NextLine(PCHAR LineBuffer, ULONG BufferSize, FILE *File) { PCHAR p, pp; - + /* Scan each line */ while (fgets(LineBuffer, BufferSize, File)) { /* Remember it */ gLineCount++; - + /* Reset the pointer at the beginning of the line */ - p = LineBuffer; + p = LineBuffer; /* Now bypass all whitespace (and tabspace) */ while ((*p) && ((*p == ' ') || (*p == '\t'))) p++; - + /* If this is an old-style comment, skip the line */ if (*p == ';') continue; - + /* Otherwise, check for new-style comment */ pp = strstr(p, "//"); if (pp) @@ -262,11 +262,11 @@ p = strchr(p, '\n'); if (p) *p = '\0'; } - + /* We have a line! */ return TRUE; } - + /* No line found */ return FALSE; } @@ -276,7 +276,7 @@ { ULONG KeyWord; CHAR KeyWordChars[32]; - + /* Scan each line, skipping it if it's not a keyword */ while (NextLine(gBuf, sizeof(gBuf), gfpInput)) { @@ -288,21 +288,21 @@ if (KeyWord < KEYWORD_COUNT) return KeyWord; } } - + /* We skipped all the possible lines, not finding anything */ return KEYWORD_COUNT; } ULONG DoKBD(VOID) -{ +{ /* On Unicode files, we need to find the Unicode marker (FEEF) */ ASSERT(UnicodeFile == FALSE); - + /* Initial values */ *gKBDName = '\0'; *gDescription = '\0'; - + /* Scan for the values */ if (sscanf(gBuf, "KBD %8s \"%40[^\"]\" %d", gKBDName, gDescription, &gID) < 2) { @@ -310,7 +310,7 @@ printf("Unable to read keyboard name or description.\n"); exit(1); } - + /* Debug only */ DPRINT1("KBD Name: [%8s] Description: [%40s] ID: [%d]\n", gKBDName, gDescription, gID); return SkipLines(); @@ -318,14 +318,14 @@ ULONG DoVERSION(VOID) -{ +{ /* Scan for the value */ if (sscanf(gBuf, "VERSION %d", &gKbdLayoutVersion) < 1) { /* Couldn't find them */ printf("Unable to read keyboard version information.\n"); } - + /* Debug only */ DPRINT1("VERSION [%d]\n", gKbdLayoutVersion); return SkipLines(); @@ -333,17 +333,17 @@ ULONG DoCOPYRIGHT(VOID) -{ +{ /* Initial values */ *gCopyright = '\0'; - + /* Scan for the value */ if (sscanf(gBuf, "COPYRIGHT \"%40[^\"]\"", gCopyright) < 1) { /* Couldn't find them */ printf("Unable to read the specified COPYRIGHT string.\n"); } - + /* Debug only */ DPRINT1("COPYRIGHT [%40s]\n", gCopyright); return SkipLines(); @@ -351,17 +351,17 @@ ULONG DoCOMPANY(VOID) -{ +{ /* Initial values */ *gCompany = '\0'; - + /* Scan for the value */ if (sscanf(gBuf, "COMPANY \"%85[^\"]\"", gCompany) < 1) { /* Couldn't find them */ printf("Unable to read the specified COMPANY name.\n"); } - + /* Debug only */ DPRINT1("COMPANY [%85s]\n", gCompany); return SkipLines(); @@ -369,17 +369,17 @@ ULONG DoLOCALENAME(VOID) -{ +{ /* Initial values */ *gLocaleName = '\0'; - + /* Scan for the value */ if (sscanf(gBuf, "LOCALENAME \"%40[^\"]\"", gLocaleName) < 1) { /* Couldn't find them */ printf("Unable to read the specified COPYRIGHT string.\n"); } - + /* Debug only */ DPRINT1("LOCALENAME [%40s]\n", gLocaleName); return SkipLines(); @@ -393,23 +393,23 @@ ULONG LanguageCode; PCHAR p, pp; PKEYNAME Description; - + /* Assume nothing */ *DescriptionData = 0; - + /* Start scanning */ while (NextLine(gBuf, 256, gfpInput)) - { + { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the language code */ if (sscanf(Token, " %4x", &LanguageCode) != 1) { @@ -417,7 +417,7 @@ printf("An invalid LANGID was specified.\n"); continue; } - + /* Now get the actual description */ if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) { @@ -425,15 +425,15 @@ printf("A language description is missing.\n"); continue; } - + /* Get the description string and find the ending */ p = strstr(gBuf, Token); pp = strchr(p, '\n'); if (!pp) pp = strchr(p, '\r'); - + /* Terminate the description string here */ if (pp) *pp = 0; - + /* Now allocate the description */ Description = malloc(sizeof(KEYNAME)); if (!Description) @@ -442,15 +442,15 @@ printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); exit(1); } - + /* Fill out the structure */ Description->Code = LanguageCode; Description->Name = strdup(p); Description->Next = NULL; - + /* Debug only */ DPRINT1("LANGID: [%4x] Description: [%s]\n", Description->Code, Description->Name); - + /* Point to it and advance the pointer */ *DescriptionData = Description; DescriptionData = &Description->Next; @@ -468,23 +468,23 @@ ULONG LanguageCode; PCHAR p, pp; PKEYNAME Language; - + /* Assume nothing */ *LanguageData = 0; - + /* Start scanning */ while (NextLine(gBuf, 256, gfpInput)) - { + { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the language code */ if (sscanf(Token, " %4x", &LanguageCode) != 1) { @@ -492,7 +492,7 @@ printf("An invalid LANGID was specified.\n"); continue; } - + /* Now get the actual language */ if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) { @@ -500,15 +500,15 @@ printf("A language name is missing\n"); continue; } - + /* Get the language string and find the ending */ p = strstr(gBuf, Token); pp = strchr(p, '\n'); if (!pp) pp = strchr(p, '\r'); - + /* Terminate the language string here */ if (pp) *pp = 0; - + /* Now allocate the language */ Language = malloc(sizeof(KEYNAME)); if (!Language) @@ -517,20 +517,20 @@ printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); exit(1); } - + /* Fill out the structure */ Language->Code = LanguageCode; Language->Name = strdup(p); Language->Next = NULL; - + /* Debug only */ DPRINT1("LANGID: [%4x] Name: [%s]\n", Language->Code, Language->Name); - + /* Point to it and advance the pointer */ *LanguageData = Language; LanguageData = &Language->Next; } - + /* We are done */ return KeyWord; } @@ -543,23 +543,23 @@ ULONG CharacterCode; PCHAR p, pp; PKEYNAME KeyName; - + /* Assume nothing */ *KeyNameData = 0; - + /* Start scanning */ while (NextLine(gBuf, 256, gfpInput)) - { + { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the character code */ if (sscanf(Token, " %4x", &CharacterCode) != 1) { @@ -567,7 +567,7 @@ printf("An invalid character code was specified.\n"); continue; } - + /* Now get the actual key name */ if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) { @@ -575,15 +575,15 @@ printf("A key name is missing\n"); continue; } - + /* Get the key name string and find the ending */ p = strstr(gBuf, Token); pp = strchr(p, '\n'); if (!pp) pp = strchr(p, '\r'); - + /* Terminate the key name string here */ if (pp) *pp = 0; - + /* Now allocate the language */ KeyName = malloc(sizeof(KEYNAME)); if (!KeyName) @@ -592,22 +592,22 @@ printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); exit(1); } - + /* Fill out the structure */ KeyName->Code = CharacterCode; KeyName->Name = strdup(p); KeyName->Next = NULL; - + /* Debug only */ DPRINT1("CHARCODE: [%4x] Name: [%s]\n", KeyName->Code, KeyName->Name); - + /* Point to it and advance the pointer */ *KeyNameData = KeyName; KeyNameData = &KeyName->Next; } - + /* We are done */ - return KeyWord; + return KeyWord; } ULONG @@ -618,23 +618,23 @@ ULONG i; ULONG ShiftState; CHAR Token[32]; - + /* Reset the shift states */ for (i = 0; i < 8; i++) ShiftStates[i] = -1; - + /* Start with no states */ *StateCount = 0; - + /* Scan for shift states */ while (NextLine(gBuf, 256, gfpInput)) { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the shift state */ if (sscanf(gBuf, " %1s[012367]", Token) != 1) { @@ -642,10 +642,10 @@ if (Verbose) printf("An invalid shift state '%s' was found (use 0, 1, 2, 3, 6, or 7.)\n", Token); continue; } - + /* Now read the state */ ShiftState = atoi(Token); - + /* Scan existing states */ for (i = 0; i < *StateCount; i++) { @@ -657,7 +657,7 @@ break; } } - + /* Make sure we won't overflow */ if (*StateCount < 8) { @@ -670,12 +670,12 @@ if (Verbose) printf("There were too many states (you defined %d).\n", *StateCount); } } - + /* Debug only */ DPRINT1("Found %d Shift States: [", *StateCount); for (i = 0; i < *StateCount; i++) DPRINT1("%d ", ShiftStates[i]); DPRINT1("]\n"); - + /* We are done */ return KeyWord; } @@ -727,24 +727,24 @@ ULONG ScanCodeCount = -1; PLAYOUTENTRY Entry; UCHAR CharacterType, LigatureChar; - + /* Zero out the layout */ memset(LayoutData, 0, sizeof(LAYOUT)); - + /* Read each line */ Entry = &LayoutData->Entry[0]; while (NextLine(gBuf, 256, gfpInput)) { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now read the entry */ TokenCount = sscanf(gBuf, " %x %s %s", &ScanCode, Token, Cap); if (TokenCount == 3) @@ -763,7 +763,7 @@ /* Simplified layout with no cap */ FullEntry = FALSE; } - + /* One more */ DPRINT1("RAW ENTRY: [%x %s %s]\n", ScanCode, Token, Cap); Entry++; @@ -773,11 +773,11 @@ printf("ScanCode %02x - too many scancodes here to parse.\n", ScanCode); exit(1); } - + /* Fill out this entry */ Entry->ScanCode = ScanCode; Entry->LineCount = gLineCount; - + /* Loop scancode table */ for (i = 0; i < 110; i++) { @@ -787,7 +787,7 @@ { /* New code */ if (Verbose) printf("A new scancode is being defined: 0x%2X, %s\n", Entry->ScanCode, Token); - + /* Fill out the entry */ Entry->VirtualKey = getVKNum(Token); break; @@ -801,7 +801,7 @@ printf("Scancode %X was previously defined.\n", ScanCode); exit(1); } - + /* Check if there is a valid virtual key */ if (ScVk[i].VirtualKey == 0xFFFF) { @@ -809,24 +809,24 @@ printf("The Scancode you tried to use (%X) is reserved.\n", ScanCode); exit(1); } - + /* Fill out the entry */ Entry->OriginalVirtualKey = ScVk[i].VirtualKey; Entry->Name = ScVk[i].Name; break; } } - + /* The entry is now processed */ Entry->Processed = TRUE; ScVk[i].Processed = TRUE; - + /* Get the virtual key from the entry */ VirtualKey = getVKNum(Token); Entry->VirtualKey = VirtualKey; DPRINT1("ENTRY: [%x %x %x %s] with ", Entry->VirtualKey, Entry->OriginalVirtualKey, Entry->ScanCode, Entry->Name); - + /* Make sure it's valid */ if (VirtualKey == 0xFFFF) { @@ -834,13 +834,13 @@ if (Verbose) printf("An invalid Virtual Key '%s' was defined.\n", Token); continue; } - + /* Is this a full entry */ if (FullEntry) { /* Do we have SGCAP data? Set cap mode to 2 */ if (!strcmp(Cap, "SGCAP")) *Cap = '2'; - + /* Read the cap mode */ if (sscanf(Cap, "%1d[012]", &Entry->Cap) != 1) { @@ -849,7 +849,7 @@ exit(1); } } - + /* Read the states */ Count = sscanf(gBuf, " %*s %*s %*s %s %s %s %s %s %s %s %s", @@ -863,7 +863,7 @@ State[7]); Entry->StateCount = Count; DPRINT1("%d STATES: [", Count); - + /* Check if there are less than 2 states */ if ((Count < 2) && (FullEntry)) { @@ -871,7 +871,7 @@ printf("You must have at least 2 characters.\n"); exit(1); } - + /* Loop all states */ for (i = 0; i < Count; i++) { @@ -883,7 +883,7 @@ Entry->CharData[i] = -1; continue; } - + /* Otherwise, check what kind of character this is */ CharacterType = getCharacterInfo(State[i], &Entry->CharData[i], @@ -899,16 +899,16 @@ Entry->OtherCharData[i] = 1; } } - + /* Check for sanity checks */ DPRINT1("]\n"); if (SanityCheck) { /* Not yet handled... */ printf("Sanity checks not yet handled!\n"); - exit(1); - } - + exit(1); + } + /* Check if we had SGCAP data */ if (Entry->Cap & 2) { @@ -917,7 +917,7 @@ exit(1); } } - + /* Process the scan code table */ Entry = &LayoutData->Entry[ScanCodeCount]; for (i = 0; i < 110; i++) @@ -925,7 +925,7 @@ /* Get the scan code */ CurrentCode = ScVk[i].ScanCode; if (CurrentCode == 0xFFFF) break; - + /* Check if this entry had been processed */ if (ScVk[i].Processed) { @@ -939,9 +939,9 @@ { /* Fail */ printf("ScanCode %02x - too many scancodes here to parse.\n", CurrentCode); - exit(1); + exit(1); } - + /* Build an entry for it */ Entry++; Entry->ScanCode = CurrentCode; @@ -954,7 +954,7 @@ Entry->VirtualKey, Entry->ScanCode, Entry->Name); } } - + /* Skip what's left */ return KeyWord; } @@ -969,7 +969,7 @@ PKEYNAME DescriptionData = NULL, LanguageData = NULL; PKEYNAME KeyNameData = NULL, KeyNameExtData = NULL, KeyNameDeadData = NULL; PVOID AttributeData = NULL, LigatureData = NULL, DeadKeyData = NULL; - + /* Parse keywords */ gLineCount = 0; KeyWord = SkipLines(); @@ -986,7 +986,7 @@ { /* Save this keyword */ KeyWords[KeyWord]++; - + /* Check for duplicate entires, other than DEADKEY, which is okay */ if ((KeyWord != 9) && (KeyWords[KeyWord] > 1) && (Verbose)) { @@ -1000,49 +1000,49 @@ { /* KBD */ case 0: - + DPRINT1("Found KBD section\n"); KeyWord = DoKBD(); break; - + /* VERSION */ case 1: - + DPRINT1("Found VERSION section\n"); KeyWord = DoVERSION(); break; - + /* COPYRIGHT */ case 2: - + DPRINT1("Found COPYRIGHT section\n"); KeyWord = DoCOPYRIGHT(); break; - + /* COMPANY */ case 3: - + DPRINT1("Found COMPANY section\n"); KeyWord = DoCOMPANY(); break; - + /* LOCALENAME */ case 4: - + DPRINT1("Found LOCALENAME section\n"); KeyWord = DoLOCALENAME(); break; - + /* MODIFIERS */ case 5: - + DPRINT1("Found MODIFIERS section\n"); KeyWord = DoMODIFIERS(); break; - + /* SHIFTSTATE */ case 6: - + DPRINT1("Found SHIFTSTATE section\n"); KeyWord = DoSHIFTSTATE(&StateCount, ShiftStates); if (StateCount < 2) @@ -1053,89 +1053,89 @@ exit(1); } break; - + /* ATTRIBUTES */ case 7: - + DPRINT1("Found ATTRIBUTES section\n"); KeyWord = DoATTRIBUTES(&AttributeData); break; - + /* LAYOUT */ case 8: - + DPRINT1("Found LAYOUT section\n"); KeyWord = DoLAYOUT(&g_Layout, &LigatureData, ShiftStates, StateCount); break; - + /* DEADKEY */ case 9: - + DPRINT1("Found DEADKEY section\n"); KeyWord = DoDEADKEY(&DeadKeyData); break; - + /* LIGATURE */ case 10: - + DPRINT1("Found LIGATURE section\n"); KeyWord = DoLIGATURE(&LigatureData); break; - + /* KEYNAME */ case 11: - + DPRINT1("Found KEYNAME section\n"); KeyWord = DoKEYNAME(&KeyNameData); break; - + /* KEYNAME_EXT */ case 12: - + DPRINT1("Found KEYNAME_EXT section\n"); KeyWord = DoKEYNAME(&KeyNameExtData); break; - + /* KEYNAME_DEAD */ case 13: - + DPRINT1("Found KEYNAME_DEAD section\n"); KeyWord = DoKEYNAME(&KeyNameDeadData); break; - + /* DESCRIPTIONS */ case 14: - + DPRINT1("Found DESCRIPTIONS section\n"); KeyWord = DoDESCRIPTIONS(&DescriptionData); break; - + /* LANGUAGENAMES */ case 15: - + DPRINT1("Found LANGUAGENAMES section\n"); KeyWord = DoLANGUAGENAMES(&LanguageData); break; - + /* ENDKBD */ case 16: - + DPRINT1("Found ENDKBD section\n"); KeyWord = SkipLines(); break; - - + + default: break; } } - + /* We are done */ fclose(gfpInput); - + /* Now enter the output phase */ return DoOutput(StateCount, ShiftStates,

1 0

[hbelusca] 65994: [TOOLS]: Adds back kbdtool (Keyboard Layout Compiler), and hpp (Header File Preprocessor) too, to host-tools compilation.
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 17:55:58 2015 New Revision: 65994 URL: http://svn.reactos.org/svn/reactos?rev=65994&view=rev Log: [TOOLS]: Adds back kbdtool (Keyboard Layout Compiler), and hpp (Header File Preprocessor) too, to host-tools compilation. Added: trunk/reactos/tools/kbdtool/CMakeLists.txt (with props) Modified: trunk/reactos/tools/CMakeLists.txt Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Wed Jan 7 17:55:58 2015 @@ -15,6 +15,8 @@ add_subdirectory(cabman) add_subdirectory(cdmake) +add_subdirectory(hpp) +add_subdirectory(kbdtool) add_subdirectory(mkhive) add_subdirectory(unicode) add_subdirectory(widl) Added: trunk/reactos/tools/kbdtool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/CMakeLists.t… ============================================================================== --- trunk/reactos/tools/kbdtool/CMakeLists.txt (added) +++ trunk/reactos/tools/kbdtool/CMakeLists.txt [iso-8859-1] Wed Jan 7 17:55:58 2015 @@ -0,0 +1,2 @@ + +add_executable(kbdtool data.c main.c output.c parser.c) Propchange: trunk/reactos/tools/kbdtool/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jimtabor] 65993: [Win32k] - Answer my own question. Use the Extra Information long pointer to help traffic data. See CORE-7447.
by jimtabor＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: jimtabor Date: Wed Jan 7 14:02:45 2015 New Revision: 65993 URL: http://svn.reactos.org/svn/reactos?rev=65993&view=rev Log: [Win32k] - Answer my own question. Use the Extra Information long pointer to help traffic data. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Jan 7 14:02:45 2015 @@ -772,6 +772,7 @@ UINT MsgFilterMin, UINT MsgFilterMax, UINT RemoveMsg, + LONG_PTR *ExtraInfo, BOOL bGMSG ) { PTHREADINFO pti; @@ -835,6 +836,7 @@ MsgFilterMin, MsgFilterMax, ProcessMask, + ExtraInfo, Msg )) { return TRUE; @@ -916,6 +918,7 @@ PTHREADINFO pti; NTSTATUS Status = STATUS_SUCCESS; MSG Msg; + LONG_PTR ExtraInfo = 0; pti = PsGetCurrentThreadWin32Thread(); @@ -926,6 +929,7 @@ MsgFilterMin, MsgFilterMax, MAKELONG( PM_NOREMOVE, GetWakeMask( MsgFilterMin, MsgFilterMax)), + &ExtraInfo, TRUE ) ) // act like GetMessage. { return TRUE; @@ -964,6 +968,7 @@ PTHREADINFO pti; BOOL Present = FALSE; NTSTATUS Status; + LONG_PTR ExtraInfo = 0; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) hWnd = HWND_BOTTOM; @@ -1005,6 +1010,7 @@ MsgFilterMin, MsgFilterMax, RemoveMsg, + &ExtraInfo, bGMSG ); if (Present) { @@ -1122,6 +1128,7 @@ PTHREADINFO pti; MSG Message; LARGE_INTEGER LargeTickCount; + LONG_PTR ExtraInfo = 0; Message.hwnd = Wnd; Message.message = Msg; @@ -1212,7 +1219,7 @@ } else { - MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, 0); + MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo); } } return TRUE; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Jan 7 14:02:45 2015 @@ -2026,6 +2026,7 @@ IN UINT MsgFilterLow, IN UINT MsgFilterHigh, IN UINT QSflags, + OUT LONG_PTR *ExtraInfo, OUT PMSG Message) { PUSER_MESSAGE CurrentMessage; @@ -2053,8 +2054,9 @@ ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { - *Message = CurrentMessage->Msg; - QS_Flags = CurrentMessage->QS_Flags; + *Message = CurrentMessage->Msg; + *ExtraInfo = CurrentMessage->ExtraInfo; + QS_Flags = CurrentMessage->QS_Flags; if (Remove) { Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Wed Jan 7 14:02:45 2015 @@ -131,6 +131,7 @@ IN UINT MsgFilterLow, IN UINT MsgFilterHigh, IN UINT QSflags, + OUT LONG_PTR *ExtraInfo, OUT PMSG Message); BOOL APIENTRY co_MsqPeekHardwareMessage(IN PTHREADINFO pti,

1 0

[cwittich] 65992: [SHELL32_WINETEST] do not skip progman_dde tests anymore
by cwittich＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: cwittich Date: Wed Jan 7 09:58:38 2015 New Revision: 65992 URL: http://svn.reactos.org/svn/reactos?rev=65992&view=rev Log: [SHELL32_WINETEST] do not skip progman_dde tests anymore Modified: trunk/rostests/winetests/shell32/progman_dde.c Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… ============================================================================== --- trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] Wed Jan 7 09:58:38 2015 @@ -701,12 +701,6 @@ HCONV hConv; int testnum; - if(!winetest_interactive) - { - skip("Skipping progman_dde() until we have a sane DDE implementation. CORE-6559.\n"); - return; - } - init_function_pointers(); init_strings();

1 0

[jimtabor] 65991: [Win32k] - Pass process ID to process information structure.
by jimtabor＠svn.reactos.org 06 Jan '15

06 Jan '15

Author: jimtabor Date: Tue Jan 6 04:17:20 2015 New Revision: 65991 URL: http://svn.reactos.org/svn/reactos?rev=65991&view=rev Log: [Win32k] - Pass process ID to process information structure. Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Tue Jan 6 04:17:20 2015 @@ -161,6 +161,7 @@ } ppiCurrent->peProcess = Process; + ppiCurrent->W32Pid = HandleToUlong(PsGetProcessId(Process)); /* Setup process flags */ ppiCurrent->W32PF_flags |= W32PF_PROCESSCONNECTED;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs