Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[tkreuzer] 40402: Move PDEVOBJ and related into it's own header file and update the structure to be like XP (most fields currently still commented out)
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 20:48:41 2009 New Revision: 40402 URL: http://svn.reactos.org/svn/reactos?rev=40402&view=rev Log: Move PDEVOBJ and related into it's own header file and update the structure to be like XP (most fields currently still commented out) Added: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h (with props) Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/win32k.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Mon Apr 6 20:48:41 2009 @@ -3,94 +3,14 @@ #include "brush.h" #include "bitmaps.h" +#include "pdevobj.h" /* Constants ******************************************************************/ /* Get/SetBounds/Rect support. */ #define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ -/* PDEVOBJ flags */ -#define PDEV_DISPLAY 0x00000001 /* Display device */ -#define PDEV_HARDWARE_POINTER 0x00000002 /* Supports hardware cursor */ -#define PDEV_SOFTWARE_POINTER 0x00000004 -#define PDEV_GOTFONTS 0x00000040 /* Has font driver */ -#define PDEV_PRINTER 0x00000080 -#define PDEV_ALLOCATEDBRUSHES 0x00000100 -#define PDEV_HTPAL_IS_DEVPAL 0x00000200 -#define PDEV_DISABLED 0x00000400 -#define PDEV_SYNCHRONIZE_ENABLED 0x00000800 -#define PDEV_FONTDRIVER 0x00002000 /* Font device */ -#define PDEV_GAMMARAMP_TABLE 0x00004000 -#define PDEV_UMPD 0x00008000 -#define PDEV_SHARED_DEVLOCK 0x00010000 -#define PDEV_META_DEVICE 0x00020000 -#define PDEV_DRIVER_PUNTED_CALL 0x00040000 /* Driver calls back to GDI engine */ -#define PDEV_CLONE_DEVICE 0x00080000 - /* Type definitions ***********************************************************/ - -// FIXME: move me to an appropriate header -typedef struct _GDIPOINTER /* should stay private to ENG? No, part of PDEVOBJ aka HDEV aka PDEV. */ -{ - /* private GDI pointer handling information, required for software emulation */ - BOOL Enabled; - SIZEL Size; - POINTL HotSpot; - XLATEOBJ *XlateObject; - HSURF ColorSurface; - HSURF MaskSurface; - HSURF SaveSurface; - int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ - - /* public pointer information */ - RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ - PFN_DrvMovePointer MovePointer; - ULONG Status; -} GDIPOINTER, *PGDIPOINTER; - -typedef struct _PDEVOBJ -{ - BASEOBJECT BaseObject; - - struct _PDEVOBJ *ppdevNext; - INT cPdevRefs; - INT cPdevOpenRefs; - struct _PDEVOBJ *ppdevParent; - FLONG flFlags; - PERESOURCE hsemDevLock; /* Device lock. */ - - PVOID pvGammaRamp; /* Gamma ramp pointer. */ - - HSURF FillPatterns[HS_DDI_MAX]; - - ULONG DxDd_nCount; - - DHPDEV hPDev; /* DHPDEV for device. */ - PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this device. */ - DEVINFO DevInfo; - GDIINFO GDIInfo; - HSURF pSurface; /* SURFACE for this device. */ - HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ - ULONG DisplayNumber; - PVOID pGraphicsDev; /* PGRAPHICS_DEVICE */ - - DEVMODEW DMW; - PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */ - - FLONG DxDd_Flags; /* DxDD active status flags. */ - - PFILE_OBJECT VideoFileObject; - BOOLEAN PreparedDriver; - GDIPOINTER Pointer; - /* Stuff to keep track of software cursors; win32k gdi part */ - UINT SafetyRemoveLevel; /* at what level was the cursor removed? - 0 for not removed */ - UINT SafetyRemoveCount; - - DRIVER_FUNCTIONS DriverFunctions; - struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; -} PDEVOBJ, *PPDEVOBJ; - typedef struct _ROS_DC_INFO { @@ -210,15 +130,6 @@ ROS_DC_INFO rosdc; } DC, *PDC; -typedef struct _GRAPHICS_DEVICE -{ - CHAR szNtDeviceName[CCHDEVICENAME]; /* Yes char AscII */ - CHAR szWinDeviceName[CCHDEVICENAME]; /* <- chk GetMonitorInfoW MxIxEX.szDevice */ - struct _GRAPHICS_DEVICE * pNextGraphicsDevice; - DWORD StateFlags; /* See DISPLAY_DEVICE_* */ -} GRAPHICS_DEVICE, *PGRAPHICS_DEVICE; - - /* Internal functions *********************************************************/ #define DC_LockDc(hDC) \ Added: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h (added) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Mon Apr 6 20:48:41 2009 @@ -1,0 +1,125 @@ +#ifndef __WIN32K_PDEVOBJ_H +#define __WIN32K_PDEVOBJ_H + +/* PDEVOBJ flags */ +#define PDEV_DISPLAY 0x00000001 /* Display device */ +#define PDEV_HARDWARE_POINTER 0x00000002 /* Supports hardware cursor */ +#define PDEV_SOFTWARE_POINTER 0x00000004 +#define PDEV_GOTFONTS 0x00000040 /* Has font driver */ +#define PDEV_PRINTER 0x00000080 +#define PDEV_ALLOCATEDBRUSHES 0x00000100 +#define PDEV_HTPAL_IS_DEVPAL 0x00000200 +#define PDEV_DISABLED 0x00000400 +#define PDEV_SYNCHRONIZE_ENABLED 0x00000800 +#define PDEV_FONTDRIVER 0x00002000 /* Font device */ +#define PDEV_GAMMARAMP_TABLE 0x00004000 +#define PDEV_UMPD 0x00008000 +#define PDEV_SHARED_DEVLOCK 0x00010000 +#define PDEV_META_DEVICE 0x00020000 +#define PDEV_DRIVER_PUNTED_CALL 0x00040000 /* Driver calls back to GDI engine */ +#define PDEV_CLONE_DEVICE 0x00080000 + +/* Type definitions ***********************************************************/ + +typedef struct _GDIPOINTER /* should stay private to ENG? No, part of PDEVOBJ aka HDEV aka PDEV. */ +{ + /* private GDI pointer handling information, required for software emulation */ + BOOL Enabled; + SIZEL Size; + POINTL HotSpot; + XLATEOBJ *XlateObject; + HSURF ColorSurface; + HSURF MaskSurface; + HSURF SaveSurface; + int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ + + /* public pointer information */ + RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ + PFN_DrvMovePointer MovePointer; + ULONG Status; +} GDIPOINTER, *PGDIPOINTER; + +typedef struct _GRAPHICS_DEVICE +{ + CHAR szNtDeviceName[CCHDEVICENAME]; /* Yes char AscII */ + CHAR szWinDeviceName[CCHDEVICENAME]; /* <- chk GetMonitorInfoW MxIxEX.szDevice */ + struct _GRAPHICS_DEVICE * pNextGraphicsDevice; + DWORD StateFlags; /* See DISPLAY_DEVICE_* */ +} GRAPHICS_DEVICE, *PGRAPHICS_DEVICE; + +typedef struct _PDEVOBJ +{ + BASEOBJECT BaseObject; + + struct _PDEVOBJ * ppdevNext; + INT cPdevRefs; + INT cPdevOpenRefs; + struct _PDEVOBJ * ppdevParent; + FLONG flFlags; // flags +// FLONG flAccelerated; + PERESOURCE hsemDevLock; /* Device lock. */ +// HSEMAPHORE hsemPointer; +// POINTL ptlPointer; +// SIZEL szlPointer; +// SPRITESTATE SpriteState; +// HFONT hlfntDefault; +// HFONT hlfntAnsiVariable; +// HFONT hlfntAnsiFixed; + HSURF FillPatterns[HS_DDI_MAX]; // ahsurf[HS_DDI_MAX]; +// PUNICODE_STRING pusPrtDataFileName; +// PVOID pDevHTInfo; +// RFONT * prfntActive; +// RFONT * prfntInactive; +// ULONG cInactive; +// BYTE ajbo[0x5C]; +// ULONG cDirectDrawDisableLocks; +// PVOID TypeOneInfo; + PVOID pvGammaRamp; /* Gamma ramp pointer. */ +// PVOID RemoteTypeOne; +// ULONG ulHorzRes; +// ULONG ulVertRes; +// PFN_DrvSetPointerShape pfnDrvSetPointerShape; +// PFN_DrvMovePointer pfnDrvMovePointer; +// PFN_DrvMovePointer pfnMovePointer; +// PFN_DrvSynchronize pfnDrvSynchronize; +// PFN_DrvSynchronizeSurface pfnDrvSynchronizeSurface; +// PFN_DrvSetPalette pfnDrvSetPalette; +// PFN_DrvNotify pfnDrvNotify; +// ULONG TagSig; +// PLDEVOBJ pldev; + DHPDEV hPDev; /* dhpdev, DHPDEV for device. */ + PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this device. */ + DEVINFO DevInfo; // devinfo + GDIINFO GDIInfo; // gdiinfo + HSURF pSurface; /* SURFACE for this device., FIXME: PSURFACE */ +// HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ +// PVOID pDesktopId; + PGRAPHICS_DEVICE pGraphicsDev; /* pGraphicsDevice */ +// POINTL ptlOrigion; + PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */ +// DWORD Unknown3; + FLONG DxDd_Flags; /* DxDD active status flags. */ +// LONG devAttr; +// PVOID WatchDogContext; +// ULONG WatchDogs; + union + { + DRIVER_FUNCTIONS DriverFunctions; + PVOID apfn[INDEX_LAST]; // B8C 0x0598 + }; + + /* ros specific */ + ULONG DxDd_nCount; + ULONG DisplayNumber; + DEVMODEW DMW; + PFILE_OBJECT VideoFileObject; + BOOLEAN PreparedDriver; + GDIPOINTER Pointer; + /* Stuff to keep track of software cursors; win32k gdi part */ + UINT SafetyRemoveLevel; /* at what level was the cursor removed? + 0 for not removed */ + UINT SafetyRemoveCount; + struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; +} PDEVOBJ, *PPDEVOBJ; + +#endif /* !__WIN32K_PDEVOBJ_H */ Propchange: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Mon Apr 6 20:48:41 2009 @@ -33,6 +33,7 @@ #include <include/floatobj.h> #include <include/gdiobj.h> #include <include/palette.h> +#include <include/pdevobj.h> #include <include/rect.h> #include <include/win32.h> #include <include/window.h>

1 0

[gschneider] 40401: - Evgeny Boltik, <BSTSoft AT narod DOT ru>: Fix system palette entries to match the XP and Vista system palette - This actually reverts the system palette back to r1753, see bug #4341 for more info
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 19:54:21 2009 New Revision: 40401 URL: http://svn.reactos.org/svn/reactos?rev=40401&view=rev Log: - Evgeny Boltik, <BSTSoft AT narod DOT ru>: Fix system palette entries to match the XP and Vista system palette - This actually reverts the system palette back to r1753, see bug #4341 for more info Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Mon Apr 6 19:54:21 2009 @@ -51,14 +51,14 @@ { 0x00, 0x80, 0x80, PC_SYS_USED }, { 0xc0, 0xc0, 0xc0, PC_SYS_USED }, { 0xc0, 0xdc, 0xc0, PC_SYS_USED }, - { 0xd4, 0xd0, 0xc7, PC_SYS_USED }, + { 0xa6, 0xca, 0xf0, PC_SYS_USED }, // ... c_min/2 dynamic colorcells // ... gap (for sparse palettes) // ... c_min/2 dynamic colorcells { 0xff, 0xfb, 0xf0, PC_SYS_USED }, - { 0x3a, 0x6e, 0xa5, PC_SYS_USED }, + { 0xa0, 0xa0, 0xa4, PC_SYS_USED }, { 0x80, 0x80, 0x80, PC_SYS_USED }, { 0xff, 0x00, 0x00, PC_SYS_USED }, { 0x00, 0xff, 0x00, PC_SYS_USED },

