Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[ahill] 43890: [atlnew] - RosBE doesn't support __ImageBase, so use GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) instead. - Implement CAtlBaseModule constructor. [browseui] - Since RosBE built DLLs don't run global constructors, use placement new to construct them in DllMain. This is a *HACK* and a better solution should be found. - Change DllMain be be extern C so it actually gets used.

by ahill＠svn.reactos.org

Author: ahill Date: Sun Nov 1 00:40:09 2009 New Revision: 43890 URL: http://svn.reactos.org/svn/reactos?rev=43890&view=rev Log: [atlnew] - RosBE doesn't support __ImageBase, so use GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) instead. - Implement CAtlBaseModule constructor. [browseui] - Since RosBE built DLLs don't run global constructors, use placement new to construct them in DllMain. This is a *HACK* and a better solution should be found. - Change DllMain be be extern C so it actually gets used. Modified: trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/lib/atl/atlbase.h trunk/reactos/lib/atl/atlcore.h Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sun Nov 1 00:40:09 2009 @@ -61,12 +61,23 @@ CBrowseUIModule gModule; CAtlWinModule gWinModule; +void *operator new (size_t, void *buf) +{ + return buf; +} + /************************************************************************* * BROWSEUI DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) +STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) { TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); + + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CBrowseUIModule; + new (&gWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + if (dwReason == DLL_PROCESS_ATTACH) { gModule.Init(ObjectMap, hInstance, NULL); Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=4389… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sun Nov 1 00:40:09 2009 @@ -53,8 +53,6 @@ #define offsetofclass(base, derived) (reinterpret_cast<DWORD_PTR>(static_cast<base *>(reinterpret_cast<derived *>(_ATL_PACKING))) - _ATL_PACKING) -extern "C" IMAGE_DOS_HEADER __ImageBase; - namespace ATL { @@ -451,7 +449,7 @@ public: CAtlComModule() { - m_hInstTypeLib = reinterpret_cast<HINSTANCE>(&__ImageBase); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)this, &m_hInstTypeLib); m_ppAutoObjMapFirst = NULL; m_ppAutoObjMapLast = NULL; if (FAILED(m_csObjMap.Init())) Modified: trunk/reactos/lib/atl/atlcore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcore.h?rev=4389… ============================================================================== --- trunk/reactos/lib/atl/atlcore.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcore.h [iso-8859-1] Sun Nov 1 00:40:09 2009 @@ -181,6 +181,13 @@ public : static bool m_bInitFailed; public: + CAtlBaseModule() + { + cbSize = sizeof(_ATL_BASE_MODULE); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)this, &m_hInst); + m_hInstResource = m_hInst; + } + HINSTANCE GetModuleInstance() { return m_hInst;

14 years, 10 months

[ablackmann] 43889: Implement DoCOMPANY, DoCOPYRIGHT, DoVERSION and DoLOCALENAME... that was the easy part. Happy Halloween everybody!

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Sat Oct 31 23:18:28 2009 New Revision: 43889 URL: http://svn.reactos.org/svn/reactos?rev=43889&view=rev Log: Implement DoCOMPANY, DoCOPYRIGHT, DoVERSION and DoLOCALENAME... that was the easy part. Happy Halloween everybody! Modified: trunk/reactos/tools/kbdtool/parser.c 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] Sat Oct 31 23:18:28 2009 @@ -23,8 +23,12 @@ extern FILE* gfpInput; CHAR gBuf[256]; CHAR gKBDName[10]; +CHAR gCopyright[256]; CHAR gDescription[256]; +CHAR gCompany[256]; +CHAR gLocaleName[256]; ULONG gID = 0; +ULONG gKbdLayoutVersion; CHAR g_Layout[4096]; ULONG gLineCount; PCHAR KeyWordList[KEYWORD_COUNT] = @@ -132,8 +136,6 @@ ULONG DoKBD(VOID) { - PCHAR p; - /* On Unicode files, we need to find the Unicode marker (FEEF) */ ASSERT(UnicodeFile == FALSE); @@ -156,25 +158,70 @@ 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(); } 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(); } 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(); } 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(); }

14 years, 10 months

[ablackmann] 43888: Implement DoKBD. The tool can now handle the KBD section of a .klc layout.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Sat Oct 31 22:54:26 2009 New Revision: 43888 URL: http://svn.reactos.org/svn/reactos?rev=43888&view=rev Log: Implement DoKBD. The tool can now handle the KBD section of a .klc layout. Modified: trunk/reactos/tools/kbdtool/parser.c 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] Sat Oct 31 22:54:26 2009 @@ -18,10 +18,13 @@ #define KEYWORD_COUNT 17 -extern BOOLEAN Verbose; +extern BOOLEAN Verbose, UnicodeFile; extern PCHAR gpszFileName; extern FILE* gfpInput; CHAR gBuf[256]; +CHAR gKBDName[10]; +CHAR gDescription[256]; +ULONG gID = 0; CHAR g_Layout[4096]; ULONG gLineCount; PCHAR KeyWordList[KEYWORD_COUNT] = @@ -129,6 +132,25 @@ ULONG DoKBD(VOID) { + PCHAR p; + + /* 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) + { + /* Couldn't find them */ + 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(); }

14 years, 10 months

