Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[cwittich] 20743: make GedMurphy happy

by cwittich＠svn.reactos.org

make GedMurphy happy Modified: trunk/reactos/subsys/system/servman/query.c _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-08 23:26:03 UTC (rev 20742) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-08 23:49:15 UTC (rev 20743) @@ -46,7 +46,7 @@ /* Create the icon image lists */ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), ILC_MASK, 1, 1); + GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR16, 1, 1); /* Add an icon to each image list */ hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0);

18 years, 8 months

[ion] 20742: - Get the win32k beast tamed by msvc.

by ion＠svn.reactos.org

- Get the win32k beast tamed by msvc. Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/gradient.c Modified: trunk/reactos/subsys/win32k/include/gdifloat.h Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/subsys/win32k/objects/polyfill.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/include/ndk/extypes.h 2006-01-08 23:26:03 UTC (rev 20742) @@ -43,6 +43,8 @@ // // Kernel Exported Object Types // +extern POBJECT_TYPE NTSYSAPI ExDesktopObjectType; +extern POBJECT_TYPE NTSYSAPI ExWindowStationObjectType; extern POBJECT_TYPE NTSYSAPI ExIoCompletionType; extern POBJECT_TYPE NTSYSAPI ExMutantObjectType; extern POBJECT_TYPE NTSYSAPI ExTimerType; _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -45,8 +45,7 @@ { PDWORD addr = (PDWORD)((PWORD)((PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta) + x1); - -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(_MSC_VER) /* This is about 10% faster than the generic C code below */ LONG Count = x2 - x1; @@ -97,7 +96,7 @@ VOID DIB_16BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c) { -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(_MSC_VER) asm volatile( " testl %2, %2" "\n\t" " jle 2f" "\n\t" @@ -129,7 +128,7 @@ "r"(SurfObj->lDelta), "r"(y2 - y1), "a"(c) : "cc", "memory", "%ecx"); #else - PBYTE byteaddr = SurfObj->pvScan0 + y1 * SurfObj->lDelta; + PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y1 * SurfObj->lDelta; PWORD addr = (PWORD)byteaddr + x; LONG lDelta = SurfObj->lDelta; @@ -342,7 +341,7 @@ { ULONG DestY; -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(_MSC_VER) /* This is about 10% faster than the generic C code below */ ULONG delta = DestSurface->lDelta; ULONG width = (DestRect->right - DestRect->left) ; @@ -865,13 +864,13 @@ } col; } NICEPIXEL16; -STATIC inline UCHAR +static __inline UCHAR Clamp5(ULONG val) { return (val > 31) ? 31 : val; } -STATIC inline UCHAR +static __inline UCHAR Clamp6(ULONG val) { return (val > 63) ? 63 : val; _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -88,6 +88,7 @@ int dy2; // dest y end int sy1; // src y start + int dx; int shift; BYTE srcmask, dstmask; @@ -142,7 +143,7 @@ pd = d; ps = s; srcmask = 0xff; - int dx = dwx; /* dest x for this pass */ + dx = dwx; /* dest x for this pass */ if ( dwx < dl ) { int diff = dl-dwx; _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -43,7 +43,7 @@ { PBYTE addr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta + (x1 << 1) + x1; ULONG Count = x2 - x1; -#ifndef _M_IX86 +#if !defined(_M_IX86) || defined(_MSC_VER) ULONG MultiCount; ULONG Fill[3]; #endif @@ -78,7 +78,7 @@ * * So, taking endianness into account again, we need to fill with these * ULONGs: CABC BCAB ABCA */ -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(_MSC_VER) /* This is about 30% faster than the generic C code below */ __asm__ __volatile__ ( " movl %1, %%ecx\n" @@ -396,7 +396,7 @@ { ULONG DestY; -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(_MSC_VER) PBYTE xaddr = (PBYTE)DestSurface->pvScan0 + DestRect->top * DestSurface->lDelta + (DestRect->left << 1) + DestRect->left; PBYTE addr; ULONG Count; @@ -678,7 +678,7 @@ } col; } NICEPIXEL32; -STATIC inline UCHAR +static __inline UCHAR Clamp8(ULONG val) { return (val > 255) ? 255 : val; _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -41,8 +41,7 @@ return (ULONG)(*addr); } - -#ifdef _M_IX86 +#if defined(_M_IX86) && !defined(_MSC_VER) VOID DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { @@ -78,7 +77,7 @@ VOID DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { - PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; + PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta; PDWORD addr = (PDWORD)byteaddr + x1; LONG cx = x1; while(cx < x2) @@ -744,7 +743,7 @@ } col; } NICEPIXEL32; -STATIC inline UCHAR +static __inline UCHAR Clamp8(ULONG val) { return (val > 255) ? 255 : val; _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -681,7 +681,7 @@ } col; } NICEPIXEL16; -STATIC inline UCHAR +static __inline UCHAR Clamp8(ULONG val) { return (val > 255) ? 255 : val; _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -32,7 +32,7 @@ #define NDEBUG #include <debug.h> -typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, +typedef BOOLEAN (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, @@ -42,7 +42,7 @@ BRUSHOBJ* Brush, POINTL* BrushOrigin, ROP4 Rop4); -typedef BOOLEAN STDCALL (*PSTRETCHRECTFUNC)(SURFOBJ* OutputObj, +typedef BOOLEAN (STDCALL *PSTRETCHRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, CLIPOBJ* ClipRegion, @@ -246,7 +246,7 @@ return Result; } -INT abs(INT nm); +INT __cdecl abs(INT nm); /* * @implemented _____ Modified: trunk/reactos/subsys/win32k/eng/gradient.c --- trunk/reactos/subsys/win32k/eng/gradient.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/eng/gradient.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -452,7 +452,7 @@ } -BOOL FASTCALL STATIC +BOOL static IntEngIsNULLTriangle(TRIVERTEX *pVertex, GRADIENT_TRIANGLE *gt) { if(COMPAREVERTEX(VERTEX(Vertex1), VERTEX(Vertex2))) _____ Modified: trunk/reactos/subsys/win32k/include/gdifloat.h --- trunk/reactos/subsys/win32k/include/gdifloat.h 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/include/gdifloat.h 2006-01-08 23:26:03 UTC (rev 20742) @@ -15,7 +15,7 @@ * transformation process is done in floating point internally. This function * is then used to round these coordinates to integer values. */ -static inline INT GDI_ROUND(FLOAT val) +static __inline INT GDI_ROUND(FLOAT val) { return (int)floor(val + 0.5); } @@ -23,7 +23,7 @@ /* Performs a world-to-viewport transformation on the specified point (which * is in floating point format). */ -static inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point) +static __inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point) { FLOAT x, y; @@ -42,7 +42,7 @@ * is in integer format). Returns TRUE if successful, else FALSE. */ #if 0 -static inline BOOL INTERNAL_DPTOLP(DC *dc, LPPOINT point) +static __inline BOOL INTERNAL_DPTOLP(DC *dc, LPPOINT point) { FLOAT_POINT floatPoint; @@ -62,7 +62,7 @@ /* Performs a world-to-viewport transformation on the specified point (which * is in integer format). */ -static inline void INTERNAL_LPTODP(DC *dc, LPPOINT point) +static __inline void INTERNAL_LPTODP(DC *dc, LPPOINT point) { FLOAT_POINT floatPoint; _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -49,6 +49,10 @@ DD_CALLBACKS callbacks; DD_SURFACECALLBACKS surface_callbacks; DD_PALETTECALLBACKS palette_callbacks; + DC *pDC; + BOOL success; + HANDLE hDirectDraw; + PDD_DIRECTDRAW pDirectDraw; #ifdef DX_DEBUG DPRINT1("NtGdiDdCreateDirectDrawObject\n"); #endif @@ -67,7 +71,7 @@ return NULL; } - DC *pDC = DC_LockDc(hdc); + pDC = DC_LockDc(hdc); if (!pDC) return NULL; @@ -78,7 +82,7 @@ return NULL; } - BOOL success = pDC->DriverFunctions.EnableDirectDraw( + success = pDC->DriverFunctions.EnableDirectDraw( pDC->PDev, &callbacks, &surface_callbacks, &palette_callbacks); if (!success) @@ -91,7 +95,7 @@ return NULL; } - HANDLE hDirectDraw = GDIOBJ_AllocObj(GDI_OBJECT_TYPE_DIRECTDRAW); + hDirectDraw = GDIOBJ_AllocObj(GDI_OBJECT_TYPE_DIRECTDRAW); if (!hDirectDraw) { /* No more memmory */ @@ -102,7 +106,7 @@ return NULL; } - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); + pDirectDraw = GDIOBJ_LockObj(hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); if (!pDirectDraw) { /* invalid handle */ @@ -160,6 +164,8 @@ ) { #ifdef DX_DEBUG + PDD_DIRECTDRAW pDirectDraw; + BOOL success; DPRINT1("NtGdiDdQueryDirectDrawObject\n"); #endif @@ -195,7 +201,7 @@ } - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (!pDirectDraw) @@ -207,7 +213,7 @@ return FALSE; } - BOOL success = pDirectDraw->DrvGetDirectDrawInfo( + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, pHalInfo, puNumHeaps, @@ -413,12 +419,13 @@ ) { DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + PDD_DIRECTDRAW pDirectDraw; PDD_DIRECTDRAW_GLOBAL lgpl; #ifdef DX_DEBUG DPRINT1("NtGdiDdCreateSurface\n"); #endif - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) { #ifdef DX_DEBUG @@ -460,12 +467,13 @@ { DWORD ddRVal; PDD_DIRECTDRAW_GLOBAL lgpl; + PDD_DIRECTDRAW pDirectDraw; #ifdef DX_DEBUG DPRINT1("NtGdiDdWaitForVerticalBlank\n"); #endif - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -978,6 +986,7 @@ ) { PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + PDD_SURFACE pSurface; #ifdef DX_DEBUG DPRINT1("NtGdiDdCreateSurfaceObject\n"); #endif @@ -987,7 +996,7 @@ if (!hSurface) hSurface = GDIOBJ_AllocObj(GDI_OBJECT_TYPE_DD_SURFACE); - PDD_SURFACE pSurface = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); + pSurface = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); /* FIXME - Handle pSurface == NULL!!!! */ RtlMoveMemory(&pSurface->Local, puSurfaceLocal, sizeof(DD_SURFACE_LOCAL)); _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -113,6 +113,7 @@ SURFOBJ *soMask = NULL, *soColor = NULL; XLATEOBJ *XlateObj = NULL; HDC Screen; + PDC dc; CurInfo = IntGetSysCursorInfo(WinSta); OldCursor = CurInfo->CurrentCursorObject; @@ -132,7 +133,7 @@ return (HCURSOR)0; } /* FIXME use the desktop's HDC instead of using ScreenDeviceContext */ - PDC dc = DC_LockDc(Screen); + dc = DC_LockDc(Screen); if (!dc) { @@ -772,6 +773,7 @@ PWINSTATION_OBJECT WinSta; NTSTATUS Status; PCURICON_OBJECT CurIcon; + HDC hDC; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserGetCursorInfo\n"); @@ -779,7 +781,6 @@ #if 1 - HDC hDC; /* FIXME - get the screen dc from the window station or desktop */ if (!(hDC = IntGetScreenDC())) _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -1196,12 +1196,15 @@ BOOL doPatBlt = TRUE; PWINDOW_OBJECT WndDesktop; int len; + COLORREF color_old; + UINT align_old; + int mode_old; + PWINSTATION_OBJECT WinSta = PsGetWin32Thread()->Desktop->WindowStation; DECLARE_RETURN(BOOL); - + UserEnterExclusive(); DPRINT("Enter NtUserPaintDesktop\n"); - PWINSTATION_OBJECT WinSta = PsGetWin32Thread()->Desktop->WindowStation; IntGdiGetClipBox(hDC, &Rect); @@ -1359,9 +1362,9 @@ rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); } - COLORREF color_old = NtGdiSetTextColor(hDC, RGB(255,255,255)); - UINT align_old = NtGdiSetTextAlign(hDC, TA_RIGHT); - int mode_old = NtGdiSetBkMode(hDC, TRANSPARENT); + color_old = NtGdiSetTextColor(hDC, RGB(255,255,255)); + align_old = NtGdiSetTextAlign(hDC, TA_RIGHT); + mode_old = NtGdiSetBkMode(hDC, TRANSPARENT); NtGdiTextOut(hDC, rect.right-16, rect.bottom-48, s_wszVersion, len); _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -138,7 +138,7 @@ return NULL; } -STATIC BOOL FASTCALL +static BOOL FASTCALL co_IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWindow, BOOL MouseActivate) { HWND hWnd = Window->hSelf; @@ -438,12 +438,12 @@ HWND STDCALL NtUserGetCapture(VOID) { + PUSER_MESSAGE_QUEUE ThreadQueue; DECLARE_RETURN(HWND); DPRINT("Enter NtUserGetCapture\n"); UserEnterShared(); - PUSER_MESSAGE_QUEUE ThreadQueue; ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; RETURN( ThreadQueue ? ThreadQueue->CaptureWindow : 0); _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -36,10 +36,10 @@ #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) -STATIC PHOOKTABLE GlobalHooks; +static PHOOKTABLE GlobalHooks; /* create a new hook table */ -STATIC FASTCALL PHOOKTABLE +static PHOOKTABLE IntAllocHookTable(void) { PHOOKTABLE Table; @@ -86,7 +86,7 @@ /* create a new hook and add it to the specified table */ -STATIC FASTCALL PHOOK +static PHOOK IntAddHook(PETHREAD Thread, int HookId, BOOLEAN Global, PWINSTATION_OBJECT WinStaObj) { PHOOK Hook; @@ -127,7 +127,7 @@ } /* get the hook table that a given hook belongs to */ -STATIC PHOOKTABLE FASTCALL +static PHOOKTABLE FASTCALL IntGetTable(PHOOK Hook) { if (NULL == Hook->Thread || WH_KEYBOARD_LL == Hook->HookId || @@ -140,7 +140,7 @@ } /* get the first hook in the chain */ -STATIC PHOOK FASTCALL +static PHOOK FASTCALL IntGetFirstHook(PHOOKTABLE Table, int HookId) { PLIST_ENTRY Elem = Table->Hooks[HOOKID_TO_INDEX(HookId)].Flink; @@ -149,7 +149,7 @@ } /* find the first non-deleted hook in the chain */ -STATIC PHOOK FASTCALL +static PHOOK FASTCALL IntGetFirstValidHook(PHOOKTABLE Table, int HookId) { PHOOK Hook; @@ -167,7 +167,7 @@ } /* find the next hook in the chain, skipping the deleted ones */ -STATIC PHOOK FASTCALL +static PHOOK FASTCALL IntGetNextHook(PHOOK Hook) { PHOOKTABLE Table = IntGetTable(Hook); @@ -193,7 +193,7 @@ } /* free a hook, removing it from its chain */ -STATIC VOID FASTCALL +static VOID FASTCALL IntFreeHook(PHOOKTABLE Table, PHOOK Hook, PWINSTATION_OBJECT WinStaObj) { RemoveEntryList(&Hook->Chain); @@ -210,7 +210,7 @@ } /* remove a hook, freeing it if the chain is not in use */ -STATIC FASTCALL VOID +static VOID IntRemoveHook(PHOOK Hook, PWINSTATION_OBJECT WinStaObj, BOOL TableAlreadyLocked) { PHOOKTABLE Table = IntGetTable(Hook); @@ -232,7 +232,7 @@ } /* release a hook chain, removing deleted hooks if the use count drops to 0 */ -STATIC VOID FASTCALL +static VOID FASTCALL IntReleaseHookChain(PHOOKTABLE Table, int HookId, PWINSTATION_OBJECT WinStaObj) { PLIST_ENTRY Elem; _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -233,7 +233,7 @@ /* Returns a value that indicates if the key is a modifier key, and * which one. */ -STATIC UINT STDCALL +static UINT STDCALL IntKeyboardGetModifiers(KEYBOARD_INPUT_DATA *InputData) { if (InputData->Flags & KEY_E1) @@ -280,7 +280,7 @@ /* Asks the keyboard driver to send a small table that shows which * lights should connect with which scancodes */ -STATIC NTSTATUS STDCALL +static NTSTATUS STDCALL IntKeyboardGetIndicatorTrans(HANDLE KeyboardDeviceHandle, PKEYBOARD_INDICATOR_TRANSLATION *IndicatorTrans) { @@ -333,7 +333,7 @@ /* Sends the keyboard commands to turn on/off the lights. */ -STATIC NTSTATUS STDCALL +static NTSTATUS STDCALL IntKeyboardUpdateLeds(HANDLE KeyboardDeviceHandle, PKEYBOARD_INPUT_DATA KeyInput, PKEYBOARD_INDICATOR_TRANSLATION IndicatorTrans) @@ -374,7 +374,7 @@ return STATUS_SUCCESS; } -STATIC VOID STDCALL +static VOID STDCALL IntKeyboardSendWinKeyMsg() { PWINDOW_OBJECT Window; @@ -395,13 +395,13 @@ MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); } -STATIC VOID STDCALL +static VOID STDCALL co_IntKeyboardSendAltKeyMsg() { co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); } -STATIC VOID STDCALL +static VOID STDCALL KeyboardThreadMain(PVOID StartContext) { UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -1043,6 +1043,7 @@ UINT ScanCode = (lParam >> 16) & 0xff; BOOL ExtKey = lParam & (1<<24) ? TRUE : FALSE; PKBDTABLES keyLayout; + VSC_LPWSTR *KeyNames; DECLARE_RETURN(DWORD); DPRINT("Enter NtUserGetKeyNameText\n"); @@ -1069,7 +1070,7 @@ VkCode = ScanToVk( ScanCode, ExtKey, keyLayout ); } - VSC_LPWSTR *KeyNames = 0; + KeyNames = 0; if( CareVk != VkCode ) ScanCode = VkToScan( VkCode, ExtKey, keyLayout ); _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -177,7 +177,7 @@ return Size; } -static FASTCALL NTSTATUS +static NTSTATUS PackParam(LPARAM *lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam) { NCCALCSIZE_PARAMS *UnpackedNcCalcsize; @@ -260,7 +260,7 @@ return STATUS_SUCCESS; } -static FASTCALL NTSTATUS +static NTSTATUS UnpackParam(LPARAM lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam) { NCCALCSIZE_PARAMS *UnpackedParams; @@ -670,6 +670,7 @@ PUSER_MESSAGE Message; BOOL Present, RemoveMessages; USER_REFERENCE_ENTRY Ref; + USHORT HitTest; /* The queues and order in which they are checked are documented in the MSDN article on GetMessage() */ @@ -817,7 +818,6 @@ return TRUE; } - USHORT HitTest; if((Msg->Msg.hwnd && Msg->Msg.message >= WM_MOUSEFIRST && Msg->Msg.message <= WM_MOUSELAST) && co_IntTranslateMouseMessage(ThreadQueue, &Msg->Msg, &HitTest, FALSE)) /* FIXME - check message filter again, if the message doesn't match anymore, _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -176,6 +176,7 @@ DWORD Routine) { DECLARE_RETURN(DWORD); + PDC dc; DPRINT("Enter NtUserCallOneParam\n"); @@ -198,7 +199,7 @@ return showpointer; /* No mouse */ } - PDC dc = DC_LockDc(Screen); + dc = DC_LockDc(Screen); if (!dc) { @@ -1019,7 +1020,6 @@ the bitmap. We'll change it's ownership to system and replace it with the current wallpaper bitmap */ HBITMAP hOldBitmap, hNewBitmap; - ASSERT(pvParam); UNICODE_STRING Key = RTL_CONSTANT_STRING(L"Control Panel\\Desktop"); UNICODE_STRING Tile = RTL_CONSTANT_STRING(L"TileWallpaper"); UNICODE_STRING Style = RTL_CONSTANT_STRING(L"WallpaperStyle"); @@ -1034,7 +1034,8 @@ ULONG ResLength = 0; ULONG TileNum = 0; ULONG StyleNum = 0; - + ASSERT(pvParam); + hNewBitmap = *(HBITMAP*)pvParam; if(hNewBitmap != NULL) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -259,7 +259,7 @@ return Res; } -BOOL STATIC STDCALL +BOOL static STDCALL co_MsqTranslateMouseMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd, UINT FilterLow, UINT FilterHigh, PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed, PWINDOW_OBJECT ScopeWin, PPOINT ScreenPoint, BOOL FromGlobalQueue) _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -218,7 +218,7 @@ * Internal function used by IntRedrawWindow. */ -STATIC VOID FASTCALL +static VOID FASTCALL co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags) { HDC hDC; _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -155,7 +155,7 @@ return(Dce); } -VOID STATIC STDCALL +VOID static STDCALL DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags, BOOL SetClipOrigin) { @@ -185,7 +185,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL DceDeleteClipRgn(DCE* Dce) { Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); @@ -205,7 +205,7 @@ Dce->DCXFlags |= DCX_DCEDIRTY; } -STATIC INT FASTCALL +static INT FASTCALL DceReleaseDC(DCE* dce, BOOL EndPaint) { if (DCX_DCEBUSY != (dce->DCXFlags & (DCX_DCEEMPTY | DCX_DCEBUSY))) @@ -241,7 +241,7 @@ return 1; } -STATIC VOID FASTCALL +static VOID FASTCALL DceUpdateVisRgn(DCE *Dce, PWINDOW_OBJECT Window, ULONG Flags) { HANDLE hRgnVisible = NULL; _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -248,7 +248,7 @@ } -VOID STATIC FASTCALL +VOID static FASTCALL WinPosFindIconPos(PWINDOW_OBJECT Window, POINT *Pos) { /* FIXME */ _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -159,7 +159,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - BrushOrigin = BrushObj->ptOrigin; + BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); } else @@ -400,7 +400,7 @@ return Ret; } -static FASTCALL HBITMAP +static HBITMAP IntCreateBitmapIndirect(CONST BITMAP *BM) { PBITMAPOBJ bmp; @@ -655,6 +655,7 @@ SURFOBJ *SurfaceObject; HPALETTE Pal = 0; XLATEOBJ *XlateObj; + HBITMAP hBmpTmp; dc = DC_LockDc (hDC); @@ -707,7 +708,7 @@ static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 }; BITMAPINFO bi; RtlMoveMemory ( &(bi.bmiHeader), &bih, sizeof(bih) ); - HBITMAP hBmpTmp = NtGdiCreateDIBitmap ( hDC, &bi.bmiHeader, 0, NULL, &bi, DIB_RGB_COLORS ); + hBmpTmp = NtGdiCreateDIBitmap ( hDC, &bi.bmiHeader, 0, NULL, &bi, DIB_RGB_COLORS ); //HBITMAP hBmpTmp = NtGdiCreateBitmap ( 1, 1, 1, 32, NULL); if ( hBmpTmp ) { @@ -1349,8 +1350,9 @@ RECTL DestRect, SourceRect; BOOL Status; XLATEOBJ *XlateObj; - BLENDOBJ BlendObj = {BlendFunc}; + BLENDOBJ BlendObj; HPALETTE SourcePalette = 0, DestPalette = 0; + BlendObj.BlendFunction = BlendFunc; DCDest = DC_LockDc(hDCDest); if (NULL == DCDest) _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -1176,6 +1176,7 @@ PGDIBRUSHOBJ PenBrushObj, FillBrushObj; GDIBRUSHINST FillBrushInst, PenBrushInst; RECTL RectBounds; + int potential_steps; int i, col, row, width, height, x1, x1start, x2, x2start, y1, y2; int xradius, yradius; //float aspect_square; @@ -1338,7 +1339,7 @@ d -= ddec; } - int potential_steps = ( a_square * row ) / b_square - col + 1; + potential_steps = ( a_square * row ) / b_square - col + 1; while ( d < 0 && potential_steps-- ) { d += dinc; /* two_b_square * (3 + (col << 1)); */ _____ Modified: trunk/reactos/subsys/win32k/objects/pen.c --- trunk/reactos/subsys/win32k/objects/pen.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/objects/pen.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -136,10 +136,10 @@ IN BOOL bOldStylePen, IN OPTIONAL HBRUSH hbrush) { + LOGPEN LogPen; /* NOTE: This is HACK! */ DPRINT1("FIXME: FIX CALLERS FIRST!\n"); KEBUGCHECK(0); - LOGPEN LogPen; if (PenStyle & PS_USERSTYLE) PenStyle = (PenStyle & ~PS_STYLE_MASK) | PS_SOLID; _____ Modified: trunk/reactos/subsys/win32k/objects/polyfill.c --- trunk/reactos/subsys/win32k/objects/polyfill.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/objects/polyfill.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -32,7 +32,7 @@ #define NDEBUG #include <debug.h> -INT abs(INT nm); +INT __cdecl abs(INT nm); #define FILL_EDGE_ALLOC_TAG 0x45465044 @@ -562,8 +562,7 @@ int ScanLine; void - STDCALL - (*FillScanLine)( + (STDCALL *FillScanLine)( PDC dc, int ScanLine, FILL_EDGE* ActiveHead, _____ Modified: trunk/reactos/subsys/win32k/objects/region.c --- trunk/reactos/subsys/win32k/objects/region.c 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/objects/region.c 2006-01-08 23:26:03 UTC (rev 20742) @@ -427,8 +427,8 @@ #define MEMCHECK(reg, rect, firstrect) xmemcheck(reg,&(rect),(LPRECT *)&(firstrect)) -typedef void FASTCALL (*overlapProcp)(PROSRGNDATA, PRECT, PRECT, PRECT, PRECT, INT, INT); -typedef void FASTCALL (*nonOverlapProcp)(PROSRGNDATA, PRECT, PRECT, INT, INT); +typedef void (FASTCALL *overlapProcp)(PROSRGNDATA, PRECT, PRECT, PRECT, PRECT, INT, INT); +typedef void (FASTCALL *nonOverlapProcp)(PROSRGNDATA, PRECT, PRECT, INT, INT); // Number of points to buffer before sending them off to scanlines() : Must be an even number #define NUMPTSTOBUFFER 200 _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/w32k.h 2006-01-08 23:26:03 UTC (rev 20742) @@ -24,12 +24,15 @@ #define STARTF_USEPOSITION 4 #include <stdarg.h> #include <windef.h> +#include <winerror.h> #include <wingdi.h> #include <winddi.h> #include <winuser.h> #include <prntfont.h> #include <dde.h> #include <wincon.h> +#define _NOCSECT_TYPE +#include <ddrawi.h> /* SEH Support with PSEH */ #include <pseh/pseh.h> @@ -57,3 +60,11 @@ /* Internal Win32K Header */ #include "include/win32k.h" +/* Undocumented stuff */ +typedef DRIVEROBJ *PDRIVEROBJ; +#define WM_SYSTIMER 280 +#ifndef M_PI +#define M_PI 3.14159265358979323846f +#define M_PI_2 1.57079632679489661923 +#endif + _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2006-01-08 23:24:43 UTC (rev 20741) +++ trunk/reactos/subsys/win32k/win32k.xml 2006-01-08 23:26:03 UTC (rev 20742) @@ -63,6 +63,13 @@ <file>math.c</file> <file>copy.c</file> </compilationunit> + <directory name="i386"> + <file>cos_asm.s</file> + <file>sin_asm.s</file> + <file>atan2_asm.s</file> + <file>floor_asm.s</file> + <file>ceil_asm.s</file> + </directory> </directory> <directory name="ntddraw"> <compilationunit name="ntddraw.c">

