Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 29284: - header update - add a resource
by tkreuzer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: tkreuzer Date: Fri Sep 28 21:26:29 2007 New Revision: 29284 URL: http://svn.reactos.org/svn/reactos?rev=29284&view=rev Log: - header update - add a resource Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c trunk/rostests/apitests/w32knapi/resource/ trunk/rostests/apitests/w32knapi/resource.h trunk/rostests/apitests/w32knapi/resource/system.ico (with props) trunk/rostests/apitests/w32knapi/w32knapi.rc Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.h trunk/rostests/apitests/w32knapi/w32knapi.rbuild Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Fri Sep 28 21:26:29 2007 @@ -1,4 +1,3 @@ -#include "../w32knapi.h" INT Test_NtGdiDdCreateDirectDrawObject(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Fri Sep 28 21:26:29 2007 @@ -1,14 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -BOOL -APIENTRY -NtGdiDdDeleteDirectDrawObject( - HANDLE hDirectDrawLocal -) -{ - return (BOOL)Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDrawLocal); -} INT Test_NtGdiDdDeleteDirectDrawObject(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Fri Sep 28 21:26:29 2007 @@ -1,23 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -BOOL STDCALL -NtGdiDdQueryDirectDrawObject( - HANDLE hDirectDrawLocal, - DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, - VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, - DWORD *puFourCC -) -{ - return (BOOL)Syscall(L"NtGdiDdQueryDirectDrawObject", 11, &hDirectDrawLocal); -} INT Test_NtGdiDdQueryDirectDrawObject(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c Fri Sep 28 21:26:29 2007 @@ -1,16 +1,3 @@ - -HPALETTE -APIENTRY -NtGdiEngCreatePalette( - IN ULONG iMode, - IN ULONG cColors, - IN ULONG *pulColors, - IN FLONG flRed, - IN FLONG flGreen, - IN FLONG flBlue) -{ - return (HPALETTE)Syscall(L"NtGdiEngCreatePalette", 6, &iMode); -} INT Test_NtGdiEngCreatePalette(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Fri Sep 28 21:26:29 2007 @@ -25,7 +25,11 @@ /* We should not be able to use DeleteObject() on the handle */ TEST(DeleteObject((HGDIOBJ)idEnum) == FALSE); - // FIXME: Close the enum handle + NtGdiEnumFontClose(idEnum); + + // Test no logfont (NULL): should word + // Test empty lfFaceName string: should not work + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c Fri Sep 28 21:26:29 2007 @@ -1,5 +1,3 @@ -#include "../w32knapi.h" - INT Test_NtGdiSetBitmapBits(PTESTINFO pti) { Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c Fri Sep 28 21:26:29 2007 @@ -1,5 +1,3 @@ -#include "../w32knapi.h" - /* First the call stub */ DWORD STDCALL NtUserCountClipboardFormats(VOID) Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserFindExistingCursorIcon.c Fri Sep 28 21:26:29 2007 @@ -1,0 +1,7 @@ +INT +Test_NtUserFindExistingCursoricon(PTESTINFO pti) +{ + + return APISTATUS_NORMAL; +} + Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserRedrawWindow.c Fri Sep 28 21:26:29 2007 @@ -1,0 +1,30 @@ +INT +Test_NtUserRedrawWindow(PTESTINFO pti) +{ + HWND hWnd; + RECT rect; + + hWnd = CreateWindowA("BUTTON", + "Test", + BS_PUSHBUTTON | WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + NULL, + g_hInstance, + 0); + ASSERT(hWnd); + + rect.left = 0; + rect.top = 0; + rect.right = 10; + rect.bottom = 10; + + TEST(NtUserRedrawWindow(hWnd, &rect, NULL, RDW_VALIDATE) == TRUE); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Added: trunk/rostests/apitests/w32knapi/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/resourc… ============================================================================== --- trunk/rostests/apitests/w32knapi/resource.h (added) +++ trunk/rostests/apitests/w32knapi/resource.h Fri Sep 28 21:26:29 2007 @@ -1,0 +1,2 @@ + +#define IDI_ICON 1000 Added: trunk/rostests/apitests/w32knapi/resource/system.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/w32knapi/resource/system.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Fri Sep 28 21:26:29 2007 @@ -20,6 +20,8 @@ #include "ntgdi/NtGdiGetDIBits.c" #include "ntuser/NtUserCountClipboardFormats.c" +#include "ntuser/NtUserFindExistingCursorIcon.c" +#include "ntuser/NtUserRedrawWindow.c" /* The List of tests */ TESTENTRY TestList[] = @@ -44,7 +46,9 @@ { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal }, /* ntuser */ - { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats } + { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, + { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, + { L"NtUserRedrawWindow", Test_NtUserRedrawWindow } }; /* The function that gives us the number of tests */ Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Fri Sep 28 21:26:29 2007 @@ -1,26 +1,29 @@ #ifndef _W32KNAPI_H #define _W32KNAPI_H +/* SDK/NDK Headers */ +#define NTOS_MODE_USER #define WIN32_NO_STATUS -#define NTOS_MODE_USER -#define WINVER 0x501 - #include <windows.h> +#include <winuser.h> +#include <windowsx.h> +#include <winnls32.h> +#include <ndk/ntndk.h> #include <wingdi.h> #include <winddi.h> -#include <ntddk.h> #include <d3dnthal.h> #include <prntfont.h> /* Public Win32K Headers */ +#include <win32k/ntusrtyp.h> +#include <win32k/ntuser.h> #include <win32k/callback.h> -#include <win32k/ntusrtyp.h> #include <win32k/ntgdityp.h> +#include <ntgdi.h> #include <win32k/ntgdihdl.h> -#include <ntgdi.h> - #include "../apitest.h" +#include "resource.h" typedef struct { Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild Fri Sep 28 21:26:29 2007 @@ -2,6 +2,7 @@ <include base="w32knapi">.</include> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x501</define> <library>apitest</library> <library>kernel32</library> <library>user32</library> @@ -10,4 +11,5 @@ <library>w32kdll</library> <file>w32knapi.c</file> <file>testlist.c</file> + <file>w32knapi.rc</file> </module> Added: trunk/rostests/apitests/w32knapi/w32knapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rc (added) +++ trunk/rostests/apitests/w32knapi/w32knapi.rc Fri Sep 28 21:26:29 2007 @@ -1,0 +1,5 @@ +#include <windows.h> +#include "resource.h" + +IDI_ICON ICON "resource/system.ico" +

1 0

[dreimer] 29283: Update r29282 to all rc files
by dreimer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: dreimer Date: Fri Sep 28 20:41:59 2007 New Revision: 29283 URL: http://svn.reactos.org/svn/reactos?rev=29283&view=rev Log: Update r29282 to all rc files Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc Fri Sep 28 20:41:59 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Adapter" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc Fri Sep 28 20:41:59 2007 @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Àäàïòåð" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc Fri Sep 28 20:41:59 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_MONITOR DIALOGEX 0, 0, 224, 226 +IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Monitor" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Fri Sep 28 20:41:59 2007 @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_MONITOR DIALOGEX 0, 0, 224, 226 +IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ìîí³òîð" FONT 8, "MS Shell Dlg", 0, 0, 0x0

1 0

[weiden] 29282: Fix the dialog width
by weiden＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: weiden Date: Fri Sep 28 20:35:34 2007 New Revision: 29282 URL: http://svn.reactos.org/svn/reactos?rev=29282&view=rev Log: Fix the dialog width Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Fri Sep 28 20:35:34 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Adapter" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Fri Sep 28 20:35:34 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MONITOR DIALOGEX 0, 0, 224, 226 +IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Monitor" FONT 8, "MS Shell Dlg", 0, 0, 0x0

1 0