[fireball] 43887: - Start working on proper window managing: Implement a very simple window manager, responsible for redrawing top-level windows (Swm* APIs in win32k). - Remove all previous hacks related to window redrawing in events of move or focus change. They couldn't work properly. - Wine's win32 engine really expects mouse events to be tagged by a corresponding window's handle. Make it so using SWM. - All these changes make arwinss usability actually regress (mostly due to removing unneces

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 31 21:55:25 2009 New Revision: 43887 URL: http://svn.reactos.org/svn/reactos?rev=43887&view=rev Log: - Start working on proper window managing: Implement a very simple window manager, responsible for redrawing top-level windows (Swm* APIs in win32k). - Remove all previous hacks related to window redrawing in events of move or focus change. They couldn't work properly. - Wine's win32 engine really expects mouse events to be tagged by a corresponding window's handle. Make it so using SWM. - All these changes make arwinss usability actually regress (mostly due to removing unnecessary hacks and problems in other components). Added: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/swm/ (with props) branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/wnd.c branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -71,6 +71,9 @@ /* Update brush origin */ GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + //FIXME("xDst %d, yDst %d, widthDst %d, heightDst %d, src x %d y %d\n", + // xDst, yDst, width, height, xSrc, ySrc); return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); @@ -669,6 +672,8 @@ HRGN dc_rgn; DWORD size; + //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); + /* Create a dummy region (FIXME: create it once!) */ dc_rgn = CreateRectRgn(0,0,0,0); if (!dc_rgn) return; Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -188,6 +188,10 @@ { GetCursorPos(&pt); } + + hwnd = SwmGetWindowFromPoint(pt.x, pt.y); + + FIXME("hwnd %x\n", hwnd); if (flags & MOUSEEVENTF_MOVE) { Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -58,9 +58,9 @@ hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } - //ERR( "copying bits for win %p (parent %p)/ %s -> %s\n", - // data->hwnd, parent, - // wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); + FIXME( "copying bits for win %p (parent %p)/ %s -> %s\n", + data->hwnd, parent, + wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); BitBlt( hdc_dst, dst_rect.left, dst_rect.top, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, hdc_src, src_rect.left, src_rect.top, SRCCOPY ); @@ -723,10 +723,9 @@ void CDECL RosDrv_SetFocus( HWND hwnd ) { - RECT rc; - //UNIMPLEMENTED; - GetWindowRect(hwnd, &rc); - RosDrv_UpdateZOrder(hwnd, &rc); + TRACE("SetFocus %x, desk %x\n", hwnd, GetDesktopWindow()); + if (GetDesktopWindow() != hwnd) + SwmSetForeground(hwnd); } void CDECL RosDrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) @@ -765,7 +764,7 @@ !(data = NTDRV_create_win_data( hwnd ))) return; /* Do some magic... */ - TRACE("Window %x is being made visible\n", hwnd); + FIXME("Window %x is being made visible1\n", hwnd); } if (offset == GWL_STYLE && (changed & WS_DISABLED)) @@ -787,7 +786,7 @@ UINT CDECL RosDrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - TRACE( "win %p cmd %d at %s flags %08x\n", + FIXME( "win %p cmd %d at %s flags %08x\n", hwnd, cmd, wine_dbgstr_rect(rect), swp ); return swp; @@ -819,6 +818,11 @@ if (!(data = NTDRV_create_win_data( hwnd ))) return; } + SwmPosChanging(hwnd, window_rect); + + TRACE( "win %x pos is changing. vis rect %s, win rect %s\n", + hwnd, wine_dbgstr_rect(visible_rect), wine_dbgstr_rect(window_rect) ); + *visible_rect = *window_rect; } @@ -833,6 +837,9 @@ struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); if (!data) return; + + TRACE( "win %x pos changed. new vis rect %s, old whole rect %s\n", + hwnd, wine_dbgstr_rect(visible_rect), wine_dbgstr_rect(&data->whole_rect) ); old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; @@ -855,11 +862,12 @@ old_client_rect.bottom - data->client_rect.bottom == y_offset && !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { - move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); + //move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); + SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect); } else { - move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); + //move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); } } Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -18,6 +18,7 @@ #define NTOS_USER_MODE #include <ndk/ntndk.h> #include "ntrosgdi.h" +#include "win32k/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" @@ -94,7 +95,15 @@ TRACE( "win %p window %s whole %s client %s\n", hwnd, wine_dbgstr_rect( &data->window_rect ), wine_dbgstr_rect( &data->whole_rect ), wine_dbgstr_rect( &data->client_rect )); + + /* Inform window manager about window rect in screen coords */ + SwmAddWindow(hwnd, &data->window_rect); } + + /* Add desktop window too */ + if (hwnd == GetDesktopWindow()) + SwmAddWindow(hwnd, &data->window_rect); + return data; } @@ -111,6 +120,9 @@ /* Remove property */ RemovePropA( hwnd, window_data_prop ); + /* Inform window manager */ + SwmRemoveWindow( hwnd ); + /* Free window data */ HeapFree( GetProcessHeap(), 0, data ); } Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -136,4 +136,23 @@ VOID NTAPI RosUserConnectCsrss(VOID); +VOID NTAPI +SwmAddWindow(HWND hWnd, RECT *WindowRect); + +VOID NTAPI +SwmRemoveWindow(HWND hWnd); + +VOID NTAPI +SwmSetForeground(HWND hWnd); + +VOID NTAPI +SwmPosChanging(HWND hWnd, const RECT *WindowRect); + +VOID NTAPI +SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect); + +HWND NTAPI +SwmGetWindowFromPoint(LONG x, LONG y); + + #endif /* __WIN32K_NTUSER_H */ Added: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -1,0 +1,6 @@ +#ifndef SWM__H +#define SWM__H + +VOID NTAPI SwmInitialize(); + +#endif Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -53,6 +53,7 @@ #include <xlateobj.h> #include <gre.h> #include <monitor.h> +#include <swm.h> #include "winesup.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -329,6 +329,9 @@ /* Initialize handle-mapping */ GDI_InitHandleMapping(); + /* Initialize window manager */ + SwmInitialize(); + /* Create stock objects */ CreateStockBitmap(); PALETTE_Init(); Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 31 21:55:25 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -1,0 +1,719 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/swm/winman.c + * PURPOSE: Simple Window Manager + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> + +#include "object.h" +#include "handle.h" +#include "user.h" + +#define NDEBUG +#include <debug.h> + +typedef struct _SWM_WINDOW +{ + HWND hwnd; + rectangle_t Window; + struct region *Visible; + struct region *Invisible; + + LIST_ENTRY Entry; +} SWM_WINDOW, *PSWM_WINDOW; + +/*static*/ inline struct window *get_window( user_handle_t handle ); +void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ); +void req_update_window_zorder( const struct update_window_zorder_request *req, struct update_window_zorder_reply *reply ); + +VOID NTAPI SwmDumpRegion(struct region *Region); +VOID NTAPI SwmDumpWindows(); +VOID NTAPI SwmDebugDrawWindows(); +VOID NTAPI SwmTest(); + + +/* GLOBALS *******************************************************************/ + +LIST_ENTRY SwmWindows; +ERESOURCE SwmLock; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +SwmAcquire(VOID) +{ + /* Acquire user resource exclusively */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&SwmLock, TRUE); +} + +VOID +NTAPI +SwmRelease(VOID) +{ + /* Release user resource */ + ExReleaseResourceLite(&SwmLock); + KeLeaveCriticalRegion(); +} + +VOID +NTAPI +SwmInvalidateRegion(PSWM_WINDOW Window, struct region *Region, rectangle_t *Rect) +{ + struct window *Win; + struct update_window_zorder_request req; + //struct update_window_zorder_reply reply; + struct region *ClientRegion; + + ClientRegion = create_empty_region(); + copy_region(ClientRegion, Region); + + /* Calculate what areas to paint */ + UserEnterExclusive(); + + DPRINT1("SwmInvalidateRegion hwnd %x, region:\n", Window->hwnd); + SwmDumpRegion(Region); + Win = get_window((UINT_PTR)Window->hwnd); + if (!Win) + { + UserLeave(); + return; + } + + /* Convert region to client coordinates */ + offset_region(ClientRegion, -Window->Window.left, -Window->Window.top); + + //DPRINT1("rect (%d,%d)-(%d,%d)\n", TmpRect.left, TmpRect.top, TmpRect.right, TmpRect.bottom); + + /* Update zorder */ + if (Rect) + { + req.rect = *Rect; + req.rect.left -= Window->Window.left; req.rect.top -= Window->Window.top; + req.rect.right -= Window->Window.left; req.rect.bottom -= Window->Window.left; + req.window = (UINT_PTR)Window->hwnd; + //req_update_window_zorder(&req, &reply); + } + + /* Redraw window */ + redraw_window(Win, ClientRegion, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); + + UserLeave(); + + free_region(ClientRegion); +} + +VOID +NTAPI +SwmMarkInvisible(struct region *Region) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + struct region *WindowRegion; + struct region *InvisibleRegion; + + /* Make a copy of the invisible region */ + InvisibleRegion = create_empty_region(); + copy_region(InvisibleRegion, Region); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Get window's region */ + WindowRegion = create_empty_region(); + set_region_rect(WindowRegion, &Window->Window); + + //DPRINT1("Window region ext:\n"); + //SwmDumpRegion(WindowRegion); + //DPRINT1("Region to mark invisible ext:\n"); + //SwmDumpRegion(Region); + + /* Region to mark invisible for this window = Update region X Window region */ + intersect_region(WindowRegion, WindowRegion, InvisibleRegion); + + /* Check if it's empty */ + if (!is_region_empty(WindowRegion)) + { + //DPRINT1("Subtracting region\n"); + //SwmDumpRegion(WindowRegion); + //DPRINT1("From visible region\n"); + //SwmDumpRegion(Window->Visible); + + /* If it's not empty, subtract it from visible region */ + subtract_region(Window->Visible, Window->Visible, WindowRegion); + + /* And subtract that part from our invisible region */ + subtract_region(InvisibleRegion, InvisibleRegion, WindowRegion); + } + + free_region(WindowRegion); + + /* Break if our whole invisible region is mapped to underlying windows */ + if (is_region_empty(InvisibleRegion)) break; + + /* Advance to the next window */ + Current = Current->Flink; + } + + free_region(InvisibleRegion); +} + +/* NOTE: It alters the passed region! */ +VOID +NTAPI +SwmMarkVisible(struct region *Region) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + struct region *WindowRegion; + + /* Go through every window from nearest to farthest */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Get window's region */ + WindowRegion = create_empty_region(); + set_region_rect(WindowRegion, &Window->Window); + + /* Region to mark invisible for this window = Update region X Window region */ + intersect_region(WindowRegion, WindowRegion, Region); + + /* Check if it's empty */ + if (!is_region_empty(WindowRegion)) + { + DPRINT1("Invalidating region\n"); + SwmDumpRegion(WindowRegion); + DPRINT1("of window %x\n", Window->hwnd); + + /* If it's not empty, subtract it from the source region */ + subtract_region(Region, Region, WindowRegion); + + /* And add it to this window's visible region */ + union_region(Window->Visible, Window->Visible, WindowRegion); + + /* Invalidate this region of target window */ + SwmInvalidateRegion(Window, WindowRegion, NULL); + + DPRINT1("Rest of the update region is:\n"); + SwmDumpRegion(Region); + } + + free_region(WindowRegion); + + /* If region to update became empty, quit */ + if (is_region_empty(Region)) break; + + /* Advance to the next window */ + Current = Current->Flink; + } +} + +VOID +NTAPI +SwmRecalculateVisibility(PSWM_WINDOW CalcWindow) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + struct region *Region = create_empty_region(); + struct region *WindowRegion = create_empty_region(); + + set_region_rect(WindowRegion, &CalcWindow->Window); + + /* Compile a total region of visible regions of "higher" windows */ + Current = &CalcWindow->Entry; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + union_region(Region, Region, Window->Visible); + + /* Advance to the previous window */ + Current = Current->Blink; + } + + /* Crop the region against target window */ + intersect_region(Region, Region, WindowRegion); + + /* Subtract result from target window's visible region */ + subtract_region(CalcWindow->Visible, WindowRegion, Region); + + /* Free allocated temporary regions */ + free_region(Region); + free_region(WindowRegion); +} + +VOID +NTAPI +SwmAddWindow(HWND hWnd, RECT *WindowRect) +{ + PSWM_WINDOW Win; + + DPRINT1("SwmAddWindow %x\n", hWnd); + DPRINT1("rect (%d,%d)-(%d,%d)\n", WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom); + + /* Acquire the lock */ + SwmAcquire(); + + /* Allocate entry */ + Win = ExAllocatePool(PagedPool, sizeof(SWM_WINDOW)); + RtlZeroMemory(Win, sizeof(SWM_WINDOW)); + Win->hwnd = hWnd; + Win->Window.left = WindowRect->left; + Win->Window.top = WindowRect->top; + Win->Window.right = WindowRect->right; + Win->Window.bottom = WindowRect->bottom; + + Win->Visible = create_empty_region(); + set_region_rect(Win->Visible, &Win->Window); + + /* Now go through the list and remove this rect from all underlying windows visible region */ + SwmMarkInvisible(Win->Visible); + + InsertHeadList(&SwmWindows, &Win->Entry); + + /* Now ensure it is visible on screen */ + SwmInvalidateRegion(Win, Win->Visible, &Win->Window); + + //SwmDumpWindows(); + //SwmDebugDrawWindows(); + + /* Release the lock */ + SwmRelease(); +} + +PSWM_WINDOW +NTAPI +SwmFindByHwnd(HWND hWnd) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Check if it's our entry */ + if (Window->hwnd == hWnd) + { + /* Found it, save it and break out of the loop */ + return Window; + } + + /* Advance to the next window */ + Current = Current->Flink; + } + + return NULL; +} + +VOID +NTAPI +SwmRemoveWindow(HWND hWnd) +{ + PSWM_WINDOW Win; + + /* Acquire the lock */ + SwmAcquire(); + + DPRINT1("SwmRemoveWindow %x\n", hWnd); + + /* Allocate entry */ + Win = SwmFindByHwnd(hWnd); + //ASSERT(Win != NULL); + if (!Win) + { + /* Release the lock */ + SwmRelease(); + + return; + } + + RemoveEntryList(&Win->Entry); + + /* Mark this region as visible in other window */ + SwmMarkVisible(Win->Visible); + + /* Free the entry */ + free_region(Win->Visible); + ExFreePool(Win); + + /* Release the lock */ + SwmRelease(); +} + +VOID +NTAPI +SwmSetForeground(HWND hWnd) +{ + PSWM_WINDOW SwmWin, Previous; + struct region *OldVisible; + + /* Acquire the lock */ + SwmAcquire(); + + /* Allocate entry */ + SwmWin = SwmFindByHwnd(hWnd); + //ASSERT(SwmWin != NULL); + if (!SwmWin) + { + /* Release the lock */ + SwmRelease(); + return; + } + + /* Save previous focus window */ + Previous = CONTAINING_RECORD(SwmWindows.Flink, SWM_WINDOW, Entry); + + /* It's already on top */ + if (Previous->hwnd == hWnd) + { + DPRINT1("hwnd %x is already on top\n", hWnd); + /* Release the lock */ + SwmRelease(); + return; + } + + DPRINT1("Setting %x as foreground, previous window was %x\n", hWnd, Previous->hwnd); + + /* Remove it from the list */ + RemoveEntryList(&SwmWin->Entry); + + /* Add it to the head of the list */ + InsertHeadList(&SwmWindows, &SwmWin->Entry); + + /* Make it fully visible */ + OldVisible = create_empty_region(); + copy_region(OldVisible, SwmWin->Visible); + + free_region(SwmWin->Visible); + SwmWin->Visible = create_empty_region(); + set_region_rect(SwmWin->Visible, &SwmWin->Window); + + /* Intersect new visible and old visible to find region for updating */ + intersect_region(OldVisible, OldVisible, SwmWin->Visible); + + /* If it's not empty - draw missing parts */ + if (!is_region_empty(OldVisible)) + SwmInvalidateRegion(SwmWin, OldVisible, NULL); + + free_region(OldVisible); + + /* Update previous window's visible region */ + SwmRecalculateVisibility(Previous); + + /* Release the lock */ + SwmRelease(); +} + +VOID +NTAPI +SwmPosChanging(HWND hWnd, const RECT *WindowRect) +{ +} + +VOID +NTAPI +SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect) +{ + PSWM_WINDOW SwmWin; + struct region *NewRegion; + rectangle_t WinRect; + + /* Acquire the lock */ + SwmAcquire(); + + /* Allocate entry */ + SwmWin = SwmFindByHwnd(hWnd); + if (!SwmWin) + { + /* Release the lock */ + SwmRelease(); + return; + } + + SwmWin->Window.left = WindowRect->left; + SwmWin->Window.top = WindowRect->top; + SwmWin->Window.right = WindowRect->right; + SwmWin->Window.bottom = WindowRect->bottom; + + //SwmDebugDrawWindows(); + + /* Assure the moving window is foreground */ + ASSERT(SwmWindows.Flink == &SwmWin->Entry); + + /* Create a region describing new position */ + NewRegion = create_empty_region(); + WinRect.left = WindowRect->left; WinRect.top = WindowRect->top; + WinRect.right = WindowRect->right; WinRect.bottom = WindowRect->bottom; + set_region_rect(NewRegion, &WinRect); + + /* Intersect it with the old region */ + intersect_region(NewRegion, NewRegion, SwmWin->Visible); + + /* This window's visibility region will just move, because it + really equals window's rect. */ + offset_region(SwmWin->Visible, + WindowRect->left - OldRect->left, + WindowRect->top - OldRect->top); + + /* NewRegion now holds the difference. Mark it visible. */ + SwmMarkVisible(NewRegion); + free_region(NewRegion); + + /* Redraw window itself too */ + //SwmInvalidateRegion(SwmWin, SwmWin->Visible, NULL); + + /* Release the lock */ + SwmRelease(); +} + +HWND +NTAPI +SwmGetWindowFromPoint(LONG x, LONG y) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + + /* Acquire the lock */ + SwmAcquire(); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + if (point_in_region(Window->Visible, x, y)) + { + /* Release the lock */ + SwmRelease(); + + return Window->hwnd; + } + + /* Advance to the next window */ + Current = Current->Flink; + } + + /* Release the lock */ + SwmRelease(); + + return 0; +} + + +VOID +NTAPI +SwmInitialize() +{ + NTSTATUS Status; + + /* Initialize handles list and a spinlock */ + InitializeListHead(&SwmWindows); + + /* Initialize SWM access resource */ + Status = ExInitializeResourceLite(&SwmLock); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure initializing SWM resource!\n"); + } + + SwmTest(); +} + +// haaaaaaaaaaaaaaaaaaack +struct region +{ + int size; + int num_rects; + rectangle_t *rects; + rectangle_t extents; +}; + +VOID +NTAPI +SwmDumpRegion(struct region *Region) +{ + ULONG i; + + //get_region_extents(Region, &ExtRect); + + for (i=0; i<Region->num_rects; i++) + { + DbgPrint("(%d,%d)-(%d,%d) ", Region->rects[i].left, Region->rects[i].top, + Region->rects[i].right, Region->rects[i].bottom); + } + + DbgPrint("\n"); +} + +VOID +NTAPI +SwmDumpWindows() +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + + DPRINT1("Windows in z order: "); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + DbgPrint("%x regions: \n", Window->hwnd); + SwmDumpRegion(Window->Visible); + + /* Advance to the next window */ + Current = Current->Flink; + } + + DbgPrint("\n"); +} + +VOID +NTAPI +SwmDebugDrawRect(HDC hDC, rectangle_t *Rect, ULONG Color) +{ + PDC pDC; + ULONG Scale = 4; + + /* Get a pointer to the DC */ + pDC = DC_Lock(hDC); + + pDC->pLineBrush->BrushObj.iSolidColor = Color; + + GreRectangle(pDC, Rect->left / Scale, Rect->top / Scale, Rect->right / Scale, Rect->bottom / Scale); + + /* Release the object */ + DC_Unlock(pDC); +} + +VOID +NTAPI +SwmDebugDrawRegion(HDC hDC, struct region *Region, ULONG Color) +{ + PDC pDC; + ULONG Scale = 4, i; + + if (is_region_empty(Region)) return; + + /* Get a pointer to the DC */ + pDC = DC_Lock(hDC); + + pDC->pLineBrush->BrushObj.iSolidColor = Color; + + for (i=0; i<Region->num_rects; i++) + GreRectangle(pDC, Region->rects[i].left / Scale, Region->rects[i].top / Scale, + Region->rects[i].right / Scale, Region->rects[i].bottom / Scale); + + /* Release the object */ + DC_Unlock(pDC); +} + +VOID +NTAPI +SwmDebugDrawWindows() +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + HDC ScreenDc = 0; + ROS_DCINFO RosDc = {0}; + PBRUSHGDI Brush, BrushBack; + PDC pDC; + RECTL rcSafeBounds; + + /* Create a dc */ + RosGdiCreateDC(&RosDc, &ScreenDc, L"", L"", L"", NULL); + + /* Create a pen and select it */ + Brush = GreCreateSolidBrush(RGB(0xFF, 0, 0)); + + /* Get a pointer to the DC */ + pDC = DC_Lock(ScreenDc); + GreFreeBrush(pDC->pLineBrush); + pDC->pLineBrush = Brush; + + /* Set the clipping object */ + IntEngDeleteClipRegion(pDC->CombinedClip); + RECTL_vSetRect(&rcSafeBounds, + 0, + 0, + 640, + 480); + + pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); + + /* Clear the area */ + BrushBack = pDC->pFillBrush; + pDC->pFillBrush = GreCreateSolidBrush(RGB(0,0,0)); + GreRectangle(pDC, 0, 0, 800/4, 600/4); + GreFreeBrush(pDC->pFillBrush); + pDC->pFillBrush = BrushBack; + + DC_Unlock(pDC); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + SwmDebugDrawRect(ScreenDc, &Window->Window, RGB(0,0,255)); + SwmDebugDrawRegion(ScreenDc, Window->Visible, RGB(255,0,0)); + + /* Advance to the next window */ + Current = Current->Flink; + } + + /* Delete screen dc */ + GreFreeBrush(Brush); + RosGdiDeleteDC(ScreenDc); +} + +VOID +NTAPI +SwmTest() +{ +#if 0 + RECT rect; + HWND hwnd; + + /* "desktop" */ + hwnd = (HWND)1; + rect.left = 0; rect.top = 0; + rect.right = 100; rect.bottom = 100; + SwmAddWindow(hwnd, &rect); + + /* win1 */ + hwnd = (HWND)2; + rect.left = 40; rect.top = 40; + rect.right = 60; rect.bottom = 60; + SwmAddWindow(hwnd, &rect); + + /* win2 */ + hwnd = (HWND)3; + rect.left = 50; rect.top = 50; + rect.right = 70; rect.bottom = 70; + SwmAddWindow(hwnd, &rect); + + SwmDumpWindows(); +#endif +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -81,4 +81,10 @@ RosUserGetKeyNameText 3 RosUserToUnicodeEx 7 RosUserMapVirtualKeyEx 4 -RosUserGetAsyncKeyState 1 +RosUserGetAsyncKeyState 1 +SwmAddWindow 2 +SwmRemoveWindow 1 +SwmSetForeground 1 +SwmPosChanging 2 +SwmPosChanged 3 +SwmGetWindowFromPoint 2 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -116,6 +116,9 @@ <file>kbdlayout.c</file> <file>keyboard.c</file> </directory> + <directory name="swm"> + <file>winman.c</file> + </directory> <directory name="wine"> <file>atom.c</file> <file>class.c</file> Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -110,7 +110,7 @@ #define WINPTR_NOTOPMOST ((struct window *)4L) /* retrieve a pointer to a window from its handle */ -static inline struct window *get_window( user_handle_t handle ) +/*static*/ inline struct window *get_window( user_handle_t handle ) { struct window *ret = get_user_object( handle, USER_WINDOW ); if (!ret) set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); @@ -1231,7 +1231,7 @@ /* add/subtract a region (in client coordinates) to the update region of the window */ -static void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ) +/*static*/ void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ) { struct region *tmp; struct window *child;