1 0

[dchapyshev] 40400: - Sync mciavi32, mcicda with Wine head
by dchapyshev＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: dchapyshev Date: Mon Apr 6 19:45:49 2009 New Revision: 40400 URL: http://svn.reactos.org/svn/reactos?rev=40400&view=rev Log: - Sync mciavi32, mcicda with Wine head Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/dll/win32/mcicda/mcicda.c Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Mon Apr 6 19:45:49 2009 @@ -328,7 +328,7 @@ WARN("ignoring another video stream\n"); else { - wma->ash_audio = strh; + wma->ash_video = strh; if (!MCIAVI_GetInfoVideo(wma, &mmckList, &mmckStream)) return FALSE; @@ -342,7 +342,7 @@ WARN("ignoring another audio stream\n"); else { - wma->ash_video = strh; + wma->ash_audio = strh; if (!MCIAVI_GetInfoAudio(wma, &mmckList, &mmckStream)) return FALSE; Modified: trunk/reactos/dll/win32/mcicda/mcicda.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mcicda/mcicda.c?… ============================================================================== --- trunk/reactos/dll/win32/mcicda/mcicda.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mcicda/mcicda.c [iso-8859-1] Mon Apr 6 19:45:49 2009 @@ -464,7 +464,7 @@ /* now, open the handle */ root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (wmcda->handle != 0) + if (wmcda->handle != INVALID_HANDLE_VALUE) return 0; the_error:

1 0

[dchapyshev] 40399: - Sync mscms, mscoree, msctf with Wine - Remove unneeded mscoree_ros.diff
by dchapyshev＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: dchapyshev Date: Mon Apr 6 19:43:12 2009 New Revision: 40399 URL: http://svn.reactos.org/svn/reactos?rev=40399&view=rev Log: - Sync mscms, mscoree, msctf with Wine - Remove unneeded mscoree_ros.diff Removed: trunk/reactos/dll/win32/mscoree/mscoree_ros.diff Modified: trunk/reactos/dll/win32/mscms/mscms_main.c trunk/reactos/dll/win32/mscoree/mscoree.rbuild trunk/reactos/dll/win32/mscoree/mscoree.spec trunk/reactos/dll/win32/mscoree/mscoree_main.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/dll/win32/msctf/threadmgr.c Modified: trunk/reactos/dll/win32/mscms/mscms_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms_main… ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms_main.c [iso-8859-1] Mon Apr 6 19:43:12 2009 @@ -36,6 +36,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mscms); +#ifdef HAVE_LCMS +static int lcms_error_handler( int error, const char *text ) +{ + switch (error) + { + case LCMS_ERRC_WARNING: + case LCMS_ERRC_RECOVERABLE: + case LCMS_ERRC_ABORTED: + WARN("%d %s\n", error, debugstr_a(text)); + return 1; + default: + ERR("unknown error %d %s\n", error, debugstr_a(text)); + return 0; + } +} +#endif + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); @@ -44,6 +61,9 @@ { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); +#ifdef HAVE_LCMS + cmsSetErrorHandler( lcms_error_handler ); +#endif break; case DLL_PROCESS_DETACH: #ifdef HAVE_LCMS Modified: trunk/reactos/dll/win32/mscoree/mscoree.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree.… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree.rbuild [iso-8859-1] Mon Apr 6 19:43:12 2009 @@ -1,6 +1,8 @@ <module name="mscoree" type="win32dll" baseaddress="${BASEADDRESS_MSCOREE}" installbase="system32" installname="mscoree.dll"> <importlibrary definition="mscoree.spec" /> <include base="mscoree">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> <library>wine</library> <library>kernel32</library> <library>advapi32</library> Modified: trunk/reactos/dll/win32/mscoree/mscoree.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree.… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] Mon Apr 6 19:43:12 2009 @@ -70,7 +70,7 @@ @ stdcall LoadLibraryShim(ptr ptr ptr ptr) @ stub LoadLibraryWithPolicyShim @ stdcall LoadStringRCEx(long long ptr long long ptr) -@ stub LockClrVersion +@ stdcall LockClrVersion(ptr ptr ptr) @ stub MetaDataGetDispenser @ stdcall ND_CopyObjDst(ptr ptr long long) @ stdcall ND_CopyObjSrc(ptr long ptr long) Modified: trunk/reactos/dll/win32/mscoree/mscoree_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] Mon Apr 6 19:43:12 2009 @@ -112,6 +112,8 @@ switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; @@ -252,6 +254,12 @@ FIXME("(%p %s, %p, %p, %p): semi-stub\n", szDllName, debugstr_w(szDllName), szVersion, pvReserved, phModDll); if (phModDll) *phModDll = LoadLibraryW(szDllName); + return S_OK; +} + +HRESULT WINAPI LockClrVersion(FLockClrVersionCallback hostCallback, FLockClrVersionCallback *pBeginHostSetup, FLockClrVersionCallback *pEndHostSetup) +{ + FIXME("(%p %p %p): stub\n", hostCallback, pBeginHostSetup, pEndHostSetup); return S_OK; } Removed: trunk/reactos/dll/win32/mscoree/mscoree_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_ros.diff (removed) @@ -1,11 +1,0 @@ ---- mscoree_main.c Tue Jun 10 13:29:52 2008 -+++ mscoree_main.c Sun Sep 07 16:53:09 2008 -@@ -112,8 +112,6 @@ - - switch (fdwReason) - { -- case DLL_WINE_PREATTACH: -- return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; Modified: trunk/reactos/dll/win32/msctf/documentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg… ============================================================================== --- trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] Mon Apr 6 19:43:12 2009 @@ -46,6 +46,7 @@ LONG refCount; ITfContext* contextStack[2]; /* limit of 2 contexts */ + ITfThreadMgrEventSink* ThreadMgrSink; } DocumentMgr; static inline DocumentMgr *impl_from_ITfSourceVtbl(ITfSource *iface) @@ -130,9 +131,14 @@ if (!pic || FAILED(IUnknown_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) return E_INVALIDARG; + if (This->contextStack[0] == NULL) + ITfThreadMgrEventSink_OnInitDocumentMgr(This->ThreadMgrSink,iface); + This->contextStack[1] = This->contextStack[0]; This->contextStack[0] = check; + ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); + return S_OK; } @@ -144,10 +150,17 @@ if (dwFlags == TF_POPF_ALL) { if (This->contextStack[0]) + { + ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); ITfContext_Release(This->contextStack[0]); + } if (This->contextStack[1]) + { + ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[1]); ITfContext_Release(This->contextStack[1]); + } This->contextStack[0] = This->contextStack[1] = NULL; + ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); return S_OK; } @@ -157,9 +170,13 @@ if (This->contextStack[0] == NULL) /* Cannot pop last context */ return E_FAIL; + ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); ITfContext_Release(This->contextStack[0]); This->contextStack[0] = This->contextStack[1]; This->contextStack[1] = NULL; + + if (This->contextStack[0] == NULL) + ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); return S_OK; } @@ -262,7 +279,7 @@ DocumentMgrSource_UnadviseSink, }; -HRESULT DocumentMgr_Constructor(ITfDocumentMgr **ppOut) +HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; @@ -273,6 +290,7 @@ This->DocumentMgrVtbl= &DocumentMgr_DocumentMgrVtbl; This->SourceVtbl = &DocumentMgr_SourceVtbl; This->refCount = 1; + This->ThreadMgrSink = ThreadMgrSink; TRACE("returning %p\n", This); *ppOut = (ITfDocumentMgr*)This; Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Mon Apr 6 19:43:12 2009 @@ -23,7 +23,7 @@ extern DWORD tlsIndex; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); -extern HRESULT DocumentMgr_Constructor(ITfDocumentMgr **ppOut); +extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore); extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Mon Apr 6 19:43:12 2009 @@ -32,20 +32,46 @@ #include "shlwapi.h" #include "winerror.h" #include "objbase.h" +#include "olectl.h" #include "wine/unicode.h" +#include "wine/list.h" #include "msctf.h" #include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagThreadMgrSink { + struct list entry; + union { + /* ThreadMgr Sinks */ + IUnknown *pIUnknown; + /* ITfActiveLanguageProfileNotifySink *pITfActiveLanguageProfileNotifySink; */ + /* ITfDisplayAttributeNotifySink *pITfDisplayAttributeNotifySink; */ + /* ITfKeyTraceEventSink *pITfKeyTraceEventSink; */ + /* ITfPreservedKeyNotifySink *pITfPreservedKeyNotifySink; */ + /* ITfThreadFocusSink *pITfThreadFocusSink; */ + ITfThreadMgrEventSink *pITfThreadMgrEventSink; + } interfaces; +} ThreadMgrSink; typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; LONG refCount; + const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ + ITfDocumentMgr *focus; + + /* kept as separate lists to reduce unnecessary iterations */ + struct list ActiveLanguageProfileNotifySink; + struct list DisplayAttributeNotifySink; + struct list KeyTraceEventSink; + struct list PreservedKeyNotifySink; + struct list ThreadFocusSink; + struct list ThreadMgrEventSink; } ThreadMgr; static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) @@ -53,12 +79,64 @@ return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); } +static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); +} + +static void free_sink(ThreadMgrSink *sink) +{ + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(),0,sink); +} + static void ThreadMgr_Destructor(ThreadMgr *This) { + struct list *cursor, *cursor2; + TlsSetValue(tlsIndex,NULL); TRACE("destroying %p\n", This); if (This->focus) ITfDocumentMgr_Release(This->focus); + + /* free sinks */ + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ActiveLanguageProfileNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->DisplayAttributeNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->KeyTraceEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->PreservedKeyNotifySink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadFocusSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + list_remove(cursor); + free_sink(sink); + } + HeapFree(GetProcessHeap(),0,This); } @@ -124,8 +202,9 @@ static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr **ppdim) { + ThreadMgr *This = (ThreadMgr *)iface; TRACE("(%p)\n",iface); - return DocumentMgr_Constructor(ppdim); + return DocumentMgr_Constructor((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, ppdim); } static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs @@ -166,6 +245,8 @@ if (!pdimFocus || FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) return E_INVALIDARG; + + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, This->focus, check); if (This->focus) ITfDocumentMgr_Release(This->focus); @@ -257,16 +338,48 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { + ThreadMgrSink *tms; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); + + if (!riid || !punk || !pdwCookie) + return E_INVALIDARG; + + if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) + { + tms = HeapAlloc(GetProcessHeap(),0,sizeof(ThreadMgrSink)); + if (!tms) + return E_OUTOFMEMORY; + if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&tms->interfaces.pITfThreadMgrEventSink))) + { + HeapFree(GetProcessHeap(),0,tms); + return CONNECT_E_CANNOTCONNECT; + } + list_add_head(&This->ThreadMgrEventSink,&tms->entry); + *pdwCookie = (DWORD)tms; + } + else + { + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; + } + + TRACE("cookie %x\n",*pdwCookie); + + return S_OK; } static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { + ThreadMgrSink *sink = (ThreadMgrSink*)pdwCookie; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %x\n",This,pdwCookie); + + list_remove(&sink->entry); + free_sink(sink); + + return S_OK; } static const ITfSourceVtbl ThreadMgr_SourceVtbl = @@ -279,6 +392,127 @@ ThreadMgrSource_UnadviseSink, }; +/***************************************************** + * ITfThreadMgrEventSink functions (internal) + *****************************************************/ +static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + + +static WINAPI HRESULT ThreadMgrEventSink_OnInitDocumentMgr( + ITfThreadMgrEventSink *iface,ITfDocumentMgr *pdim) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pdim); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnInitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnUninitDocumentMgr( + ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pdim); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnUninitDocumentMgr(sink->interfaces.pITfThreadMgrEventSink,pdim); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnSetFocus( + ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, + ITfDocumentMgr *pdimPrevFocus) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p %p\n",This,pdimFocus, pdimPrevFocus); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnSetFocus(sink->interfaces.pITfThreadMgrEventSink, pdimFocus, pdimPrevFocus); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnPushContext( + ITfThreadMgrEventSink *iface, ITfContext *pic) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pic); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnPushContext(sink->interfaces.pITfThreadMgrEventSink,pic); + } + + return S_OK; +} + +static WINAPI HRESULT ThreadMgrEventSink_OnPopContext( + ITfThreadMgrEventSink *iface, ITfContext *pic) +{ + struct list *cursor; + ThreadMgr *This = impl_from_ITfThreadMgrEventSink(iface); + + TRACE("(%p) %p\n",This,pic); + + LIST_FOR_EACH(cursor, &This->ThreadMgrEventSink) + { + ThreadMgrSink* sink = LIST_ENTRY(cursor,ThreadMgrSink,entry); + ITfThreadMgrEventSink_OnPopContext(sink->interfaces.pITfThreadMgrEventSink,pic); + } + + return S_OK; +} + +static const ITfThreadMgrEventSinkVtbl ThreadMgr_ThreadMgrEventSinkVtbl = +{ + ThreadMgrEventSink_QueryInterface, + ThreadMgrEventSink_AddRef, + ThreadMgrEventSink_Release, + + ThreadMgrEventSink_OnInitDocumentMgr, + ThreadMgrEventSink_OnUninitDocumentMgr, + ThreadMgrEventSink_OnSetFocus, + ThreadMgrEventSink_OnPushContext, + ThreadMgrEventSink_OnPopContext +}; + HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ThreadMgr *This; @@ -300,9 +534,17 @@ This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->SourceVtbl = &ThreadMgr_SourceVtbl; + This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); + list_init(&This->ActiveLanguageProfileNotifySink); + list_init(&This->DisplayAttributeNotifySink); + list_init(&This->KeyTraceEventSink); + list_init(&This->PreservedKeyNotifySink); + list_init(&This->ThreadFocusSink); + list_init(&This->ThreadMgrEventSink); + TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; return S_OK;