18 years, 8 months

[gedmurphy] 20741: implement list refreshing and program exit

by gedmurphy＠svn.reactos.org

implement list refreshing and program exit Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-08 23:15:58 UTC (rev 20740) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-08 23:24:43 UTC (rev 20741) @@ -3,7 +3,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit",ID_FILE_EXIT + MENUITEM "E&xit",ID_EXIT END POPUP "Action" BEGIN @@ -71,22 +71,22 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FIRSTCOLUMN "Name" + IDS_FIRSTCOLUMN "Name" IDS_SECONDCOLUMN "Description" - IDS_THIRDCOLUMN "Status" + IDS_THIRDCOLUMN "Status" IDS_FOURTHCOLUMN "Startup Type" - IDS_FITHCOLUMN "Log On As" + IDS_FITHCOLUMN "Log On As" END STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_STATUS_RUNNING "Started" IDS_SERVICES_STATUS_STOPPED "Stopped" - IDS_SERVICES_YES "Yes" - IDS_SERVICES_UNKNOWN "Unknown" - IDS_SERVICES_AUTO "Automatic" - IDS_SERVICES_MAN "Manual" - IDS_SERVICES_DIS "Disabled" + IDS_SERVICES_YES "Yes" + IDS_SERVICES_UNKNOWN "Unknown" + IDS_SERVICES_AUTO "Automatic" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Disabled" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-08 23:15:58 UTC (rev 20740) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-08 23:24:43 UTC (rev 20741) @@ -34,6 +34,8 @@ DWORD Index; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + ListView_DeleteAllItems(hListView); + NumServices = GetServiceList(); if (NumServices) _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-08 23:15:58 UTC (rev 20740) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-08 23:24:43 UTC (rev 20741) @@ -22,7 +22,6 @@ #define ID_EXIT 2010 #define IDR_MAINMENU 102 -#define ID_FILE_EXIT 4001 #define ID_VIEW_CUSTOMIZE 4021 #define ID_HELP_ABOUT 4031 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-08 23:15:58 UTC (rev 20740) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-08 23:24:43 UTC (rev 20741) @@ -26,30 +26,28 @@ { //HFONT hfDefault; - HWND hTool; TBADDBITMAP tbab; INT iImageOffset; - INT statwidths[] = {110, -1}; + INT statwidths[] = {110, -1}; /* widths of status bar */ TCHAR szTemp[256]; - RECT rcClient; LVCOLUMN lvc = { 0 }; /* Toolbar buttons */ TBBUTTON tbb [NUM_BUTTONS] = - { // iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString + { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ {TBICON_PROP, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ {TBICON_REFRESH, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ {TBICON_EXPORT, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* export */ /* Note: First item for a seperator is its width in pixels */ - {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ {TBICON_START, ID_START, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ {TBICON_STOP, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ {TBICON_PAUSE, ID_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ {TBICON_RESTART, ID_RESTART, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ - {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ @@ -98,10 +96,6 @@ /* Add buttons to toolbar */ SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); - /* Send a WM_SIZE message to layout controls */ - GetClientRect(hwnd, &rcClient); - SendMessage(hwnd, WM_SIZE, SIZE_RESTORED, MAKELONG(rcClient.right, rcClient.bottom)); - /* Show toolbar */ ShowWindow(hTool, SW_SHOWNORMAL); @@ -121,39 +115,43 @@ if (hListView == NULL) MessageBox(hwnd, _T("Could not create List View."), _T("Error"), MB_OK | MB_ICONERROR); - - ListView_SetExtendedListViewStyle(hListView, LVS_EX_FULLROWSELECT | - /*LVS_EX_GRIDLINES |*/ LVS_EX_HEADERDRAGDROP); + LVS_EX_GRIDLINES | LVS_EX_HEADERDRAGDROP); lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; lvc.fmt = LVCFMT_LEFT; - /* Add columns to the list-view (first column contains check box). */ + /* Add columns to the list-view */ + + /* name */ lvc.iSubItem = 0; lvc.cx = 160; LoadString(hInstance, IDS_FIRSTCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 0, &lvc); + /* description */ lvc.iSubItem = 1; lvc.cx = 260; LoadString(hInstance, IDS_SECONDCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 1, &lvc); + /* status */ lvc.iSubItem = 2; lvc.cx = 75; LoadString(hInstance, IDS_THIRDCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 2, &lvc); + /* startup type */ lvc.iSubItem = 3; lvc.cx = 80; LoadString(hInstance, IDS_FOURTHCOLUMN, szTemp, 256); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 3, &lvc); + /* logon as */ lvc.iSubItem = 4; lvc.cx = 100; LoadString(hInstance, IDS_FITHCOLUMN, szTemp, 256); @@ -309,11 +307,18 @@ case WM_COMMAND: switch(LOWORD(wParam)) { - case ID_FILE_EXIT: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; + case ID_PROP: + PropSheets(hwnd); + break; + + case ID_REFRESH: + if (! RefreshServiceList() ) + GetError(); - case ID_START: + case ID_EXPORT: + break; + + case ID_START: break; case ID_STOP: @@ -328,13 +333,16 @@ case ID_RESTART: break; - case ID_REFRESH: + case ID_NEW: break; - case ID_PROP: - PropSheets(hwnd); + case ID_HELP: break; + case ID_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + case ID_VIEW_CUSTOMIZE: break; @@ -345,9 +353,6 @@ AboutDialogProc); break; - case ID_EXPORT: - break; - } break;