14 years, 10 months

[ablackmann] 43886: Implement stubs for all the different keyword stub-parsers.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Sat Oct 31 21:24:33 2009 New Revision: 43886 URL: http://svn.reactos.org/svn/reactos?rev=43886&view=rev Log: Implement stubs for all the different keyword stub-parsers. Modified: trunk/reactos/tools/kbdtool/parser.c 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] Sat Oct 31 21:24:33 2009 @@ -22,6 +22,7 @@ extern PCHAR gpszFileName; extern FILE* gfpInput; CHAR gBuf[256]; +CHAR g_Layout[4096]; ULONG gLineCount; PCHAR KeyWordList[KEYWORD_COUNT] = { @@ -125,11 +126,104 @@ return KEYWORD_COUNT; } +ULONG +DoKBD(VOID) +{ + return SkipLines(); +} + +ULONG +DoVERSION(VOID) +{ + return SkipLines(); +} + +ULONG +DoCOPYRIGHT(VOID) +{ + return SkipLines(); +} + +ULONG +DoCOMPANY(VOID) +{ + return SkipLines(); +} + +ULONG +DoLOCALENAME(VOID) +{ + return SkipLines(); +} + +ULONG +DoMODIFIERS(VOID) +{ + return SkipLines(); +} + +ULONG +DoDESCRIPTIONS(PVOID DescriptionData) +{ + return SkipLines(); +} + +ULONG +DoKEYNAME(PVOID KeyNameData) +{ + return SkipLines(); +} + +ULONG +DoLIGATURE(PVOID LigatureData) +{ + return SkipLines(); +} + +ULONG +DoATTRIBUTES(PVOID AttributeData) +{ + return SkipLines(); +} + +ULONG +DoLANGUAGENAMES(PVOID LanguageData) +{ + return SkipLines(); +} + +ULONG +DoDEADKEY(PVOID DeadKeyData) +{ + return SkipLines(); +} + +ULONG +DoSHIFTSTATE(IN PULONG StateCount, + IN OUT PULONG ShiftStates) +{ + *StateCount = 10; + return SkipLines(); +} + +ULONG +DoLAYOUT(IN PVOID LayoutData, + IN PVOID LigatureData, + IN PULONG ShiftStates, + IN ULONG StateCount) +{ + return SkipLines(); +} + VOID DoParsing(VOID) { ULONG KeyWords[KEYWORD_COUNT]; ULONG KeyWord; + ULONG StateCount; + ULONG ShiftStates[8]; + PVOID AttributeData, LigatureData, DeadKeyData, DescriptionData; + PVOID KeyNameData, KeyNameExtData, KeyNameDeadData, LanguageData; /* Parse keywords */ gLineCount = 0; @@ -155,6 +249,7 @@ printf("The '%s' keyword appeared multiple times.\n", KeyWordList[KeyWord]); } + /* Now parse this keyword */ switch (KeyWord) @@ -163,112 +258,122 @@ case 0: printf("Found KBD section\n"); - KeyWord = SkipLines(); + KeyWord = DoKBD(); break; /* VERSION */ case 1: printf("Found VERSION section\n"); - KeyWord = SkipLines(); + KeyWord = DoVERSION(); break; /* COPYRIGHT */ case 2: printf("Found COPYRIGHT section\n"); - KeyWord = SkipLines(); + KeyWord = DoCOPYRIGHT(); break; /* COMPANY */ case 3: printf("Found COMPANY section\n"); - KeyWord = SkipLines(); + KeyWord = DoCOMPANY(); break; /* LOCALENAME */ case 4: printf("Found LOCALENAME section\n"); - KeyWord = SkipLines(); + KeyWord = DoLOCALENAME(); break; /* MODIFIERS */ case 5: printf("Found MODIFIERS section\n"); - KeyWord = SkipLines(); + KeyWord = DoMODIFIERS(); break; /* SHIFTSTATE */ case 6: printf("Found SHIFTSTATE section\n"); - KeyWord = SkipLines(); + KeyWord = DoSHIFTSTATE(&StateCount, ShiftStates); + if (StateCount < 2) + { + /* Fail */ + fclose(gfpInput); + printf("ERROR"); + exit(1); + } break; /* ATTRIBUTES */ case 7: printf("Found ATTRIBUTES section\n"); - KeyWord = SkipLines(); + KeyWord = DoATTRIBUTES(&AttributeData); break; /* LAYOUT */ case 8: printf("Found LAYOUT section\n"); - KeyWord = SkipLines(); + KeyWord = DoLAYOUT(&g_Layout, + &LigatureData, + ShiftStates, + StateCount); break; /* DEADKEY */ case 9: printf("Found DEADKEY section\n"); - KeyWord = SkipLines(); + KeyWord = DoDEADKEY(&DeadKeyData); break; /* LIGATURE */ case 10: printf("Found LIGATURE section\n"); - KeyWord = SkipLines(); + KeyWord = DoLIGATURE(&LigatureData); break; /* KEYNAME */ case 11: printf("Found KEYNAME section\n"); - KeyWord = SkipLines(); + KeyWord = DoKEYNAME(&KeyNameData); break; /* KEYNAME_EXT */ case 12: printf("Found KEYNAME_EXT section\n"); - KeyWord = SkipLines(); + KeyWord = DoKEYNAME(&KeyNameExtData); break; /* KEYNAME_DEAD */ case 13: printf("Found KEYNAME_DEAD section\n"); - KeyWord = SkipLines(); + KeyWord = DoKEYNAME(&KeyNameDeadData); break; /* DESCRIPTIONS */ case 14: printf("Found DESCRIPTIONS section\n"); - KeyWord = SkipLines(); + KeyWord = DoDESCRIPTIONS(&DescriptionData); break; /* LANGUAGENAMES */ case 15: printf("Found LANGUAGENAMES section\n"); - KeyWord = SkipLines(); + KeyWord = DoLANGUAGENAMES(&LanguageData); break; /* ENDKBD */