1 0

[cwittich] 40398: wininet: Fixed memory corruption in urlcache. Author: Marcus Meissner <marcus at jet.franken.de> Date: Sun Apr 5 13:55:21 2009 +0200
by cwittich＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cwittich Date: Mon Apr 6 19:42:28 2009 New Revision: 40398 URL: http://svn.reactos.org/svn/reactos?rev=40398&view=rev Log: wininet: Fixed memory corruption in urlcache. Author: Marcus Meissner <marcus at jet.franken.de> Date: Sun Apr 5 13:55:21 2009 +0200 Modified: trunk/reactos/dll/win32/wininet/urlcache.c Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Mon Apr 6 19:42:28 2009 @@ -980,11 +980,13 @@ /* FIXME: is source url optional? */ if (*lpdwBufferSize >= dwRequiredSize) { - lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrl - 1; - if (bUnicode) - MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); - else - memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, (lenUrl + 1) * sizeof(CHAR)); + DWORD lenUrlBytes = (lenUrl+1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + + lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrlBytes; + if (bUnicode) + MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); + else + memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lenUrlBytes); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize))

1 0

[cwittich] 40397: add cryptnet_winetest to bootcd
by cwittich＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cwittich Date: Mon Apr 6 19:41:41 2009 New Revision: 40397 URL: http://svn.reactos.org/svn/reactos?rev=40397&view=rev Log: add cryptnet_winetest to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 6 19:41:41 2009 @@ -698,6 +698,7 @@ modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional modules\rostests\winetests\crypt32\crypt32_winetest.exe 7 optional +modules\rostests\winetests\cryptnet\cryptnet_winetest.exe 7 optional modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional

1 0