18 years, 8 months

[turner] 20740: Fix tab complete bugs, including 1238.

by turner＠svn.reactos.org

Fix tab complete bugs, including 1238. Modified: trunk/reactos/subsys/system/cmd/filecomp.c _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2006-01-08 23:05:38 UTC (rev 20739) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2006-01-08 23:15:58 UTC (rev 20740) @@ -384,7 +384,7 @@ nQuotes++; /* Find the prefix and suffix */ - if(nQuotes % 2 && nQuotes > 1) + if(nQuotes % 2 && nQuotes >= 1) { /* Odd number of quotes. Just start from the last " */ /* THis is the way MS does it, and is an easy way out */ @@ -401,7 +401,7 @@ szSearch = szSearch1; /* Move one char past */ szSearch++; - szSearch[0] = _T('\0'); + szSearch[0] = _T('\0'); _tcscpy(szPrefix,str); return; @@ -582,7 +582,9 @@ /* Start the search for all the files */ GetFullPathName(szBaseWord, MAX_PATH, szSearchPath, NULL); if(StartLength > 0) + { _tcscat(szSearchPath,_T("*")); + } _tcscpy(LastSearch,szSearchPath); _tcscpy(LastPrefix,szPrefix); } @@ -613,10 +615,10 @@ continue; /* Don't show files when they are doing 'cd' or 'rd' */ - if(!ShowAll) + if(!ShowAll && + file.dwFileAttributes != 0xFFFFFFFF && + !(file.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - DWORD attr = GetFileAttributes (file.cFileName); - if(attr != 0xFFFFFFFF && (!(attr & FILE_ATTRIBUTE_DIRECTORY))) continue; }

18 years, 8 months

[ion] 20739: - Remove inline assembly and use assembly files isntead. These come from lib\rtl\i386... it woudl be nice to share them but atm this causes some problems. I think the math code in lib\rtl should be split into lib\math eventually...

by ion＠svn.reactos.org

- Remove inline assembly and use assembly files isntead. These come from lib\rtl\i386... it woudl be nice to share them but atm this causes some problems. I think the math code in lib\rtl should be split into lib\math eventually... Added: trunk/reactos/subsys/win32k/misc/i386/ Added: trunk/reactos/subsys/win32k/misc/i386/atan2_asm.s Added: trunk/reactos/subsys/win32k/misc/i386/ceil_asm.s Added: trunk/reactos/subsys/win32k/misc/i386/cos_asm.s Added: trunk/reactos/subsys/win32k/misc/i386/floor_asm.s Added: trunk/reactos/subsys/win32k/misc/i386/sin_asm.s Modified: trunk/reactos/subsys/win32k/misc/math.c _____ Added: trunk/reactos/subsys/win32k/misc/i386/atan2_asm.s --- trunk/reactos/subsys/win32k/misc/i386/atan2_asm.s 2006-01-08 22:50:11 UTC (rev 20738) +++ trunk/reactos/subsys/win32k/misc/i386/atan2_asm.s 2006-01-08 23:05:38 UTC (rev 20739) @@ -0,0 +1,52 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/atan.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl (ekohl(a)rz-online.de) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +.globl _atan2 + +.intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + +_atan2: + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fld qword ptr [ebp+16] // Load real from stack + fpatan // Take the arctangent + mov esp,ebp + pop ebp + ret _____ Added: trunk/reactos/subsys/win32k/misc/i386/ceil_asm.s --- trunk/reactos/subsys/win32k/misc/i386/ceil_asm.s 2006-01-08 22:50:11 UTC (rev 20738) +++ trunk/reactos/subsys/win32k/misc/i386/ceil_asm.s 2006-01-08 23:05:38 UTC (rev 20739) @@ -0,0 +1,58 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/ceil.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl (ekohl(a)rz-online.de) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +.globl _ceil + +.intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + +_ceil: + push ebp + mov ebp,esp + sub esp,4 // Allocate temporary space + fld qword ptr [ebp+8] // Load real from stack + fstcw [ebp-2] // Save control word + fclex // Clear exceptions + mov word ptr [ebp-4],0xb63 // Rounding control word + fldcw [ebp-4] // Set new rounding control + frndint // Round to integer + fclex // Clear exceptions + fldcw [ebp-2] // Restore control word + mov esp,ebp // Deallocate temporary space + pop ebp + ret _____ Added: trunk/reactos/subsys/win32k/misc/i386/cos_asm.s --- trunk/reactos/subsys/win32k/misc/i386/cos_asm.s 2006-01-08 22:50:11 UTC (rev 20738) +++ trunk/reactos/subsys/win32k/misc/i386/cos_asm.s 2006-01-08 23:05:38 UTC (rev 20739) @@ -0,0 +1,50 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/cos.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl (ekohl(a)rz-online.de) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +.globl _cos + +.intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + +_cos: + push ebp + mov ebp,esp // Point to the stack frame + fld qword ptr [ebp+8] // Load real from stack + fcos // Take the cosine + pop ebp + ret _____ Added: trunk/reactos/subsys/win32k/misc/i386/floor_asm.s --- trunk/reactos/subsys/win32k/misc/i386/floor_asm.s 2006-01-08 22:50:11 UTC (rev 20738) +++ trunk/reactos/subsys/win32k/misc/i386/floor_asm.s 2006-01-08 23:05:38 UTC (rev 20739) @@ -0,0 +1,58 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/floor.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl (ekohl(a)rz-online.de) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +.globl _floor + +.intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + +_floor: + push ebp + mov ebp,esp + sub esp,4 // Allocate temporary space + fld qword ptr [ebp+8] // Load real from stack + fstcw [ebp-2] // Save control word + fclex // Clear exceptions + mov word ptr [ebp-4],0x763 // Rounding control word + fldcw [ebp-4] // Set new rounding control + frndint // Round to integer + fclex // Clear exceptions + fldcw [ebp-2] // Restore control word + mov esp,ebp + pop ebp + ret _____ Added: trunk/reactos/subsys/win32k/misc/i386/sin_asm.s --- trunk/reactos/subsys/win32k/misc/i386/sin_asm.s 2006-01-08 22:50:11 UTC (rev 20738) +++ trunk/reactos/subsys/win32k/misc/i386/sin_asm.s 2006-01-08 23:05:38 UTC (rev 20739) @@ -0,0 +1,50 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/sin.S + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl (ekohl(a)rz-online.de) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +.globl _sin + +.intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + +_sin: + push ebp // Save register bp + mov ebp,esp // Point to the stack frame + fld qword ptr [ebp+8] // Load real from stack + fsin // Take the sine + pop ebp // Restore register bp + ret _____ Modified: trunk/reactos/subsys/win32k/misc/math.c --- trunk/reactos/subsys/win32k/misc/math.c 2006-01-08 22:50:11 UTC (rev 20738) +++ trunk/reactos/subsys/win32k/misc/math.c 2006-01-08 23:05:38 UTC (rev 20739) @@ -20,222 +20,6 @@ #include <w32k.h> -double atan (double __x); -double atan2 (double __y, double __x); -double ceil (double __x); -double cos (double __x); -double fabs (double __x); -double floor (double __x); -long _ftol (double fl); -double log (double __x); -double __log2 (double __x); -double pow (double __x, double __y); -double sin (double __x); -double sqrt (double __x); -double tan (double __x); -div_t div(int num, int denom); -int mod(int num, int denom); - -double atan (double __x) -{ - register double __value; - __asm __volatile__ - ("fld1\n\t" - "fpatan" - : "=t" (__value) : "0" (__x)); - - return __value; -} - -double atan2 (double __y, double __x) -{ - register double __value; - __asm __volatile__ - ("fpatan\n\t" - "fld %%st(0)" - : "=t" (__value) : "0" (__x), "u" (__y)); - - return __value; -} - -double ceil (double __x) -{ - register double __value; - __volatile unsigned short int __cw, __cwtmp; - - __asm __volatile ("fnstcw %0" : "=m" (__cw)); - __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */ - __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); - __asm __volatile ("fldcw %0" : : "m" (__cw)); - - return __value; -} - -double cos (double __x) -{ - register double __value; - __asm __volatile__ - ("fcos" - : "=t" (__value): "0" (__x)); - - return __value; -} - -double fabs (double __x) -{ - register double __value; - __asm __volatile__ - ("fabs" - : "=t" (__value) : "0" (__x)); - - return __value; -} - -double floor (double __x) -{ - register double __value; - __volatile unsigned short int __cw, __cwtmp; - - __asm __volatile ("fnstcw %0" : "=m" (__cw)); - __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */ - __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); - __asm __volatile ("fldcw %0" : : "m" (__cw)); - - return __value; -} - -long _ftol (double fl) -{ - return (long)fl; -} - -double log (double __x) -{ - register double __value; - __asm __volatile__ - ("fldln2\n\t" - "fxch\n\t" - "fyl2x" - : "=t" (__value) : "0" (__x)); - - return __value; -} - -double __log2 (double __x) -{ - register double __value; - __asm __volatile__ - ("fld1\n\t" - "fxch\n\t" - "fyl2x" - : "=t" (__value) : "0" (__x)); - - return __value; -} - -double pow (double __x, double __y) -{ - register double __value, __exponent; - long __p = (long) __y; - - if (__x == 0.0 && __y > 0.0) - return 0.0; - if (__y == (double) __p) - { - double __r = 1.0; - if (__p == 0) - return 1.0; - if (__p < 0) - { - __p = -__p; - __x = 1.0 / __x; - } - while (1) - { - if (__p & 1) - __r *= __x; - __p >>= 1; - if (__p == 0) - return __r; - __x *= __x; - } - /* NOTREACHED */ - } - __asm __volatile__ - ("fmul %%st(1) # y * log2(x)\n\t" - "fst %%st(1)\n\t" - "frndint # int(y * log2(x))\n\t" - "fxch\n\t" - "fsub %%st(1) # fract(y * log2(x))\n\t" - "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __value += 1.0; - __asm __volatile__ - ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); - - return __value; -} - -double sin (double __x) -{ - register double __value; - __asm __volatile__ - ("fsin" - : "=t" (__value) : "0" (__x)); - - return __value; -} - -double sqrt (double __x) -{ - register double __value; - __asm __volatile__ - ("fsqrt" - : "=t" (__value) : "0" (__x)); - - return __value; -} - -double tan (double __x) -{ - register double __value; - register double __value2 __attribute__ ((unused)); - __asm __volatile__ - ("fptan" - : "=t" (__value2), "=u" (__value) : "0" (__x)); - - return __value; -} - -div_t div(int num, int denom) -{ - div_t r; - if (num > 0 && denom < 0) { - num = -num; - denom = -denom; - } - r.quot = num / denom; - r.rem = num % denom; - if (num < 0 && denom > 0) - { - if (r.rem > 0) - { - r.quot++; - r.rem -= denom; - } - } - return r; -} - -int mod(int num, int denom) -{ - div_t dvt = div(num, denom); - return dvt.rem; -} - /* * FIXME! Is there a better algorithm. like FT_MulDiv *

18 years, 8 months

[hpoussin] 20738: Display the error message only in case of... error

by hpoussin＠svn.reactos.org

Display the error message only in case of... error Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2006-01-08 22:48:21 UTC (rev 20737) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2006-01-08 22:50:11 UTC (rev 20738) @@ -533,18 +533,20 @@ InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(DevInstRegKey, DesiredAccess, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoOpenDeviceRegistryKey(%wZ): Base key doesn't exist, exiting... (Status 0x%08lx)\n", &KeyName, Status); + ExFreePool(KeyNameBuffer); + return Status; + } ExFreePool(KeyNameBuffer); /* - * For driver key we're done now. Also if the base key doesn't - * exist we can bail out with error... + * For driver key we're done now. */ - if ((DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) || !NT_SUCCESS(Status)) - { - DPRINT1("IoOpenDeviceRegistryKey(): Base key doesn't exist, exiting...\n"); + if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) return Status; - } /* * Let's go further. For device key we must open "Device Parameters"

18 years, 8 months

[gedmurphy] 20737: Make the toolbar a bit more attractive.

by gedmurphy＠svn.reactos.org

Make the toolbar a bit more attractive. Modified: trunk/reactos/subsys/system/servman/En.rc Deleted: trunk/reactos/subsys/system/servman/res/buttons.bmp Added: trunk/reactos/subsys/system/servman/res/toolbar.bmp Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-08 22:48:21 UTC (rev 20737) @@ -67,7 +67,7 @@ CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END -IDB_BUTTONS BITMAP "res/buttons.bmp" +IDB_BUTTONS BITMAP "res/toolbar.bmp" STRINGTABLE DISCARDABLE BEGIN @@ -118,4 +118,7 @@ IDS_TOOLTIP_STOP "Stop service" IDS_TOOLTIP_PAUSE "Pause service" IDS_TOOLTIP_RESTART "Restart service" + IDS_TOOLTIP_NEW "Create a service" + IDS_TOOLTIP_HELP "Help" + IDS_TOOLTIP_EXIT "Exit" END _____ Deleted: trunk/reactos/subsys/system/servman/res/buttons.bmp (Binary files differ) _____ Added: trunk/reactos/subsys/system/servman/res/toolbar.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/servman/res/toolbar.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-08 22:48:21 UTC (rev 20737) @@ -9,16 +9,18 @@ #define IDC_TOOLBAR 1001 #define IDC_STATUSBAR 1002 -#define ID_PROP 4010 -#define ID_REFRESH 4011 -#define ID_EXPORT 4012 +#define ID_PROP 2000 +#define ID_REFRESH 2001 +#define ID_EXPORT 2002 +#define ID_START 2003 +#define ID_STOP 2004 +#define ID_PAUSE 2005 +#define ID_RESUME 2006 +#define ID_RESTART 2007 +#define ID_NEW 2008 +#define ID_HELP 2009 +#define ID_EXIT 2010 -#define ID_START 2000 -#define ID_STOP 2001 -#define ID_PAUSE 2002 -#define ID_RESUME 2003 -#define ID_RESTART 2004 - #define IDR_MAINMENU 102 #define ID_FILE_EXIT 4001 #define ID_VIEW_CUSTOMIZE 4021 @@ -37,34 +39,42 @@ #define IDS_TOOLTIP_STOP 6004 #define IDS_TOOLTIP_PAUSE 6005 #define IDS_TOOLTIP_RESTART 6006 +#define IDS_TOOLTIP_NEW 6007 +#define IDS_TOOLTIP_HELP 6008 +#define IDS_TOOLTIP_EXIT 6009 - #define IDS_SERVICES_STATUS_RUNNING 5000 #define IDS_SERVICES_STATUS_STOPPED 5001 -#define IDS_SERVICES_YES 5002 +#define IDS_SERVICES_YES 5002 #define IDS_SERVICES_UNKNOWN 5003 -#define IDS_SERVICES_AUTO 5004 -#define IDS_SERVICES_MAN 5005 -#define IDS_SERVICES_DIS 5006 +#define IDS_SERVICES_AUTO 5004 +#define IDS_SERVICES_MAN 5005 +#define IDS_SERVICES_DIS 5006 #define IDS_SERVICES_NUM_SERVICES 5010 #define IDI_SM_ICON 50 #define IDB_BUTTONS 51 -#define TBICON_START 2 -#define TBICON_STOP 3 -#define TBICON_PAUSE 0 -#define TBICON_RESTART 1 +#define TBICON_PROP 0 +#define TBICON_REFRESH 1 +#define TBICON_EXPORT 2 +#define TBICON_START 3 +#define TBICON_STOP 4 +#define TBICON_PAUSE 5 +#define TBICON_RESTART 6 +#define TBICON_NEW 7 +#define TBICON_HELP 8 +#define TBICON_EXIT 9 -#define IDS_PROP_SHEET 10000 -#define IDD_DLG_GENERAL 10001 -#define IDC_SERV_NAME 10041 -#define IDC_DISP_NAME 10051 -#define IDC_DESCRIPTION 10061 -#define IDC_START_TYPE 10101 -#define IDC_SERV_STATUS 10121 -#define IDC_START 10131 -#define IDC_STOP 10141 -#define IDC_PAUSE 10151 -#define IDC_RESUME 10161 -#define IDC_START_PARAM 10191 +#define IDS_PROP_SHEET 10000 +#define IDD_DLG_GENERAL 10001 +#define IDC_SERV_NAME 10041 +#define IDC_DISP_NAME 10051 +#define IDC_DESCRIPTION 10061 +#define IDC_START_TYPE 10101 +#define IDC_SERV_STATUS 10121 +#define IDC_START 10131 +#define IDC_STOP 10141 +#define IDC_PAUSE 10151 +#define IDC_RESUME 10161 +#define IDC_START_PARAM 10191 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-08 22:48:21 UTC (rev 20737) @@ -37,9 +37,9 @@ /* Toolbar buttons */ TBBUTTON tbb [NUM_BUTTONS] = { // iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString - {STD_PROPERTIES, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ - {STD_FILENEW, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ - {STD_FILENEW, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ + {TBICON_PROP, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ + {TBICON_REFRESH, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ + {TBICON_EXPORT, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* export */ /* Note: First item for a seperator is its width in pixels */ {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ @@ -48,6 +48,13 @@ {TBICON_STOP, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ {TBICON_PAUSE, ID_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ {TBICON_RESTART, ID_RESTART, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ + + {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ + {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ + {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ + }; /* ======================== Create Toolbar ============================== */ @@ -76,11 +83,17 @@ /* Add custom images */ tbab.hInst = hInstance; tbab.nID = IDB_BUTTONS; - iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 4, (LPARAM)&tbab); + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 11, (LPARAM)&tbab); + tbb[0].iBitmap += iImageOffset; /* properties */ + tbb[1].iBitmap += iImageOffset; /* refresh */ + tbb[2].iBitmap += iImageOffset; /* export */ tbb[4].iBitmap += iImageOffset; /* start */ tbb[5].iBitmap += iImageOffset; /* stop */ - tbb[6].iBitmap += iImageOffset; /* pause */ + tbb[6].iBitmap += iImageOffset; /* pause */ tbb[7].iBitmap += iImageOffset; /* restart */ + tbb[9].iBitmap += iImageOffset; /* new */ + tbb[10].iBitmap += iImageOffset; /* help */ + tbb[11].iBitmap += iImageOffset; /* exit */ /* Add buttons to toolbar */ SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); @@ -260,7 +273,19 @@ case ID_RESTART: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_RESTART); break; + + case ID_NEW: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEW); + break; + case ID_HELP: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); + break; + + case ID_EXIT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); + break; + } } break; _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-08 22:14:26 UTC (rev 20736) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-08 22:48:21 UTC (rev 20737) @@ -9,7 +9,7 @@ #include "resource.h" #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 8 +#define NUM_BUTTONS 12 BOOL RefreshServiceList(VOID);

18 years, 8 months

[gvg] 20736: Obtain DHCP info from DHCP client service

by gvg＠svn.reactos.org

Obtain DHCP info from DHCP client service Modified: trunk/reactos/include/libs/dhcp/rosdhcp_public.h Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml Added: trunk/reactos/lib/iphlpapi/dhcp.h Added: trunk/reactos/lib/iphlpapi/dhcp_reactos.c Modified: trunk/reactos/lib/iphlpapi/iphlpapi.xml Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/services/dhcp/api.c Modified: trunk/reactos/services/dhcp/dhclient.c Modified: trunk/reactos/services/dhcp/include/dhcpd.h Modified: trunk/reactos/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/services/dhcp/pipe.c _____ Modified: trunk/reactos/include/libs/dhcp/rosdhcp_public.h --- trunk/reactos/include/libs/dhcp/rosdhcp_public.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/include/libs/dhcp/rosdhcp_public.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -7,6 +7,7 @@ DhcpReqReleaseIpAddress, DhcpReqRenewIpAddress, DhcpReqStaticRefreshParams, + DhcpReqGetAdapterInfo, }; typedef struct _COMM_DHCP_REQ { @@ -39,6 +40,12 @@ DWORD Mtu; DWORD Speed; } QueryHWInfo; + struct { + BOOL DhcpEnabled; + DWORD DhcpServer; + time_t LeaseObtained; + time_t LeaseExpires; + } GetAdapterInfo; } COMM_DHCP_REPLY; #define DHCP_PIPE_NAME "\\\\.\\pipe\\dhcpclient" _____ Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -12,6 +12,7 @@ #include <roscfg.h> #include <winsock2.h> #include <dhcpcsdk.h> +#include <time.h> #include <dhcp/rosdhcp_public.h> #define DHCP_TIMEOUT 1000 @@ -117,6 +118,70 @@ return Reply.Reply; } +/*++ + * @name DhcpRosGetAdapterInfo + * @implemented ReactOS only + * + * Get DHCP info for an adapter + * + * @param AdapterIndex + * Index of the adapter (iphlpapi-style) for which info is + * requested + * + * @param DhcpEnabled + * Returns whether DHCP is enabled for the adapter + * + * @param DhcpServer + * Returns DHCP server IP address (255.255.255.255 if no + * server reached yet), in network byte order + * + * @param LeaseObtained + * Returns time at which the lease was obtained + * + * @param LeaseExpires + * Returns time at which the lease will expire + * + * @return non-zero on success + * + * @remarks This is a ReactOS-only routine + * + *--*/ +DWORD APIENTRY DhcpRosGetAdapterInfo( DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires ) +{ + COMM_DHCP_REQ Req; + COMM_DHCP_REPLY Reply; + DWORD BytesRead; + BOOL Result; + + Req.Type = DhcpReqGetAdapterInfo; + Req.AdapterIndex = AdapterIndex; + + Result = CallNamedPipe + ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), + &BytesRead, DHCP_TIMEOUT ); + + if ( 0 != Result && 0 != Reply.Reply ) { + *DhcpEnabled = Reply.GetAdapterInfo.DhcpEnabled; + } else { + *DhcpEnabled = FALSE; + } + if ( *DhcpEnabled ) { + *DhcpServer = Reply.GetAdapterInfo.DhcpServer; + *LeaseObtained = Reply.GetAdapterInfo.LeaseObtained; + *LeaseExpires = Reply.GetAdapterInfo.LeaseExpires; + } else { + *DhcpServer = INADDR_NONE; + *LeaseObtained = 0; + *LeaseExpires = 0; + } + + return Reply.Reply; +} + INT STDCALL DllMain(PVOID hinstDll, ULONG dwReason, _____ Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def 2006-01-08 22:14:26 UTC (rev 20736) @@ -1,16 +0,0 @@ -; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $ -; -; dhcpcsvc.def -; -; ReactOS Operating System -; -LIBRARY dhcpcsvc.dll -EXPORTS -DhcpCApiInitialize@4 -DhcpCApiCleanup@0 -DhcpQueryHWInfo@16 -DhcpLeaseIpAddress@4 -DhcpReleaseIpAddressLease@4 -DhcpRenewIpAddressLease@4 -DhcpStaticRefreshParams@12 -; EOF _____ Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.spec 2006-01-08 22:14:26 UTC (rev 20736) @@ -0,0 +1,47 @@ +# +# PROJECT: ReactOS Networking +# LICENSE: GPL - See COPYING in the top level directory +# FILE: lib/dhcpcsvc/dhcpcsvc.spec +# PURPOSE: dhcpcsvc exports +# COPYRIGHT: Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> +# +@ stub DhcpAcquireParameters +@ stub DhcpAcquireParametersByBroadcast +@ stdcall DhcpCApiCleanup() +@ stdcall DhcpCApiInitialize(ptr) +@ stub DhcpDelPersistentRequestParams +@ stub DhcpDeRegisterOptions +@ stub DhcpDeRegisterParamChange +@ stub DhcpEnumClasses +@ stub DhcpFallbackRefreshParams +@ stub DhcpHandlePnPEvent +@ stdcall DhcpLeaseIpAddress(long) +@ stub DhcpLeaseIpAddressEx +@ stub DhcpNotifyConfigChange +@ stub DhcpNotifyConfigChangeEx +@ stub DhcpNotifyMediaReconnected +@ stub DhcpOpenGlobalEvent +@ stub DhcpPersistentRequestParams +@ stdcall DhcpQueryHWInfo(long ptr ptr ptr) +@ stub DhcpRegisterOptions +@ stub DhcpRegisterParamChange +@ stdcall DhcpReleaseIpAddressLease(long) +@ stub DhcpReleaseIpAddressLeaseEx +@ stub DhcpReleaseParameters +@ stub DhcpRemoveDNSRegistrations +@ stdcall DhcpRenewIpAddressLease(long) +@ stub DhcpRenewIpAddressLeaseEx +@ stub DhcpRequestOptions +@ stub DhcpRequestParams +@ stdcall DhcpStaticRefreshParams(long long long) +@ stub DhcpUndoRequestParams +@ stub McastApiCleanup +@ stub McastApiStartup +@ stub McastEnumerateScopes +@ stub McastGenUID +@ stub McastReleaseAddress +@ stub McastRenewAddress +@ stub McastRequestAddress +@ stdcall DhcpRosGetAdapterInfo(long ptr ptr ptr ptr) +# The Windows DHCP client service is implemented in the DLL too +#@ stub ServiceMain _____ Modified: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml --- trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml 2006-01-08 22:14:26 UTC (rev 20736) @@ -1,5 +1,5 @@ <module name="dhcpcsvc" type="win32dll" installbase="system32" installname="dhcpcsvc.dll"> - <importlibrary definition="dhcpcsvc.def" /> + <importlibrary definition="dhcpcsvc.spec.def" /> <include base="dhcpcsvc">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> @@ -11,4 +11,5 @@ <library>iphlpapi</library> <file>dhcpcsvc.c</file> <file>dhcpcsvc.rc</file> + <file>dhcpcsvc.spec</file> </module> _____ Added: trunk/reactos/lib/iphlpapi/dhcp.h --- trunk/reactos/lib/iphlpapi/dhcp.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/dhcp.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS Networking + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/iphlpapi/dhcp_reactos.c + * PURPOSE: DHCP helper functions for ReactOS + * COPYRIGHT: Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> + */ + +#ifndef WINE_DHCP_H_ +#define WINE_DHCP_H_ + +DWORD getDhcpInfoForAdapter(DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires); + +#endif /* ndef WINE_DHCP_H_ */ Property changes on: trunk/reactos/lib/iphlpapi/dhcp.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/iphlpapi/dhcp_reactos.c --- trunk/reactos/lib/iphlpapi/dhcp_reactos.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/dhcp_reactos.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS Networking + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/iphlpapi/dhcp_reactos.c + * PURPOSE: DHCP helper functions for ReactOS + * COPYRIGHT: Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> + */ + +#include "iphlpapi_private.h" +#include "dhcp.h" +#include <assert.h> + +#define NDEBUG +#include "debug.h" + +DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires); + +DWORD getDhcpInfoForAdapter(DWORD AdapterIndex, + PBOOL DhcpEnabled, + PDWORD DhcpServer, + time_t *LeaseObtained, + time_t *LeaseExpires) +{ + return DhcpRosGetAdapterInfo(AdapterIndex, DhcpEnabled, DhcpServer, + LeaseObtained, LeaseExpires); +} Property changes on: trunk/reactos/lib/iphlpapi/dhcp_reactos.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi.xml --- trunk/reactos/lib/iphlpapi/iphlpapi.xml 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/iphlpapi.xml 2006-01-08 22:14:26 UTC (rev 20736) @@ -11,6 +11,8 @@ <library>kernel32</library> <library>advapi32</library> <library>ws2_32</library> + <library>dhcpcsvc</library> + <file>dhcp_reactos.c</file> <file>ifenum_reactos.c</file> <file>ipstats_reactos.c</file> <file>iphlpapi_main.c</file> _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c --- trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -42,6 +42,7 @@ #include "winbase.h" #include "winreg.h" #include "iphlpapi.h" +#include "dhcp.h" #include "ifenum.h" #include "ipstats.h" #include "resinfo.h" @@ -559,6 +560,8 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) { DWORD ret; + BOOL dhcpEnabled; + DWORD dhcpServer; TRACE("pAdapterInfo %p, pOutBufLen %p\n", pAdapterInfo, pOutBufLen); if (!pOutBufLen) @@ -637,6 +640,12 @@ ptr->IpAddressList.IpAddress.String); toIPAddressString(getInterfaceMaskByIndex(table->indexes[ndx]), ptr->IpAddressList.IpMask.String); + getDhcpInfoForAdapter(table->indexes[ndx], &dhcpEnabled, + &dhcpServer, &ptr->LeaseObtained, + &ptr->LeaseExpires); + ptr->DhcpEnabled = (DWORD) dhcpEnabled; + toIPAddressString(dhcpServer, + ptr->DhcpServer.IpAddress.String); if (winsEnabled) { ptr->HaveWins = TRUE; memcpy(ptr->PrimaryWinsServer.IpAddress.String, _____ Modified: trunk/reactos/services/dhcp/api.c --- trunk/reactos/services/dhcp/api.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/api.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -11,6 +11,9 @@ #include <winsock2.h> #include <iphlpapi.h> +#define NDEBUG +#include <reactos/debug.h> + static CRITICAL_SECTION ApiCriticalSection; VOID ApiInit() { @@ -140,3 +143,40 @@ return Send( &Reply ); } + +DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { + COMM_DHCP_REPLY Reply; + PDHCP_ADAPTER Adapter; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.Reply = Adapter ? 1 : 0; + + if( Adapter ) { + Reply.GetAdapterInfo.DhcpEnabled = (S_STATIC != Adapter->DhclientState.state); + if (S_BOUND == Adapter->DhclientState.state) { + if (sizeof(Reply.GetAdapterInfo.DhcpServer) == + Adapter->DhclientState.active->serveraddress.len) { + memcpy(&Reply.GetAdapterInfo.DhcpServer, + Adapter->DhclientState.active->serveraddress.iabuf, + Adapter->DhclientState.active->serveraddress.len); + } else { + DPRINT1("Unexpected server address len %d\n", + Adapter->DhclientState.active->serveraddress.len); + Reply.GetAdapterInfo.DhcpServer = htonl(INADDR_NONE); + } + Reply.GetAdapterInfo.LeaseObtained = Adapter->DhclientState.active->obtained; + Reply.GetAdapterInfo.LeaseExpires = Adapter->DhclientState.active->expiry; + } else { + Reply.GetAdapterInfo.DhcpServer = htonl(INADDR_NONE); + Reply.GetAdapterInfo.LeaseObtained = 0; + Reply.GetAdapterInfo.LeaseExpires = 0; + } + } + + ApiUnlock(); + + return Send( &Reply ); +} _____ Modified: trunk/reactos/services/dhcp/dhclient.c --- trunk/reactos/services/dhcp/dhclient.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/dhclient.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -420,6 +420,9 @@ ip->client->new->rebind = ip->client->new->renewal + ip->client->new->renewal / 2 + ip->client->new->renewal / 4; +#ifdef _REACTOS_ + ip->client->new->obtained = cur_time; +#endif ip->client->new->expiry += cur_time; /* Lease lengths can never be negative. */ if (ip->client->new->expiry < cur_time) @@ -809,6 +812,10 @@ lease->address.len = sizeof(packet->raw->yiaddr); memcpy(lease->address.iabuf, &packet->raw->yiaddr, lease->address.len); +#ifdef _REACTOS_ + lease->serveraddress.len = sizeof(packet->raw->siaddr); + memcpy(lease->serveraddress.iabuf, &packet->raw->siaddr, lease->address.len); +#endif /* If the server name was filled out, copy it. */ if ((!packet->options[DHO_DHCP_OPTION_OVERLOAD].len || _____ Modified: trunk/reactos/services/dhcp/include/dhcpd.h --- trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -158,6 +158,10 @@ time_t expiry, renewal, rebind; struct iaddr address; char *server_name; +#ifdef _REACTOS_ + time_t obtained; + struct iaddr serveraddress; +#endif char *filename; struct string_list *medium; unsigned int is_static : 1; _____ Modified: trunk/reactos/services/dhcp/include/rosdhcp.h --- trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 22:14:26 UTC (rev 20736) @@ -67,6 +67,8 @@ extern DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSGetAdapterInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ); extern int inet_aton(const char *s, struct in_addr *addr); int warn( char *format, ... ); #endif/*ROSDHCP_H*/ _____ Modified: trunk/reactos/services/dhcp/pipe.c --- trunk/reactos/services/dhcp/pipe.c 2006-01-08 21:38:13 UTC (rev 20735) +++ trunk/reactos/services/dhcp/pipe.c 2006-01-08 22:14:26 UTC (rev 20736) @@ -9,6 +9,9 @@ #include <rosdhcp.h> +#define NDEBUG +#include <reactos/debug.h> + static HANDLE CommPipe = INVALID_HANDLE_VALUE, CommThread; DWORD CommThrId; @@ -30,8 +33,8 @@ DWORD WINAPI PipeThreadProc( LPVOID Parameter ) { DWORD BytesRead, BytesWritten; COMM_DHCP_REQ Req; - BOOL Result; - BOOLEAN Connection; + COMM_DHCP_REPLY Reply; + BOOL Result, Connection; while( (Connection = ConnectNamedPipe( CommPipe, NULL )) ) { Result = ReadFile( CommPipe, &Req, sizeof(Req), &BytesRead, NULL ); @@ -52,6 +55,21 @@ case DhcpReqRenewIpAddress: BytesWritten = DSRenewIpAddressLease( PipeSend, &Req ); break; + + case DhcpReqStaticRefreshParams: + BytesWritten = DSStaticRefreshParams( PipeSend, &Req ); + break; + + case DhcpReqGetAdapterInfo: + BytesWritten = DSGetAdapterInfo( PipeSend, &Req ); + break; + + default: + DPRINT1("Unrecognized request type %d\n", Req.Type); + ZeroMemory( &Reply, sizeof( COMM_DHCP_REPLY ) ); + Reply.Reply = 0; + BytesWritten = PipeSend( &Reply ); + break; } } DisconnectNamedPipe( CommPipe );