14 years, 10 months

[ablackmann] 43885: Start implementing the main parser loop. The tool detects the keywords in the test.klc layout... and that's about all it does for now.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Sat Oct 31 21:03:43 2009 New Revision: 43885 URL: http://svn.reactos.org/svn/reactos?rev=43885&view=rev Log: Start implementing the main parser loop. The tool detects the keywords in the test.klc layout... and that's about all it does for now. Modified: trunk/reactos/tools/kbdtool/main.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=4… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Sat Oct 31 21:03:43 2009 @@ -26,8 +26,8 @@ /* FUNCTIONS ******************************************************************/ -void -usage() +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", @@ -57,9 +57,9 @@ printf("should not be here"); } -int -main(int argc, - char** argv) +INT +main(INT argc, + PCHAR* argv) { CHAR Option; PCHAR OpenFlags; @@ -145,13 +145,13 @@ } /* If you got here, the options are invalid or missing */ - usage(); + PrintUsage(); } break; } /* Do we have no options? */ - if (optind == argc) usage(); + if (optind == argc) PrintUsage(); /* Should we announce ourselves? */ if (!NoLogo) @@ -213,6 +213,12 @@ /* Now inform the user */ printf("Compiling layout information from '%s' for %s.\n", gpszFileName, BuildOptions); } + + /* Now parse the keywords */ + DoParsing(); + + /* We are done */ + fclose(gfpInput); /* Now do something... */ printf("Like a rock...\n"); 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] Sat Oct 31 21:03:43 2009 @@ -16,6 +16,272 @@ /* GLOBALS ********************************************************************/ +#define KEYWORD_COUNT 17 + +extern BOOLEAN Verbose; +extern PCHAR gpszFileName; +extern FILE* gfpInput; +CHAR gBuf[256]; +ULONG gLineCount; +PCHAR KeyWordList[KEYWORD_COUNT] = +{ + "KBD", + "VERSION", + "COPYRIGHT", + "COMPANY", + "LOCALENAME", + "MODIIFERS", + "SHIFTSTATE", + "ATTRIBUTES", + "LAYOUT", + "DEADKEY", + "LIGATURE", + "KEYNAME", + "KEYNAME_EXT", + "KEYNAME_DEAD", + "DESCRIPTIONS", + "LANGUAGENAMES", + "ENDKBD", +}; + /* FUNCTIONS ******************************************************************/ +ULONG +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; +} + +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; + + /* 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) + { + /* We have a comment, so terminate there (unless the whole line is one) */ + if (pp == p) continue; + *pp = '\0'; + } + else + { + /* No comment, so find the new line and terminate there */ + p = strchr(p, '\n'); + if (p) *p = '\0'; + } + + /* We have a line! */ + return TRUE; + } + + /* No line found */ + return FALSE; +} + +ULONG +SkipLines(VOID) +{ + ULONG KeyWord; + CHAR KeyWordChars[32]; + + /* Scan each line, skipping it if it's not a keyword */ + while (NextLine(gBuf, sizeof(gBuf), gfpInput)) + { + /* Read a single word */ + if (sscanf(gBuf, "%s", KeyWordChars) == 1) + { + /* If the word is a keyword, stop skipping lines */ + KeyWord = isKeyWord(KeyWordChars); + if (KeyWord < KEYWORD_COUNT) return KeyWord; + } + } + + /* We skipped all the possible lines, not finding anything */ + return KEYWORD_COUNT; +} + +VOID +DoParsing(VOID) +{ + ULONG KeyWords[KEYWORD_COUNT]; + ULONG KeyWord; + + /* Parse keywords */ + gLineCount = 0; + KeyWord = SkipLines(); + if (KeyWord >= KEYWORD_COUNT) + { + /* Invalid keyword count, fail */ + fclose(gfpInput); + printf("No keywords were found in '%s'.\n", gpszFileName); + exit(1); + } + + /* Now parse the keywords */ + while (KeyWord < (KEYWORD_COUNT - 1)) + { + /* Save this keyword */ + KeyWords[KeyWord]++; + + /* Check for duplicate entires, other than DEADKEY, which is okay */ + if ((KeyWord != 9) && (KeyWords[KeyWord] > 1) && (Verbose)) + { + /* On a verbose run, warn the user */ + printf("The '%s' keyword appeared multiple times.\n", + KeyWordList[KeyWord]); + } + + /* Now parse this keyword */ + switch (KeyWord) + { + /* KBD */ + case 0: + + printf("Found KBD section\n"); + KeyWord = SkipLines(); + break; + + /* VERSION */ + case 1: + + printf("Found VERSION section\n"); + KeyWord = SkipLines(); + break; + + /* COPYRIGHT */ + case 2: + + printf("Found COPYRIGHT section\n"); + KeyWord = SkipLines(); + break; + + /* COMPANY */ + case 3: + + printf("Found COMPANY section\n"); + KeyWord = SkipLines(); + break; + + /* LOCALENAME */ + case 4: + + printf("Found LOCALENAME section\n"); + KeyWord = SkipLines(); + break; + + /* MODIFIERS */ + case 5: + + printf("Found MODIFIERS section\n"); + KeyWord = SkipLines(); + break; + + /* SHIFTSTATE */ + case 6: + + printf("Found SHIFTSTATE section\n"); + KeyWord = SkipLines(); + break; + + /* ATTRIBUTES */ + case 7: + + printf("Found ATTRIBUTES section\n"); + KeyWord = SkipLines(); + break; + + /* LAYOUT */ + case 8: + + printf("Found LAYOUT section\n"); + KeyWord = SkipLines(); + break; + + /* DEADKEY */ + case 9: + + printf("Found DEADKEY section\n"); + KeyWord = SkipLines(); + break; + + /* LIGATURE */ + case 10: + + printf("Found LIGATURE section\n"); + KeyWord = SkipLines(); + break; + + /* KEYNAME */ + case 11: + + printf("Found KEYNAME section\n"); + KeyWord = SkipLines(); + break; + + /* KEYNAME_EXT */ + case 12: + + printf("Found KEYNAME_EXT section\n"); + KeyWord = SkipLines(); + break; + + /* KEYNAME_DEAD */ + case 13: + + printf("Found KEYNAME_DEAD section\n"); + KeyWord = SkipLines(); + break; + + /* DESCRIPTIONS */ + case 14: + + printf("Found DESCRIPTIONS section\n"); + KeyWord = SkipLines(); + break; + + /* LANGUAGENAMES */ + case 15: + + printf("Found LANGUAGENAMES section\n"); + KeyWord = SkipLines(); + break; + + /* ENDKBD */ + case 16: + + printf("Found ENDKBD section\n"); + KeyWord = SkipLines(); + break; + + + default: + break; + } + } +} /* EOF */