[tkreuzer] 29281: update export list
by tkreuzer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: tkreuzer Date: Fri Sep 28 20:32:57 2007 New Revision: 29281 URL: http://svn.reactos.org/svn/reactos?rev=29281&view=rev Log: update export list Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Fri Sep 28 20:32:57 2007 @@ -187,29 +187,29 @@ NtGdiGetEudcTimeStampEx@12 NtGdiGetFontData@20 NtGdiGetFontResourceInfoInternalW@28 -;NtGdiGetGlyphIndicesW@20 -;NtGdiGetGlyphIndicesWInternal@24 +NtGdiGetGlyphIndicesW@20 +NtGdiGetGlyphIndicesWInternal@24 NtGdiGetGlyphOutline@32 NtGdiGetKerningPairs@12 -;NtGdiGetLinkedUFIs@12 +NtGdiGetLinkedUFIs@12 NtGdiGetMiterLimit@8 -;NtGdiGetMonitorID@12 +NtGdiGetMonitorID@12 NtGdiGetNearestColor@8 NtGdiGetNearestPaletteIndex@8 -;NtGdiGetObjectBitmapHandle@8 +NtGdiGetObjectBitmapHandle@8 NtGdiGetOutlineTextMetricsInternalW@16 NtGdiGetPath@16 NtGdiGetPixel@12 NtGdiGetRandomRgn@12 NtGdiGetRasterizerCaps@8 -;NtGdiGetRealizationInfo@12 +NtGdiGetRealizationInfo@12 NtGdiGetRegionData@12 NtGdiGetRgnBox@8 -;NtGdiGetServerMetaFileBits@28 -;NtGdiGetSpoolMessage@16 -;NtGdiGetStats@20 +NtGdiGetServerMetaFileBits@28 +NtGdiGetSpoolMessage@16 +NtGdiGetStats@20 NtGdiGetStockObject@4 -;NtGdiGetStringBitmapW@20 +NtGdiGetStringBitmapW@20 NtGdiGetSystemPaletteUse@4 NtGdiGetTextCharsetInfo@12 NtGdiGetTextExtent@20 @@ -217,28 +217,28 @@ NtGdiGetTextFaceW@16 NtGdiGetTextMetricsW@12 NtGdiGetTransform@12 -;NtGdiGetUFI@24 -;NtGdiGetEmbUFI@28 -;NtGdiGetUFIPathname@40 -;NtGdiGetEmbedFonts@0 -;NtGdiChangeGhostFont@8 -;NtGdiAddEmbFontToDC@8 -;NtGdiGetFontUnicodeRanges@8 -;NtGdiGetWidthTable@28 +NtGdiGetUFI@24 +NtGdiGetEmbUFI@28 +NtGdiGetUFIPathname@40 +NtGdiGetEmbedFonts@0 +NtGdiChangeGhostFont@8 +NtGdiAddEmbFontToDC@8 +NtGdiGetFontUnicodeRanges@8 +NtGdiGetWidthTable@28 NtGdiGradientFill@24 NtGdiHfontCreate@20 -;NtGdiIcmBrushInfo@32 -;NtGdiInit@0 -;NtGdiInitSpool@0 +NtGdiIcmBrushInfo@32 +NtGdiInit@0 +NtGdiInitSpool@0 NtGdiIntersectClipRect@20 NtGdiInvertRgn@8 NtGdiLineTo@12 -;NtGdiMakeFontDir@20 -;NtGdiMakeInfoDC@8 +NtGdiMakeFontDir@20 +NtGdiMakeInfoDC@8 NtGdiMaskBlt@52 NtGdiModifyWorldTransform@12 -;NtGdiMonoBitmap@4 -;NtGdiMoveTo@16 +NtGdiMonoBitmap@4 +NtGdiMoveTo@16 NtGdiOffsetClipRgn@12 NtGdiOffsetRgn@12 NtGdiOpenDCW@28 @@ -248,16 +248,16 @@ NtGdiPlgBlt@44 NtGdiPolyDraw@16 NtGdiPolyPolyDraw@20 -;NtGdiPolyTextOutW@16 +NtGdiPolyTextOutW@16 NtGdiPtInRegion@12 NtGdiPtVisible@12 -;NtGdiQueryFonts@12 -;NtGdiQueryFontAssocInfo@4 +NtGdiQueryFonts@12 +NtGdiQueryFontAssocInfo@4 NtGdiRectangle@20 NtGdiRectInRegion@8 NtGdiRectVisible@8 -;NtGdiRemoveFontResourceW@24 -;NtGdiRemoveFontMemResourceEx@4 +NtGdiRemoveFontResourceW@24 +NtGdiRemoveFontMemResourceEx@4 NtGdiResetDC@20 NtGdiResizePalette@8 NtGdiRestoreDC@8 @@ -265,61 +265,61 @@ NtGdiSaveDC@4 NtGdiScaleViewportExtEx@24 NtGdiScaleWindowExtEx@24 -;NtGdiSelectBitmap@8 -;NtGdiSelectBrush@8 +NtGdiSelectBitmap@8 +NtGdiSelectBrush@8 NtGdiSelectClipPath@8 -;NtGdiSelectFont@8 -;NtGdiSelectPen@8 -;NtGdiSetBitmapAttributes@8 +NtGdiSelectFont@8 +NtGdiSelectPen@8 +NtGdiSetBitmapAttributes@8 NtGdiSetBitmapBits@12 NtGdiSetBitmapDimension@16 NtGdiSetBoundsRect@12 -;NtGdiSetBrushAttributes@8 +NtGdiSetBrushAttributes@8 NtGdiSetBrushOrg@16 NtGdiSetColorAdjustment@8 NtGdiSetColorSpace@8 NtGdiSetDeviceGammaRamp@8 NtGdiSetDIBitsToDeviceInternal@64 -;NtGdiSetFontEnumeration@4 -;NtGdiSetFontXform@12 +NtGdiSetFontEnumeration@4 +NtGdiSetFontXform@12 NtGdiSetIcmMode@12 -;NtGdiSetLinkedUFIs@12 -;NtGdiSetMagicColors@12 +NtGdiSetLinkedUFIs@12 +NtGdiSetMagicColors@12 NtGdiSetMetaRgn@4 NtGdiSetMiterLimit@12 -;NtGdiGetDeviceWidth@4 -;NtGdiMirrorWindowOrg@4 -;NtGdiSetLayout@12 +NtGdiGetDeviceWidth@4 +NtGdiMirrorWindowOrg@4 +NtGdiSetLayout@12 NtGdiSetPixel@16 NtGdiSetPixelFormat@8 NtGdiSetRectRgn@20 NtGdiSetSystemPaletteUse@8 NtGdiSetTextJustification@12 -;NtGdiSetupPublicCFONT@12 -;NtGdiSetVirtualResolution@20 -;NtGdiSetSizeDevice@12 +NtGdiSetupPublicCFONT@12 +NtGdiSetVirtualResolution@20 +NtGdiSetSizeDevice@12 NtGdiStartDoc@16 NtGdiStartPage@4 NtGdiStretchBlt@48 -;NtGdiStretchDIBitsInternal@64 +NtGdiStretchDIBitsInternal@64 NtGdiStrokeAndFillPath@4 NtGdiStrokePath@4 NtGdiSwapBuffers@4 NtGdiTransformPoints@20 NtGdiTransparentBlt@44 -;NtGdiUnloadPrinterDriver@8 -;NtGdiUnmapMemFont@4 +NtGdiUnloadPrinterDriver@8 +NtGdiUnmapMemFont@4 NtGdiUnrealizeObject@4 NtGdiUpdateColors@4 NtGdiWidenPath@4 NtUserActivateKeyboardLayout@8 NtUserAlterWindowStyle@12 -;NtUserAssociateInputContext@12 +NtUserAssociateInputContext@12 NtUserAttachThreadInput@12 NtUserBeginPaint@8 NtUserBitBltSysBmp@32 NtUserBlockInput@4 -;NtUserBuildHimcList@16 +NtUserBuildHimcList@16 NtUserBuildHwndList@28 NtUserBuildNameList@16 NtUserBuildPropList@16 @@ -335,24 +335,24 @@ NtUserCallTwoParam@12 NtUserChangeClipboardChain@8 NtUserChangeDisplaySettings@20 -;NtUserCheckImeHotKey@8 +NtUserCheckImeHotKey@8 NtUserCheckMenuItem@12 NtUserChildWindowFromPointEx@16 NtUserClipCursor@4 NtUserCloseClipboard@0 NtUserCloseDesktop@4 NtUserCloseWindowStation@4 -;NtUserConsoleControl@12 +NtUserConsoleControl@12 NtUserConvertMemHandle@8 NtUserCopyAcceleratorTable@12 NtUserCountClipboardFormats@0 NtUserCreateAcceleratorTable@8 NtUserCreateCaret@16 NtUserCreateDesktop@20 -;NtUserCreateInputContext@4 +NtUserCreateInputContext@4 NtUserCreateLocalMemHandle@16 -;NtUserCreateWindowEx@60 -;NtUserCreateWindowStation@28 +NtUserCreateWindowEx@60 +NtUserCreateWindowStation@28 NtUserDdeGetQualityOfService@12 NtUserDdeInitialize@20 NtUserDdeSetQualityOfService@12 @@ -360,11 +360,11 @@ NtUserDefSetText@8 NtUserDeleteMenu@12 NtUserDestroyAcceleratorTable@4 -;NtUserDestroyCursor@8 -;NtUserDestroyInputContext@4 +NtUserDestroyCursor@8 +NtUserDestroyInputContext@4 NtUserDestroyMenu@4 NtUserDestroyWindow@4 -;NtUserDisableThreadIme@4 +NtUserDisableThreadIme@4 NtUserDispatchMessage@4 NtUserDragDetect@12 NtUserDragObject@20 @@ -386,13 +386,13 @@ NtUserExcludeUpdateRgn@8 NtUserFillWindow@16 ;NtUserFindExistingCursorIcon@12 -;NtUserFindWindowEx@20 +NtUserFindWindowEx@20 NtUserFlashWindowEx@4 NtUserGetAltTabInfo@24 NtUserGetAncestor@8 ;NtUserGetAppImeLevel@4 NtUserGetAsyncKeyState@4 -;NtUserGetAtomName@8 +NtUserGetAtomName@8 NtUserGetCaretBlinkTime@0 NtUserGetCaretPos@4 ;NtUserGetClassInfo@20 @@ -415,10 +415,10 @@ NtUserGetForegroundWindow@0 NtUserGetGuiResources@8 NtUserGetGUIThreadInfo@8 -;NtUserGetIconInfo@24 -;NtUserGetIconSize@16 +NtUserGetIconInfo@24 +NtUserGetIconSize@16 NtUserGetImeHotKey@16 -;NtUserGetImeInfoEx@8 +NtUserGetImeInfoEx@8 NtUserGetInternalWindowPos@12 NtUserGetKeyboardLayoutList@8 NtUserGetKeyboardLayoutName@4 @@ -435,11 +435,11 @@ NtUserGetOpenClipboardWindow@0 NtUserGetPriorityClipboardFormat@8 NtUserGetProcessWindowStation@0 -;NtUserGetRawInputBuffer@12 -;NtUserGetRawInputData@20 -;NtUserGetRawInputDeviceInfo@16 -;NtUserGetRawInputDeviceList@12 -;NtUserGetRegisteredRawInputDevices@12 +NtUserGetRawInputBuffer@12 +NtUserGetRawInputData@20 +NtUserGetRawInputDeviceInfo@16 +NtUserGetRawInputDeviceList@12 +NtUserGetRegisteredRawInputDevices@12 NtUserGetScrollBarInfo@12 NtUserGetSystemMenu@8 NtUserGetThreadDesktop@8 @@ -450,11 +450,11 @@ NtUserGetWindowDC@4 NtUserGetWindowPlacement@8 NtUserGetWOWClass@8 -;NtUserHardErrorControl@12 +NtUserHardErrorControl@12 NtUserHideCaret@4 NtUserHiliteMenuItem@16 NtUserImpersonateDdeClientWindow@8 -;NtUserInitialize@12 +NtUserInitialize@12 NtUserInitializeClientPfnArrays@16 ;NtUserInitTask@48 NtUserInternalGetWindowText@12 @@ -469,13 +469,13 @@ NtUserMapVirtualKeyEx@16 NtUserMenuItemFromPoint@16 NtUserMessageCall@28 -;NtUserMinMaximize@12 +NtUserMinMaximize@12 NtUserMNDragLeave@0 NtUserMNDragOver@8 NtUserModifyUserStartupInfoFlags@8 NtUserMoveWindow@24 NtUserNotifyIMEStatus@12 -;NtUserNotifyProcessCreate@16 +NtUserNotifyProcessCreate@16 NtUserNotifyWinEvent@16 NtUserOpenClipboard@8 NtUserOpenDesktop@12 @@ -485,34 +485,34 @@ NtUserPeekMessage@20 NtUserPostMessage@16 NtUserPostThreadMessage@16 -;NtUserPrintWindow@12 -;NtUserProcessConnect@12 -;NtUserQueryInformationThread@20 -;NtUserQueryInputContext@8 +NtUserPrintWindow@12 +NtUserProcessConnect@12 +NtUserQueryInformationThread@20 +NtUserQueryInputContext@8 NtUserQuerySendMessage@4 NtUserQueryUserCounters@20 NtUserQueryWindow@8 NtUserRealChildWindowFromPoint@12 -;NtUserRealInternalGetMessage@24 -;NtUserRealWaitMessageEx@8 +NtUserRealInternalGetMessage@24 +NtUserRealWaitMessageEx@8 NtUserRedrawWindow@16 -;NtUserRegisterClassExWOW@28 -;NtUserRegisterUserApiHook@8 +NtUserRegisterClassExWOW@28 +NtUserRegisterUserApiHook@8 NtUserRegisterHotKey@16 -;NtUserRegisterRawInputDevices@12 +NtUserRegisterRawInputDevices@12 NtUserRegisterTasklist@4 NtUserRegisterWindowMessage@4 NtUserRemoveMenu@12 NtUserRemoveProp@8 -;NtUserResolveDesktop@16 +NtUserResolveDesktop@16 NtUserResolveDesktopForWOW@4 NtUserSBGetParms@16 NtUserScrollDC@28 NtUserScrollWindowEx@32 -;NtUserSelectPalette@12 +NtUserSelectPalette@12 NtUserSendInput@12 NtUserSetActiveWindow@4 -;NtUserSetAppImeLevel@8 +NtUserSetAppImeLevel@8 NtUserSetCapture@4 NtUserSetClassLong@16 NtUserSetClassWord@12 @@ -520,15 +520,15 @@ NtUserSetClipboardViewer@4 NtUserSetConsoleReserveKeys@8 NtUserSetCursor@4 -;NtUserSetCursorContents@8 +NtUserSetCursorContents@8 ;NtUserSetCursorIconData@16 NtUserSetDbgTag@8 NtUserSetFocus@4 NtUserSetImeHotKey@20 -;NtUserSetImeInfoEx@4 +NtUserSetImeInfoEx@4 NtUserSetImeOwnerWindow@8 -;NtUserSetInformationProcess@16 -;NtUserSetInformationThread@16 +NtUserSetInformationProcess@16 +NtUserSetInformationThread@16 NtUserSetInternalWindowPos@16 NtUserSetKeyboardState@4 NtUserSetLogonNotifyWindow@4 @@ -548,7 +548,7 @@ NtUserSetSystemMenu@8 NtUserSetSystemTimer@16 NtUserSetThreadDesktop@4 -;NtUserSetThreadLayoutHandles@8 +NtUserSetThreadLayoutHandles@8 NtUserSetThreadState@8 NtUserSetTimer@16 NtUserSetWindowFNID@8 @@ -565,17 +565,17 @@ NtUserShowScrollBar@12 NtUserShowWindow@8 NtUserShowWindowAsync@8 -;NtUserSoundSentry@0 +NtUserSoundSentry@0 NtUserSwitchDesktop@4 NtUserSystemParametersInfo@16 -;NtUserTestForInteractiveUser@4 +NtUserTestForInteractiveUser@4 NtUserThunkedMenuInfo@8 NtUserThunkedMenuItemInfo@24 NtUserToUnicodeEx@28 NtUserTrackMouseEvent@4 NtUserTrackPopupMenuEx@24 -;NtUserCalcMenuBar@20 -;NtUserPaintMenuBar@24 +NtUserCalcMenuBar@20 +NtUserPaintMenuBar@24 NtUserTranslateAccelerator@12 NtUserTranslateMessage@8 NtUserUnhookWindowsHookEx@4 @@ -583,18 +583,18 @@ NtUserUnloadKeyboardLayout@4 NtUserUnlockWindowStation@4 ;NtUserUnregisterClass@12 -;NtUserUnregisterUserApiHook@0 +NtUserUnregisterUserApiHook@0 NtUserUnregisterHotKey@8 NtUserUpdateInputContext@12 NtUserUpdateInstance@12 NtUserUpdateLayeredWindow@36 -;NtUserGetLayeredWindowAttributes@16 +NtUserGetLayeredWindowAttributes@16 NtUserSetLayeredWindowAttributes@16 NtUserUpdatePerUserSystemParameters@8 NtUserUserHandleGrantAccess@12 -;NtUserValidateHandleSecure@8 -;NtUserValidateRect@8 -;NtUserValidateTimerCallback@12 +NtUserValidateHandleSecure@8 +NtUserValidateRect@8 +NtUserValidateTimerCallback@12 NtUserVkKeyScanEx@12 NtUserWaitForInputIdle@12 NtUserWaitForMsgAndEvent@4 @@ -602,78 +602,78 @@ NtUserWin32PoolAllocationStats@24 NtUserWindowFromPoint@8 NtUserYieldTask@0 -;NtUserRemoteConnect@12 -;NtUserRemoteRedrawRectangle@16 -;NtUserRemoteRedrawScreen@0 -;NtUserRemoteStopScreenUpdates@0 -;NtUserCtxDisplayIOCtl@12 -;NtGdiEngAssociateSurface@12 -;NtGdiEngCreateBitmap@24 -;NtGdiEngCreateDeviceSurface@16 -;NtGdiEngCreateDeviceBitmap@16 -;NtGdiEngCreatePalette@24 -;NtGdiEngComputeGlyphSet@12 -;NtGdiEngCopyBits@24 -;NtGdiEngDeletePalette@4 -;NtGdiEngDeleteSurface@4 -;NtGdiEngEraseSurface@12 -;NtGdiEngUnlockSurface@4 +NtUserRemoteConnect@12 +NtUserRemoteRedrawRectangle@16 +NtUserRemoteRedrawScreen@0 +NtUserRemoteStopScreenUpdates@0 +NtUserCtxDisplayIOCtl@12 +NtGdiEngAssociateSurface@12 +NtGdiEngCreateBitmap@24 +NtGdiEngCreateDeviceSurface@16 +NtGdiEngCreateDeviceBitmap@16 +NtGdiEngCreatePalette@24 +NtGdiEngComputeGlyphSet@12 +NtGdiEngCopyBits@24 +NtGdiEngDeletePalette@4 +NtGdiEngDeleteSurface@4 +NtGdiEngEraseSurface@12 +NtGdiEngUnlockSurface@4 NtGdiEngLockSurface@4 NtGdiEngBitBlt@44 NtGdiEngStretchBlt@44 -;NtGdiEngPlgBlt@44 -;NtGdiEngMarkBandingSurface@4 -;NtGdiEngStrokePath@32 -;NtGdiEngFillPath@28 -;NtGdiEngStrokeAndFillPath@40 -;NtGdiEngPaint@20 -;NtGdiEngLineTo@36 +NtGdiEngPlgBlt@44 +NtGdiEngMarkBandingSurface@4 +NtGdiEngStrokePath@32 +NtGdiEngFillPath@28 +NtGdiEngStrokeAndFillPath@40 +NtGdiEngPaint@20 +NtGdiEngLineTo@36 NtGdiEngAlphaBlend@28 -;NtGdiEngGradientFill@40 -;NtGdiEngTransparentBlt@32 -;NtGdiEngTextOut@40 -;NtGdiEngStretchBltROP@52 -;NtGdiXLATEOBJ_cGetPalette@16 -;NtGdiXLATEOBJ_iXlate@8 -;NtGdiXLATEOBJ_hGetColorTransform@4 -;NtGdiCLIPOBJ_bEnum@12 -;NtGdiCLIPOBJ_cEnumStart@20 -;NtGdiCLIPOBJ_ppoGetPath@4 -;NtGdiEngDeletePath@4 -;NtGdiEngCreateClip@0 -;NtGdiEngDeleteClip@4 -;NtGdiBRUSHOBJ_ulGetBrushColor@4 -;NtGdiBRUSHOBJ_pvAllocRbrush@8 -;NtGdiBRUSHOBJ_pvGetRbrush@4 -;NtGdiBRUSHOBJ_hGetColorTransform@4 -;NtGdiXFORMOBJ_bApplyXform@20 -;NtGdiXFORMOBJ_iGetXform@8 -;NtGdiFONTOBJ_vGetInfo@12 -;NtGdiFONTOBJ_pxoGetXform@4 -;NtGdiFONTOBJ_cGetGlyphs@20 -;NtGdiFONTOBJ_pifi@4 -;NtGdiFONTOBJ_pfdg@4 -;NtGdiFONTOBJ_pQueryGlyphAttrs@8 -;NtGdiFONTOBJ_pvTrueTypeFontFile@8 -;NtGdiFONTOBJ_cGetAllGlyphHandles@8 -;NtGdiSTROBJ_bEnum@12 -;NtGdiSTROBJ_bEnumPositionsOnly@12 -;NtGdiSTROBJ_bGetAdvanceWidths@16 -;NtGdiSTROBJ_vEnumStart@4 -;NtGdiSTROBJ_dwGetCodePage@4 -;NtGdiPATHOBJ_vGetBounds@8 -;NtGdiPATHOBJ_bEnum@8 -;NtGdiPATHOBJ_vEnumStart@4 -;NtGdiPATHOBJ_vEnumStartClipLines@16 -;NtGdiPATHOBJ_bEnumClipLines@12 -;NtGdiGetDhpdev@4 -;NtGdiEngCheckAbort@4 -;NtGdiHT_Get8BPPFormatPalette@16 -;NtGdiHT_Get8BPPMaskPalette@24 -;NtGdiUpdateTransform@4 -;NtGdiSetPUMPDOBJ@16 -;NtGdiBRUSHOBJ_DeleteRbrush@8 -;NtGdiUMPDEngFreeUserMem@4 -;NtGdiUnmapMemFont@4 -;NtGdiDrawStream@12 +NtGdiEngGradientFill@40 +NtGdiEngTransparentBlt@32 +NtGdiEngTextOut@40 +NtGdiEngStretchBltROP@52 +NtGdiXLATEOBJ_cGetPalette@16 +NtGdiXLATEOBJ_iXlate@8 +NtGdiXLATEOBJ_hGetColorTransform@4 +NtGdiCLIPOBJ_bEnum@12 +NtGdiCLIPOBJ_cEnumStart@20 +NtGdiCLIPOBJ_ppoGetPath@4 +NtGdiEngDeletePath@4 +NtGdiEngCreateClip@0 +NtGdiEngDeleteClip@4 +NtGdiBRUSHOBJ_ulGetBrushColor@4 +NtGdiBRUSHOBJ_pvAllocRbrush@8 +NtGdiBRUSHOBJ_pvGetRbrush@4 +NtGdiBRUSHOBJ_hGetColorTransform@4 +NtGdiXFORMOBJ_bApplyXform@20 +NtGdiXFORMOBJ_iGetXform@8 +NtGdiFONTOBJ_vGetInfo@12 +NtGdiFONTOBJ_pxoGetXform@4 +NtGdiFONTOBJ_cGetGlyphs@20 +NtGdiFONTOBJ_pifi@4 +NtGdiFONTOBJ_pfdg@4 +NtGdiFONTOBJ_pQueryGlyphAttrs@8 +NtGdiFONTOBJ_pvTrueTypeFontFile@8 +NtGdiFONTOBJ_cGetAllGlyphHandles@8 +NtGdiSTROBJ_bEnum@12 +NtGdiSTROBJ_bEnumPositionsOnly@12 +NtGdiSTROBJ_bGetAdvanceWidths@16 +NtGdiSTROBJ_vEnumStart@4 +NtGdiSTROBJ_dwGetCodePage@4 +NtGdiPATHOBJ_vGetBounds@8 +NtGdiPATHOBJ_bEnum@8 +NtGdiPATHOBJ_vEnumStart@4 +NtGdiPATHOBJ_vEnumStartClipLines@16 +NtGdiPATHOBJ_bEnumClipLines@12 +NtGdiGetDhpdev@4 +NtGdiEngCheckAbort@4 +NtGdiHT_Get8BPPFormatPalette@16 +NtGdiHT_Get8BPPMaskPalette@24 +NtGdiUpdateTransform@4 +NtGdiSetPUMPDOBJ@16 +NtGdiBRUSHOBJ_DeleteRbrush@8 +NtGdiUMPDEngFreeUserMem@4 +NtGdiUnmapMemFont@4 +NtGdiDrawStream@12