18 years, 8 months

[frik85] 20735: add support for swedish and italian languages

by frik85＠svn.reactos.org

add support for swedish and italian languages Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/structure.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php 2006-01-08 21:32:30 UTC (rev 20734) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/it.php 2006-01-08 21:38:13 UTC (rev 20735) @@ -62,7 +62,7 @@ // myReactOS Content -$roscms_langres['myReactOS_description'] = 'Un'interfaccia potente e facile da usare per gestire il tuo ReactOS homepage account.'; +$roscms_langres['myReactOS_description'] = 'Un interfaccia potente e facile da usare per gestire il tuo ReactOS homepage account.'; $roscms_langres['Account_Information'] = 'Informazioni Account'; $roscms_langres['Account_Information_description'] = 'Un riassunto delle informazioni sul tuo account ... &ltda supportare>'; _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/structure.php --- trunk/web/reactos.org/htdocs/roscms/inc/structure.php 2006-01-08 21:32:30 UTC (rev 20734) +++ trunk/web/reactos.org/htdocs/roscms/inc/structure.php 2006-01-08 21:38:13 UTC (rev 20735) @@ -127,6 +127,9 @@ <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=de">Deutsch (German)</option> <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=fr">Franþais (French)</option> <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=ru">Russian (Russian)</option> + <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=es">Spanish</option> + <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=sv">Swedish</option> + <option value="<?php echo $roscms_intern_path_server; ?>?page=<?php echo $rpm_page; ?>&lang=it">Italian</option> </optgroup> </select> </div>