[dchapyshev] 40396: - Remove unneeded files (sync with Wine)
by dchapyshev＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: dchapyshev Date: Mon Apr 6 19:39:01 2009 New Revision: 40396 URL: http://svn.reactos.org/svn/reactos?rev=40396&view=rev Log: - Remove unneeded files (sync with Wine) Removed: trunk/reactos/dll/win32/lz32/lzexpand.spec trunk/reactos/dll/win32/lz32/lzexpand16.c trunk/reactos/dll/win32/rasapi32/rasapi16.spec trunk/reactos/dll/win32/wintab32/wintab.spec trunk/reactos/dll/win32/wintab32/wintab16.c Removed: trunk/reactos/dll/win32/lz32/lzexpand.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lzexpand.sp… ============================================================================== --- trunk/reactos/dll/win32/lz32/lzexpand.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lz32/lzexpand.spec (removed) @@ -1,12 +1,0 @@ -1 pascal LZCopy(word word) LZCopy16 -2 pascal -ret16 LZOpenFile(str ptr word) LZOpenFile16 -3 pascal -ret16 LZInit(word) LZInit16 -4 pascal LZSeek(word long word) LZSeek16 -5 pascal -ret16 LZRead(word ptr word) LZRead16 -6 pascal -ret16 LZClose(word) LZClose16 -7 pascal -ret16 LZStart() LZStart16 -8 pascal CopyLZFile(word word) CopyLZFile16 -9 pascal -ret16 LZDone() LZDone16 -10 pascal -ret16 GetExpandedName(str ptr) GetExpandedName16 -#11 WEP -#12 ___EXPORTEDSTUB Removed: trunk/reactos/dll/win32/lz32/lzexpand16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lzexpand16.… ============================================================================== --- trunk/reactos/dll/win32/lz32/lzexpand16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lz32/lzexpand16.c (removed) @@ -1,152 +1,0 @@ -/* - * LZ Decompression functions - * - * Copyright 1996 Marcus Meissner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "lzexpand.h" - -#include "wine/winbase16.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(file); - -#define MAX_LZSTATES 16 - -#define IS_LZ_HANDLE(h) (((h) >= 0x400) && ((h) < 0x400+MAX_LZSTATES)) - - -/*********************************************************************** - * LZStart (LZEXPAND.7) - */ -INT16 WINAPI LZStart16(void) -{ - TRACE("(void)\n"); - return 1; -} - - -/*********************************************************************** - * LZInit (LZEXPAND.3) - */ -HFILE16 WINAPI LZInit16( HFILE16 hfSrc ) -{ - HFILE ret = LZInit( (HFILE)DosFileHandleToWin32Handle(hfSrc) ); - if (IS_LZ_HANDLE(ret)) return ret; - if ((INT)ret <= 0) return ret; - return hfSrc; -} - - -/*********************************************************************** - * GetExpandedName (LZEXPAND.10) - */ -INT16 WINAPI GetExpandedName16( LPSTR in, LPSTR out ) -{ - return (INT16)GetExpandedNameA( in, out ); -} - - -/*********************************************************************** - * LZRead (LZEXPAND.5) - */ -INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread ) -{ - if (IS_LZ_HANDLE(fd)) return LZRead( fd, buf, toread ); - return _lread( (HFILE)DosFileHandleToWin32Handle(fd), buf, toread ); -} - - -/*********************************************************************** - * LZSeek (LZEXPAND.4) - */ -LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type ) -{ - if (IS_LZ_HANDLE(fd)) return LZSeek( fd, off, type ); - return _llseek( (HFILE)DosFileHandleToWin32Handle(fd), off, type ); -} - - -/*********************************************************************** - * LZCopy (LZEXPAND.1) - * - */ -LONG WINAPI LZCopy16( HFILE16 src, HFILE16 dest ) -{ - /* already a LZ handle? */ - if (IS_LZ_HANDLE(src)) return LZCopy( src, (HFILE)DosFileHandleToWin32Handle(dest) ); - - /* no, try to open one */ - src = LZInit16(src); - if ((INT16)src <= 0) return 0; - if (IS_LZ_HANDLE(src)) - { - LONG ret = LZCopy( src, (HFILE)DosFileHandleToWin32Handle(dest) ); - LZClose( src ); - return ret; - } - /* it was not a compressed file */ - return LZCopy( (HFILE)DosFileHandleToWin32Handle(src), (HFILE)DosFileHandleToWin32Handle(dest) ); -} - - -/*********************************************************************** - * LZOpenFile (LZEXPAND.2) - */ -HFILE16 WINAPI LZOpenFile16( LPSTR fn, LPOFSTRUCT ofs, UINT16 mode ) -{ - HFILE hfret = LZOpenFileA( fn, ofs, mode ); - /* return errors and LZ handles unmodified */ - if ((INT)hfret <= 0) return hfret; - if (IS_LZ_HANDLE(hfret)) return hfret; - /* but allocate a dos handle for 'normal' files */ - return Win32HandleToDosFileHandle((HANDLE)hfret); -} - - -/*********************************************************************** - * LZClose (LZEXPAND.6) - */ -void WINAPI LZClose16( HFILE16 fd ) -{ - if (IS_LZ_HANDLE(fd)) LZClose( fd ); - else DisposeLZ32Handle( DosFileHandleToWin32Handle((HFILE)fd) ); -} - - -/*********************************************************************** - * CopyLZFile (LZEXPAND.8) - */ -LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest ) -{ - TRACE("(%d,%d)\n",src,dest); - return LZCopy16(src,dest); -} - - -/*********************************************************************** - * LZDone (LZEXPAND.9) - */ -void WINAPI LZDone16(void) -{ - TRACE("(void)\n"); -} Removed: trunk/reactos/dll/win32/rasapi32/rasapi16.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi1… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi16.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi16.spec (removed) @@ -1,9 +1,0 @@ -#1 stub WEP -#2 stub DLLENTRYPOINT -3 stub RNA1632_THUNKDATA16 -4 stub RasGetErrorString -5 stub RasEnumConnections -6 stub RasHangUp -7 stub RasEnumEntries -8 stub RasGetConnectStatus -9 stub RasDial Removed: trunk/reactos/dll/win32/wintab32/wintab.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab.… ============================================================================== --- trunk/reactos/dll/win32/wintab32/wintab.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintab32/wintab.spec (removed) @@ -1,42 +1,0 @@ -20 pascal -ret16 WTInfo(word word ptr) WTInfo16 -21 pascal -ret16 WTOpen(word ptr word) WTOpen16 -22 pascal -ret16 WTClose(word) WTClose16 -23 pascal -ret16 WTPacketsGet(word s_word ptr) WTPacketsGet16 -24 pascal -ret16 WTPacket(word word ptr) WTPacket16 -40 pascal -ret16 WTEnable(word word) WTEnable16 -41 pascal -ret16 WTOverlap(word word) WTOverlap16 -60 pascal -ret16 WTConfig(word word) WTConfig16 -61 pascal -ret16 WTGet(word ptr) WTGet16 -62 pascal -ret16 WTSet(word ptr) WTSet16 -63 pascal -ret16 WTExtGet(word word ptr) WTExtGet16 -64 pascal -ret16 WTExtSet(word word ptr) WTExtSet16 -65 pascal -ret16 WTSave(word ptr) WTSave16 -66 pascal -ret16 WTRestore(word ptr word) WTRestore16 -80 pascal -ret16 WTPacketsPeek(word s_word ptr) WTPacketsPeek16 -81 pascal -ret16 WTDataGet(word word word s_word ptr ptr) WTDataGet16 -82 pascal -ret16 WTDataPeek(word word word s_word ptr ptr) WTDataPeek16 -83 pascal WTQueuePackets(word) WTQueuePackets16 -84 pascal -ret16 WTQueueSizeGet(word) WTQueueSizeGet16 -85 pascal -ret16 WTQueueSizeSet(word s_word) WTQueueSizeSet16 -100 pascal -ret16 WTMgrOpen(word word) WTMgrOpen16 -101 pascal -ret16 WTMgrClose(word) WTMgrClose16 -120 pascal -ret16 WTMgrContextEnum(word ptr long) WTMgrContextEnum16 -121 pascal -ret16 WTMgrContextOwner(word word) WTMgrContextOwner16 -122 pascal -ret16 WTMgrDefContext(word word) WTMgrDefContext16 -140 pascal -ret16 WTMgrDeviceConfig(word word word) WTMgrDeviceConfig16 -141 pascal -ret16 WTMgrConfigReplace(word word ptr) WTMgrConfigReplace16 -160 pascal WTMgrPacketHook(word word s_word ptr) WTMgrPacketHook16 -161 pascal WTMgrPacketHookDefProc(s_word word long ptr) WTMgrPacketHookDefProc16 -180 pascal -ret16 WTMgrExt(word word ptr) WTMgrExt16 -181 pascal -ret16 WTMgrCsrEnable(word word word) WTMgrCsrEnable16 -182 pascal -ret16 WTMgrCsrButtonMap(word word ptr ptr) WTMgrCsrButtonMap16 -183 pascal -ret16 WTMgrCsrPressureBtnMarks(word word long long) WTMgrCsrPressureBtnMarks16 -184 pascal -ret16 WTMgrCsrPressureResponse(word word ptr ptr) WTMgrCsrPressureResponse16 -185 pascal -ret16 WTMgrCsrExt(word word word ptr) WTMgrCsrExt16 -200 pascal -ret16 WTQueuePacketsEx(word ptr ptr) WTQueuePacketsEx16 -201 pascal -ret16 WTMgrCsrPressureBtnMarksEx(word word ptr ptr) WTMgrCsrPressureBtnMarksEx16 -202 pascal -ret16 WTMgrConfigReplaceEx(word word str str) WTMgrConfigReplaceEx16 -203 pascal -ret16 WTMgrPacketHookEx(word s_word str str) WTMgrPacketHookEx16 -204 pascal -ret16 WTMgrPacketUnhook(word) WTMgrPacketUnhook16 -205 pascal -ret16 WTMgrPacketHookNext(word s_word word long) WTMgrPacketHookNext16 -206 pascal -ret16 WTMgrDefContextEx(word word word) WTMgrDefContextEx16 Removed: trunk/reactos/dll/win32/wintab32/wintab16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab1… ============================================================================== --- trunk/reactos/dll/win32/wintab32/wintab16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintab32/wintab16.c (removed) @@ -1,540 +1,0 @@ -/* - * Tablet Win16 - * - * Copyright 2002 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -#include "wintab.h" - -#include "wine/windef16.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wintab); - -/**********************************************************************/ - -#define DECLARE_HANDLE16(a) \ - typedef HANDLE16 a##16; \ - typedef a##16 *P##a##16; \ - typedef a##16 *NP##a##16; \ - typedef a##16 *LP##a##16 - -DECLARE_HANDLE16(HMGR); /* manager handle */ -DECLARE_HANDLE16(HCTX); /* context handle */ -DECLARE_HANDLE16(HWTHOOK); /* hook handle */ - -/**********************************************************************/ - -typedef struct tagLOGCONTEXT16 { - char lcName[LCNAMELEN]; - UINT16 lcOptions; - UINT16 lcStatus; - UINT16 lcLocks; - UINT16 lcMsgBase; - UINT16 lcDevice; - UINT16 lcPktRate; - WTPKT lcPktData; - WTPKT lcPktMode; - WTPKT lcMoveMask; - DWORD lcBtnDnMask; - DWORD lcBtnUpMask; - LONG lcInOrgX; - LONG lcInOrgY; - LONG lcInOrgZ; - LONG lcInExtX; - LONG lcInExtY; - LONG lcInExtZ; - LONG lcOutOrgX; - LONG lcOutOrgY; - LONG lcOutOrgZ; - LONG lcOutExtX; - LONG lcOutExtY; - LONG lcOutExtZ; - FIX32 lcSensX; - FIX32 lcSensY; - FIX32 lcSensZ; - BOOL16 lcSysMode; - INT16 lcSysOrgX; - INT16 lcSysOrgY; - INT16 lcSysExtX; - INT16 lcSysExtY; - FIX32 lcSysSensX; - FIX32 lcSysSensY; -} LOGCONTEXT16, *PLOGCONTEXT16, *NPLOGCONTEXT16, *LPLOGCONTEXT16; - -/**********************************************************************/ - -typedef BOOL16 (WINAPI * WTENUMPROC16)(HCTX16, LPARAM); /* changed CALLBACK->WINAPI, 1.1 */ -typedef BOOL16 (WINAPI * WTCONFIGPROC16)(HCTX16, HWND16); -typedef LRESULT (WINAPI * WTHOOKPROC16)(INT16, WPARAM16, LPARAM); -typedef WTHOOKPROC16 *LPWTHOOKPROC16; - -/*********************************************************************** - * WTInfo (WINTAB.20) - */ -UINT16 WINAPI WTInfo16(UINT16 wCategory, UINT16 nIndex, LPVOID lpOutput) -{ - FIXME("(%hu, %hu, %p): stub\n", wCategory, nIndex, lpOutput); - - return 0; -} - -/*********************************************************************** - * WTOpen (WINTAB.21) - */ -HCTX16 WINAPI WTOpen16(HWND16 hWnd, LPLOGCONTEXT16 lpLogCtx, BOOL16 fEnable) -{ - FIXME("(0x%04hx, %p, %hu): stub\n", hWnd, lpLogCtx, fEnable); - - return 0; -} - -/*********************************************************************** - * WTClose (WINTAB.22) - */ -BOOL16 WINAPI WTClose16(HCTX16 hCtx) -{ - FIXME("(0x%04hx): stub\n", hCtx); - - return TRUE; -} - -/*********************************************************************** - * WTPacketsGet (WINTAB.23) - */ -INT16 WINAPI WTPacketsGet16(HCTX16 hCtx, INT16 cMaxPkts, LPVOID lpPkts) -{ - FIXME("(0x%04hx, %hd, %p): stub\n", hCtx, cMaxPkts, lpPkts); - - return 0; -} - -/*********************************************************************** - * WTPacket (WINTAB.24) - */ -BOOL16 WINAPI WTPacket16(HCTX16 hCtx, UINT16 wSerial, LPVOID lpPkt) -{ - FIXME("(0x%04hx, %hd, %p): stub\n", hCtx, wSerial, lpPkt); - - return FALSE; -} - -/*********************************************************************** - * WTEnable (WINTAB.40) - */ -BOOL16 WINAPI WTEnable16(HCTX16 hCtx, BOOL16 fEnable) -{ - FIXME("(0x%04hx, %hu): stub\n", hCtx, fEnable); - - return FALSE; -} - -/*********************************************************************** - * WTOverlap (WINTAB.41) - */ -BOOL16 WINAPI WTOverlap16(HCTX16 hCtx, BOOL16 fToTop) -{ - FIXME("(0x%04hx, %hu): stub\n", hCtx, fToTop); - - return FALSE; -} - -/*********************************************************************** - * WTConfig (WINTAB.60) - */ -BOOL16 WINAPI WTConfig16(HCTX16 hCtx, HWND16 hWnd) -{ - FIXME("(0x%04hx, 0x%04hx): stub\n", hCtx, hWnd); - - return FALSE; -} - -/*********************************************************************** - * WTGet (WINTAB.61) - */ -BOOL16 WINAPI WTGet16(HCTX16 hCtx, LPLOGCONTEXT16 lpLogCtx) -{ - FIXME("(0x%04hx, %p): stub\n", hCtx, lpLogCtx); - - return FALSE; -} - -/*********************************************************************** - * WTSet (WINTAB.62) - */ -BOOL16 WINAPI WTSet16(HCTX16 hCtx, LPLOGCONTEXT16 lpLogCtx) -{ - FIXME("(0x%04hx, %p): stub\n", hCtx, lpLogCtx); - - return FALSE; -} - -/*********************************************************************** - * WTExtGet (WINTAB.63) - */ -BOOL16 WINAPI WTExtGet16(HCTX16 hCtx, UINT16 wExt, LPVOID lpData) -{ - FIXME("(0x%04hx, %hu, %p): stub\n", hCtx, wExt, lpData); - - return FALSE; -} - -/*********************************************************************** - * WTExtSet (WINTAB.64) - */ -BOOL16 WINAPI WTExtSet16(HCTX16 hCtx, UINT16 wExt, LPVOID lpData) -{ - FIXME("(0x%04hx, %hu, %p): stub\n", hCtx, wExt, lpData); - - return FALSE; -} - -/*********************************************************************** - * WTSave (WINTAB.65) - */ -BOOL16 WINAPI WTSave16(HCTX16 hCtx, LPVOID lpSaveInfo) -{ - FIXME("(0x%04hx, %p): stub\n", hCtx, lpSaveInfo); - - return FALSE; -} - -/*********************************************************************** - * WTRestore (WINTAB.66) - */ -HCTX16 WINAPI WTRestore16(HWND16 hWnd, LPVOID lpSaveInfo, BOOL16 fEnable) -{ - FIXME("(0x%04hx, %p, %hu): stub\n", hWnd, lpSaveInfo, fEnable); - - return 0; -} - -/*********************************************************************** - * WTPacketsPeek (WINTAB.80) - */ -INT16 WINAPI WTPacketsPeek16(HCTX16 hCtx, INT16 cMaxPkts, LPVOID lpPkts) -{ - FIXME("(0x%04hx, %hd, %p): stub\n", hCtx, cMaxPkts, lpPkts); - - return 0; -} - -/*********************************************************************** - * WTDataGet (WINTAB.81) - */ -INT16 WINAPI WTDataGet16(HCTX16 hCtx, UINT16 wBegin, UINT16 wEnd, - INT16 cMaxPkts, LPVOID lpPkts, LPINT16 lpNPkts) -{ - FIXME("(0x%04hx, %hu, %hu, %hd, %p, %p): stub\n", - hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); - - return 0; -} - -/*********************************************************************** - * WTDataPeek (WINTAB.82) - */ -INT16 WINAPI WTDataPeek16(HCTX16 hCtx, UINT16 wBegin, UINT16 wEnd, - INT16 cMaxPkts, LPVOID lpPkts, LPINT16 lpNPkts) -{ - FIXME("(0x%04hx, %hu, %hu, %hd, %p, %p): stub\n", - hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); - - return 0; -} - -/*********************************************************************** - * WTQueuePackets (WINTAB.83) - * - * OBSOLETE IN WIN32! - */ -DWORD WINAPI WTQueuePackets16(HCTX16 hCtx) -{ - FIXME("(0x%04hx): stub\n", hCtx); - - return 0; -} - -/*********************************************************************** - * WTQueuePacketsEx (WINTAB.200) - */ -BOOL16 WINAPI WTQueuePacketsEx16(HCTX16 hCtx, UINT16 *lpOld, UINT16 *lpNew) -{ - FIXME("(0x%04hx, %p, %p): stub\n", hCtx, lpOld, lpNew); - - return TRUE; -} - -/*********************************************************************** - * WTQueueSizeGet (WINTAB.84) - */ -INT16 WINAPI WTQueueSizeGet16(HCTX16 hCtx) -{ - FIXME("(0x%04hx): stub\n", hCtx); - - return 0; -} - -/*********************************************************************** - * WTQueueSizeSet (WINTAB.85) - */ -BOOL16 WINAPI WTQueueSizeSet16(HCTX16 hCtx, INT16 nPkts) -{ - FIXME("(0x%04hx, %hd): stub\n", hCtx, nPkts); - - return FALSE; -} - -/*********************************************************************** - * WTMgrOpen (WINTAB.100) - */ -HMGR16 WINAPI WTMgrOpen16(HWND16 hWnd, UINT16 wMsgBase) -{ - FIXME("(0x%04hx, %hu): stub\n", hWnd, wMsgBase); - - return 0; -} - -/*********************************************************************** - * WTMgrClose (WINTAB.101) - */ -BOOL16 WINAPI WTMgrClose16(HMGR16 hMgr) -{ - FIXME("(0x%04hx): stub\n", hMgr); - - return FALSE; -} - -/*********************************************************************** - * WTMgrContextEnum (WINTAB.120) - */ -BOOL16 WINAPI WTMgrContextEnum16(HMGR16 hMgr, WTENUMPROC16 lpEnumFunc, LPARAM lParam) -{ - FIXME("(0x%04hx, %p, %ld): stub\n", hMgr, lpEnumFunc, lParam); - - return FALSE; -} - -/*********************************************************************** - * WTMgrContextOwner (WINTAB.121) - */ -HWND16 WINAPI WTMgrContextOwner16(HMGR16 hMgr, HCTX16 hCtx) -{ - FIXME("(0x%04hx, 0x%04hx): stub\n", hMgr, hCtx); - - return 0; -} - -/*********************************************************************** - * WTMgrDefContext (WINTAB.122) - */ -HCTX16 WINAPI WTMgrDefContext16(HMGR16 hMgr, BOOL16 fSystem) -{ - FIXME("(0x%04hx, %hu): stub\n", hMgr, fSystem); - - return 0; -} - -/*********************************************************************** - * WTMgrDefContextEx (WINTAB.206) - * - * 1.1 - */ -HCTX16 WINAPI WTMgrDefContextEx16(HMGR16 hMgr, UINT16 wDevice, BOOL16 fSystem) -{ - FIXME("(0x%04hx, %hu, %hu): stub\n", hMgr, wDevice, fSystem); - - return 0; -} - -/*********************************************************************** - * WTMgrDeviceConfig (WINTAB.140) - */ -UINT16 WINAPI WTMgrDeviceConfig16(HMGR16 hMgr, UINT16 wDevice, HWND16 hWnd) -{ - FIXME("(0x%04hx, %hu, 0x%04hx): stub\n", hMgr, wDevice, hWnd); - - return 0; -} - -/*********************************************************************** - * WTMgrConfigReplace (WINTAB.141) - * - * OBSOLETE IN WIN32! - */ -BOOL16 WINAPI WTMgrConfigReplace16(HMGR16 hMgr, BOOL16 fInstall, - WTCONFIGPROC16 lpConfigProc) -{ - FIXME("(0x%04hx, %hu, %p): stub\n", hMgr, fInstall, lpConfigProc); - - return FALSE; -} - -/*********************************************************************** - * WTMgrConfigReplaceEx (WINTAB.202) - */ -BOOL16 WINAPI WTMgrConfigReplaceEx16(HMGR16 hMgr, BOOL16 fInstall, - LPSTR lpszModule, LPSTR lpszCfgProc) -{ - FIXME("(0x%04hx, %hu, %s, %s): stub\n", hMgr, fInstall, - debugstr_a(lpszModule), debugstr_a(lpszCfgProc)); - - return FALSE; -} - -/*********************************************************************** - * WTMgrPacketHook (WINTAB.160) - * - * OBSOLETE IN WIN32! - */ -WTHOOKPROC16 WINAPI WTMgrPacketHook16(HMGR16 hMgr, BOOL16 fInstall, - INT16 nType, WTHOOKPROC16 lpFunc) -{ - FIXME("(0x%04hx, %hu, %hd, %p): stub\n", hMgr, fInstall, nType, lpFunc); - - return 0; -} - -/*********************************************************************** - * WTMgrPacketHookEx (WINTAB.203) - */ -HWTHOOK16 WINAPI WTMgrPacketHookEx16(HMGR16 hMgr, INT16 nType, - LPSTR lpszModule, LPSTR lpszHookProc) -{ - FIXME("(0x%04hx, %hd, %s, %s): stub\n", hMgr, nType, - debugstr_a(lpszModule), debugstr_a(lpszHookProc)); - - return 0; -} - -/*********************************************************************** - * WTMgrPacketUnhook (WINTAB.204) - */ -BOOL16 WINAPI WTMgrPacketUnhook16(HWTHOOK16 hHook) -{ - FIXME("(0x%04hx): stub\n", hHook); - - return FALSE; -} - -/*********************************************************************** - * WTMgrPacketHookDefProc (WINTAB.161) - * - * OBSOLETE IN WIN32! - */ -LRESULT WINAPI WTMgrPacketHookDefProc16(INT16 nCode, WPARAM16 wParam, - LPARAM lParam, LPWTHOOKPROC16 lplpFunc) -{ - FIXME("(%hd, %hu, %lu, %p): stub\n", nCode, wParam, lParam, lplpFunc); - - return 0; -} - -/*********************************************************************** - * WTMgrPacketHookNext (WINTAB.205) - */ -LRESULT WINAPI WTMgrPacketHookNext16(HWTHOOK16 hHook, INT16 nCode, - WPARAM16 wParam, LPARAM lParam) -{ - FIXME("(0x%04hx, %hd, %hu, %lu): stub\n", hHook, nCode, wParam, lParam); - - return 0; -} - - -/*********************************************************************** - * WTMgrExt (WINTAB.180) - */ -BOOL16 WINAPI WTMgrExt16(HMGR16 hMgr, UINT16 wExt, LPVOID lpData) -{ - FIXME("(0x%04hx, %hu, %p): stub\n", hMgr, wExt, lpData); - - return FALSE; -} - -/*********************************************************************** - * WTMgrCsrEnable (WINTAB.181) - */ -BOOL16 WINAPI WTMgrCsrEnable16(HMGR16 hMgr, UINT16 wCursor, BOOL16 fEnable) -{ - FIXME("(0x%04hx, %hu, %hu): stub\n", hMgr, wCursor, fEnable); - - return FALSE; -} - -/*********************************************************************** - * WTMgrCsrButtonMap (WINTAB.182) - */ -BOOL16 WINAPI WTMgrCsrButtonMap16(HMGR16 hMgr, UINT16 wCursor, - LPBYTE lpLogBtns, LPBYTE lpSysBtns) -{ - FIXME("(0x%04hx, %hu, %p, %p): stub\n", hMgr, wCursor, lpLogBtns, lpSysBtns); - - return FALSE; -} - -/*********************************************************************** - * WTMgrCsrPressureBtnMarks (WINTAB.183) - * - * OBSOLETE IN WIN32! (But only according to documentation) - */ -BOOL16 WINAPI WTMgrCsrPressureBtnMarks16(HMGR16 hMgr, UINT16 wCsr, - DWORD dwNMarks, DWORD dwTMarks) -{ - FIXME("(0x%04hx, %hu, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); - - return FALSE; -} - -/*********************************************************************** - * WTMgrCsrPressureBtnMarksEx (WINTAB.201) - */ -BOOL16 WINAPI WTMgrCsrPressureBtnMarksEx16(HMGR16 hMgr, UINT16 wCsr, - UINT16 *lpNMarks, UINT16 *lpTMarks) -{ - FIXME("(0x%04hx, %hu, %p, %p): stub\n", hMgr, wCsr, lpNMarks, lpTMarks); - - return FALSE; -} - -/*********************************************************************** - * WTMgrCsrPressureResponse (WINTAB.184) - */ -BOOL16 WINAPI WTMgrCsrPressureResponse16(HMGR16 hMgr, UINT16 wCsr, - UINT16 *lpNResp, UINT16 *lpTResp) -{ - FIXME("(0x%04hx, %hu, %p, %p): stub\n", hMgr, wCsr, lpNResp, lpTResp); - - return FALSE; -} - -/*********************************************************************** - * WTMgrCsrExt (WINTAB.185) - */ -BOOL16 WINAPI WTMgrCsrExt16(HMGR16 hMgr, UINT16 wCsr, UINT16 wExt, LPVOID lpData) -{ - FIXME("(0x%04hx, %hu, %hu, %p): stub\n", hMgr, wCsr, wExt, lpData); - - return FALSE; -}