14 years, 10 months

[ablackmann] 43884: Add sample US layout keyboard layout file. Generated with MSKLC by loading the US layout in Windows 7.

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Sat Oct 31 20:51:27 2009 New Revision: 43884 URL: http://svn.reactos.org/svn/reactos?rev=43884&view=rev Log: Add sample US layout keyboard layout file. Generated with MSKLC by loading the US layout in Windows 7. Added: trunk/reactos/tools/kbdtool/test.klc Added: trunk/reactos/tools/kbdtool/test.klc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/test.klc?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/test.klc (added) +++ trunk/reactos/tools/kbdtool/test.klc [iso-8859-1] Sat Oct 31 20:51:27 2009 @@ -1,0 +1,162 @@ +KBD Layout01 "US - Custom" + +COPYRIGHT "(c) 2009 Company" + +COMPANY "Company" + +LOCALENAME "en-US" + +LOCALEID "00000409" + +VERSION 1.0 + +SHIFTSTATE + +0 //Column 4 +1 //Column 5 : Shft +2 //Column 6 : Ctrl + +LAYOUT ;an extra '@' at the end is a dead key + +//SC VK_ Cap 0 1 2 +//-- ---- ---- ---- ---- ---- + +02 1 0 1 0021 -1 // DIGIT ONE, EXCLAMATION MARK, <none> +03 2 0 2 0040 -1 // DIGIT TWO, COMMERCIAL AT, <none> +04 3 0 3 0023 -1 // DIGIT THREE, NUMBER SIGN, <none> +05 4 0 4 0024 -1 // DIGIT FOUR, DOLLAR SIGN, <none> +06 5 0 5 0025 -1 // DIGIT FIVE, PERCENT SIGN, <none> +07 6 0 6 005e -1 // DIGIT SIX, CIRCUMFLEX ACCENT, <none> +08 7 0 7 0026 -1 // DIGIT SEVEN, AMPERSAND, <none> +09 8 0 8 002a -1 // DIGIT EIGHT, ASTERISK, <none> +0a 9 0 9 0028 -1 // DIGIT NINE, LEFT PARENTHESIS, <none> +0b 0 0 0 0029 -1 // DIGIT ZERO, RIGHT PARENTHESIS, <none> +0c OEM_MINUS 0 002d 005f -1 // HYPHEN-MINUS, LOW LINE, <none> +0d OEM_PLUS 0 003d 002b -1 // EQUALS SIGN, PLUS SIGN, <none> +10 Q 1 q Q -1 // LATIN SMALL LETTER Q, LATIN CAPITAL LETTER Q, <none> +11 W 1 w W -1 // LATIN SMALL LETTER W, LATIN CAPITAL LETTER W, <none> +12 E 1 e E -1 // LATIN SMALL LETTER E, LATIN CAPITAL LETTER E, <none> +13 R 1 r R -1 // LATIN SMALL LETTER R, LATIN CAPITAL LETTER R, <none> +14 T 1 t T -1 // LATIN SMALL LETTER T, LATIN CAPITAL LETTER T, <none> +15 Y 1 y Y -1 // LATIN SMALL LETTER Y, LATIN CAPITAL LETTER Y, <none> +16 U 1 u U -1 // LATIN SMALL LETTER U, LATIN CAPITAL LETTER U, <none> +17 I 1 i I -1 // LATIN SMALL LETTER I, LATIN CAPITAL LETTER I, <none> +18 O 1 o O -1 // LATIN SMALL LETTER O, LATIN CAPITAL LETTER O, <none> +19 P 1 p P -1 // LATIN SMALL LETTER P, LATIN CAPITAL LETTER P, <none> +1a OEM_4 0 005b 007b 001b // LEFT SQUARE BRACKET, LEFT CURLY BRACKET, ESCAPE +1b OEM_6 0 005d 007d 001d // RIGHT SQUARE BRACKET, RIGHT CURLY BRACKET, INFORMATION SEPARATOR THREE +1e A 1 a A -1 // LATIN SMALL LETTER A, LATIN CAPITAL LETTER A, <none> +1f S 1 s S -1 // LATIN SMALL LETTER S, LATIN CAPITAL LETTER S, <none> +20 D 1 d D -1 // LATIN SMALL LETTER D, LATIN CAPITAL LETTER D, <none> +21 F 1 f F -1 // LATIN SMALL LETTER F, LATIN CAPITAL LETTER F, <none> +22 G 1 g G -1 // LATIN SMALL LETTER G, LATIN CAPITAL LETTER G, <none> +23 H 1 h H -1 // LATIN SMALL LETTER H, LATIN CAPITAL LETTER H, <none> +24 J 1 j J -1 // LATIN SMALL LETTER J, LATIN CAPITAL LETTER J, <none> +25 K 1 k K -1 // LATIN SMALL LETTER K, LATIN CAPITAL LETTER K, <none> +26 L 1 l L -1 // LATIN SMALL LETTER L, LATIN CAPITAL LETTER L, <none> +27 OEM_1 0 003b 003a -1 // SEMICOLON, COLON, <none> +28 OEM_7 0 0027 0022 -1 // APOSTROPHE, QUOTATION MARK, <none> +29 OEM_3 0 0060 007e -1 // GRAVE ACCENT, TILDE, <none> +2b OEM_5 0 005c 007c 001c // REVERSE SOLIDUS, VERTICAL LINE, INFORMATION SEPARATOR FOUR +2c Z 1 z Z -1 // LATIN SMALL LETTER Z, LATIN CAPITAL LETTER Z, <none> +2d X 1 x X -1 // LATIN SMALL LETTER X, LATIN CAPITAL LETTER X, <none> +2e C 1 c C -1 // LATIN SMALL LETTER C, LATIN CAPITAL LETTER C, <none> +2f V 1 v V -1 // LATIN SMALL LETTER V, LATIN CAPITAL LETTER V, <none> +30 B 1 b B -1 // LATIN SMALL LETTER B, LATIN CAPITAL LETTER B, <none> +31 N 1 n N -1 // LATIN SMALL LETTER N, LATIN CAPITAL LETTER N, <none> +32 M 1 m M -1 // LATIN SMALL LETTER M, LATIN CAPITAL LETTER M, <none> +33 OEM_COMMA 0 002c 003c -1 // COMMA, LESS-THAN SIGN, <none> +34 OEM_PERIOD 0 002e 003e -1 // FULL STOP, GREATER-THAN SIGN, <none> +35 OEM_2 0 002f 003f -1 // SOLIDUS, QUESTION MARK, <none> +39 SPACE 0 0020 0020 0020 // SPACE, SPACE, SPACE +56 OEM_102 0 005c 007c 001c // REVERSE SOLIDUS, VERTICAL LINE, INFORMATION SEPARATOR FOUR +53 DECIMAL 0 002e 002e -1 // FULL STOP, FULL STOP, + + +KEYNAME + +01 Esc +0e Backspace +0f Tab +1c Enter +1d Ctrl +2a Shift +36 "Right Shift" +37 "Num *" +38 Alt +39 Space +3a "Caps Lock" +3b F1 +3c F2 +3d F3 +3e F4 +3f F5 +40 F6 +41 F7 +42 F8 +43 F9 +44 F10 +45 Pause +46 "Scroll Lock" +47 "Num 7" +48 "Num 8" +49 "Num 9" +4a "Num -" +4b "Num 4" +4c "Num 5" +4d "Num 6" +4e "Num +" +4f "Num 1" +50 "Num 2" +51 "Num 3" +52 "Num 0" +53 "Num Del" +54 "Sys Req" +57 F11 +58 F12 +7c F13 +7d F14 +7e F15 +7f F16 +80 F17 +81 F18 +82 F19 +83 F20 +84 F21 +85 F22 +86 F23 +87 F24 + +KEYNAME_EXT + +1c "Num Enter" +1d "Right Ctrl" +35 "Num /" +37 "Prnt Scrn" +38 "Right Alt" +45 "Num Lock" +46 Break +47 Home +48 Up +49 "Page Up" +4b Left +4d Right +4f End +50 Down +51 "Page Down" +52 Insert +53 Delete +54 <00> +56 Help +5b "Left Windows" +5c "Right Windows" +5d Application + +DESCRIPTIONS + +0409 US - Custom +LANGUAGENAMES + +0409 English (United States) +ENDKBD +