1 0

[fireball] 29280: - Add ros_glue.cpp for implementing CrNt stubs. - Start changing CrNt to actual ReactOS functions (no need for supporting different versions / importing CrossNT lib).
by fireball＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: fireball Date: Fri Sep 28 16:35:41 2007 New Revision: 29280 URL: http://svn.reactos.org/svn/reactos?rev=29280&view=rev Log: - Add ros_glue.cpp for implementing CrNt stubs. - Start changing CrNt to actual ReactOS functions (no need for supporting different versions / importing CrossNT lib). Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp (with props) Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Sep 28 16:35:41 2007 @@ -2648,7 +2648,7 @@ for (j = 0; j < 26; j += 2) { // Build a buffer based on the identify data. - MOV_DW_SWP(vendorId[j], ((PUCHAR)LunExt->IdentifyData.ModelNumber)[j]); + vendorId[j] = RtlUshortByteSwap(((PUCHAR)LunExt->IdentifyData.ModelNumber)[j]); } if (!AtapiStringCmp (vendorId, "CD-ROM CDR", 11)) { @@ -3054,9 +3054,9 @@ chan = &(deviceExtension->chan[c]); - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(chan->CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED) == CHECK_INTR_DETECTED) { + if((ULONG)InterlockedCompareExchange(&chan->CheckIntr, + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED) == CHECK_INTR_DETECTED) { //ASSERT(!deviceExtension->simplexOnly); chan->DpcState = DPC_STATE_ISR; if(!AtapiInterrupt__(HwDeviceExtension, (UCHAR)c)) { @@ -3144,17 +3144,17 @@ // if (deviceExtension->chan[c].CheckIntr == CHECK_INTR_DETECTED) { // deviceExtension->chan[c].CheckIntr = CHECK_INTR_ACTIVE; // } - c_state = (ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED); + c_state = (ULONG)InterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED); if(c_state == CHECK_INTR_IDLE) { // c_state = deviceExtension->chan[c].CheckIntr; // if (deviceExtension->chan[c].CheckIntr == CHECK_INTR_IDLE) { // deviceExtension->chan[c].CheckIntr = CHECK_INTR_ACTIVE // } - c_state = (ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_IDLE); + c_state = (ULONG)InterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_IDLE); } } while(c_state == CHECK_INTR_CHECK); KdPrint2((PRINT_PREFIX "AtapiInterrupt(base): locked\n")); @@ -3241,9 +3241,9 @@ continue; } - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_CHECK, - (PVOID)CHECK_INTR_IDLE) != CHECK_INTR_IDLE) { + if((ULONG)CrNtInterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_CHECK, + CHECK_INTR_IDLE) != CHECK_INTR_IDLE) { KdPrint2((PRINT_PREFIX "AtapiInterrupt2: !CHECK_INTR_IDLE\n")); // hunt on unexpected intr (Some devices generate double interrupts, // some controllers (at least CMD649) interrupt twice with small delay. @@ -3296,9 +3296,9 @@ if(!(deviceExtension->chan[c].ChannelCtrlFlags & CTRFLAGS_DPC_REQ)) { - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { + if((ULONG)InterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { continue; } @@ -3350,9 +3350,9 @@ } else { // check if other channel(s) interrupted // must do nothing in simplex mode - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(chan->CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { + if((ULONG)CrNtInterlockedCompareExchange(&(chan->CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { continue; } //ASSERT(!deviceExtension->simplexOnly); @@ -5569,7 +5569,7 @@ sectors)); // Get starting sector number from CDB. - MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB10.LBA); + startingSector = RtlUlongByteSwap((ULONG)((PCDB)Srb->Cdb)->CDB10.LBA); MOV_DW_SWP(sectorCount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); KdPrint2((PRINT_PREFIX @@ -6345,7 +6345,7 @@ // Fill in vendor identification fields. for (i = 0; i < 24; i += 2) { - MOV_DW_SWP(inquiryData->VendorId[i], ((PUCHAR)identifyData->ModelNumber)[i]); + inquiryData->VendorId[i] = RtlUshortByteSwap(((PUCHAR)identifyData->ModelNumber)[i]); } /* // Initialize unused portion of product id. @@ -6356,7 +6356,7 @@ // Move firmware revision from IDENTIFY data to // product revision in INQUIRY data. for (i = 0; i < 4; i += 2) { - MOV_DW_SWP(inquiryData->ProductRevisionLevel[i], ((PUCHAR)identifyData->FirmwareRevision)[i]); + inquiryData->ProductRevisionLevel[i] = RtlUshortByteSwap(((PUCHAR)identifyData->FirmwareRevision)[i]); } status = SRB_STATUS_SUCCESS; Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h Fri Sep 28 16:35:41 2007 @@ -16,7 +16,7 @@ ( SpinLock )) - +#if 0 CROSSNT_DECL( LONG, __fastcall, @@ -62,6 +62,12 @@ IN PVOID ExChange, IN PVOID Comperand )) +#endif + +#define CrNtInterlockedIncrement InterlockedIncrement +#define CrNtInterlockedDecrement InterlockedDecrement +#define CrNtInterlockedExchangeAdd InterlockedExchangeAdd +#define CrNtInterlockedCompareExchange InterlockedCompareExchange CROSSNT_DECL_EX("HAL.DLL", KIRQL,__stdcall, Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp (added) +++ trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp Fri Sep 28 16:35:41 2007 @@ -1,0 +1,7 @@ +#include "stdafx.h" + +extern "C" { +ULONG MajorVersion = 0x04; +ULONG MinorVersion = 0x01; +ULONG BuildNumber = 0x0; +} Propchange: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp ------------------------------------------------------------------------------ svn:eol-style = native 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Fri Sep 28 16:35:41 2007 @@ -16,6 +16,7 @@ <file>id_probe.cpp</file> <file>id_queue.cpp</file> <file>id_sata.cpp</file> + <file>ros_glue.cpp</file> <file>stdafx.cpp</file> <file>idedma.rc</file> </module>