1 0

[gschneider] 40395: commit #100: add me to credits
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 19:03:57 2009 New Revision: 40395 URL: http://svn.reactos.org/svn/reactos?rev=40395&view=rev Log: commit #100: add me to credits Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=40395&r1=40394… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Mon Apr 6 19:03:57 2009 @@ -23,6 +23,7 @@ Ge van Geldorp <ge(a)gse.nl> Ged Murphy <gedmurphy(a)reactos.org> Gregor Brunmar <gregor brunmar at home se> +Gregor Schneider <grschneider(a)gmail.com> Guido de Jong Gunnar Andre' Dalsnes <hardon(a)online.no> Hans Kremer

1 0

[gschneider] 40394: - include/crt/math.h: float type math functions are not c++ specific, they are especially needed in the c language - move code accordingly - dll/win32/gdiplus: sync with current wine, correct sqrtf usage
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 18:58:12 2009 New Revision: 40394 URL: http://svn.reactos.org/svn/reactos?rev=40394&view=rev Log: - include/crt/math.h: float type math functions are not c++ specific, they are especially needed in the c language - move code accordingly - dll/win32/gdiplus: sync with current wine, correct sqrtf usage Modified: trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/include/crt/math.h Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -172,6 +172,164 @@ } } +static ARGB blend_colors(ARGB start, ARGB end, int current, int total) +{ + ARGB result=0; + ARGB i; + for (i=0xff; i<=0xff0000; i = i << 8) + result |= (((start&i)*(total - current)+(end&i)*(current))/total)&i; + return result; +} + +static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) +{ + switch (brush->bt) + { + case BrushTypeLinearGradient: + { + GpLineGradient *line = (GpLineGradient*)brush; + RECT rc; + int num_steps = 255; + + SelectClipPath(graphics->hdc, RGN_AND); + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + { + GpPointF endpointsf[2]; + POINT endpointsi[2]; + POINT poly[4]; + + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + /* fill with starting color */ + FillRect(graphics->hdc, &rc, brush->gdibrush); + + endpointsf[0] = line->startpoint; + endpointsf[1] = line->endpoint; + transform_and_round_points(graphics, endpointsi, endpointsf, 2); + + if (abs(endpointsi[0].x-endpointsi[1].x) > abs(endpointsi[0].y-endpointsi[1].y)) + { + /* vertical-ish gradient */ + int endborderx; /* vertical rectangle boundary near endpoint */ + int startx, endx; /* x co-ordinates of endpoints shifted to intersect the top of the visible rectangle */ + int startbottomx, endbottomx; /* x co-ordinate of endpoints shifted to intersect the bottom of the visible rectangle */ + int width; + COLORREF col; + HBRUSH hbrush, hprevbrush; + int i; + + if (endpointsi[1].x > endpointsi[0].x) + endborderx = rc.right; + else + endborderx = rc.left; + + startx = roundr((rc.top - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); + endx = roundr((rc.top - endpointsf[1].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[1].X); + width = endx - startx; + startbottomx = roundr((rc.bottom - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); + endbottomx = startbottomx+width; + + if (num_steps > abs(width)) num_steps = abs(width); + + poly[0].x = endborderx; + poly[0].y = rc.bottom; + poly[1].x = endborderx; + poly[1].y = rc.top; + poly[2].y = rc.top; + poly[3].y = rc.bottom; + + for (i=1; i<num_steps; i++) + { + ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + int ofs = width * i / num_steps; + col = ARGB2COLORREF(argb); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[2].x = startx + ofs; + poly[3].x = startbottomx + ofs; + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + + poly[2].x = endx; + poly[3].x = endbottomx; + + /* draw the ending color */ + col = ARGB2COLORREF(line->endcolor); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + else if (endpointsi[0].y != endpointsi[1].y) + { + /* horizontal-ish gradient */ + int endbordery; /* horizontal rectangle boundary near endpoint */ + int starty, endy; /* y co-ordinates of endpoints shifted to intersect the left of the visible rectangle */ + int startrighty, endrighty; /* y co-ordinate of endpoints shifted to intersect the right of the visible rectangle */ + int height; + COLORREF col; + HBRUSH hbrush, hprevbrush; + int i; + + if (endpointsi[1].y > endpointsi[0].y) + endbordery = rc.bottom; + else + endbordery = rc.top; + + starty = roundr((rc.left - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); + endy = roundr((rc.left - endpointsf[1].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[1].Y); + height = endy - starty; + startrighty = roundr((rc.right - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); + endrighty = startrighty+height; + + if (num_steps > abs(height)) num_steps = abs(height); + + poly[0].x = rc.right; + poly[0].y = endbordery; + poly[1].x = rc.left; + poly[1].y = endbordery; + poly[2].x = rc.left; + poly[3].x = rc.right; + + for (i=1; i<num_steps; i++) + { + ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + int ofs = height * i / num_steps; + col = ARGB2COLORREF(argb); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[2].y = starty + ofs; + poly[3].y = startrighty + ofs; + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + + poly[2].y = endy; + poly[3].y = endrighty; + + /* draw the ending color */ + col = ARGB2COLORREF(line->endcolor); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + /* else startpoint == endpoint */ + } + break; + } + default: + SelectObject(graphics->hdc, brush->gdibrush); + FillPath(graphics->hdc); + break; + } +} + /* GdipDrawPie/GdipFillPie helper function */ static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) @@ -1853,20 +2011,35 @@ rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); - if(roundr(rect->Width) == 0 && roundr(rect->Height) == 0){ - rel_width = rel_height = 1.0; - nwidth = nheight = INT_MAX; - } - else{ + if (roundr(rect->Width) == 0) + { + rel_width = 1.0; + nwidth = INT_MAX; + } + else + { rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) / rect->Width; + nwidth = roundr(rel_width * rect->Width); + } + + if (roundr(rect->Height) == 0) + { + rel_height = 1.0; + nheight = INT_MAX; + } + else + { rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) / rect->Height; - - nwidth = roundr(rel_width * rect->Width); nheight = roundr(rel_height * rect->Height); + } + + if (roundr(rect->Width) != 0 && roundr(rect->Height) != 0) + { + /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE); SelectClipRgn(graphics->hdc, rgn); } @@ -1894,7 +2067,7 @@ DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); for(i = 0, j = 0; i < length; i++){ - if(!isprint(string[i]) && (string[i] != '\n')) + if(!isprintW(string[i]) && (string[i] != '\n')) continue; stringdup[j] = string[i]; @@ -2086,7 +2259,6 @@ save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); @@ -2098,7 +2270,7 @@ goto end; EndPath(graphics->hdc); - FillPath(graphics->hdc); + brush_fill_path(graphics, brush); retval = Ok; @@ -2749,7 +2921,7 @@ nwidth = nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ - if(!isprint(string[i]) && (string[i] != '\n')) + if(!isprintW(string[i]) && (string[i] != '\n')) continue; stringdup[j] = string[i]; Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -147,7 +147,7 @@ /* check flatness as a half of distance between middle point and a linearized path */ if(fabs(((pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y))) <= - (0.5 * flatness*sqrt((powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0))))){ + (0.5 * flatness*sqrtf((powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0))))){ return TRUE; } else Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -249,6 +249,14 @@ return Ok; } +GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, + PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) +{ + FIXME("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) { IStream* stream; @@ -549,6 +557,7 @@ ERR("could not make stream\n"); GdipFree(*bitmap); GdipFree(buff); + *bitmap = NULL; return GenericError; } @@ -558,6 +567,7 @@ IStream_Release(stream); GdipFree(*bitmap); GdipFree(buff); + *bitmap = NULL; return GenericError; } Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=403… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -189,6 +189,9 @@ return res; } __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); } +#endif +#endif + #ifndef __x86_64 __CRT_INLINE float acosf(float _X) { return ((float)acos((double)_X)); } __CRT_INLINE float asinf(float _X) { return ((float)asin((double)_X)); } @@ -214,8 +217,6 @@ __CRT_INLINE float tanf(float _X) { return ((float)tan((double)_X)); } __CRT_INLINE float tanhf(float _X) { return ((float)tanh((double)_X)); } #endif -#endif -#endif #ifndef NO_OLDNAMES #define DOMAIN _DOMAIN