14 years, 10 months

[cgutman] 43883: - Don't disconnect the same socket multiple times (once per TDI_SEND IRP cancelled, once per TDI_RECEIVE IRP cancelled, once per TDI_SEND IRP on a closing socket, and once per TDI_RECEIVE IRP on a closing socket) - Implement support for graceful socket closure - Fix some memory leaks

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 31 19:46:08 2009 New Revision: 43883 URL: http://svn.reactos.org/svn/reactos?rev=43883&view=rev Log: - Don't disconnect the same socket multiple times (once per TDI_SEND IRP cancelled, once per TDI_RECEIVE IRP cancelled, once per TDI_SEND IRP on a closing socket, and once per TDI_RECEIVE IRP on a closing socket) - Implement support for graceful socket closure - Fix some memory leaks Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Oct 31 19:46:08 2009 @@ -102,26 +102,6 @@ TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); } -VOID DispDoDisconnect( PVOID Data ) { - PDISCONNECT_TYPE DisType = (PDISCONNECT_TYPE)Data; - - TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect\n")); - TcpipRecursiveMutexEnter(&TCPLock, TRUE); - TCPDisconnect - ( DisType->Context, - DisType->Type, - NULL, - NULL, - DispDataRequestComplete, - DisType->Irp ); - TcpipRecursiveMutexLeave(&TCPLock); - TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); - - DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); - - exFreePool(DisType); -} - VOID NTAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) @@ -136,7 +116,6 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; - PDISCONNECT_TYPE DisType; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -159,22 +138,8 @@ switch(MinorFunction) { case TDI_SEND: case TDI_RECEIVE: - DisType = exAllocatePool(NonPagedPool, sizeof(DISCONNECT_TYPE)); - if (DisType) - { - DisType->Type = TDI_DISCONNECT_RELEASE | - ((MinorFunction == TDI_RECEIVE) ? TDI_DISCONNECT_ABORT : 0); - DisType->Context = TranContext->Handle.ConnectionContext; - DisType->Irp = Irp; - - TCPRemoveIRP( TranContext->Handle.ConnectionContext, Irp ); - - if (!ChewCreate(DispDoDisconnect, DisType)) - exFreePool(DisType); - } - - IoReleaseCancelSpinLock(Irp->CancelIrql); - return; + TCPRemoveIRP( TranContext->Handle.ConnectionContext, Irp ); + break; case TDI_SEND_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 31 19:46:08 2009 @@ -44,15 +44,6 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - /* We have to notify oskittcp of the abortion */ - TCPDisconnect - ( Connection, - TDI_DISCONNECT_RELEASE | TDI_DISCONNECT_ABORT, - NULL, - NULL, - Bucket->Request.RequestNotifyObject, - (PIRP)Bucket->Request.RequestContext ); - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); exFreePool(Bucket); @@ -64,15 +55,6 @@ Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; - /* We have to notify oskittcp of the abortion */ - TCPDisconnect - ( Connection, - TDI_DISCONNECT_RELEASE, - NULL, - NULL, - Bucket->Request.RequestNotifyObject, - (PIRP)Bucket->Request.RequestContext ); - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); exFreePool(Bucket); @@ -89,6 +71,8 @@ Connection); Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + + exFreePool(Bucket); } while ((Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest, @@ -98,6 +82,8 @@ Complete = Bucket->Request.RequestNotifyObject; Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + + exFreePool(Bucket); } Connection->SignalState = 0; @@ -671,29 +657,17 @@ PTDI_CONNECTION_INFORMATION ReturnInfo, PTCP_COMPLETION_ROUTINE Complete, PVOID Context ) { - NTSTATUS Status; + NTSTATUS Status = STATUS_INVALID_PARAMETER; ASSERT_LOCKED(&TCPLock); TI_DbgPrint(DEBUG_TCP,("started\n")); - switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) { - case 0: - case TDI_DISCONNECT_ABORT: - Flags = 0; - break; - - case TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE: - Flags = 2; - break; - - case TDI_DISCONNECT_RELEASE: - Flags = 1; - break; - } - - Status = TCPTranslateError - ( OskitTCPShutdown( Connection->SocketContext, Flags ) ); + if (Flags & TDI_DISCONNECT_RELEASE) + Status = TCPTranslateError(OskitTCPDisconnect(Connection->SocketContext)); + + if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) + Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD)); TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status));