1 0

[hpoussin] 29279: Moved shared define to header file Patch by Marc Piulachs, marc (dot) piulachs (at) codexchange.net See issue #2700 for more details.
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 16:17:19 2007 New Revision: 29279 URL: http://svn.reactos.org/svn/reactos?rev=29279&view=rev Log: Moved shared define to header file Patch by Marc Piulachs, marc (dot) piulachs (at) codexchange.net See issue #2700 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h (original) +++ trunk/reactos/base/shell/cmd/cmd.h Fri Sep 28 16:17:19 2007 @@ -46,6 +46,9 @@ /* command line buffer length */ #define CMDLINE_LENGTH 8192 + +/* 16k = max buffer size */ +#define BUFF_SIZE 16384 /* global variables */ extern HANDLE hOut; Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Fri Sep 28 16:17:19 2007 @@ -46,10 +46,7 @@ COPY_RESTART = 0x080, /* /Z */ COPY_BINARY = 0x100, /* /B */ }; - -#define BUFF_SIZE 16384 /* 16k = max buffer size */ - - + INT copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH],

1 0

[hpoussin] 29278: RtlRandom is now part of NDK since r29254
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 16:13:44 2007 New Revision: 29278 URL: http://svn.reactos.org/svn/reactos?rev=29278&view=rev Log: RtlRandom is now part of NDK since r29254 Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c (original) +++ trunk/reactos/base/services/dhcp/dhclient.c Fri Sep 28 16:13:44 2007 @@ -113,13 +113,6 @@ #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) time_t scripttime; - -/* XXX Added this since it's not in the NDK ;0/ */ -ULONG -NTAPI -RtlRandom( - IN OUT PULONG Seed - ); /* XXX Implement me */ int check_arp( struct interface_info *ip, struct client_lease *lp ) {