18 years, 8 months

[frik85] 20734: add support for swedish and italian languages

by frik85＠svn.reactos.org

add support for swedish and italian languages Modified: trunk/web/reactos.org/htdocs/roscms/index.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/index.php --- trunk/web/reactos.org/htdocs/roscms/index.php 2006-01-08 21:26:34 UTC (rev 20733) +++ trunk/web/reactos.org/htdocs/roscms/index.php 2006-01-08 21:32:30 UTC (rev 20734) @@ -126,6 +126,8 @@ case 'fr': case 'ru': case 'es': + case 'sv': + case 'it': break; default: $checked_lang = ''; @@ -228,6 +230,24 @@ $rpm_lang_session="ru/"; $rpm_lang="ru"; } + $var = ""; + $var = strchr($roscms_referrer, "/es/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="es/"; + $rpm_lang="ru"; + } + $var = ""; + $var = strchr($roscms_referrer, "/sv/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="sv/"; + $rpm_lang="ru"; + } + $var = ""; + $var = strchr($roscms_referrer, "/it/"); + if ($var != "" AND $rpm_lang == "") { + $rpm_lang_session="it/"; + $rpm_lang="ru"; + } if ($rpm_lang == "") { $rpm_lang_session="en/"; $rpm_lang="en";

18 years, 8 months

← Newer
1
...
32
33
34
35
36
37
38
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006