14 years, 10 months

[ablackmann] 43882: Implement opening the layout file and printing out the target DLL architecture. Add missing exit(0).

by ablackmann＠svn.reactos.org

Author: ablackmann Date: Sat Oct 31 19:43:15 2009 New Revision: 43882 URL: http://svn.reactos.org/svn/reactos?rev=43882&view=rev Log: Implement opening the layout file and printing out the target DLL architecture. Add missing exit(0). Modified: trunk/reactos/tools/kbdtool/main.c Modified: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Sat Oct 31 19:43:15 2009 @@ -21,6 +21,8 @@ ULONG gSubVersion = 40; BOOLEAN UnicodeFile, Verbose, NoLogo, FallbackDriver, SanityCheck, SourceOnly; ULONG BuildType; +PCHAR gpszFileName; +FILE* gfpInput; /* FUNCTIONS ******************************************************************/ @@ -60,6 +62,8 @@ char** argv) { CHAR Option; + PCHAR OpenFlags; + CHAR BuildOptions[16] = {0}; /* Loop for parameter */ while (TRUE) @@ -157,8 +161,62 @@ gVersion, gSubVersion); } - /* Otherwise... do something */ - printf("Zoom zoom...\n"); + /* Save the file name */ + gpszFileName = argv[optind]; + + /* Open either as binary or text */ + OpenFlags = "rb"; + if (!UnicodeFile) OpenFlags = "rt"; + + /* Open a handle to the file */ + gfpInput = fopen(gpszFileName, OpenFlags); + if (!gfpInput) + { + /* Couldn't open it */ + printf("Unable to open '%s' for read.\n", gpszFileName); + exit(1); + } + + /* Should we print out what we're doing? */ + if (!NoLogo) + { + /* Are we only building the source files? */ + if (SourceOnly) + { + /* Then there's no target architecture */ + strcpy(BuildOptions, "source files"); + } + else + { + /* Take a look at the target architecture*/ + switch (BuildType) + { + /* Print the appropriate message depending on what was chosen */ + case 0: + strcpy(BuildOptions, "i386/x86"); + break; + case 1: + strcpy(BuildOptions, "ia64"); + break; + case 2: + strcpy(BuildOptions, "amd64/x64"); + break; + case 3: + strcpy(BuildOptions, "wow64"); + break; + default: + strcpy(BuildOptions, "unknown purpose"); + break; + } + } + + /* Now inform the user */ + printf("Compiling layout information from '%s' for %s.\n", gpszFileName, BuildOptions); + } + + /* Now do something... */ + printf("Like a rock...\n"); + exit(0); } /* EOF */

14 years, 10 months

[cgutman] 43881: - Implement OskitTCPDisconnect

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 31 19:15:23 2009 New Revision: 43881 URL: http://svn.reactos.org/svn/reactos?rev=43881&view=rev Log: - Implement OskitTCPDisconnect Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Sat Oct 31 19:15:23 2009 @@ -162,6 +162,8 @@ char *buffer, int size); +int OskitTCPDisconnect(void *socket); + #undef errno void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ); @@ -182,4 +184,7 @@ #define OSK_MSG_PEEK 0x02 #define OSK_MSG_DONTWAIT 0x80 +#define FREAD 0x0001 +#define FWRITE 0x0002 + #endif/*OSKITTCP_H*/ Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Oct 31 19:15:23 2009 @@ -236,6 +236,14 @@ return (error); } +int OskitTCPDisconnect(void *socket) +{ + if (!socket) + return OSK_ESHUTDOWN; + + return sodisconnect(socket); +} + int OskitTCPShutdown( void *socket, int disconn_type ) { if (!socket) return OSK_ESHUTDOWN;

14 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009