1 0

[fireball] 40393: - Specify NTAPI for all functions without calling convention specified (Alexey Komarov <q4a@reactos.org>). - Remove (unsupported) -mrtd compiler flag.
by fireball＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: fireball Date: Mon Apr 6 18:38:21 2009 New Revision: 40393 URL: http://svn.reactos.org/svn/reactos?rev=40393&view=rev Log: - Specify NTAPI for all functions without calling convention specified (Alexey Komarov <q4a(a)reactos.org>). - Remove (unsupported) -mrtd compiler flag. Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/badblock.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -984,18 +984,21 @@ #ifndef USER_MODE PSCSI_REQUEST_BLOCK +NTAPI BuildMechanismStatusSrb ( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); PSCSI_REQUEST_BLOCK +NTAPI BuildRequestSenseSrb ( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); VOID +NTAPI AtapiHwInitializeChanger ( IN PVOID HwDeviceExtension, IN ULONG TargetId, @@ -1003,6 +1006,7 @@ ); ULONG +NTAPI AtapiSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -1010,6 +1014,7 @@ ); ULONG +NTAPI IdeSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -1019,6 +1024,7 @@ #define AtapiCopyMemory RtlCopyMemory VOID +NTAPI AtapiHexToString ( ULONG Value, PCHAR *Buffer @@ -1027,28 +1033,33 @@ #define AtapiStringCmp(s1, s2, n) _strnicmp(s1, s2, n) BOOLEAN +NTAPI AtapiInterrupt( IN PVOID HwDeviceExtension ); BOOLEAN +NTAPI AtapiInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c ); BOOLEAN +NTAPI AtapiHwInitialize( IN PVOID HwDeviceExtension ); ULONG +NTAPI IdeBuildSenseBuffer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); VOID +NTAPI IdeMediaStatus( IN BOOLEAN EnableMSN, IN PVOID HwDeviceExtension, @@ -1066,12 +1077,14 @@ ); ULONG +NTAPI AtapiParseArgumentString( IN PCCH String, IN PCCH KeyWord ); BOOLEAN +NTAPI IssueIdentify( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1081,6 +1094,7 @@ ); BOOLEAN +NTAPI SetDriveParameters( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1088,6 +1102,7 @@ ); ULONG +NTAPI CheckDevice( IN PVOID HwDeviceExtension, IN ULONG Channel, @@ -1098,6 +1113,7 @@ #define UNIATA_FIND_DEV_UNHIDE 0x01 BOOLEAN +NTAPI FindDevices( IN PVOID HwDeviceExtension, IN ULONG Flags, @@ -1113,18 +1129,21 @@ #ifndef USER_MODE BOOLEAN +NTAPI AtapiResetController( IN PVOID HwDeviceExtension, IN ULONG PathId ); BOOLEAN +NTAPI AtapiStartIo( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); BOOLEAN +NTAPI AtapiStartIo__( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -1132,6 +1151,7 @@ ); extern UCHAR +NTAPI AtaCommand48( // IN PVOID HwDeviceExtension, IN struct _HW_DEVICE_EXTENSION* deviceExtension, @@ -1145,6 +1165,7 @@ ); extern UCHAR +NTAPI AtaCommand( // IN PVOID HwDeviceExtension, IN struct _HW_DEVICE_EXTENSION* deviceExtension, @@ -1160,15 +1181,19 @@ ); extern LONG +NTAPI AtaPioMode(PIDENTIFY_DATA2 ident); extern LONG +NTAPI AtaWmode(PIDENTIFY_DATA2 ident); extern LONG +NTAPI AtaUmode(PIDENTIFY_DATA2 ident); extern VOID +NTAPI AtapiDpcDispatch( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -1179,18 +1204,22 @@ //#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) extern LONG +NTAPI AtaPio2Mode(LONG pio); extern LONG +NTAPI AtaPioMode(PIDENTIFY_DATA2 ident); extern VOID +NTAPI AtapiEnableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c ); extern VOID +NTAPI AtapiDisableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c @@ -1202,6 +1231,7 @@ #define IOMODE_NOT_SPECIFIED (0xffffffffL) extern ULONG +NTAPI AtapiRegCheckDevValue( IN PVOID HwDeviceExtension, IN ULONG chan, @@ -1211,6 +1241,7 @@ ); extern ULONG +NTAPI AtapiRegCheckParameterValue( IN PVOID HwDeviceExtension, IN PCWSTR PathSuffix, @@ -1218,7 +1249,7 @@ IN ULONG Default ); -extern ULONG g_LogToDisplay; +extern ULONG g_LogToDisplay; extern "C" VOID @@ -1229,6 +1260,7 @@ ); VOID +NTAPI UniataInitMapBM( IN struct _HW_DEVICE_EXTENSION* deviceExtension, IN struct _IDE_BUSMASTER_REGISTERS* BaseIoAddressBM_0, @@ -1236,6 +1268,7 @@ ); VOID +NTAPI UniataInitMapBase( IN struct _HW_CHANNEL* chan, IN PIDE_REGISTERS_1 BaseIoAddress1, @@ -1243,6 +1276,7 @@ ); VOID +NTAPI UniataInitSyncBaseIO( IN struct _HW_CHANNEL* chan ); @@ -1255,11 +1289,13 @@ ); VOID +NTAPI UniataDumpATARegs( IN struct _HW_CHANNEL* chan ); ULONG +NTAPI EncodeVendorStr( OUT PWCHAR Buffer, IN PUCHAR Str, @@ -1267,12 +1303,14 @@ ); ULONGLONG +NTAPI UniAtaCalculateLBARegsBack( struct _HW_LU_EXTENSION* LunExt, ULONGLONG lba ); BOOLEAN +NTAPI UniataAnybodyHome( IN PVOID HwDeviceExtension, IN ULONG Channel, Modified: trunk/reactos/drivers/storage/ide/uniata/badblock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/badblock.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/badblock.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -58,16 +58,19 @@ #pragma pack(pop) void +NTAPI InitBadBlocks( IN PHW_LU_EXTENSION LunExt ); void +NTAPI ForgetBadBlocks( IN PHW_LU_EXTENSION LunExt ); bool +NTAPI CheckIfBadBlock( IN PHW_LU_EXTENSION LunExt, // IN UCHAR command, Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -1009,6 +1009,7 @@ //extern const CHAR retry_Udma[MAX_RETRIES+1]; extern VOID +NTAPI UniataEnumBusMasterController( IN PVOID DriverObject, PVOID Argument2 @@ -1037,6 +1038,7 @@ #define UNIATA_ALLOCATE_NEW_LUNS 0x00 extern BOOLEAN +NTAPI UniataAllocateLunExt( PHW_DEVICE_EXTENSION deviceExtension, ULONG NewNumberChannels @@ -1063,16 +1065,19 @@ ); extern NTSTATUS +NTAPI UniataConnectIntr2( IN PVOID HwDeviceExtension ); extern NTSTATUS +NTAPI UniataDisconnectIntr2( IN PVOID HwDeviceExtension ); extern ULONG +NTAPI ScsiPortGetBusDataByOffset( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1087,6 +1092,7 @@ #define PCISLOTNUM_NOT_SPECIFIED (0xffffffffL) extern ULONG +NTAPI AtapiFindListedDev( PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters, ULONG lim, @@ -1097,6 +1103,7 @@ ); extern ULONG +NTAPI AtapiFindDev( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1107,6 +1114,7 @@ ); extern VOID +NTAPI AtapiDmaAlloc( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -1114,6 +1122,7 @@ ); extern BOOLEAN +NTAPI AtapiDmaSetup( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1124,6 +1133,7 @@ ); extern BOOLEAN +NTAPI AtapiDmaPioSync( PVOID HwDeviceExtension, PSCSI_REQUEST_BLOCK Srb, @@ -1132,12 +1142,14 @@ ); extern BOOLEAN +NTAPI AtapiDmaDBSync( PHW_CHANNEL chan, PSCSI_REQUEST_BLOCK Srb ); extern VOID +NTAPI AtapiDmaStart( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1146,6 +1158,7 @@ ); extern UCHAR +NTAPI AtapiDmaDone( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1154,6 +1167,7 @@ ); extern VOID +NTAPI AtapiDmaReinit( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev, @@ -1161,12 +1175,14 @@ ); extern VOID +NTAPI AtapiDmaInit__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev ); extern VOID +NTAPI AtapiDmaInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1186,6 +1202,7 @@ extern PDRIVER_OBJECT SavedDriverObject; extern BOOLEAN +NTAPI UniataChipDetectChannels( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -1194,6 +1211,7 @@ ); extern BOOLEAN +NTAPI UniataChipDetect( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -1203,6 +1221,7 @@ ); extern BOOLEAN +NTAPI AtapiChipInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1210,6 +1229,7 @@ ); extern ULONG +NTAPI AtapiGetIoRange( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -1462,6 +1482,7 @@ } BOOLEAN +NTAPI AtapiReadChipConfig( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1469,6 +1490,7 @@ ); VOID +NTAPI UniataForgetDevice( PHW_LU_EXTENSION LunExt ); Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -102,6 +102,7 @@ ); VOID +NTAPI AtapiHwInitialize__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG lChannel @@ -140,6 +141,7 @@ ); VOID +NTAPI AtapiQueueTimerDpc( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -158,6 +160,7 @@ #endif //UNIATA_CORE BOOLEAN +NTAPI AtapiCheckInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c @@ -167,6 +170,7 @@ #ifndef UNIATA_CORE BOOLEAN +NTAPI AtapiRegGetStringParameterValue( IN PWSTR RegistryPath, IN PWSTR Name, @@ -718,6 +722,7 @@ Translate to 48-Lba form if required */ UCHAR +NTAPI AtaCommand48( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, @@ -896,6 +901,7 @@ This is simply wrapper for AtaCommand48() */ UCHAR +NTAPI AtaCommand( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, @@ -916,6 +922,7 @@ } // end AtaCommand() LONG +NTAPI AtaPio2Mode(LONG pio) { switch (pio) { @@ -930,6 +937,7 @@ } // end AtaPio2Mode() LONG +NTAPI AtaPioMode(PIDENTIFY_DATA2 ident) { if (ident->PioTimingsValid) { @@ -950,6 +958,7 @@ } // end AtaPioMode() LONG +NTAPI AtaWmode(PIDENTIFY_DATA2 ident) { if (ident->MultiWordDMASupport & 0x04) @@ -962,6 +971,7 @@ } // end AtaWmode() LONG +NTAPI AtaUmode(PIDENTIFY_DATA2 ident) { if (!ident->UdmaModesValid) @@ -1067,6 +1077,7 @@ cancels previous Dpc request (if any), but we need Dpc queue. */ VOID +NTAPI AtapiQueueTimerDpc( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -1128,6 +1139,7 @@ #endif //UNIATA_CORE VOID +NTAPI UniataDumpATARegs( IN PHW_CHANNEL chan ) @@ -1175,6 +1187,7 @@ --*/ BOOLEAN +NTAPI IssueIdentify( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1769,6 +1782,7 @@ --*/ BOOLEAN +NTAPI SetDriveParameters( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1811,6 +1825,7 @@ } // end SetDriveParameters() VOID +NTAPI UniataForgetDevice( PHW_LU_EXTENSION LunExt ) @@ -1845,6 +1860,7 @@ BOOLEAN +NTAPI AtapiResetController__( IN PVOID HwDeviceExtension, IN ULONG PathId, @@ -2193,6 +2209,7 @@ --*/ ULONG +NTAPI MapError( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -2604,6 +2621,7 @@ } // end AtapiHwInitialize() VOID +NTAPI AtapiHwInitialize__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG lChannel @@ -2826,6 +2844,7 @@ #ifndef UNIATA_CORE VOID +NTAPI AtapiHwInitializeChanger( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -2860,6 +2879,7 @@ --*/ ULONG +NTAPI AtapiParseArgumentString( IN PCCH String, IN PCCH KeyWord @@ -3026,6 +3046,7 @@ Timer callback */ VOID +NTAPI AtapiCallBack__( IN PVOID HwDeviceExtension, IN UCHAR lChannel @@ -3155,6 +3176,7 @@ } // end AtapiCallBack__() VOID +NTAPI AtapiCallBack_X( IN PVOID HwDeviceExtension ) @@ -3300,6 +3322,7 @@ #ifndef UNIATA_CORE BOOLEAN +NTAPI AtapiInterrupt2( IN PKINTERRUPT Interrupt, IN PVOID Isr2HwDeviceExtension @@ -3470,6 +3493,7 @@ VOID +NTAPI AtapiEnableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c @@ -3492,6 +3516,7 @@ } // end AtapiEnableInterrupts() VOID +NTAPI AtapiDisableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c @@ -3517,6 +3542,7 @@ Check hardware for interrupt state */ BOOLEAN +NTAPI AtapiCheckInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c // logical channel @@ -3895,6 +3921,7 @@ BOOLEAN +NTAPI AtapiInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c @@ -5281,6 +5308,7 @@ --*/ ULONG +NTAPI IdeSendSmartCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -5394,6 +5422,7 @@ #endif //UNIATA_CORE ULONGLONG +NTAPI UniAtaCalculateLBARegs( PHW_LU_EXTENSION LunExt, ULONG startingSector, @@ -5434,6 +5463,7 @@ } // end UniAtaCalculateLBARegs() ULONGLONG +NTAPI UniAtaCalculateLBARegsBack( PHW_LU_EXTENSION LunExt, ULONGLONG lba @@ -5478,6 +5508,7 @@ --*/ ULONG +NTAPI IdeReadWrite( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -5736,6 +5767,7 @@ --*/ ULONG +NTAPI IdeVerify( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -5837,6 +5869,7 @@ --*/ ULONG +NTAPI AtapiSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -6409,6 +6442,7 @@ #endif ULONG +NTAPI IdeSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -7003,6 +7037,7 @@ --*/ VOID +NTAPI IdeMediaStatus( BOOLEAN EnableMSN, IN PVOID HwDeviceExtension, @@ -7077,6 +7112,7 @@ --*/ ULONG +NTAPI IdeBuildSenseBuffer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -7129,6 +7165,7 @@ }// End of IdeBuildSenseBuffer VOID +NTAPI UniataUserDeviceReset( PHW_DEVICE_EXTENSION deviceExtension, PHW_LU_EXTENSION LunExt, @@ -7152,6 +7189,7 @@ } // end UniataUserDeviceReset() BOOLEAN +NTAPI UniataNeedQueueing( PHW_DEVICE_EXTENSION deviceExtension, PHW_CHANNEL chan, @@ -7214,6 +7252,7 @@ } // end AtapiStartIo() BOOLEAN +NTAPI AtapiStartIo__( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -8163,6 +8202,7 @@ void +NTAPI UniataInitAtaCommands() { int i; @@ -8666,6 +8706,7 @@ PSCSI_REQUEST_BLOCK +NTAPI BuildMechanismStatusSrb( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -8707,6 +8748,7 @@ #endif //UNIATA_CORE PSCSI_REQUEST_BLOCK +NTAPI BuildRequestSenseSrb ( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -8748,6 +8790,7 @@ #ifndef UNIATA_CORE ULONG +NTAPI AtapiRegCheckDevLunValue( IN PVOID HwDeviceExtension, IN PCWCH NamePrefix, @@ -8777,6 +8820,7 @@ } // end AtapiRegCheckDevLunValue() ULONG +NTAPI EncodeVendorStr( OUT PWCHAR Buffer, IN PUCHAR Str, @@ -8816,6 +8860,7 @@ } // end EncodeVendorStr() ULONG +NTAPI AtapiRegCheckDevValue( IN PVOID HwDeviceExtension, IN ULONG chan, @@ -8936,6 +8981,7 @@ Returns: Registry Key value */ ULONG +NTAPI AtapiRegCheckParameterValue( IN PVOID HwDeviceExtension, IN PCWSTR PathSuffix, Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -122,6 +122,7 @@ void +NTAPI InitBadBlocks( IN PHW_LU_EXTENSION LunExt ) @@ -222,6 +223,7 @@ void +NTAPI ForgetBadBlocks( IN PHW_LU_EXTENSION LunExt ) @@ -235,6 +237,7 @@ } // end ForgetBadBlocks() bool +NTAPI CheckIfBadBlock( IN PHW_LU_EXTENSION LunExt, // IN UCHAR command, Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -53,6 +53,7 @@ PHYSICAL_ADDRESS ph4gb = {{0xFFFFFFFF, 0}}; VOID +NTAPI cyrix_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -60,6 +61,7 @@ ); VOID +NTAPI promise_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -67,6 +69,7 @@ ); VOID +NTAPI hpt_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -74,6 +77,7 @@ ); VOID +NTAPI via82c_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -81,6 +85,7 @@ ); ULONG +NTAPI hpt_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel // physical channel number (0-1) @@ -89,6 +94,7 @@ #define ATAPI_DEVICE(de, ldev) (de->lun[ldev].DeviceFlags & DFLAGS_ATAPI_DEVICE) ULONG +NTAPI AtapiVirtToPhysAddr_( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -124,6 +130,7 @@ } // end AtapiVirtToPhysAddr_() VOID +NTAPI AtapiDmaAlloc( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -204,6 +211,7 @@ } // end AtapiDmaAlloc() BOOLEAN +NTAPI AtapiDmaSetup( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -352,6 +360,7 @@ } // end AtapiDmaSetup() BOOLEAN +NTAPI AtapiDmaPioSync( PVOID HwDeviceExtension, PSCSI_REQUEST_BLOCK Srb, @@ -416,6 +425,7 @@ } // end AtapiDmaPioSync() BOOLEAN +NTAPI AtapiDmaDBSync( PHW_CHANNEL chan, PSCSI_REQUEST_BLOCK Srb @@ -436,6 +446,7 @@ } // end AtapiDmaDBSync() VOID +NTAPI AtapiDmaStart( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -528,6 +539,7 @@ } // end AtapiDmaStart() UCHAR +NTAPI AtapiDmaDone( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -589,6 +601,7 @@ } // end AtapiDmaDone() VOID +NTAPI AtapiDmaReinit( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev, @@ -671,6 +684,7 @@ } // end AtapiDmaReinit() VOID +NTAPI AtapiDmaInit__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev @@ -706,6 +720,7 @@ } // end AtapiDmaInit__() BOOLEAN +NTAPI AtaSetTransferMode( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, @@ -749,6 +764,7 @@ } // end AtaSetTransferMode() VOID +NTAPI AtapiDmaInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1796,6 +1812,7 @@ VOID +NTAPI cyrix_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -1825,6 +1842,7 @@ } // cyrix_timing() VOID +NTAPI promise_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -1888,6 +1906,7 @@ VOID +NTAPI hpt_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -2032,6 +2051,7 @@ #define FIT(v,min,max) (((v)>(max)?(max):(v))<(min)?(min):(v)) VOID +NTAPI via82c_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -44,6 +44,7 @@ #include "stdafx.h" BOOLEAN +NTAPI UniataChipDetectChannels( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -140,6 +141,7 @@ } // end UniataChipDetectChannels() BOOLEAN +NTAPI UniataChipDetect( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -916,6 +918,7 @@ This will prevent data losses */ VOID +NTAPI AtapiViaSouthBridgeFixup( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -980,6 +983,7 @@ This will prevent data losses */ VOID +NTAPI AtapiRosbSouthBridgeFixup( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1031,6 +1035,7 @@ This will prevent data losses */ VOID +NTAPI AtapiAliSouthBridgeFixup( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1082,6 +1087,7 @@ } // end AtapiRosbSouthBridgeFixup() ULONG +NTAPI hpt_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel // physical channel number (0-1) @@ -1116,6 +1122,7 @@ ULONG +NTAPI via_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel // physical channel number (0-1) @@ -1163,6 +1170,7 @@ } // end via_cable80() BOOLEAN +NTAPI generic_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel, // physical channel number (0-1) @@ -1192,6 +1200,7 @@ } // end generic_cable80() VOID +NTAPI UniAtaReadLunConfig( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel, // physical channel @@ -1241,6 +1250,7 @@ } // end UniAtaReadLunConfig() BOOLEAN +NTAPI AtapiReadChipConfig( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1322,6 +1332,7 @@ } // end AtapiReadChipConfig() BOOLEAN +NTAPI AtapiChipInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1880,6 +1891,7 @@ } // end AtapiChipInit() VOID +NTAPI UniataInitMapBM( IN PHW_DEVICE_EXTENSION deviceExtension, IN PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0, @@ -1906,6 +1918,7 @@ } // end UniataInitMapBM() VOID +NTAPI UniataInitMapBase( IN PHW_CHANNEL chan, IN PIDE_REGISTERS_1 BaseIoAddress1, @@ -1926,6 +1939,7 @@ } // end UniataInitMapBase() VOID +NTAPI UniataInitSyncBaseIO( IN PHW_CHANNEL chan ) Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -64,6 +64,7 @@ // local routines ULONG +NTAPI UniataEnumBusMasterController__( /* IN PVOID HwDeviceExtension, IN PVOID Context, @@ -74,6 +75,7 @@ ); VOID +NTAPI AtapiDoNothing(VOID) { return; @@ -85,6 +87,7 @@ Get PCI address by ConfigInfo and RID */ ULONG +NTAPI AtapiGetIoRange( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -163,6 +166,7 @@ Hal routines directly in order to scan PCI bus. */ VOID +NTAPI UniataEnumBusMasterController( IN PVOID DriverObject, PVOID Argument2 @@ -173,6 +177,7 @@ } // end UniataEnumBusMasterController() BOOLEAN +NTAPI UniataCheckPCISubclass( BOOLEAN known, ULONG RaidFlags, @@ -212,6 +217,7 @@ Builds PCI device list using Hal routines (not ScsiPort wrappers) */ ULONG +NTAPI UniataEnumBusMasterController__( ) { @@ -560,6 +566,7 @@ Wrapper for read PCI config space */ ULONG +NTAPI ScsiPortGetBusDataByOffset( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -598,6 +605,7 @@ If no matching record found, -1 is returned */ ULONG +NTAPI AtapiFindListedDev( PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters, ULONG lim, @@ -676,6 +684,7 @@ on specified Bus/Slot */ ULONG +NTAPI AtapiFindDev( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -728,6 +737,7 @@ ULONG +NTAPI UniataFindCompatBusMasterController1( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -748,6 +758,7 @@ } // end UniataFindCompatBusMasterController1() ULONG +NTAPI UniataFindCompatBusMasterController2( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -768,6 +779,7 @@ } // end UniataFindCompatBusMasterController2() BOOLEAN +NTAPI UniataAllocateLunExt( PHW_DEVICE_EXTENSION deviceExtension, ULONG NewNumberChannels @@ -828,6 +840,7 @@ --*/ ULONG +NTAPI UniataFindBusMasterController( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -1705,6 +1718,7 @@ This is for claiming PCI Busmaster in compatible mode under WDM OSes */ ULONG +NTAPI UniataFindFakeBusMasterController( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -2045,6 +2059,7 @@ --*/ NTSTATUS +NTAPI UniataConnectIntr2( IN PVOID HwDeviceExtension ) @@ -2147,6 +2162,7 @@ } // end UniataConnectIntr2() NTSTATUS +NTAPI UniataDisconnectIntr2( IN PVOID HwDeviceExtension ) @@ -2198,6 +2214,7 @@ --*/ ULONG +NTAPI AtapiFindController( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -2614,6 +2631,7 @@ } // end AtapiFindController() BOOLEAN +NTAPI UniataAnybodyHome( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -2689,6 +2707,7 @@ } // end UniataAnybodyHome() ULONG +NTAPI CheckDevice( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -2873,6 +2892,7 @@ --*/ BOOLEAN +NTAPI FindDevices( IN PVOID HwDeviceExtension, IN ULONG Flags, Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -4,6 +4,7 @@ Get cost of insertion Req1 before Req2 */ LONGLONG +NTAPI UniataGetCost( PHW_LU_EXTENSION LunExt, IN PATA_REQ AtaReq1, @@ -52,6 +53,7 @@ Perform reorder if necessary */ VOID +NTAPI UniataQueueRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -218,6 +220,7 @@ Remove request from queue and get next request */ VOID +NTAPI UniataRemoveRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -306,6 +309,7 @@ (from head of the queue) */ PSCSI_REQUEST_BLOCK +NTAPI UniataGetCurRequest( IN PHW_CHANNEL chan ) @@ -323,6 +327,7 @@ (used in simplex mode only) */ PHW_CHANNEL +NTAPI UniataGetNextChannel( IN PHW_CHANNEL chan ) Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -6,6 +6,7 @@ Perform reorder if necessary */ VOID +NTAPI UniataQueueRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -15,6 +16,7 @@ Remove request from queue and get next request */ VOID +NTAPI UniataRemoveRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -25,6 +27,7 @@ (from head of the queue) */ PSCSI_REQUEST_BLOCK +NTAPI UniataGetCurRequest( IN PHW_CHANNEL chan ); @@ -34,6 +37,7 @@ (used in simplex mode only) */ PHW_CHANNEL +NTAPI UniataGetNextChannel( IN PHW_CHANNEL chan ); Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -1,6 +1,7 @@ #include "stdafx.h" UCHAR +NTAPI UniataSataConnect( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel @@ -61,6 +62,7 @@ } // end UniataSataConnect() UCHAR +NTAPI UniataSataPhyEnable( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel @@ -118,6 +120,7 @@ } // end UniataSataPhyEnable() BOOLEAN +NTAPI UniataSataClearErr( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -162,6 +165,7 @@ } // end UniataSataClearErr() BOOLEAN +NTAPI UniataSataEvent( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -197,6 +201,7 @@ } // end UniataSataEvent() BOOLEAN +NTAPI UniataAhciInit( IN PVOID HwDeviceExtension ) @@ -308,6 +313,7 @@ } // end UniataAhciInit() UCHAR +NTAPI UniataAhciStatus( IN PVOID HwDeviceExtension, IN ULONG lChannel @@ -367,6 +373,7 @@ } // end UniataAhciStatus() ULONG +NTAPI UniataAhciSetupFIS( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -2,12 +2,14 @@ #define __UNIATA_SATA__H__ UCHAR +NTAPI UniataSataConnect( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel ); UCHAR +NTAPI UniataSataPhyEnable( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel @@ -17,6 +19,7 @@ #define UNIATA_SATA_IGNORE_CONNECT FALSE BOOLEAN +NTAPI UniataSataClearErr( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -27,6 +30,7 @@ #define UNIATA_SATA_EVENT_DETACH 0x02 BOOLEAN +NTAPI UniataSataEvent( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -39,17 +43,20 @@ (deviceExtension->chan[lChannel].RegTranslation[IDX_SATA_SStatus].Addr)) BOOLEAN +NTAPI UniataAhciInit( IN PVOID HwDeviceExtension ); UCHAR +NTAPI UniataAhciStatus( IN PVOID HwDeviceExtension, IN ULONG lChannel ); ULONG +NTAPI UniataAhciSetupFIS( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -28,6 +28,7 @@ extern "C" NTSTATUS +NTAPI CrNtInit( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -35,12 +36,14 @@ extern "C" PVOID +NTAPI CrNtGetModuleBase( IN PCHAR pModuleName ); extern "C" PVOID +NTAPI CrNtFindModuleBaseByPtr( IN PVOID ptrInSection, IN PCHAR ptrExportedName @@ -48,6 +51,7 @@ extern "C" PVOID +NTAPI CrNtGetProcAddress( PVOID ModuleBase, PCHAR pFunctionName Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -4,7 +4,6 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> - <compilerflag>-mrtd</compilerflag>  <library>ntoskrnl</library> <library>hal</library>

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009