1 0

[hpoussin] 29277: Fix compilation (but not linking!)
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 15:39:34 2007 New Revision: 29277 URL: http://svn.reactos.org/svn/reactos?rev=29277&view=rev Log: Fix compilation (but not linking!) Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.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/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/srb.h 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h Fri Sep 28 15:39:34 2007 @@ -927,30 +927,6 @@ ULONG DeviceNumber ); -/*#define IdeHardReset(BaseIoAddress,result) \ -{\ - UCHAR statusByte;\ - ULONG i;\ - SelectDrive(BaseIoAddress,DeviceNumber); \ - AtapiWritePort1(&BaseIoAddress->AltStatus,/*IDE_DC_DISABLE_INTERRUPTS | *//*IDE_DC_RESET_CONTROLLER );\ -/* ScsiPortStallExecution(50 * 1000);\ - AtapiWritePort1(&BaseIoAddress->AltStatus,IDE_DC_REENABLE_CONTROLLER);\ - /* 5 seconds for reset */ \ -/* for (i = 0; i < 1000 * (1+11); i++) {\ - statusByte = AtapiReadPort1(&BaseIoAddress->AltStatus);\ - if (statusByte != IDE_STATUS_IDLE && statusByte != IDE_STATUS_SUCCESS) {\ - ScsiPortStallExecution((i<1000) ? 5 : 500);\ - } else {\ - break;\ - }\ - }\ - KdPrint2((PRINT_PREFIX "IdeHardReset: Status %x\n", statusByte)); \ - if (i == 1000*1000) {\ - result = FALSE;\ - }\ - result = TRUE;\ -}*/ - #endif //USER_MODE #define IS_RDP(OperationCode)\ @@ -1158,7 +1134,7 @@ ); -//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) \ +//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) extern LONG AtaPio2Mode(LONG pio); 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h Fri Sep 28 15:39:34 2007 @@ -702,18 +702,19 @@ ULONG NextDpcChan; PHW_TIMER HwScsiTimer; LONGLONG DpcTime; -/* +#if 0 PHW_TIMER HwScsiTimer1; PHW_TIMER HwScsiTimer2; LONGLONG DpcTime1; -/* PHW_TIMER CurDpc; - LARGE_INTEGER ActivationTime;*/ - -/* KDPC Dpc; - KTIMER Timer; - PHW_TIMER HwScsiTimer;*/ +// PHW_TIMER CurDpc; +// LARGE_INTEGER ActivationTime; + +// KDPC Dpc; +// KTIMER Timer; +// PHW_TIMER HwScsiTimer; // KSPIN_LOCK QueueSpinLock; // KIRQL QueueOldIrql; +#endif struct _HW_DEVICE_EXTENSION* DeviceExtension; struct _HW_LU_EXTENSION* lun[2]; @@ -731,7 +732,7 @@ LONGLONG IntersectCount; LONGLONG TryReorderCount; LONGLONG TryReorderHeadCount; - LONGLONG TryReorderTailCount; /* in-order requests */ + LONGLONG TryReorderTailCount; // in-order requests #endif //QUEUE_STATISTICS //ULONG BaseMemAddress; @@ -832,7 +833,7 @@ ULONG FirstChannelToCheck; #if 1 HW_LU_EXTENSION lun[IDE_MAX_LUN]; - HW_CHANNEL chan[AHCI_MAX_PORT/*IDE_MAX_CHAN*/]; + HW_CHANNEL chan[AHCI_MAX_PORT]; // IDE_MAX_CHAN #else PHW_LU_EXTENSION lun; PHW_CHANNEL chan; @@ -850,12 +851,12 @@ ULONG ActiveDpcChan; ULONG FirstDpcChan; -/* - PHW_TIMER HwScsiTimer1; - PHW_TIMER HwScsiTimer2; - LONGLONG DpcTime1; - LONGLONG DpcTime2; -*/ + +// PHW_TIMER HwScsiTimer1; +// PHW_TIMER HwScsiTimer2; +// LONGLONG DpcTime1; +// LONGLONG DpcTime2; + ULONG queue_depth; PDEVICE_OBJECT Isr2DevObj; @@ -921,8 +922,8 @@ extern PBUSMASTER_CONTROLLER_INFORMATION BMList; extern ULONG BMListLen; -extern const CHAR retry_Wdma[MAX_RETRIES+1]; -extern const CHAR retry_Udma[MAX_RETRIES+1]; +//extern const CHAR retry_Wdma[MAX_RETRIES+1]; +//extern const CHAR retry_Udma[MAX_RETRIES+1]; extern VOID UniataEnumBusMasterController( Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h Fri Sep 28 15:39:34 2007 @@ -83,7 +83,7 @@ /* ReactOS-specific defines */ #ifdef DDKAPI #define USE_REACTOS_DDK -#endif DDKAPI +#endif //DDKAPI /* Are we under GNU C (mingw) ??? */ #if __GNUC__ >=3 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Sep 28 15:39:34 2007 @@ -619,7 +619,7 @@ ULONG DeviceNumber ) { - ULONG c = chan->lChannel; + //ULONG c = chan->lChannel; ULONG i; UCHAR dma_status = 0; KdPrint2((PRINT_PREFIX "AtapiSoftReset:\n")); @@ -947,7 +947,7 @@ KdPrint2((PRINT_PREFIX "AtapiTimerDpc:\n")); lChannel = deviceExtension->ActiveDpcChan = deviceExtension->FirstDpcChan; - if(lChannel == -1) { + if(lChannel == (ULONG)-1) { KdPrint2((PRINT_PREFIX "AtapiTimerDpc: no items\n")); return; } @@ -959,7 +959,7 @@ chan->HwScsiTimer = NULL; deviceExtension->FirstDpcChan = chan->NextDpcChan; - if(deviceExtension->FirstDpcChan != -1) { + if(deviceExtension->FirstDpcChan != (ULONG)-1) { recall = TRUE; } @@ -968,7 +968,7 @@ chan->NextDpcChan = -1; lChannel = deviceExtension->ActiveDpcChan = deviceExtension->FirstDpcChan; - if(lChannel == -1) { + if(lChannel == (ULONG)-1) { KdPrint2((PRINT_PREFIX "AtapiTimerDpc: no more items\n")); deviceExtension->FirstDpcChan = deviceExtension->ActiveDpcChan = -1; @@ -1037,7 +1037,7 @@ i = deviceExtension->FirstDpcChan; chan = prev_chan = NULL; - while(i != -1) { + while(i != (ULONG)-1) { prev_chan = chan; chan = &deviceExtension->chan[i]; if(chan->DpcTime > time.QuadPart) { @@ -1822,7 +1822,7 @@ max_ldev = (chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE) ? 1 : 2; if(CompleteType != RESET_COMPLETE_NONE) { #ifndef UNIATA_CORE - while(CurSrb = UniataGetCurRequest(chan)) { + while((CurSrb = UniataGetCurRequest(chan))) { PATA_REQ AtaReq = (PATA_REQ)(CurSrb->SrbExtension); @@ -2127,7 +2127,7 @@ PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); // ULONG i; UCHAR errorByte; - UCHAR srbStatus; + UCHAR srbStatus = SRB_STATUS_SUCCESS; UCHAR scsiStatus; ULONG ldev = GET_LDEV(Srb); @@ -2966,7 +2966,7 @@ chan->DpcState = DPC_STATE_TIMER; if(!AtapiInterrupt__(HwDeviceExtension, lChannel)) { InterlockedExchange(&(chan->CheckIntr), CHECK_INTR_IDLE); - KdPrint2((PRINT_PREFIX "AtapiCallBack: What's fucking this ???!!!\n")); + KdPrint2((PRINT_PREFIX "AtapiCallBack: What's fucking this ???\n")); } goto ReturnCallback; } @@ -3104,7 +3104,7 @@ ULONG c, _c; BOOLEAN status = FALSE; ULONG c_state; - ULONG i_res; + ULONG i_res = 0; ULONG pass; BOOLEAN checked[AHCI_MAX_PORT]; @@ -3253,7 +3253,7 @@ } c_count++; - if(i_res = AtapiCheckInterrupt__(deviceExtension, (UCHAR)c)) { + if((i_res = AtapiCheckInterrupt__(deviceExtension, (UCHAR)c))) { KdPrint2((PRINT_PREFIX "AtapiInterrupt2: intr\n")); if(i_res == 2) { @@ -3443,7 +3443,7 @@ ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ULONG status; - ULONG pr_status; + ULONG pr_status = 0; UCHAR dma_status = 0; UCHAR reg8 = 0; UCHAR reg32 = 0; @@ -3583,7 +3583,7 @@ reg32 = AtapiReadPort1(chan, IDX_BM_DeviceSpecific0); KdPrint2((PRINT_PREFIX " Sii DS0 %x\n", reg32)); - if(reg32 == 0xffffffff) { + if(reg32 == (UCHAR)-1) { KdPrint2((PRINT_PREFIX " Sii mio unexpected\n")); return FALSE; } @@ -3806,11 +3806,11 @@ PATA_REQ AtaReq = srb ? (PATA_REQ)(srb->SrbExtension) : NULL; ULONG wordCount = 0, wordsThisInterrupt = DEV_BSIZE/2; - ULONG status; + ULONG status = SRB_STATUS_SUCCESS; UCHAR dma_status = 0; ULONG i; ULONG k; - UCHAR statusByte,interruptReason; + UCHAR statusByte = 0,interruptReason; BOOLEAN atapiDev = FALSE; @@ -5334,7 +5334,7 @@ ULONG ldev = GET_LDEV(Srb); UCHAR DeviceNumber = (UCHAR)(ldev & 1); ULONG startingSector; - ULONG wordCount; + ULONG wordCount = 0; UCHAR statusByte,statusByte2; UCHAR cmd; ULONGLONG lba; @@ -7670,10 +7670,10 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: Set transfer mode\n")); - if(AtaCtl->SetMode.OrigMode != -1) { + if(AtaCtl->SetMode.OrigMode != (ULONG)-1) { LunExt->OrigTransferMode = (UCHAR)(AtaCtl->SetMode.OrigMode); } - if(AtaCtl->SetMode.MaxMode != -1) { + if(AtaCtl->SetMode.MaxMode != (ULONG)-1) { LunExt->LimitedTransferMode = (UCHAR)(AtaCtl->SetMode.MaxMode); if(LunExt->LimitedTransferMode > LunExt->OrigTransferMode) { @@ -7813,7 +7813,7 @@ Srb); // Remove current Srb & get next one - if(Srb = UniataGetCurRequest(chan)) { + if((Srb = UniataGetCurRequest(chan))) { AtaReq = (PATA_REQ)(Srb->SrbExtension); if(AtaReq->ReqState > REQ_STATE_QUEUED) { // current request is under precessing, thus @@ -7851,7 +7851,7 @@ { int i; UCHAR command; - UCHAR flags; + UCHAR flags = 0; for(i=0, command=0; i<256; i++, command++) { 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp Fri Sep 28 15:39:34 2007 @@ -153,7 +153,7 @@ QueryTable[0].DefaultData = 0; QueryTable[0].DefaultLength = 0; - RtlZeroMemory(QueryTable + 1, sizeof RTL_QUERY_REGISTRY_TABLE); // EOF + RtlZeroMemory(QueryTable + 1, sizeof(RTL_QUERY_REGISTRY_TABLE)); // EOF NTSTATUS status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, L"UniATA\\Parameters\\BadBlocks", 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp Fri Sep 28 15:39:34 2007 @@ -50,7 +50,7 @@ static const CHAR retry_Wdma[MAX_RETRIES+1] = {2, 2, 2,-1,-1,-1}; static const CHAR retry_Udma[MAX_RETRIES+1] = {6, 2,-1,-1,-1,-1}; -PHYSICAL_ADDRESS ph4gb = {0xFFFFFFFF, 0}; +PHYSICAL_ADDRESS ph4gb = {{0xFFFFFFFF, 0}}; VOID cyrix_timing ( @@ -242,7 +242,7 @@ data = (PUCHAR)(chan->DB_IO); } else if(!dma_count || ((LONG)(dma_base) == -1)) { - AtaReq->dma_base = NULL; + AtaReq->dma_base = 0; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); return FALSE; } @@ -257,7 +257,7 @@ AtaReq->dma_tab[i].count = (dma_count & 0xffff); i++; if (i >= ATA_DMA_ENTRIES) { - AtaReq->dma_base = NULL; + AtaReq->dma_base = 0; KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); return FALSE; } @@ -272,7 +272,7 @@ goto retry_DB_IO; } else if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { - AtaReq->dma_base = NULL; + AtaReq->dma_base = 0; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); return FALSE; } @@ -783,7 +783,7 @@ if(deviceExtension->BaseIoAddressSATA_0.Addr) { //if(ChipFlags & UNIATA_SATA) { /****************/ - /* SATA Generic * + /* SATA Generic */ /****************/ UCHAR ModeByte; 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h Fri Sep 28 15:39:34 2007 @@ -133,4 +133,4 @@ }; // end extern "C" -#endif //__CROSS_VERSION_LIB_NT__H__ +#endif //__CROSS_VERSION_LIB_NT__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h Fri Sep 28 15:39:34 2007 @@ -1,5 +1,8 @@ #ifndef __NTDDK_EX__H__ #define __NTDDK_EX__H__ + +#undef ASSERT +#define ASSERT typedef enum _SYSTEM_INFORMATION_CLASS { Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/srb.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/srb.h Fri Sep 28 15:39:34 2007 @@ -190,7 +190,9 @@ // ScsiQuerySupportedControlTypes: // +#ifdef _MSC_VER #pragma warning(disable:4200) +#endif typedef struct _SCSI_SUPPORTED_CONTROL_TYPE_LIST { // @@ -209,7 +211,9 @@ OUT BOOLEAN SupportedTypeList[0]; } SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST; -#pragma warning(default:4200) +#ifdef _MSC_VER +#pragma warning(disable:4200) +#endif // // Uninitialized flag value. @@ -419,38 +423,38 @@ // typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_INITIALIZE) ( IN PVOID DeviceExtension ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_STARTIO) ( IN PVOID DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_INTERRUPT) ( IN PVOID DeviceExtension ); typedef -VOID +VOID DDKAPI (*PHW_TIMER) ( IN PVOID DeviceExtension ); typedef -VOID +VOID DDKAPI (*PHW_DMA_STARTED) ( IN PVOID DeviceExtension ); typedef -ULONG +ULONG DDKAPI (*PHW_FIND_ADAPTER) ( IN PVOID DeviceExtension, IN PVOID HwContext, @@ -461,14 +465,14 @@ ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_RESET_BUS) ( IN PVOID DeviceExtension, IN ULONG PathId ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_ADAPTER_STATE) ( IN PVOID DeviceExtension, IN PVOID Context, @@ -476,7 +480,7 @@ ); typedef -SCSI_ADAPTER_CONTROL_STATUS +SCSI_ADAPTER_CONTROL_STATUS DDKAPI (*PHW_ADAPTER_CONTROL) ( IN PVOID DeviceExtension, IN SCSI_ADAPTER_CONTROL_TYPE ControlType, @@ -603,7 +607,7 @@ // SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortInitialize( IN PVOID Argument1, IN PVOID Argument2, @@ -612,14 +616,14 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortFreeDeviceBase( IN PVOID HwDeviceExtension, IN PVOID MappedAddress ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortGetBusData( IN PVOID DeviceExtension, IN ULONG BusDataType, @@ -630,7 +634,7 @@ ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortSetBusDataByOffset( IN PVOID DeviceExtension, IN ULONG BusDataType, @@ -642,7 +646,7 @@ ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetDeviceBase( IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, @@ -653,7 +657,7 @@ ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetLogicalUnit( IN PVOID HwDeviceExtension, IN UCHAR PathId, @@ -662,7 +666,7 @@ ); SCSIPORT_API -PSCSI_REQUEST_BLOCK +PSCSI_REQUEST_BLOCK DDKAPI ScsiPortGetSrb( IN PVOID DeviceExtension, IN UCHAR PathId, @@ -672,7 +676,7 @@ ); SCSIPORT_API -SCSI_PHYSICAL_ADDRESS +SCSI_PHYSICAL_ADDRESS DDKAPI ScsiPortGetPhysicalAddress( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -681,14 +685,14 @@ ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetVirtualAddress( IN PVOID HwDeviceExtension, IN SCSI_PHYSICAL_ADDRESS PhysicalAddress ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetUncachedExtension( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -696,13 +700,13 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortFlushDma( IN PVOID DeviceExtension ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortIoMapTransfer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -711,7 +715,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortNotification( IN SCSI_NOTIFICATION_TYPE NotificationType, IN PVOID HwDeviceExtension, @@ -719,7 +723,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortLogError( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, @@ -731,7 +735,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortCompleteRequest( IN PVOID HwDeviceExtension, IN UCHAR PathId, @@ -741,7 +745,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortMoveMemory( IN PVOID WriteBuffer, IN PVOID ReadBuffer, @@ -749,25 +753,25 @@ ); SCSIPORT_API -UCHAR +UCHAR DDKAPI ScsiPortReadPortUchar( IN PUCHAR Port ); SCSIPORT_API -USHORT +USHORT DDKAPI ScsiPortReadPortUshort( IN PUSHORT Port ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortReadPortUlong( IN PULONG Port ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadPortBufferUchar( IN PUCHAR Port, IN PUCHAR Buffer, @@ -775,7 +779,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadPortBufferUshort( IN PUSHORT Port, IN PUSHORT Buffer, @@ -783,7 +787,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadPortBufferUlong( IN PULONG Port, IN PULONG Buffer, @@ -791,25 +795,25 @@ ); SCSIPORT_API -UCHAR +UCHAR DDKAPI ScsiPortReadRegisterUchar( IN PUCHAR Register ); SCSIPORT_API -USHORT +USHORT DDKAPI ScsiPortReadRegisterUshort( IN PUSHORT Register ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortReadRegisterUlong( IN PULONG Register ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadRegisterBufferUchar( IN PUCHAR Register, IN PUCHAR Buffer, @@ -817,7 +821,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadRegisterBufferUshort( IN PUSHORT Register, IN PUSHORT Buffer, @@ -825,7 +829,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadRegisterBufferUlong( IN PULONG Register, IN PULONG Buffer, @@ -833,34 +837,34 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortStallExecution( IN ULONG Delay ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortUchar( IN PUCHAR Port, IN UCHAR Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortUshort( IN PUSHORT Port, IN USHORT Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortUlong( IN PULONG Port, IN ULONG Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortBufferUchar( IN PUCHAR Port, IN PUCHAR Buffer, @@ -868,7 +872,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortBufferUshort( IN PUSHORT Port, IN PUSHORT Buffer, @@ -876,7 +880,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortBufferUlong( IN PULONG Port, IN PULONG Buffer, @@ -884,28 +888,28 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterUchar( IN PUCHAR Register, IN UCHAR Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterUshort( IN PUSHORT Register, IN USHORT Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterUlong( IN PULONG Register, IN ULONG Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterBufferUchar( IN PUCHAR Register, IN PUCHAR Buffer, @@ -913,7 +917,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterBufferUshort( IN PUSHORT Register, IN PUSHORT Buffer, @@ -921,7 +925,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterBufferUlong( IN PULONG Register, IN PULONG Buffer, @@ -929,13 +933,13 @@ ); SCSIPORT_API -SCSI_PHYSICAL_ADDRESS +SCSI_PHYSICAL_ADDRESS DDKAPI ScsiPortConvertUlongToPhysicalAddress( ULONG UlongAddress ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortConvertPhysicalAddressToUlong( SCSI_PHYSICAL_ADDRESS Address ); @@ -943,7 +947,7 @@ #define ScsiPortConvertPhysicalAddressToUlong(Address) ((Address).LowPart) SCSIPORT_API -BOOLEAN +BOOLEAN DDKAPI ScsiPortValidateRange( IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, @@ -956,7 +960,7 @@ // begin_ntminitape SCSIPORT_API -VOID +VOID DDKAPI ScsiDebugPrint( ULONG DebugPrintLevel, PCCHAR DebugMessage,

1 0

[fireball] 29276: - Reenable CrossNT stuff. - Fix some #else BLAH / #endif BLAH warnings. - Change SYSTEM_INFORMATION_CLASS structure by what we have in NDK (duplication for now).
by fireball＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: fireball Date: Fri Sep 28 15:01:10 2007 New Revision: 29276 URL: http://svn.reactos.org/svn/reactos?rev=29276&view=rev Log: - Reenable CrossNT stuff. - Fix some #else BLAH / #endif BLAH warnings. - Change SYSTEM_INFORMATION_CLASS structure by what we have in NDK (duplication for now). Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Sep 28 15:01:10 2007 @@ -4061,7 +4061,7 @@ #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -4109,7 +4109,7 @@ } #ifndef UNIATA_CORE goto CallTimerDpc2; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); #endif //UNIATA_CORE } @@ -4304,7 +4304,7 @@ KdPrint2((PRINT_PREFIX "AtapiInterrupt: go to DPC (drq0)\n")); #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -4815,7 +4815,7 @@ KdPrint2((PRINT_PREFIX "AtapiInterrupt: go to DPC (busy)\n")); #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -4873,7 +4873,7 @@ TimerValue = 100; #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -5018,7 +5018,7 @@ TimerValue = 2000; #ifndef UNIATA_CORE goto CallTimerDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -8057,10 +8057,10 @@ ((WinVer_Id() <= WinVer_NT) ? 0 : sizeof(hwInitializationData.w2k)); // Set entry points. - hwInitializationData.comm.HwInitialize = AtapiHwInitialize; - hwInitializationData.comm.HwResetBus = AtapiResetController; - hwInitializationData.comm.HwStartIo = AtapiStartIo; - hwInitializationData.comm.HwInterrupt = AtapiInterrupt; + hwInitializationData.comm.HwInitialize = (PHW_INITIALIZE)AtapiHwInitialize; + hwInitializationData.comm.HwResetBus = (PHW_RESET_BUS)AtapiResetController; + hwInitializationData.comm.HwStartIo = (PHW_STARTIO)AtapiStartIo; + hwInitializationData.comm.HwInterrupt = (PHW_INTERRUPT)AtapiInterrupt; // Specify size of extensions. hwInitializationData.comm.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); @@ -8072,7 +8072,7 @@ // Set PnP-specific API if(WinVer_Id() > WinVer_NT) { hwInitializationData.comm.NeedPhysicalAddresses = TRUE; - hwInitializationData.w2k.HwAdapterControl = AtapiAdapterControl; + hwInitializationData.w2k.HwAdapterControl = (PHW_ADAPTER_CONTROL)AtapiAdapterControl; } KdPrint2((PRINT_PREFIX "\n\nATAPI IDE enum supported BusMaster Devices\n")); 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.h Fri Sep 28 15:01:10 2007 @@ -38,4 +38,4 @@ IN PHW_CHANNEL chan ); -#endif __UNIATA_COMMAND_QUEUE_SUPPORT__H__ +#endif //__UNIATA_COMMAND_QUEUE_SUPPORT__H__ 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h Fri Sep 28 15:01:10 2007 @@ -33,4 +33,4 @@ IN ULONG Action ); -#endif __UNIATA_SATA__H__ +#endif //__UNIATA_SATA__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h Fri Sep 28 15:01:10 2007 @@ -1,12 +1,13 @@ #ifndef __NTDDK_EX__H__ #define __NTDDK_EX__H__ -typedef enum _SYSTEM_INFORMATION_CLASS { +typedef enum _SYSTEM_INFORMATION_CLASS +{ SystemBasicInformation, SystemProcessorInformation, SystemPerformanceInformation, SystemTimeOfDayInformation, - SystemPathInformation, + SystemPathInformation, /// Obsolete: Use KUSER_SHARED_DATA SystemProcessInformation, SystemCallCountInformation, SystemDeviceInformation, @@ -32,9 +33,9 @@ SystemUnloadGdiDriverInformation, SystemTimeAdjustmentInformation, SystemSummaryMemoryInformation, - SystemNextEventIdInformation, - SystemEventIdsInformation, - SystemCrashDumpInformation, + SystemMirrorMemoryInformation, + SystemPerformanceTraceInformation, + SystemObsolete0, SystemExceptionInformation, SystemCrashDumpStateInformation, SystemKernelDebuggerInformation, @@ -44,12 +45,64 @@ SystemPrioritySeperation, SystemPlugPlayBusInformation, SystemDockInformation, - SystemPowerInformation, + SystemPowerInformationNative, SystemProcessorSpeedInformation, SystemCurrentTimeZoneInformation, - SystemLookasideInformation + SystemLookasideInformation, + SystemTimeSlipNotification, + SystemSessionCreate, + SystemSessionDetach, + SystemSessionInformation, + SystemRangeStartInformation, + SystemVerifierInformation, + SystemAddVerifier, + SystemSessionProcessesInformation, + SystemLoadGdiDriverInSystemSpaceInformation, + SystemNumaProcessorMap, + SystemPrefetcherInformation, + SystemExtendedProcessInformation, + SystemRecommendedSharedDataAlignment, + SystemComPlusPackage, + SystemNumaAvailableMemory, + SystemProcessorPowerInformation, + SystemEmulationBasicInformation, + SystemEmulationProcessorInformation, + SystemExtendedHanfleInformation, + SystemLostDelayedWriteInformation, + SystemBigPoolInformation, + SystemSessionPoolTagInformation, + SystemSessionMappedViewInformation, + SystemHotpatchInformation, + SystemObjectSecurityMode, + SystemWatchDogTimerHandler, + SystemWatchDogTimerInformation, + SystemLogicalProcessorInformation, + SystemWo64SharedInformationObosolete, + SystemRegisterFirmwareTableInformationHandler, + SystemFirmwareTableInformation, + SystemModuleInformationEx, + SystemVerifierTriageInformation, + SystemSuperfetchInformation, + SystemMemoryListInformation, + SystemFileCacheInformationEx, + SystemThreadPriorityClientIdInformation, + SystemProcessorIdleCycleTimeInformation, + SystemVerifierCancellationInformation, + SystemProcessorPowerInformationEx, + SystemRefTraceInformation, + SystemSpecialPoolInformation, + SystemProcessIdInformation, + SystemErrorPortInformation, + SystemBootEnvironmentInformation, + SystemHypervisorInformation, + SystemVerifierInformationEx, + SystemTimeZoneInformation, + SystemImageFileExecutionOptionsInformation, + SystemCoverageInformation, + SystemPrefetchPathInformation, + SystemVerifierFaultsInformation, + MaxSystemInfoClass, } SYSTEM_INFORMATION_CLASS; - NTSYSAPI NTSTATUS @@ -105,7 +158,7 @@ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; typedef unsigned short WORD; -typedef unsigned int BOOL; +//typedef unsigned int BOOL; typedef unsigned long DWORD; typedef unsigned char BYTE; @@ -438,6 +491,7 @@ */ } KTHREAD_HDR, *PKTHREAD_HDR; +#ifdef __REACTOS__ typedef struct _IMAGE_DOS_HEADER { // DOS .EXE header WORD e_magic; // Magic number WORD e_cblp; // Bytes on last page of file @@ -543,6 +597,7 @@ DWORD AddressOfNames; // RVA from base of image DWORD AddressOfNameOrdinals; // RVA from base of image } IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY; +#endif NTHALAPI VOID Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h Fri Sep 28 15:01:10 2007 @@ -6,7 +6,7 @@ #include "stddef.h" #include "stdarg.h" -//#include "inc\CrossNt.h" +#include "inc/CrossNt.h" #include "atapi.h" // includes scsi.h #include "ntdddisk.h"

1 0

[dreimer] 29275: Forgot this translated file.
by dreimer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: dreimer Date: Fri Sep 28 14:49:35 2007 New Revision: 29275 URL: http://svn.reactos.org/svn/reactos?rev=29275&view=rev Log: Forgot this translated file. Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc Fri Sep 28 14:49:35 2007 @@ -41,7 +41,6 @@ Parameter Bezeichnet beliebige Angaben in der Befehlszeile, die von\n\ dem aufgerufenen Batchprogramm benötigt werden." - STRING_CD_HELP, "Wechselt das Verzeichnis oder zeigt dessen Namen an.\n\n\ CHDIR [Laufwerk:][Pfad]\n\ CHDIR[..|.]\n\ @@ -53,12 +52,10 @@ Laufwerk anzuzeigen.\n\ Mit CD ohne Parameter wird das aktuelle Laufwerk und Verzeichnis angezeigt." - STRING_CHCP_HELP, "Zeigt die aktuelle Codepage oder wechselt sie.\n\n\ CHCP [nnn]\n\n\ nnn Codepage angeben.\n\n\ Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an." - STRING_CHOICE_HELP, "Wartet auf den Benutzer, welcher aus einer Auswahl eine Option wählen muss.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ @@ -92,7 +89,6 @@ /P CMD wird permanent und führt autoexec.bat aus\n\ (kann nicht beendet werden).\n\ /T:bf Setzt die Hintergrund- und Vordergrund-Farbe (siehe COLOR Befehl)." - STRING_COLOR_HELP1, "Legt die standard Hinter- und Vordergrundfarben für die Konsole fest.\n\n\ COLOR [attr [/F]] \n\n\ @@ -129,7 +125,6 @@ Bestätigen auf.\n\n\ Die Option /Y ist möglicherweise in der Umgebungsvariablen COPYCMD.\n\ ..." - STRING_DATE_HELP1, "\nGeben Sie das neue Datum ein (mm%cdd%cyyyy): " @@ -200,8 +195,6 @@ Optionen können in der Umgebungsvariablen DIRCMD voreingestellt werden.\n\ ""-"" vor einer Option setzt die Voreinstellung ausser Kraft, z.B. DIR /-W." - - STRING_DIR_HELP2, " Datenträger in Laufwerk %c ist %s\n" STRING_DIR_HELP3, " Datenträger in Laufwerk %c hat keinen Namen\n" STRING_DIR_HELP4, " Datenträger-Seriennummer ist %04X-%04X\n" @@ -385,6 +378,46 @@ STRING_REN_HELP3, " %lu Dateien umbennant\n" +STRING_REPLACE_HELP1, "Ersetzt Dateien.\n\n\ +REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/A] [/P] [/R] [/W]\n\ +REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/P] [/R] [/S] [/W] [/U]\n\n\ + [Laufwerk1:][Pfad1]dateiname Bezeichnet die Quelldatei(en).\n\ + [Laufwerk2:][Pfad2] Bezeichnet den Pfad in dem die Dateien ersetzt\n\ + werden sollen.\n\ + /A Fügt neue Dateien dem Zielpfad hinzu. Kann nicht\n\ + mit /S oder /U Parameter genutzt werden.\n\ + /P Wartet auf Bestätigung bevor eine Datei ersetzt\n\ + oder eine Quelldatei hinzugefügt wird.\n\ + /R Ersetzt schreibgeschützte Dateien.\n\ + /S Ersetzt Dateien in allen Unterordnern des Ziel-\n\ + pfades. Kann nicht mit Parameter /A genutzt\n\ + werden.\n\ + /W Wartet vor dem Start bis ein Datenträger\n\ + eingelegt wurde.\n\ + /U Ersetzt (aktualisiert) nur Dateien, die älter\n\ + sind als die Quelldaten.Kann nicht mit Paramater\n\ + /A genutzt werden\n" + +STRING_REPLACE_HELP2, "Quellpfad benötigt\n" + +STRING_REPLACE_HELP3, "Keine Dateien ersetzt\n" + +STRING_REPLACE_HELP4, "%lu Datei(en) ersetzt\n" + +STRING_REPLACE_HELP5, "Ersetze %s\n" + +STRING_REPLACE_HELP6, "Ersetze %s\n" + +STRING_REPLACE_HELP7, "Keine Dateien hinzugefügt\n" + +STRING_REPLACE_HELP8, "%lu Datei(en) hinzugefügt\n" + +STRING_REPLACE_HELP9, "Füge %s hinzu (Y/N) " + +STRING_REPLACE_HELP10, "Ersetze %s (Y/N) " + +STRING_REPLACE_HELP11, "Füge %s hinzu\n" + STRING_SHIFT_HELP, "Verändert die Position ersetzbarer Parameter in einem Batchprogramm.\n\n\ SHIFT [DOWN]" @@ -501,7 +534,6 @@ MAX maximieren das Fenster\n\ RESTORE stellt das Fenster wieder her\n\ title neuer Titel" - STRING_HELP1, "Übersicht aller verfügbaren Befehle und deren Kurzbeschreibungen\n\n\ Befehl /? Um nähere Informationen zu einem bestimmten Befehl\n\ @@ -548,6 +580,7 @@ REM Leitet Kommentare in einer Batchdatei.\n\ REN Benennt eine Datei bzw. Dateien um.\n\ RENAME Bennent eine Datei bzw. Dateien um.\n\ +REPLACE Ersetzt Dateien.\n\ RMDIR Löscht ein Verzeichnis.\n\ SCREEN Bewegt den Cursor und optional die Ausgabe.\n\ SET Setzt oder löscht die Umgebungsvariablen bzw. zeigt sie an.\n\ @@ -563,10 +596,8 @@ Datenträger geschrieben werden.\n\ VOL Zeigt die Datenträgervolumebezeichnung und die Seriennummer an.\n" - STRING_CHOICE_OPTION, "JN" STRING_COPY_OPTION, "JNA" - STRING_ALIAS_ERROR, "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n" STRING_BATCH_ERROR, "Es trat ein Fehler auf, während die Batch-Datei geöffnet wurde.\n" @@ -604,21 +635,13 @@ STRING_FREE_ERROR2, "keine Bezeichnung" STRING_GOTO_ERROR1, "Keine Sprungmarke für GOTO gesetzt" STRING_GOTO_ERROR2, "Sprungmarke '%s' wurde nicht gefunden\n" - STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[FEHLER]\n" - STRING_REN_ERROR1, "MoveFile() ist fehlgeschlagen. Fehler: %lu\n" - STRING_START_ERROR1, "Derzeit noch kein Batch Support!" - STRING_TIME_ERROR1, "Ungültige Zeit." - STRING_TYPE_ERROR1, "Ungültige Option '/%s'\n" - STRING_WINDOW_ERROR1, "Fenster nicht gefunden" - - STRING_ERROR_PARAMETERF_ERROR, "Parameterformat ist nicht korrekt - %c\n" STRING_ERROR_INVALID_SWITCH, "Ungültiger Parameter - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Zu viele Parameter - %s\n" @@ -632,9 +655,14 @@ STRING_ERROR_CANNOTPIPE, "Fehler: Cannot pipe! Temporäre Datei kann nicht geöffnet werden!\n" STRING_ERROR_D_PAUSEMSG, "Drücken Sie eine beliebige Taste . . ." STRING_ERROR_DRIVER_NOT_READY, "Laufwerk ist nicht bereit" - STRING_PATH_ERROR, "CMD: Nicht in environment '%s'\n" - +STRING_REPLACE_ERROR1, "Ungültiger Parameter - %s\n" +STRING_REPLACE_ERROR2, "Pfad wurde nicht gefunden - %s\n" +STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n" +STRING_REPLACE_ERROR4, "Invalid parameter combination\n" +STRING_REPLACE_ERROR5, "Zugriff verweigert - %s\n" +STRING_REPLACE_ERROR6, "Keine Dateien gefunden - %s\n" +STRING_REPLACE_ERROR7, "Erweiterter Fehler 32\n" STRING_CMD_SHELLINFO, "\nReactOS Befehlszeilen Interpreter" STRING_VERSION_RUNVER, " läuft in %s" STRING_COPY_FILE , " %d Datei(en) kopiert\n" @@ -643,7 +671,6 @@ STRING_SCREEN_COL, "ungültige Spalten-Angabe" STRING_SCREEN_ROW, "ungültige Zeilen-Angabe" STRING_TIMER_TIME "Timer %d ist %s: " - STRING_INVALID_OPERAND, "Ungültiger Operand." STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen."

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs