Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by ion＠svn.reactos.com

remove debug message Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-25 00:04:12 UTC (rev 15489) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-25 01:49:50 UTC (rev 15490) @@ -570,7 +570,7 @@ Tag[3] = TypeName->Buffer[3]; /* Set Tag */ - DPRINT1("Convert: %s \n", Tag); + DPRINT("Convert: %s \n", Tag); LocalObjectType->Key = *(PULONG)Tag; }

19 years, 3 months

[greatlrd] 15489: Add 24bits mode strings

by greatlrd＠svn.reactos.com

Add 24bits mode strings hope it fix qemu Modified: trunk/reactos/lib/cpl/desk/en.rc Modified: trunk/reactos/lib/cpl/desk/resource.h Modified: trunk/reactos/lib/cpl/desk/settings.c Modified: trunk/reactos/lib/cpl/desk/sv.rc _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-05-24 22:29:00 UTC (rev 15488) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-05-25 00:04:12 UTC (rev 15489) @@ -98,7 +98,7 @@ IDS_COLOR_4BIT "16 Colors" IDS_COLOR_8BIT "256 Colors" IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_32BIT "True Color (24 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2005-05-24 22:29:00 UTC (rev 15488) +++ trunk/reactos/lib/cpl/desk/resource.h 2005-05-25 00:04:12 UTC (rev 15489) @@ -61,6 +61,7 @@ #define IDS_COLOR_4BIT 2904 #define IDS_COLOR_8BIT 2908 #define IDS_COLOR_16BIT 2916 +#define IDS_COLOR_24BIT 2924 #define IDS_COLOR_32BIT 2932 #endif /* __CPL_DESK_RESOURCE_H__ */ _____ Modified: trunk/reactos/lib/cpl/desk/settings.c --- trunk/reactos/lib/cpl/desk/settings.c 2005-05-24 22:29:00 UTC (rev 15488) +++ trunk/reactos/lib/cpl/desk/settings.c 2005-05-25 00:04:12 UTC (rev 15489) @@ -62,14 +62,18 @@ LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); _stprintf(Buffer, Pixel, CurrentDisplayDevice->CurrentSettings->dmPelsWidth, CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); - + + for (index = 0; index < CurrentDisplayDevice->ResolutionsCount; index++) + { + if (CurrentDisplayDevice->Resolutions[index].dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth && CurrentDisplayDevice->Resolutions[index].dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight) { SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETPOS, TRUE, index); break; } + } if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); } _____ Modified: trunk/reactos/lib/cpl/desk/sv.rc --- trunk/reactos/lib/cpl/desk/sv.rc 2005-05-24 22:29:00 UTC (rev 15488) +++ trunk/reactos/lib/cpl/desk/sv.rc 2005-05-25 00:04:12 UTC (rev 15489) @@ -76,7 +76,7 @@ IDS_COLOR_4BIT "16 fõrger" IDS_COLOR_8BIT "256 fõrger" IDS_COLOR_16BIT "65 536 fõrger (16 Bit)" - IDS_COLOR_32BIT "16,7 miljoner fõrger (24 Bit)" + IDS_COLOR_24BIT "16,7 miljoner fõrger (24 Bit)" IDS_COLOR_32BIT "16,7 miljoner fõrger (32 Bit)" IDS_PIXEL "%lux%lu Pixlar" END

19 years, 3 months

[gvg] 15488: Wine-20050524 vendor drop

by gvg＠svn.reactos.com

Wine-20050524 vendor drop Modified: vendor/wine/dlls/cabinet/current/Makefile.in Modified: vendor/wine/dlls/cabinet/current/cabinet.h Modified: vendor/wine/dlls/cabinet/current/fci.c Modified: vendor/wine/dlls/comctl32/current/Makefile.in Modified: vendor/wine/dlls/comctl32/current/comboex.c Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/current/datetime.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/hotkey.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/ipaddress.c Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/monthcal.c Modified: vendor/wine/dlls/comctl32/current/tab.c Modified: vendor/wine/dlls/comctl32/current/toolbar.c Modified: vendor/wine/dlls/comctl32/current/updown.c Modified: vendor/wine/dlls/commdlg/current/Makefile.in Modified: vendor/wine/dlls/commdlg/current/commdlg.spec Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.c Modified: vendor/wine/dlls/commdlg/current/fontdlg.c Deleted: vendor/wine/dlls/commdlg/current/generic.c Modified: vendor/wine/dlls/dinput/current/Makefile.in Modified: vendor/wine/dlls/dinput/current/device.c Modified: vendor/wine/dlls/dinput/current/dinput_main.c Modified: vendor/wine/dlls/dinput/current/dinput_private.h Modified: vendor/wine/dlls/dinput/current/joystick_linux.c Modified: vendor/wine/dlls/dinput/current/joystick_linuxinput.c Modified: vendor/wine/dlls/dinput/current/keyboard.c Modified: vendor/wine/dlls/dinput/current/mouse.c Modified: vendor/wine/dlls/dinput8/current/Makefile.in Modified: vendor/wine/dlls/dsound/current/Makefile.in Modified: vendor/wine/dlls/dsound/current/buffer.c Modified: vendor/wine/dlls/dsound/current/dsound.c Modified: vendor/wine/dlls/dsound/current/dsound.spec Modified: vendor/wine/dlls/dsound/current/dsound_main.c Modified: vendor/wine/dlls/dsound/current/dsound_private.h Modified: vendor/wine/dlls/dsound/current/mixer.c Modified: vendor/wine/dlls/dsound/current/primary.c Modified: vendor/wine/dlls/dsound/current/propset.c Modified: vendor/wine/dlls/dsound/current/regsvr.c Modified: vendor/wine/dlls/icmp/current/Makefile.in Modified: vendor/wine/dlls/mpr/current/Makefile.in Modified: vendor/wine/dlls/msi/current/Makefile.in Modified: vendor/wine/dlls/msi/current/action.c Modified: vendor/wine/dlls/msi/current/action.h Modified: vendor/wine/dlls/msi/current/appsearch.c Modified: vendor/wine/dlls/msi/current/cond.y Modified: vendor/wine/dlls/msi/current/create.c Modified: vendor/wine/dlls/msi/current/custom.c Modified: vendor/wine/dlls/msi/current/database.c Modified: vendor/wine/dlls/msi/current/dialog.c Modified: vendor/wine/dlls/msi/current/insert.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.spec Modified: vendor/wine/dlls/msi/current/msi_Fr.rc Modified: vendor/wine/dlls/msi/current/msipriv.h Modified: vendor/wine/dlls/msi/current/msiquery.c Modified: vendor/wine/dlls/msi/current/order.c Modified: vendor/wine/dlls/msi/current/package.c Modified: vendor/wine/dlls/msi/current/query.h Modified: vendor/wine/dlls/msi/current/record.c Modified: vendor/wine/dlls/msi/current/registry.c Modified: vendor/wine/dlls/msi/current/sql.y Modified: vendor/wine/dlls/msi/current/suminfo.c Modified: vendor/wine/dlls/msi/current/table.c Modified: vendor/wine/dlls/msi/current/tokenize.c Modified: vendor/wine/dlls/msi/current/update.c Modified: vendor/wine/dlls/msi/current/version.rc Modified: vendor/wine/dlls/msi/current/where.c Modified: vendor/wine/dlls/msimg32/current/Makefile.in Modified: vendor/wine/dlls/ole32/current/Makefile.in Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/compositemoniker.c Modified: vendor/wine/dlls/ole32/current/filemoniker.c Modified: vendor/wine/dlls/ole32/current/ftmarshal.c Modified: vendor/wine/dlls/ole32/current/git.c Modified: vendor/wine/dlls/ole32/current/hglobalstream.c Modified: vendor/wine/dlls/ole32/current/itemmoniker.c Modified: vendor/wine/dlls/ole32/current/marshal.c Modified: vendor/wine/dlls/ole32/current/moniker.c Modified: vendor/wine/dlls/ole32/current/moniker.h Modified: vendor/wine/dlls/ole32/current/ole16.c Modified: vendor/wine/dlls/ole32/current/ole2.c Modified: vendor/wine/dlls/ole32/current/ole2_16.c Modified: vendor/wine/dlls/ole32/current/ole2thk.spec Modified: vendor/wine/dlls/ole32/current/ole32.spec Modified: vendor/wine/dlls/ole32/current/ole32_main.c Deleted: vendor/wine/dlls/ole32/current/ole32_main.h Modified: vendor/wine/dlls/ole32/current/oleobj.c Modified: vendor/wine/dlls/ole32/current/oleproxy.c Modified: vendor/wine/dlls/ole32/current/stg_prop.c Modified: vendor/wine/dlls/ole32/current/storage32.c Modified: vendor/wine/dlls/ole32/current/storage32.h Modified: vendor/wine/dlls/oleaut32/current/Makefile.in Modified: vendor/wine/dlls/oleaut32/current/oleaut32_Fr.rc Modified: vendor/wine/dlls/oleaut32/current/olepicture.c Modified: vendor/wine/dlls/oleaut32/current/tmarshal.c Modified: vendor/wine/dlls/oleaut32/current/variant.c [truncated at 100 lines; 89 more skipped] _____ Modified: vendor/wine/dlls/cabinet/current/Makefile.in --- vendor/wine/dlls/cabinet/current/Makefile.in 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/cabinet/current/Makefile.in 2005-05-24 22:29:00 UTC (rev 15488) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cabinet.dll +IMPORTLIB = libcabinet.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ _____ Modified: vendor/wine/dlls/cabinet/current/cabinet.h --- vendor/wine/dlls/cabinet/current/cabinet.h 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/cabinet/current/cabinet.h 2005-05-24 22:29:00 UTC (rev 15488) @@ -2,6 +2,7 @@ * cabinet.h * * Copyright 2002 Greg Turner + * Copyright 2005 Gerold Jens Wucherpfennig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -292,6 +293,19 @@ typedef struct { unsigned int FCI_Intmagic; + PERF perf; + PFNFCIFILEPLACED pfnfiledest; + PFNFCIALLOC pfnalloc; + PFNFCIFREE pfnfree; + PFNFCIOPEN pfnopen; + PFNFCIREAD pfnread; + PFNFCIWRITE pfnwrite; + PFNFCICLOSE pfnclose; + PFNFCISEEK pfnseek; + PFNFCIDELETE pfndelete; + PFNFCIGETTEMPFILE pfnfcigtf; + PCCAB pccab; + void *pv; } FCI_Int, *PFCI_Int; typedef struct { @@ -307,7 +321,7 @@ } FDI_Int, *PFDI_Int; /* cast an HFCI into a PFCI_Int */ -#define PFCI_INT(hfci) ((PFDI_Int)(hfci)) +#define PFCI_INT(hfci) ((PFCI_Int)(hfci)) /* cast an HFDI into a PFDI_Int */ #define PFDI_INT(hfdi) ((PFDI_Int)(hfdi)) _____ Modified: vendor/wine/dlls/cabinet/current/fci.c --- vendor/wine/dlls/cabinet/current/fci.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/cabinet/current/fci.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -2,6 +2,7 @@ * File Compression Interface * * Copyright 2002 Patrik Stridvall + * Copyright 2005 Gerold Jens Wucherpfennig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "fci.h" +#include "cabinet.h" #include "wine/debug.h" @@ -33,12 +35,55 @@ /*********************************************************************** * FCICreate (CABINET.10) + * + * Provided with several callbacks, + * returns a handle which can be used to perform operations + * on cabinet files. + * + * PARAMS + * perf [IO] A pointer to an ERF structure. When FCICreate + * returns an error condition, error information may + * be found here as well as from GetLastError. + * pfnfiledest [I] A pointer to a function which is called when a file + * is placed. Only useful for subsequent cabinet files. + * pfnalloc [I] A pointer to a function which allocates ram. Uses + * the same interface as malloc. + * pfnfree [I] A pointer to a function which frees ram. Uses the + * same interface as free. + * pfnopen [I] A pointer to a function which opens a file. Uses + * the same interface as _open. + * pfnread [I] A pointer to a function which reads from a file into + * a caller-provided buffer. Uses the same interface + * as _read + * pfnwrite [I] A pointer to a function which writes to a file from + * a caller-provided buffer. Uses the same interface + * as _write. + * pfnclose [I] A pointer to a function which closes a file handle. + * Uses the same interface as _close. + * pfnseek [I] A pointer to a function which seeks in a file. + * Uses the same interface as _lseek. + * pfndelete [I] A pointer to a function which deletes a file. + * pfnfcigtf [I] A pointer to a function which gets the name of a + * temporary file; ignored in wine + * pccab [I] A pointer to an initialized CCAB structure + * pv [I] A pointer to an application-defined notification + * function which will be passed to other FCI functions + * as a parameter. + * + * RETURNS + * On success, returns an FCI handle of type HFCI. + * On failure, the NULL file handle is returned. Error + * info can be retrieved from perf. + * + * INCLUDES + * fci.h + * */ HFCI __cdecl FCICreate( PERF perf, - PFNFCIFILEPLACED pfnfcifp, - PFNFCIALLOC pfna, - PFNFCIFREE pfnf, + PFNFCIFILEPLACED pfnfiledest, + PFNFCIALLOC pfnalloc, + PFNFCIFREE pfnfree, PFNFCIOPEN pfnopen, PFNFCIREAD pfnread, PFNFCIWRITE pfnwrite, @@ -49,17 +94,57 @@ PCCAB pccab, void *pv) { - FIXME("(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p): stub\n", - perf, pfnfcifp, pfna, pfnf, pfnopen, pfnread, pfnwrite, pfnclose, - pfnseek, pfndelete, pfnfcigtf, pccab, pv); + HFCI rv; + if ((!pfnalloc) || (!pfnfree)) { perf->erfOper = FCIERR_NONE; - perf->erfType = 0; + perf->erfType = ERROR_BAD_ARGUMENTS; perf->fError = TRUE; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_BAD_ARGUMENTS); + return NULL; + } + if (!(rv = (HFCI) (*pfnalloc)(sizeof(FCI_Int)))) { + perf->erfOper = FCIERR_ALLOC_FAIL; + perf->erfType = ERROR_NOT_ENOUGH_MEMORY; + perf->fError = TRUE; + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; + } + + PFCI_INT(rv)->FCI_Intmagic = FCI_INT_MAGIC; + PFCI_INT(rv)->perf = perf; + PFCI_INT(rv)->pfnfiledest = pfnfiledest; + PFCI_INT(rv)->pfnalloc = pfnalloc; + PFCI_INT(rv)->pfnfree = pfnfree; + PFCI_INT(rv)->pfnopen = pfnopen; + PFCI_INT(rv)->pfnread = pfnread; + PFCI_INT(rv)->pfnwrite = pfnwrite; + PFCI_INT(rv)->pfnclose = pfnclose; + PFCI_INT(rv)->pfnseek = pfnseek; + PFCI_INT(rv)->pfndelete = pfndelete; + PFCI_INT(rv)->pfnfcigtf = pfnfcigtf; + PFCI_INT(rv)->pccab = pccab; + PFCI_INT(rv)->pv = pv; + + /* Still mark as incomplete, because of other missing FCI* APIs */ + + PFCI_INT(rv)->FCI_Intmagic = 0; + PFDI_FREE(rv, rv); + FIXME("(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p): stub\n", + perf, pfnfiledest, pfnalloc, pfnfree, pfnopen, pfnread, pfnwrite, pfnclose, + pfnseek, pfndelete, pfnfcigtf, pccab, pv); + + perf->erfOper = FCIERR_NONE; + perf->erfType = 0; + perf->fError = TRUE; + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return NULL; + } /*********************************************************************** @@ -116,12 +201,30 @@ /*********************************************************************** * FCIDestroy (CABINET.14) + * + * Frees a handle created by FCICreate. + * Only reason for failure would be an invalid handle. + * + * PARAMS + * hfci [I] The HFCI to free + * + * RETURNS + * TRUE for success + * FALSE for failure */ BOOL __cdecl FCIDestroy(HFCI hfci) { - FIXME("(%p): stub\n", hfci); + if (REALLY_IS_FCI(hfci)) { + PFCI_INT(hfci)->FCI_Intmagic = 0; + PFDI_FREE(hfci, hfci); + /*return TRUE; */ + } else { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return FALSE; + /* Still mark as incomplete, because of other missing FCI* APIs */ + FIXME("(%p): stub\n", hfci); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } _____ Modified: vendor/wine/dlls/comctl32/current/Makefile.in --- vendor/wine/dlls/comctl32/current/Makefile.in 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/Makefile.in 2005-05-24 22:29:00 UTC (rev 15488) @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = comctl32.dll +IMPORTLIB = libcomctl32.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 DELAYIMPORTS = winmm EXTRALIBS = $(LIBUNICODE) _____ Modified: vendor/wine/dlls/comctl32/current/comboex.c --- vendor/wine/dlls/comctl32/current/comboex.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/comboex.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -283,6 +283,26 @@ } +static INT COMBOEX_GetIndex(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) +{ + CBE_ITEMDATA *moving; + INT index; + + moving = infoPtr->items; + index = infoPtr->nb_items - 1; + + while (moving && (moving != item)) { + moving = moving->next; + index--; + } + if (!moving || (index < 0)) { + ERR("COMBOBOXEX item structures broken. Please report!\n"); + return -1; + } + return index; +} + + static LPCWSTR COMBOEX_GetText(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) { NMCOMBOBOXEXW nmce; @@ -295,6 +315,7 @@ ZeroMemory(&nmce, sizeof(nmce)); nmce.ceItem.mask = CBEIF_TEXT; nmce.ceItem.lParam = item->lParam; + nmce.ceItem.iItem = COMBOEX_GetIndex(infoPtr, item); COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce); if (is_textW(nmce.ceItem.pszText)) { @@ -1389,6 +1410,7 @@ ZeroMemory(&nmce, sizeof(nmce)); nmce.ceItem.mask = CBEIF_INDENT; nmce.ceItem.lParam = item->lParam; + nmce.ceItem.iItem = dis->itemID; COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce); if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iIndent = nmce.ceItem.iIndent; @@ -1453,6 +1475,7 @@ ZeroMemory(&nmce, sizeof(nmce)); nmce.ceItem.mask = (drawstate == ILD_NORMAL) ? CBEIF_IMAGE : CBEIF_SELECTEDIMAGE; nmce.ceItem.lParam = item->lParam; + nmce.ceItem.iItem = dis->itemID; COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce); if (drawstate == ILD_NORMAL) { if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iImage = nmce.ceItem.iImage; @@ -1468,6 +1491,7 @@ ZeroMemory(&nmce, sizeof(nmce)); nmce.ceItem.mask = CBEIF_OVERLAY; nmce.ceItem.lParam = item->lParam; + nmce.ceItem.iItem = dis->itemID; COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce); if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iOverlay = nmce.ceItem.iOverlay; _____ Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c --- vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -588,7 +588,7 @@ if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, KEY_WRITE, &newkey))) { /* not present - what to do ??? */ - ERR("Can not open key, error=%d, attempting to create\n", + ERR("Could not open key, error=%d, attempting to create\n", err); if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, @@ -980,7 +980,7 @@ &newkey, &dwdisp))) { /* error - what to do ??? */ - ERR("(%lu %lu %lx %lx \"%s\" %p): Can not open key, error=%d\n", + ERR("(%lu %lu %lx %lx \"%s\" %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, (DWORD)mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, err); _____ Modified: vendor/wine/dlls/comctl32/current/datetime.c --- vendor/wine/dlls/comctl32/current/datetime.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/datetime.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -607,7 +607,7 @@ RECT *checkbox = &infoPtr->checkbox; SIZE size; COLORREF oldTextColor; - SHORT fieldWidth; + SHORT fieldWidth = 0; /* draw control edge */ TRACE("\n"); _____ Modified: vendor/wine/dlls/comctl32/current/header.c --- vendor/wine/dlls/comctl32/current/header.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/header.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -163,7 +163,7 @@ HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_ITEM *phdi = &infoPtr->items[iItem]; RECT r; - INT oldBkMode; + INT oldBkMode, cxEdge = GetSystemMetrics(SM_CXEDGE); TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, infoPtr->bUnicode); @@ -188,6 +188,9 @@ else DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); + r.left -= cxEdge; + r.right += cxEdge; + if (phdi->fmt & HDF_OWNERDRAW) { DRAWITEMSTRUCT dis; dis.CtlType = ODT_HEADER; @@ -206,149 +209,117 @@ SetBkMode(hdc, oldBkMode); } else { - UINT uTextJustify = DT_LEFT; + UINT rw, rh, /* width and height of r */ + *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ + /* cnt,txt,img,bmp */ + UINT cx, tx, ix, bx, + cw, tw, iw, bw; + BITMAP bmp; - if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER) - uTextJustify = DT_CENTER; - else if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_RIGHT) - uTextJustify = DT_RIGHT; + cw = tw = iw = bw = 0; + rw = r.right - r.left; + rh = r.bottom - r.top; - if ((phdi->fmt & HDF_BITMAP) && !(phdi->fmt & HDF_BITMAP_ON_RIGHT) && (phdi->hbm)) { - BITMAP bmp; - HDC hdcBitmap; - INT yD, yS, cx, cy, rx, ry; + if (phdi->fmt & HDF_STRING) { + RECT textRect; - GetObjectW (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp); + DrawTextW (hdc, phdi->pszText, -1, + &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); + cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; + } - ry = r.bottom - r.top; - rx = r.right - r.left; - - if (ry >= bmp.bmHeight) { - cy = bmp.bmHeight; - yD = r.top + (ry - bmp.bmHeight) / 2; - yS = 0; - } - else { - cy = ry; - yD = r.top; - yS = (bmp.bmHeight - ry) / 2; - - } - - if (rx >= bmp.bmWidth + infoPtr->iMargin) { - cx = bmp.bmWidth; - } - else { - cx = rx - infoPtr->iMargin; - } - - hdcBitmap = CreateCompatibleDC (hdc); - SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hdc, r.left + infoPtr->iMargin, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY); - DeleteDC (hdcBitmap); - - r.left += (bmp.bmWidth + infoPtr->iMargin); + if ((phdi->fmt & HDF_IMAGE) && (infoPtr->himl)) { + iw = infoPtr->himl->cx + 2 * infoPtr->iMargin; + x = &ix; + w = &iw; } - - if ((phdi->fmt & HDF_BITMAP) && (phdi->fmt & HDF_BITMAP_ON_RIGHT) && (phdi->hbm)) { - BITMAP bmp; - HDC hdcBitmap; - INT xD, yD, yS, cx, cy, rx, ry, tx; - RECT textRect; - + if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) { GetObjectW (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp); - - textRect = r; - if (phdi->fmt & HDF_STRING) { - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); - tx = textRect.right - textRect.left; + bw = bmp.bmWidth + 2 * infoPtr->iMargin; + if (!iw) { + x = &bx; + w = &bw; } - else - tx = 0; - ry = r.bottom - r.top; - rx = r.right - r.left; + } - if (ry >= bmp.bmHeight) { - cy = bmp.bmHeight; - yD = r.top + (ry - bmp.bmHeight) / 2; - yS = 0; - } - else { - cy = ry; - yD = r.top; - yS = (bmp.bmHeight - ry) / 2; + if (bw || iw) + cw += *w; + /* align cx using the unclipped cw */ + if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_LEFT) + cx = r.left; + else if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER) + cx = r.left + rw / 2 - cw / 2; + else /* HDF_RIGHT */ + cx = r.right - cw; + + /* clip cx & cw */ + if (cx < r.left) + cx = r.left; + if (cx + cw > r.right) + cw = r.right - cx; + + tx = cx + infoPtr->iMargin; + /* since cw might have changed we have to recalculate tw */ + tw = cw - infoPtr->iMargin * 2; + + if (iw || bw) { + tw -= *w; + if (phdi->fmt & HDF_BITMAP_ON_RIGHT) { + /* put pic behind text */ + *x = cx + tw + infoPtr->iMargin * 3; + } else { + *x = cx + infoPtr->iMargin; + /* move text behind pic */ + tx += *w; } - - if (r.left + tx + bmp.bmWidth + 2*infoPtr->iMargin <= r.right) { - cx = bmp.bmWidth; - xD = r.left + tx + infoPtr->iMargin; - } - else { - if (rx >= bmp.bmWidth + infoPtr->iMargin ) { - cx = bmp.bmWidth; - xD = r.right - bmp.bmWidth - infoPtr->iMargin; - r.right = xD - infoPtr->iMargin; - } - else { - cx = rx - infoPtr->iMargin; - xD = r.left; - r.right = r.left; - } - } - - hdcBitmap = CreateCompatibleDC (hdc); - SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hdc, xD, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY); - DeleteDC (hdcBitmap); } - if ((phdi->fmt & HDF_IMAGE) && !(phdi->fmt & HDF_BITMAP_ON_RIGHT) && (infoPtr->himl)) { - r.left += infoPtr->iMargin; - ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left, r.top + (r.bottom-r.top- infoPtr->himl->cy)/2, - infoPtr->himl->cx, r.bottom-r.top, CLR_DEFAULT, CLR_DEFAULT, 0); - r.left += infoPtr->himl->cx; + if (iw && bw) { + /* since we're done with the layout we can + now calculate the position of bmp which + has no influence on alignment and layout + because of img */ + if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_RIGHT) + bx = cx - bw + infoPtr->iMargin; + else + bx = cx + cw + infoPtr->iMargin; } - if ((phdi->fmt & HDF_IMAGE) && (phdi->fmt & HDF_BITMAP_ON_RIGHT) && (infoPtr->himl)) { - RECT textRect; - INT tx; + if (iw || bw) { + HDC hClipDC = GetDC(hwnd); + HRGN hClipRgn = CreateRectRgn(r.left, r.top, r.right, r.bottom); + SelectClipRgn(hClipDC, hClipRgn); + + if (bw) { + HDC hdcBitmap = CreateCompatibleDC (hClipDC); + SelectObject (hdcBitmap, phdi->hbm); + BitBlt (hClipDC, bx, r.top + ((INT)rh - bmp.bmHeight) / 2, + bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); + DeleteDC (hdcBitmap); + } - textRect = r; - if (phdi->fmt & HDF_STRING) { - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); - tx = textRect.right - textRect.left; - } - else - tx = 0; - - if (tx < (r.right-r.left - infoPtr->himl->cx - GetSystemMetrics(SM_CXEDGE))) - ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left + tx + 2*infoPtr->iMargin, - r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, infoPtr->himl->cx, r.bottom-r.top, - CLR_DEFAULT, CLR_DEFAULT, 0); - else { - INT x = max(r.right - infoPtr->iMargin - infoPtr->himl->cx, r.left); - INT cx = min(infoPtr->himl->cx, r.right-r.left - GetSystemMetrics(SM_CXEDGE)); - ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, x , - r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, cx, r.bottom-r.top, - CLR_DEFAULT, CLR_DEFAULT, 0); - r.right -= infoPtr->himl->cx - infoPtr->iMargin; + if (iw) { + ImageList_DrawEx (infoPtr->himl, phdi->iImage, hClipDC, + ix, r.top + ((INT)rh - infoPtr->himl->cy) / 2, + infoPtr->himl->cx, infoPtr->himl->cy, CLR_DEFAULT, CLR_DEFAULT, 0); } - } - if (((phdi->fmt & HDF_STRING) + DeleteObject(hClipRgn); + DeleteDC(hClipDC); + } + + if (((phdi->fmt & HDF_STRING) || (!(phdi->fmt & (HDF_OWNERDRAW|HDF_STRING|HDF_BITMAP| HDF_BITMAP_ON_RIGHT|HDF_IMAGE)))) /* no explicit format specified? */ && (phdi->pszText)) { - oldBkMode = SetBkMode(hdc, TRANSPARENT); - r.left += infoPtr->iMargin; - r.right -= infoPtr->iMargin; + oldBkMode = SetBkMode(hdc, TRANSPARENT); SetTextColor (hdc, (bHotTrack) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); + r.left = tx; + r.right = tx + tw; DrawTextW (hdc, phdi->pszText, -1, - &r, uTextJustify|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); + &r, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); } _____ Modified: vendor/wine/dlls/comctl32/current/hotkey.c --- vendor/wine/dlls/comctl32/current/hotkey.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/hotkey.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -54,7 +54,7 @@ BYTE CurrMod; INT CaretPos; DWORD ScanCode; - WCHAR strNone[15]; /* hope its long enough ... */ + WCHAR strNone[15]; /* hope it's long enough ... */ } HOTKEY_INFO; static const WCHAR HOTKEY_plussep[] = { ' ', '+', ' ' }; _____ Modified: vendor/wine/dlls/comctl32/current/imagelist.c --- vendor/wine/dlls/comctl32/current/imagelist.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/imagelist.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -98,7 +98,7 @@ * nothing * * NOTES - * This function can NOT be used to reduce the number of images. + * This function CANNOT be used to reduce the number of images. */ static void IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) _____ Modified: vendor/wine/dlls/comctl32/current/ipaddress.c --- vendor/wine/dlls/comctl32/current/ipaddress.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/ipaddress.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -62,6 +62,7 @@ { HWND Self; HWND Notify; + BOOL Enabled; IPPART_INFO Part[4]; } IPADDRESS_INFO; @@ -127,12 +128,26 @@ static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; POINT pt; + COLORREF bgCol, fgCol; int i; TRACE("\n"); GetClientRect (infoPtr->Self, &rect); + + if (infoPtr->Enabled) { + bgCol = COLOR_WINDOW; + fgCol = COLOR_WINDOWTEXT; + } else { + bgCol = COLOR_3DFACE; + fgCol = COLOR_GRAYTEXT; + } + + FillRect (hdc, &rect, (HBRUSH) (bgCol+1)); DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + + SetBkColor (hdc, GetSysColor(bgCol)); + SetTextColor(hdc, GetSysColor(fgCol)); for (i = 0; i < 3; i++) { GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart); @@ -174,6 +189,7 @@ edit.bottom = rcClient.bottom - 2; infoPtr->Self = hwnd; + infoPtr->Enabled = FALSE; infoPtr->Notify = lpCreate->hwndParent; for (i = 0; i < 4; i++) { @@ -215,6 +231,20 @@ } +static LRESULT IPADDRESS_Enable (IPADDRESS_INFO *infoPtr, BOOL enabled) +{ + int i; + + infoPtr->Enabled = enabled; + + for (i = 0; i < 4; i++) + EnableWindow(infoPtr->Part[i].EditHwnd, enabled); + + InvalidateRgn(infoPtr->Self, NULL, FALSE); + return 0; +} + + static LRESULT IPADDRESS_Paint (IPADDRESS_INFO *infoPtr, HDC hdc) { PAINTSTRUCT ps; @@ -517,6 +547,10 @@ case WM_DESTROY: return IPADDRESS_Destroy (infoPtr); + case WM_ENABLE: + return IPADDRESS_Enable (infoPtr, (BOOL)wParam); + break; + case WM_PAINT: return IPADDRESS_Paint (infoPtr, (HDC)wParam); _____ Modified: vendor/wine/dlls/comctl32/current/listview.c --- vendor/wine/dlls/comctl32/current/listview.c 2005-05-24 21:32:47 UTC (rev 15487) +++ vendor/wine/dlls/comctl32/current/listview.c 2005-05-24 22:29:00 UTC (rev 15488) @@ -24,7 +24,7 @@ * NOTES * * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 21, 2002, by Dimitrie O. Paun. + * of Comctl32.dll version 6.0 on May. 20, 2005, by James Hawkins. * * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. @@ -32,6 +32,17 @@ * * TODO: * + * Default Message Processing + * -- EN_KILLFOCUS should be handled in WM_COMMAND + * -- WM_CREATE: create the icon and small icon image lists at this point only if + * the LVS_SHAREIMAGELISTS style is not specified. + * -- WM_ERASEBKGND: forward this message to the parent window if the bkgnd + * color is CLR_NONE. + * -- WM_WINDOWPOSCHANGED: arrange the list items if the current view is icon + * or small icon and the LVS_AUTOARRANGE style is specified. + * -- WM_TIMER + * -- WM_WININICHANGE + * * Features * -- Hot item handling, mouse hovering * -- Workareas support @@ -74,6 +85,8 @@ * -- LVS_NOLABELWRAP * -- LVS_NOSCROLL (see Q137520) * -- LVS_SORTASCENDING, LVS_SORTDESCENDING + * -- LVS_ALIGNTOP + * -- LVS_TYPESTYLEMASK * * Extended Styles * -- LVS_EX_BORDERSELECT @@ -99,6 +112,7 @@ * -- LVN_ODFINDITEM * -- LVN_SETDISPINFO * -- NM_HOVER + * -- LVN_BEGINRDRAG * * Messages: * -- LVM_CANCELEDITLABEL @@ -130,6 +144,20 @@ * -- LVM_SORTGROUPS * -- LVM_SORTITEMSEX * + * Macros: + * -- ListView_GetCheckSate, ListView_SetCheckState + * -- ListView_GetHoverTime, ListView_SetHoverTime + * -- ListView_GetISearchString + * -- ListView_GetNumberOfWorkAreas + * -- ListView_GetOrigin + * -- ListView_GetTextBkColor + * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat + * -- ListView_GetWorkAreas, ListView_SetWorkAreas + * -- ListView_SortItemsEx + * + * Functions: + * -- LVGroupComparE + * * Known differences in message stream from native control (not known if * these differences cause problems): * LVM_INSERTITEM issues LVM_SETITEMSTATE and LVM_SETITEM in certain cases. @@ -224,6 +252,7 @@ HIMAGELIST himlState; BOOL bLButtonDown; BOOL bRButtonDown; + POINT ptClickPos; /* point where the user clicked */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ INT nItemHeight; INT nItemWidth; @@ -393,6 +422,7 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, INT, INT, INT, INT, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); +static INT LISTVIEW_HitTest(LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); /******** Text handling functions *************************************/ @@ -3141,7 +3171,23 @@ return bResult; } +static BOOL LISTVIEW_GetItemAtPt(LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, POINT pt) +{ + LVHITTESTINFO lvHitTestInfo; + ZeroMemory(&lvHitTestInfo, sizeof(lvHitTestInfo)); + lvHitTestInfo.pt.x = pt.x; + lvHitTestInfo.pt.y = pt.y; + + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE); + + lpLVItem->mask = LVIF_PARAM; + lpLVItem->iItem = lvHitTestInfo.iItem; + lpLVItem->iSubItem = 0; + + return LISTVIEW_GetItemT(infoPtr, lpLVItem, TRUE); +} + /*** * DESCRIPTION: * Called when the mouse is being actively tracked and has hovered for a specified @@ -3162,10 +3208,18 @@ */ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKyes, INT x, INT y) { - if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) - /* FIXME: select the item!!! */ - /*LISTVIEW_GetItemAtPt(infoPtr, pt)*/; + if (infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) + { + LVITEMW item; + POINT pt; + pt.x = x; + pt.y = y; + + if (LISTVIEW_GetItemAtPt(infoPtr, &item, pt)) + LISTVIEW_SetSelection(infoPtr, item.iItem); + } + return 0; } @@ -3183,8 +3237,25 @@ */ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { - TRACKMOUSEEVENT trackinfo; + TRACKMOUSEEVENT trackinfo; + if (infoPtr->bLButtonDown && DragDetect(infoPtr->hwndSelf, infoPtr->ptClickPos)) + { + LVHITTESTINFO lvHitTestInfo; + NMLISTVIEW nmlv; + + lvHitTestInfo.pt = infoPtr->ptClickPos; + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + + ZeroMemory(&nmlv, sizeof(nmlv)); + nmlv.iItem = lvHitTestInfo.iItem; + nmlv.ptAction = infoPtr->ptClickPos; + + notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); + + return 0; + } + /* see if we are supposed to be tracking mouse hovering */ if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { /* fill in the trackinfo struct */ @@ -7488,6 +7559,25 @@ /*** * DESCRIPTION: + * Enables the listview control. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] bEnable : specifies whether to enable or disable the window + * + * RETURN: + * SUCCESS : TRUE + * FAILURE : FALSE + */ +static BOOL LISTVIEW_Enable(LISTVIEW_INFO *infoPtr, BOOL bEnable) +{ + if (infoPtr->dwStyle & LVS_OWNERDRAWFIXED) + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return TRUE; +} + +/*** + * DESCRIPTION: * Erases the background of the listview control. * * PARAMETER(S): @@ -7901,70 +7991,8 @@ return 0; } - /*** * DESCRIPTION: - * Track mouse/dragging - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] pt : mouse coordinate - * - * RETURN: - * Zero - */ -static LRESULT LISTVIEW_TrackMouse(LISTVIEW_INFO *infoPtr, POINT pt) -{ - INT cxDrag = GetSystemMetrics(SM_CXDRAG); - INT cyDrag = GetSystemMetrics(SM_CYDRAG); - RECT r; - MSG msg; - - TRACE("\n"); - - r.top = pt.y - cyDrag; - r.left = pt.x - cxDrag; - r.bottom = pt.y + cyDrag; - r.right = pt.x + cxDrag; - - SetCapture(infoPtr->hwndSelf); - - while (1) - { - if (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) - { - if (msg.message == WM_MOUSEMOVE) - { - pt.x = (short)LOWORD(msg.lParam); - pt.y = (short)HIWORD(msg.lParam); - if (PtInRect(&r, pt)) - continue; - else - { - ReleaseCapture(); - return 1; - } - } - else if (msg.message >= WM_LBUTTONDOWN && - msg.message <= WM_RBUTTONDBLCLK) - { - break; - } - - DispatchMessageW(&msg); - } - - if (GetCapture() != infoPtr->hwndSelf) - return 0; - } - - ReleaseCapture(); - return 0; -} - - -/*** - * DESCRIPTION: * Processes double click messages (left mouse button). * * PARAMETER(S): @@ -8023,8 +8051,9 @@ if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); - /* set left button down flag */ + /* set left button down flag and record the click position */ infoPtr->bLButtonDown = TRUE; + infoPtr->ptClickPos = pt; lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; @@ -8047,20 +8076,7 @@ } return 0; } - if (LISTVIEW_TrackMouse(infoPtr, lvHitTestInfo.pt)) - { - NMLISTVIEW nmlv; - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = nItem; - nmlv.ptAction.x = lvHitTestInfo.pt.x; - nmlv.ptAction.y = lvHitTestInfo.pt.y; - - notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); - - return 0; - } - if (infoPtr->dwStyle & LVS_SINGLESEL) { if (LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED)) @@ -8288,6 +8304,11 @@ notify_listview(infoPtr, LVN_COLUMNCLICK, &nmlv); } break; + + case HDN_DIVIDERDBLCLICKW: + case HDN_DIVIDERDBLCLICKA: [truncated at 1000 lines; 22447 more skipped]

19 years, 3 months

[ion] 15487: Fix Tag Usage

by ion＠svn.reactos.com

Fix Tag Usage Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-24 21:21:34 UTC (rev 15486) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-24 21:32:47 UTC (rev 15487) @@ -563,29 +563,15 @@ } else { - #if 0 - ANSI_STRING Tag; - ULONG i; + CHAR Tag[4]; + Tag[0] = TypeName->Buffer[0]; + Tag[1] = TypeName->Buffer[1]; + Tag[2] = TypeName->Buffer[2]; + Tag[3] = TypeName->Buffer[3]; - DPRINT1("Convert: %wZ \n", TypeName); - Status = RtlUnicodeStringToAnsiString(&Tag, TypeName, TRUE); - DPRINT1("Convert done\n"); - if (NT_SUCCESS(Status)) - { - /* Add spaces if needed */ - for (i = 3; i >= Tag.Length; i--) Tag.Buffer[i] = ' '; - - /* Use the first four letters */ - LocalObjectType->Key = *(PULONG)Tag.Buffer; - ExFreePool(Tag.Buffer); - } - else - #endif - { - /* Some weird problem. Use Unicode name */ - LocalObjectType->Key = *(PULONG)TypeName->Buffer; - Status = STATUS_SUCCESS; - } + /* Set Tag */ + DPRINT1("Convert: %s \n", Tag); + LocalObjectType->Key = *(PULONG)Tag; } /* Set it up */

19 years, 3 months

[ion] 15486: Fix memory leaks in object manager, use tags and use some more public types

by ion＠svn.reactos.com

Fix memory leaks in object manager, use tags and use some more public types Modified: trunk/reactos/include/ddk/obfuncs.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ob/dirobj.c Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/ntobj.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/ob/wait.c _____ Modified: trunk/reactos/include/ddk/obfuncs.h --- trunk/reactos/include/ddk/obfuncs.h 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/include/ddk/obfuncs.h 2005-05-24 21:21:34 UTC (rev 15486) @@ -63,6 +63,34 @@ PSECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength); +typedef struct _OBJECT_HANDLE_COUNT_ENTRY +{ + struct _EPROCESS *Process; + ULONG HandleCount; +} OBJECT_HANDLE_COUNT_ENTRY, *POBJECT_HANDLE_COUNT_ENTRY; + +typedef struct _OBJECT_HANDLE_COUNT_DATABASE +{ + ULONG CountEntries; + POBJECT_HANDLE_COUNT_ENTRY HandleCountEntries[1]; +} OBJECT_HANDLE_COUNT_DATABASE, *POBJECT_HANDLE_COUNT_DATABASE; + +typedef struct _OBJECT_HEADER_HANDLE_INFO +{ + union { + POBJECT_HANDLE_COUNT_DATABASE HandleCountDatabase; + OBJECT_HANDLE_COUNT_ENTRY SingleEntry; + }; +} OBJECT_HEADER_HANDLE_INFO, *POBJECT_HEADER_HANDLE_INFO; + +typedef struct _OBJECT_HEADER_CREATOR_INFO +{ + LIST_ENTRY TypeList; + PVOID CreatorUniqueProcess; + USHORT CreatorBackTraceIndex; + USHORT Reserved; +} OBJECT_HEADER_CREATOR_INFO, *POBJECT_HEADER_CREATOR_INFO; + typedef struct _OBJECT_HEADER_NAME_INFO { struct _DIRECTORY_OBJECT *Directory; _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -122,14 +122,14 @@ CurrentHeader = BODY_TO_HEADER(CurrentObject); DPRINT("Current ObjectType %wZ\n", - &CurrentHeader->ObjectType->TypeName); + &CurrentHeader->Type->TypeName); - if (CurrentHeader->ObjectType->TypeInfo.ParseProcedure == NULL) + if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) { DPRINT("Current object can't parse\n"); break; } - Status = CurrentHeader->ObjectType->TypeInfo.ParseProcedure(CurrentObject, + Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, &NextObject, &PathString, &current, _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -512,7 +512,7 @@ else { /* KeyObject is the root key */ - Status = ObQueryNameString (BODY_TO_HEADER(KeyObject)->NameInfo->Directory, + Status = ObQueryNameString (HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(KeyObject))->Directory, LocalInfo, MAX_PATH * sizeof(WCHAR), &LocalReturnLength); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-24 21:21:34 UTC (rev 15486) @@ -16,45 +16,46 @@ struct _EPROCESS; -typedef struct +typedef PVOID POBJECT; + +typedef struct _QUAD { - CSHORT Type; - CSHORT Size; -} COMMON_BODY_HEADER, *PCOMMON_BODY_HEADER; + union { + LONGLONG UseThisFieldToCopy; + float DoNotUseThisField; + }; +} QUAD, *PQUAD; -typedef PVOID POBJECT; +#define OB_FLAG_CREATE_INFO 0x01 // has OBJECT_CREATE_INFO +#define OB_FLAG_KERNEL_MODE 0x02 // created by kernel +#define OB_FLAG_CREATOR_INFO 0x04 // has OBJECT_CREATOR_INFO +#define OB_FLAG_EXCLUSIVE 0x08 // OBJ_EXCLUSIVE +#define OB_FLAG_PERMANENT 0x10 // OBJ_PERMANENT +#define OB_FLAG_SECURITY 0x20 // has security descriptor +#define OB_FLAG_SINGLE_PROCESS 0x40 // no HandleDBList +/* Will be moved to public headers once "Entry" is gone */ typedef struct _OBJECT_HEADER -/* - * PURPOSE: Header for every object managed by the object manager - */ { - POBJECT_HEADER_NAME_INFO NameInfo; - LIST_ENTRY Entry; - LONG RefCount; - LONG HandleCount; - BOOLEAN Permanent; - BOOLEAN Inherit; - POBJECT_TYPE ObjectType; - POBJECT_CREATE_INFORMATION ObjectCreateInfo; - PSECURITY_DESCRIPTOR SecurityDescriptor; - - /* - * PURPOSE: Object type - * NOTE: This overlaps the first member of the object body - */ - CSHORT Type; - - /* - * PURPOSE: Object size - * NOTE: This overlaps the second member of the object body - */ - CSHORT Size; - - + LIST_ENTRY Entry; + LONG PointerCount; + union { + LONG HandleCount; + PVOID NextToFree; + }; + POBJECT_TYPE Type; + UCHAR NameInfoOffset; + UCHAR HandleInfoOffset; + UCHAR QuotaInfoOffset; + UCHAR Flags; + union { + POBJECT_CREATE_INFORMATION ObjectCreateInfo; + PVOID QuotaBlockCharged; + }; + PSECURITY_DESCRIPTOR SecurityDescriptor; + QUAD Body; } OBJECT_HEADER, *POBJECT_HEADER; - typedef struct _DIRECTORY_OBJECT { CSHORT Type; @@ -92,13 +93,19 @@ OBJTYP_MAX, }; -#define HEADER_TO_BODY(objhdr) \ - (PVOID)((ULONG_PTR)objhdr + sizeof(OBJECT_HEADER) - sizeof(COMMON_BODY_HEADER)) - #define BODY_TO_HEADER(objbdy) \ - CONTAINING_RECORD(&(((PCOMMON_BODY_HEADER)objbdy)->Type), OBJECT_HEADER, Type) + CONTAINING_RECORD((objbdy), OBJECT_HEADER, Body) + +#define HEADER_TO_OBJECT_NAME(objhdr) ((POBJECT_HEADER_NAME_INFO) \ + (!(objhdr)->NameInfoOffset ? NULL: ((PCHAR)(objhdr) - (objhdr)->NameInfoOffset))) + +#define HEADER_TO_HANDLE_INFO(objhdr) ((POBJECT_HEADER_HANDLE_INFO) \ + (!(objhdr)->HandleInfoOffset ? NULL: ((PCHAR)(objhdr) - (objhdr)->HandleInfoOffset))) + +#define HEADER_TO_CREATOR_INFO(objhdr) ((POBJECT_HEADER_CREATOR_INFO) \ + (!((objhdr)->Flags & OB_FLAG_CREATOR_INFO) ? NULL: ((PCHAR)(objhdr) - sizeof(OBJECT_HEADER_CREATOR_INFO)))) -#define OBJECT_ALLOC_SIZE(ObjectSize) ((ObjectSize)+sizeof(OBJECT_HEADER)-sizeof(COMMON_BODY_HEADER)) +#define OBJECT_ALLOC_SIZE(ObjectSize) ((ObjectSize)+sizeof(OBJECT_HEADER)) #define HANDLE_TO_EX_HANDLE(handle) \ (LONG)(((LONG)(handle) >> 2) - 1) _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -63,14 +63,14 @@ return(STATUS_SUCCESS); } - ParentObjectType = BODY_TO_HEADER(Parent)->ObjectType; + ParentObjectType = BODY_TO_HEADER(Parent)->Type; if (ParentObjectType != IoDeviceObjectType && ParentObjectType != IoFileObjectType) { DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", &BODY_TO_HEADER(Parent)->NameInfo->Name, - BODY_TO_HEADER(Parent)->ObjectType->Name.Buffer, + BODY_TO_HEADER(Parent)->Type->Name.Buffer, RemainingPath); return(STATUS_UNSUCCESSFUL); } @@ -870,7 +870,7 @@ { return Status; } - if (BODY_TO_HEADER(DeviceObject)->ObjectType != IoDeviceObjectType) + if (BODY_TO_HEADER(DeviceObject)->Type != IoDeviceObjectType) { ObDereferenceObject (DeviceObject); return STATUS_OBJECT_NAME_COLLISION; @@ -904,7 +904,7 @@ } } RtlMapGenericMask(&DesiredAccess, - &BODY_TO_HEADER(FileObject)->ObjectType->TypeInfo.GenericMapping); + &BODY_TO_HEADER(FileObject)->Type->TypeInfo.GenericMapping); Status = ObInsertObject ((PVOID)FileObject, NULL, _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -799,14 +799,14 @@ POBJECT_HEADER Header; Header = BODY_TO_HEADER(Object); - if (Header->ObjectType == ExEventObjectType || - Header->ObjectType == IoCompletionType || - Header->ObjectType == ExMutantObjectType || - Header->ObjectType == ExSemaphoreObjectType || - Header->ObjectType == ExTimerType || - Header->ObjectType == PsProcessType || - Header->ObjectType == PsThreadType || - Header->ObjectType == IoFileObjectType) { + if (Header->Type == ExEventObjectType || + Header->Type == IoCompletionType || + Header->Type == ExMutantObjectType || + Header->Type == ExSemaphoreObjectType || + Header->Type == ExTimerType || + Header->Type == PsProcessType || + Header->Type == PsThreadType || + Header->Type == IoFileObjectType) { return TRUE; _____ Modified: trunk/reactos/ntoskrnl/ob/dirobj.c --- trunk/reactos/ntoskrnl/ob/dirobj.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/ob/dirobj.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -253,11 +253,11 @@ EntryHeader = CONTAINING_RECORD(ListEntry, OBJECT_HEADER, Entry); /* calculate the size of the required buffer space for this entry */ - Name = (EntryHeader->NameInfo->Name.Length != 0 ? &EntryHeader->NameInfo->Name : NULL); - Type = &EntryHeader->ObjectType->Name; + Name = (HEADER_TO_OBJECT_NAME(EntryHeader)->Name.Length != 0 ? &HEADER_TO_OBJECT_NAME(EntryHeader)->Name : NULL); + Type = &EntryHeader->Type->Name; EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + ((Name != NULL) ? ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + - (ULONG)EntryHeader->ObjectType->Name.Length + sizeof(WCHAR); + (ULONG)EntryHeader->Type->Name.Length + sizeof(WCHAR); if(RequiredSize + EntrySize <= BufferLength) { _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -60,19 +60,24 @@ ObpDecrementHandleCount(PVOID ObjectBody) { POBJECT_HEADER ObjectHeader = BODY_TO_HEADER(ObjectBody); + DPRINT("Header: %x\n", ObjectHeader); LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); + DPRINT("NewHandleCount: %x\n", NewHandleCount); + DPRINT("HEADER_TO_OBJECT_NAME: %x\n", HEADER_TO_OBJECT_NAME(ObjectHeader)); - if ((ObjectHeader->ObjectType != NULL) && - (ObjectHeader->ObjectType->TypeInfo.CloseProcedure != NULL)) + if ((ObjectHeader->Type != NULL) && + (ObjectHeader->Type->TypeInfo.CloseProcedure != NULL)) { /* the handle count should be decremented but we pass the previous value to the callback */ - ObjectHeader->ObjectType->TypeInfo.CloseProcedure(ObjectBody, NewHandleCount + 1); + ObjectHeader->Type->TypeInfo.CloseProcedure(ObjectBody, NewHandleCount + 1); } if(NewHandleCount == 0) { - if(ObjectHeader->NameInfo->Directory != NULL && !ObjectHeader->Permanent) + if(HEADER_TO_OBJECT_NAME(ObjectHeader) && + HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory != NULL && + !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) { /* delete the object from the namespace when the last handle got closed. Only do this if it's actually been inserted into the namespace and @@ -215,7 +220,7 @@ } ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - Body = HEADER_TO_BODY(ObjectHeader); + Body = &ObjectHeader->Body; ObpDecrementHandleCount(Body); @@ -276,7 +281,7 @@ } ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); - ObjectBody = HEADER_TO_BODY(ObjectHeader); + ObjectBody = &ObjectHeader->Body; NewHandleEntry.u1.Object = SourceHandleEntry->u1.Object; if(InheritHandle) @@ -295,7 +300,7 @@ if (DesiredAccess & GENERIC_ANY) { RtlMapGenericMask(&DesiredAccess, - &ObjectHeader->ObjectType->TypeInfo.GenericMapping); + &ObjectHeader->Type->TypeInfo.GenericMapping); } NewHandleEntry.u2.GrantedAccess = DesiredAccess; } @@ -524,7 +529,7 @@ PAGED_CODE(); ObjectHeader = EX_OBJ_TO_HDR(Object); - ObjectBody = HEADER_TO_BODY(ObjectHeader); + ObjectBody = &ObjectHeader->Body; ObpDecrementHandleCount(ObjectBody); } @@ -545,7 +550,7 @@ ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) { - ObReferenceObject(HEADER_TO_BODY(ObjectHeader)); + ObReferenceObject(&ObjectHeader->Body); } } @@ -631,7 +636,7 @@ if (GrantedAccess & GENERIC_ANY) { RtlMapGenericMask(&GrantedAccess, - &ObjectHeader->ObjectType->TypeInfo.GenericMapping); + &ObjectHeader->Type->TypeInfo.GenericMapping); } NewEntry.u1.Object = ObjectHeader; @@ -822,13 +827,13 @@ } ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - ObjectBody = HEADER_TO_BODY(ObjectHeader); + ObjectBody = &ObjectHeader->Body; DPRINT("locked1: ObjectHeader: 0x%x [HT:0x%x]\n", ObjectHeader, HandleTable); - if (ObjectType != NULL && ObjectType != ObjectHeader->ObjectType) + if (ObjectType != NULL && ObjectType != ObjectHeader->Type) { - DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%x)\n", &ObjectType->TypeName, ObjectHeader->ObjectType ? &ObjectHeader->ObjectType->TypeName : NULL, Handle); + DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%x)\n", &ObjectType->TypeName, ObjectHeader->Type ? &ObjectHeader->Type->TypeName : NULL, Handle); ExUnlockHandleTableEntry(HandleTable, HandleEntry); @@ -842,7 +847,7 @@ if (DesiredAccess & GENERIC_ANY) { RtlMapGenericMask(&DesiredAccess, - &BODY_TO_HEADER(ObjectBody)->ObjectType->TypeInfo.GenericMapping); + &BODY_TO_HEADER(ObjectBody)->Type->TypeInfo.GenericMapping); } GrantedAccess = HandleEntry->u2.GrantedAccess; @@ -963,7 +968,7 @@ DPRINT("ObInsertObject: %x\n", Object); Header = BODY_TO_HEADER(Object); ObjectCreateInfo = Header->ObjectCreateInfo; - ObjectNameInfo = Header->NameInfo; + ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); /* First try to find the Object */ if (ObjectNameInfo && ObjectNameInfo->Name.Buffer) @@ -1000,10 +1005,9 @@ RtlInitUnicodeString(&RemainingPath, NULL); } - if (FoundHeader && FoundHeader->ObjectType == ObDirectoryType && + if (FoundHeader && FoundHeader->Type == ObDirectoryType && RemainingPath.Buffer) { - DPRINT("Adding to Object Directory\n"); ObpAddEntryDirectory(FoundObject, Header, NULL); ObjectAttached = TRUE; @@ -1013,7 +1017,7 @@ PWSTR BufferPos = RemainingPath.Buffer; NewName = ExAllocatePool(NonPagedPool, RemainingPath.MaximumLength); - ObjectNameInfo = Header->NameInfo; + ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); if (BufferPos[0] == L'\\') { @@ -1028,36 +1032,36 @@ DPRINT("Name: %S\n", ObjectNameInfo->Name.Buffer); } - if ((Header->ObjectType == IoFileObjectType) || - (Header->ObjectType == ExDesktopObjectType) || - (Header->ObjectType->TypeInfo.OpenProcedure != NULL)) + if ((Header->Type == IoFileObjectType) || + (Header->Type == ExDesktopObjectType) || + (Header->Type->TypeInfo.OpenProcedure != NULL)) { DPRINT("About to call Open Routine\n"); - if (Header->ObjectType == IoFileObjectType) + if (Header->Type == IoFileObjectType) { /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ DPRINT("Calling IopCreateFile: %x\n", FoundObject); - Status = IopCreateFile(HEADER_TO_BODY(Header), + Status = IopCreateFile(&Header->Body, FoundObject, RemainingPath.Buffer, ObjectCreateInfo); DPRINT("Called IopCreateFile: %x\n", Status); } - else if (Header->ObjectType == ExDesktopObjectType) + else if (Header->Type == ExDesktopObjectType) { /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ DPRINT("Calling ExpDesktopCreate\n"); - Status = ExpDesktopCreate(HEADER_TO_BODY(Header), + Status = ExpDesktopCreate(&Header->Body, FoundObject, RemainingPath.Buffer, ObjectCreateInfo); } - else if (Header->ObjectType->TypeInfo.OpenProcedure != NULL) + else if (Header->Type->TypeInfo.OpenProcedure != NULL) { - DPRINT("Calling %x\n", Header->ObjectType->TypeInfo.OpenProcedure); - Status = Header->ObjectType->TypeInfo.OpenProcedure(ObCreateHandle, - HEADER_TO_BODY(Header), + DPRINT("Calling %x\n", Header->Type->TypeInfo.OpenProcedure); + Status = Header->Type->TypeInfo.OpenProcedure(ObCreateHandle, + &Header->Body, NULL, 0, 0); @@ -1088,19 +1092,19 @@ Status = SeAssignSecurity((FoundHeader != NULL) ? FoundHeader->SecurityDescriptor : NULL, (ObjectCreateInfo != NULL) ? ObjectCreateInfo->SecurityDescriptor : NULL, &NewSecurityDescriptor, - (Header->ObjectType == ObDirectoryType), + (Header->Type == ObDirectoryType), &SubjectContext, - &Header->ObjectType->TypeInfo.GenericMapping, + &Header->Type->TypeInfo.GenericMapping, PagedPool); if (NT_SUCCESS(Status)) { DPRINT("NewSecurityDescriptor %p\n", NewSecurityDescriptor); - if (Header->ObjectType->TypeInfo.SecurityProcedure != NULL) + if (Header->Type->TypeInfo.SecurityProcedure != NULL) { /* Call the security method */ - Status = Header->ObjectType->TypeInfo.SecurityProcedure(HEADER_TO_BODY(Header), + Status = Header->Type->TypeInfo.SecurityProcedure(&Header->Body, AssignSecurityDescriptor, 0, NewSecurityDescriptor, @@ -1120,12 +1124,7 @@ DPRINT("Security Complete\n"); SeReleaseSubjectContext(&SubjectContext); - - /* We can delete the Create Info now */ - Header->ObjectCreateInfo = NULL; - ObpReleaseCapturedAttributes(ObjectCreateInfo); - ExFreePool(ObjectCreateInfo); - + /* Create the Handle */ /* HACKHACK: Because of ROS's incorrect startup, this can be called * without a valid Process until I finalize the startup patch, @@ -1137,14 +1136,19 @@ if (Handle != NULL) { Status = ObpCreateHandle(PsGetCurrentProcess(), - HEADER_TO_BODY(Header), + &Header->Body, DesiredAccess, - Header->Inherit, + ObjectCreateInfo->Attributes & OBJ_INHERIT, Handle); DPRINT("handle Created: %d. refcount. handlecount %d %d\n", *Handle, Header->RefCount, Header->HandleCount); } + /* We can delete the Create Info now */ + Header->ObjectCreateInfo = NULL; + ObpReleaseCapturedAttributes(ObjectCreateInfo); + ExFreePool(ObjectCreateInfo); + DPRINT("Status %x\n", Status); return Status; } @@ -1227,7 +1231,7 @@ // pshi->GrantedAccess; // pshi->Object; -// pshi->ObjectTypeIndex; +// pshi->TypeIndex; // pshi->HandleAttributes; // KeReleaseSpinLock( &Process->HandleTable.ListLock, oldIrql ); _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -256,7 +256,8 @@ { KIRQL oldlvl; - Header->NameInfo->Directory = Parent; + ASSERT(HEADER_TO_OBJECT_NAME(Header)); + HEADER_TO_OBJECT_NAME(Header)->Directory = Parent; KeAcquireSpinLock(&Parent->Lock, &oldlvl); InsertTailList(&Parent->head, &Header->Entry); @@ -276,13 +277,13 @@ DPRINT("ObpRemoveEntryDirectory(Header %x)\n",Header); - KeAcquireSpinLock(&(Header->NameInfo->Directory->Lock),&oldlvl); + KeAcquireSpinLock(&(HEADER_TO_OBJECT_NAME(Header)->Directory->Lock),&old lvl); if (Header->Entry.Flink && Header->Entry.Blink) { RemoveEntryList(&(Header->Entry)); Header->Entry.Flink = Header->Entry.Blink = NULL; } - KeReleaseSpinLock(&(Header->NameInfo->Directory->Lock),oldlvl); + KeReleaseSpinLock(&(HEADER_TO_OBJECT_NAME(Header)->Directory->Lock),oldl vl); } NTSTATUS @@ -324,26 +325,26 @@ } if (Name[0]=='.' && Name[1]=='.' && Name[2]==0) { - return(BODY_TO_HEADER(DirectoryObject)->NameInfo->Directory); + return(HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(DirectoryObject))->Directory ); } while (current!=(&(DirectoryObject->head))) { current_obj = CONTAINING_RECORD(current,OBJECT_HEADER,Entry); - DPRINT(" Scanning: %S for: %S\n",current_obj->NameInfo->Name.Buffer, Name); + DPRINT(" Scanning: %S for: %S\n",HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name); if (Attributes & OBJ_CASE_INSENSITIVE) { - if (_wcsicmp(current_obj->NameInfo->Name.Buffer, Name)==0) + if (_wcsicmp(HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name)==0) { - DPRINT("Found it %x\n",HEADER_TO_BODY(current_obj)); - return(HEADER_TO_BODY(current_obj)); + DPRINT("Found it %x\n",&current_obj->Body); + return(&current_obj->Body); } } else { - if ( wcscmp(current_obj->NameInfo->Name.Buffer, Name)==0) + if ( wcscmp(HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name)==0) { - DPRINT("Found it %x\n",HEADER_TO_BODY(current_obj)); - return(HEADER_TO_BODY(current_obj)); + DPRINT("Found it %x\n",&current_obj->Body); + return(&current_obj->Body); } } current = current->Flink; @@ -550,17 +551,43 @@ return Status; } - LocalObjectType = HEADER_TO_BODY(Header); + LocalObjectType = (POBJECT_TYPE)&Header->Body; + DPRINT("Local ObjectType: %p Header: %p \n", LocalObjectType, Header); /* Check if this is the first Object Type */ if (!ObTypeObjectType) { ObTypeObjectType = LocalObjectType; - Header->ObjectType = ObTypeObjectType; + Header->Type = ObTypeObjectType; + LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); } + else + { + #if 0 + ANSI_STRING Tag; + ULONG i; + + DPRINT1("Convert: %wZ \n", TypeName); + Status = RtlUnicodeStringToAnsiString(&Tag, TypeName, TRUE); + DPRINT1("Convert done\n"); + if (NT_SUCCESS(Status)) + { + /* Add spaces if needed */ + for (i = 3; i >= Tag.Length; i--) Tag.Buffer[i] = ' '; + + /* Use the first four letters */ + LocalObjectType->Key = *(PULONG)Tag.Buffer; + ExFreePool(Tag.Buffer); + } + else + #endif + { + /* Some weird problem. Use Unicode name */ + LocalObjectType->Key = *(PULONG)TypeName->Buffer; + Status = STATUS_SUCCESS; + } + } - /* FIXME: Generate Tag */ - /* Set it up */ LocalObjectType->TypeInfo = *ObjectTypeInitializer; LocalObjectType->Name = *TypeName; _____ Modified: trunk/reactos/ntoskrnl/ob/ntobj.c --- trunk/reactos/ntoskrnl/ob/ntobj.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/ob/ntobj.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -122,13 +122,13 @@ BasicInfo->Attributes = HandleInfo.HandleAttributes; BasicInfo->GrantedAccess = HandleInfo.GrantedAccess; BasicInfo->HandleCount = ObjectHeader->HandleCount; - BasicInfo->PointerCount = ObjectHeader->RefCount; + BasicInfo->PointerCount = ObjectHeader->PointerCount; BasicInfo->PagedPoolUsage = 0; /* FIXME*/ BasicInfo->NonPagedPoolUsage = 0; /* FIXME*/ BasicInfo->NameInformationLength = 0; /* FIXME*/ BasicInfo->TypeInformationLength = 0; /* FIXME*/ BasicInfo->SecurityDescriptorLength = 0; /* FIXME*/ - if (ObjectHeader->ObjectType == ObSymbolicLinkType) + if (ObjectHeader->Type == ObSymbolicLinkType) { BasicInfo->CreateTime.QuadPart = ((PSYMLINK_OBJECT)Object)->CreateTime.QuadPart; @@ -169,10 +169,10 @@ break; } - RtlCopyUnicodeString(&typeinfo->Type,&ObjectHeader->ObjectType->TypeName ); + RtlCopyUnicodeString(&typeinfo->Type,&ObjectHeader->Type->TypeName); //This should be info from the object header, not the object type, right? typeinfo->TotalHandles = ObjectHeader-> HandleCount; - typeinfo->ReferenceCount = ObjectHeader -> RefCount; + typeinfo->ReferenceCount = ObjectHeader -> PointerCount; } #endif Status = STATUS_NOT_IMPLEMENTED; @@ -223,9 +223,9 @@ POBJECT_HEADER ObjectHeader; ObjectHeader = BODY_TO_HEADER(ObjectBody); - ObjectHeader->Permanent = Permanent; + ObjectHeader->Flags |= OB_FLAG_PERMANENT; - if (ObjectHeader->HandleCount == 0 && !Permanent && ObjectHeader->NameInfo->Directory) + if (ObjectHeader->HandleCount == 0 && !Permanent && HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory) { /* Remove the object from the namespace */ ObpRemoveEntryDirectory(ObjectHeader); _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-05-24 21:04:44 UTC (rev 15485) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-05-24 21:21:34 UTC (rev 15486) @@ -379,14 +379,14 @@ CurrentHeader = BODY_TO_HEADER(CurrentObject); DPRINT("Current ObjectType %wZ\n", - &CurrentHeader->ObjectType->Name); + &CurrentHeader->Type->Name); - if (CurrentHeader->ObjectType->TypeInfo.ParseProcedure == NULL) + if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) { DPRINT("Current object can't parse\n"); break; } - Status = CurrentHeader->ObjectType->TypeInfo.ParseProcedure(CurrentObject, + Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, &NextObject, &PathString, &current, @@ -461,27 +461,27 @@ ObjectHeader = BODY_TO_HEADER(Object); - if (ObjectHeader->ObjectType != NULL && - ObjectHeader->ObjectType->TypeInfo.QueryNameProcedure != NULL) + if (ObjectHeader->Type != NULL && + ObjectHeader->Type->TypeInfo.QueryNameProcedure != NULL) { - DPRINT ("Calling %x\n", ObjectHeader->ObjectType->TypeInfo.QueryNameProcedure); - Status = ObjectHeader->ObjectType->TypeInfo.QueryNameProcedure (Object, + DPRINT ("Calling %x\n", ObjectHeader->Type->TypeInfo.QueryNameProcedure); + Status = ObjectHeader->Type->TypeInfo.QueryNameProcedure (Object, ObjectNameInfo, Length, ReturnLength); } - else if (ObjectHeader->NameInfo->Name.Length > 0 && ObjectHeader->NameInfo->Name.Buffer != NULL) + else if (HEADER_TO_OBJECT_NAME(ObjectHeader)->Name.Length > 0 && HEADER_TO_OBJECT_NAME(ObjectHeader)->Name.Buffer != NULL) { DPRINT ("Object does not have a 'QueryName' function\n"); - if (ObjectHeader->NameInfo->Directory == NameSpaceRoot) + if (HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory == NameSpaceRoot) { DPRINT ("Reached the root directory\n"); ObjectNameInfo->Name.Length = 0; ObjectNameInfo->Name.Buffer[0] = 0; Status = STATUS_SUCCESS; } - else if (ObjectHeader->NameInfo->Directory != NULL) + else if (HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory != NULL) { LocalInfo = ExAllocatePool (NonPagedPool, sizeof(OBJECT_NAME_INFORMATION) + @@ -489,7 +489,7 @@ if (LocalInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; - Status = ObQueryNameString (ObjectHeader->NameInfo->Directory, + Status = ObQueryNameString (HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory, LocalInfo, MAX_PATH * sizeof(WCHAR), &LocalReturnLength); @@ -508,14 +508,14 @@ return Status; } - DPRINT ("Object path %wZ\n", &ObjectHeader->NameInfo->Name); + DPRINT ("Object path %wZ\n", &HEADER_TO_OBJECT_NAME(ObjectHeader)->Name); Status = RtlAppendUnicodeToString (&ObjectNameInfo->Name, L"\\"); if (!NT_SUCCESS (Status)) return Status; Status = RtlAppendUnicodeStringToString (&ObjectNameInfo->Name, - &ObjectHeader->NameInfo->Name); + &HEADER_TO_OBJECT_NAME(ObjectHeader)->Name); } else { @@ -549,8 +549,14 @@ POBJECT_HEADER *ObjectHeader) { POBJECT_HEADER Header; - POBJECT_HEADER_NAME_INFO ObjectNameInfo; + BOOLEAN HasHandleInfo = FALSE; + BOOLEAN HasNameInfo = FALSE; + BOOLEAN HasCreatorInfo = FALSE; + POBJECT_HEADER_HANDLE_INFO HandleInfo; + POBJECT_HEADER_NAME_INFO NameInfo; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; POOL_TYPE PoolType; + ULONG FinalSize = ObjectSize; ULONG Tag; /* If we don't have an Object Type yet, force NonPaged */ @@ -566,35 +572,104 @@ Tag = ObjectType->Key; } - /* Allocate memory for the Object */ - Header = ExAllocatePoolWithTag(PoolType, ObjectSize, Tag); + DPRINT("Checking ObjectName: %x\n", ObjectName); + /* Check if the Object has a name */ + if (ObjectName->Buffer) + { + FinalSize += sizeof(OBJECT_HEADER_NAME_INFO); + HasNameInfo = TRUE; + } + + if (ObjectType) + { + /* Check if the Object maintains handle counts */ + DPRINT("Checking ObjectType->TypeInfo: %x\n", &ObjectType->TypeInfo); + if (ObjectType->TypeInfo.MaintainHandleCount) + { + FinalSize += sizeof(OBJECT_HEADER_HANDLE_INFO); + HasHandleInfo = TRUE; + } + + /* Check if the Object maintains type lists */ + if (ObjectType->TypeInfo.MaintainTypeList) + { + FinalSize += sizeof(OBJECT_HEADER_CREATOR_INFO); + HasCreatorInfo = TRUE; + } + } + + /* Allocate memory for the Object and Header */ + DPRINT("Allocating: %x %x\n", FinalSize, Tag); + Header = ExAllocatePoolWithTag(PoolType, FinalSize, Tag); if (!Header) { DPRINT1("Not enough memory!\n"); return STATUS_INSUFFICIENT_RESOURCES; } + + /* Initialize Handle Info */ + if (HasHandleInfo) + { + HandleInfo = (POBJECT_HEADER_HANDLE_INFO)Header; + DPRINT("Info: %x\n", HandleInfo); + HandleInfo->SingleEntry.HandleCount = 0; + Header = (POBJECT_HEADER)(HandleInfo + 1); + } + + /* Initialize the Object Name Info */ + if (HasNameInfo) + { + NameInfo = (POBJECT_HEADER_NAME_INFO)Header; + DPRINT("Info: %x %wZ\n", NameInfo, ObjectName); + NameInfo->Name = *ObjectName; + NameInfo->Directory = NULL; + Header = (POBJECT_HEADER)(NameInfo + 1); + } + /* Initialize Creator Info */ + if (HasCreatorInfo) + { + CreatorInfo = (POBJECT_HEADER_CREATOR_INFO)Header; + DPRINT("Info: %x\n", CreatorInfo); + /* FIXME: Needs Alex's Init patch + * CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcessId(); + */ + InitializeListHead(&CreatorInfo->TypeList); + Header = (POBJECT_HEADER)(CreatorInfo + 1); + } + /* Initialize the object header */ RtlZeroMemory(Header, ObjectSize); - DPRINT("Initalizing header %p\n", Header); + DPRINT("Initalized header %p\n", Header); Header->HandleCount = 0; - Header->RefCount = 1; - Header->ObjectType = ObjectType; + Header->PointerCount = 1; + Header->Type = ObjectType; + Header->Flags = OB_FLAG_CREATE_INFO; + + /* Set the Offsets for the Info */ + if (HasHandleInfo) + { + Header->HandleInfoOffset = HasNameInfo * sizeof(OBJECT_HEADER_NAME_INFO) + + sizeof(OBJECT_HEADER_HANDLE_INFO) + + HasCreatorInfo * sizeof(OBJECT_HEADER_CREATOR_INFO); + Header->Flags |= OB_FLAG_SINGLE_PROCESS; + } + if (HasNameInfo) + { + Header->NameInfoOffset = sizeof(OBJECT_HEADER_NAME_INFO) + + HasCreatorInfo * sizeof(OBJECT_HEADER_CREATOR_INFO); + } + if (HasCreatorInfo) Header->Flags |= OB_FLAG_CREATOR_INFO; + if (ObjectCreateInfo && ObjectCreateInfo->Attributes & OBJ_PERMANENT) { - Header->Permanent = TRUE; + Header->Flags |= OB_FLAG_PERMANENT; } - if (ObjectCreateInfo && ObjectCreateInfo->Attributes & OBJ_INHERIT) + if (ObjectCreateInfo && ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE) { - Header->Inherit = TRUE; + Header->Flags |= OB_FLAG_EXCLUSIVE; } - - /* Initialize the Object Name Info [part of header in OB 2.0] */ - ObjectNameInfo = ExAllocatePool(PoolType, ObjectSize); - ObjectNameInfo->Name = *ObjectName; - ObjectNameInfo->Directory = NULL; /* Link stuff to Object Header */ - Header->NameInfo = ObjectNameInfo; Header->ObjectCreateInfo = ObjectCreateInfo; /* Return Header */ @@ -663,7 +738,7 @@ { /* Return the Object */ DPRINT("Returning Object\n"); - *Object = HEADER_TO_BODY(Header); + *Object = &Header->Body; /* Return to caller, leave the Capture Info Alive for ObInsert */ return Status; @@ -707,43 +782,43 @@ Header = BODY_TO_HEADER(Object); - if (ObjectType != NULL && Header->ObjectType != ObjectType) + if (ObjectType != NULL && Header->Type != ObjectType) { DPRINT("Failed %p (type was %x %wZ) should be %x %wZ\n", Header, - Header->ObjectType, - &BODY_TO_HEADER(Header->ObjectType)->NameInfo, + Header->Type, + &BODY_TO_HEADER(Header->Type)->NameInfo, ObjectType, &BODY_TO_HEADER(ObjectType)->NameInfo); return(STATUS_UNSUCCESSFUL); } - if (Header->ObjectType == PsProcessType) + if (Header->Type == PsProcessType) { - DPRINT("Ref p 0x%x refcount %d type %x ", - Object, Header->RefCount, PsProcessType); + DPRINT("Ref p 0x%x PointerCount %d type %x ", + Object, Header->PointerCount, PsProcessType); DPRINT("eip %x\n", ((PULONG)&Object)[-1]); } - if (Header->ObjectType == PsThreadType) + if (Header->Type == PsThreadType) { - DPRINT("Deref t 0x%x with refcount %d type %x ", - Object, Header->RefCount, PsThreadType); + DPRINT("Deref t 0x%x with PointerCount %d type %x ", + Object, Header->PointerCount, PsThreadType); DPRINT("eip %x\n", ((PULONG)&Object)[-1]); } - if (Header->RefCount == 0 && !Header->Permanent) + if (Header->PointerCount == 0 && !(Header->Flags & OB_FLAG_PERMANENT)) { - if (Header->ObjectType == PsProcessType) + if (Header->Type == PsProcessType) { return STATUS_PROCESS_IS_TERMINATING; } - if (Header->ObjectType == PsThreadType) + if (Header->Type == PsThreadType) { return STATUS_THREAD_IS_TERMINATING; } return(STATUS_UNSUCCESSFUL); } - if (1 == InterlockedIncrement(&Header->RefCount) && !Header->Permanent) + if (1 == InterlockedIncrement(&Header->PointerCount) && !(Header->Flags & OB_FLAG_PERMANENT)) { KEBUGCHECK(0); } @@ -794,6 +869,11 @@ static NTSTATUS ObpDeleteObject(POBJECT_HEADER Header) { + PVOID HeaderLocation = Header; + POBJECT_HEADER_HANDLE_INFO HandleInfo; + POBJECT_HEADER_NAME_INFO NameInfo; + POBJECT_HEADER_CREATOR_INFO CreatorInfo; + DPRINT("ObpDeleteObject(Header %p)\n", Header); if (KeGetCurrentIrql() != PASSIVE_LEVEL) { @@ -801,10 +881,10 @@ KEBUGCHECK(0); } - if (Header->ObjectType != NULL && - Header->ObjectType->TypeInfo.DeleteProcedure != NULL) + if (Header->Type != NULL && + Header->Type->TypeInfo.DeleteProcedure != NULL) { - Header->ObjectType->TypeInfo.DeleteProcedure(HEADER_TO_BODY(Header)); + Header->Type->TypeInfo.DeleteProcedure(&Header->Body); } if (Header->SecurityDescriptor != NULL) @@ -812,22 +892,35 @@ ObpRemoveSecurityDescriptor(Header->SecurityDescriptor); } - if (Header->NameInfo) [truncated at 1000 lines; 224 more skipped]

19 years, 3 months

[ion] 15485: Fix DHCP from crashing, silence tcp and iphlp

by ion＠svn.reactos.com

Fix DHCP from crashing, silence tcp and iphlp Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c Modified: trunk/reactos/subsys/system/dhcp/dispatch.c _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c --- trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-05-24 19:52:43 UTC (rev 15484) +++ trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-05-24 21:04:44 UTC (rev 15485) @@ -9,7 +9,7 @@ */ #include "precomp.h" -//#define NDEBUG +#define NDEBUG #ifndef NDEBUG DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER); _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-05-24 19:52:43 UTC (rev 15484) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-05-24 21:04:44 UTC (rev 15485) @@ -129,15 +129,15 @@ DWORD allocationSizeForEntityArray = entrySize * MAX_TDI_ENTITIES, arraySize = entrySize * MAX_TDI_ENTITIES; - DbgPrint("TdiGetSetOfThings(tcpFile %x,toiClass %x,toiType %x,toiId %x," - "teiEntity %x,fixedPart %d,entrySize %d)\n", - (int)tcpFile, - (int)toiClass, - (int)toiType, - (int)toiId, - (int)teiEntity, - (int)fixedPart, - (int)entrySize ); + TRACE("TdiGetSetOfThings(tcpFile %x,toiClass %x,toiType %x,toiId %x," + "teiEntity %x,fixedPart %d,entrySize %d)\n", + (int)tcpFile, + (int)toiClass, + (int)toiType, + (int)toiId, + (int)teiEntity, + (int)fixedPart, + (int)entrySize ); req.ID.toi_class = toiClass; req.ID.toi_type = toiType; _____ Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c --- trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-05-24 19:52:43 UTC (rev 15484) +++ trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-05-24 21:04:44 UTC (rev 15485) @@ -17,10 +17,10 @@ #ifdef DBG /* See debug.h for debug/trace constants */ -DWORD DebugTraceLevel = MIN_TRACE; +//DWORD DebugTraceLevel = MIN_TRACE; //DWORD DebugTraceLevel = MAX_TRACE; //DWORD DebugTraceLevel = DEBUG_ULTRA; - +DWORD DebugTraceLevel = 0; #endif /* DBG */ /* To make the linker happy */ @@ -386,8 +386,8 @@ Sleep( timeout->tv_sec * 1000 + (timeout->tv_usec / 1000) ); } return 0; - } else { - WS_DbgPrint(MID_TRACE,("Calling WSPSelect\n")); + } else if (Provider->ProcTable.lpWSPSelect) { + WS_DbgPrint(MID_TRACE,("Calling WSPSelect:%x\n", Provider->ProcTable.lpWSPSelect)); Count = Provider->ProcTable.lpWSPSelect( nfds, readfds, writefds, exceptfds, (LPTIMEVAL)timeout, &Errno); @@ -400,6 +400,9 @@ WSASetLastError(Errno); return SOCKET_ERROR; } + } else { + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; } return Count; _____ Modified: trunk/reactos/subsys/system/dhcp/dispatch.c --- trunk/reactos/subsys/system/dhcp/dispatch.c 2005-05-24 19:52:43 UTC (rev 15484) +++ trunk/reactos/subsys/system/dhcp/dispatch.c 2005-05-24 21:04:44 UTC (rev 15485) @@ -186,8 +186,10 @@ if (errno == EAGAIN || errno == EINTR) { time(&cur_time); continue; - } else + } else { error("poll: %m"); + break; + } } /* Get the current time... */

19 years, 3 months

[greatlrd] 15484: ChangeDisplay

by greatlrd＠svn.reactos.com

ChangeDisplay 1. Add debug msg 2. Corrent some return value for CDS_UPDATEREGISTRY 3. Remove #ifdef CDS_VIDEOPARAMETERS Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-05-24 18:42:54 UTC (rev 15483) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-05-24 19:52:43 UTC (rev 15484) @@ -2509,6 +2509,8 @@ BOOLEAN SetPrimary = FALSE; LONG Ret; + DPRINT1("display flag : %x\n",dwflags); + if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) { /* Check global, reset and noreset flags */ @@ -2530,13 +2532,17 @@ switch (dwflags) { case 0: /* Dynamically change graphics mode */ + DPRINT1("flag 0 UNIMPLEMENT \n"); + Ret = DISP_CHANGE_FAILED; break; case CDS_FULLSCREEN: /* Given mode is temporary */ + DPRINT1("flag CDS_FULLSCREEN UNIMPLEMENT \n"); Ret = DISP_CHANGE_FAILED; break; + case CDS_UPDATEREGISTRY: { UNICODE_STRING ObjectName; @@ -2551,6 +2557,8 @@ HANDLE DevInstRegKey; ULONG NewValue; + DPRINT1("set CDS_UPDATEREGISTRY \n"); + /* Get device name (pDeviceName is "\.\xxx") */ for (LastSlash = pDeviceName->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) { @@ -2619,44 +2627,49 @@ { RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.BitsPerPel"); NewValue = DevMode->dmBitsPerPel; - Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); } if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSWIDTH) { RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.XResolution"); NewValue = DevMode->dmPelsWidth; - Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); } if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSHEIGHT) { RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.YResolution"); NewValue = DevMode->dmPelsHeight; - Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); + Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); } ZwClose(DevInstRegKey); if (NT_SUCCESS(Status)) Ret = DISP_CHANGE_RESTART; else - Ret = DISP_CHANGE_FAILED; + /* return DISP_CHANGE_NOTUPDATED when we can save to reg only vaild for NT */ + Ret = DISP_CHANGE_NOTUPDATED; break; } case CDS_TEST: /* Test if the mode could be set */ + DPRINT1("flag CDS_TEST UNIMPLEMENT"); Ret = DISP_CHANGE_FAILED; break; -#ifdef CDS_VIDEOPARAMETERS + case CDS_VIDEOPARAMETERS: - if (lParam == NULL) - return DISP_CHANGE_BADPARAM; + + if (lParam == NULL) return DISP_CHANGE_BADPARAM; + + DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); Ret = DISP_CHANGE_FAILED; break; -#endif + default: + DPRINT1("flag DISP_CHANGE_BADFLAGS\n"); Ret = DISP_CHANGE_BADFLAGS; break; }

19 years, 3 months

[greatlrd] 15483: add CDS_VIDEOPARAMETERS for changedisplay setting it was mising in our include files

by greatlrd＠svn.reactos.com

add CDS_VIDEOPARAMETERS for changedisplay setting it was mising in our include files Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-05-24 14:14:40 UTC (rev 15482) +++ trunk/reactos/w32api/include/winuser.h 2005-05-24 18:42:54 UTC (rev 15483) @@ -153,6 +153,7 @@ #define CDS_FULLSCREEN 4 #define CDS_GLOBAL 8 #define CDS_SET_PRIMARY 16 +#define CDS_VIDEOPARAMETERS 20 #define CDS_RESET 0x40000000 #define CDS_SETRECT 0x20000000 #define CDS_NORESET 0x10000000

19 years, 3 months

[greatlrd] 15482: VBE driver never write which reslutions it should use as defualt

by greatlrd＠svn.reactos.com

VBE driver never write which reslutions it should use as defualt therefor the change resultions did not working on bootcd do not remove this settings. from the reg. Thanks Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-23 20:31:53 UTC (rev 15481) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-24 14:14:40 UTC (rev 15482) @@ -929,6 +929,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x0000000 1 HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDr ivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.YResolution",0x00010001,480 + + ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0 x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" @@ -937,6 +943,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x0000000 1 HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDr ivers",0x00010000,"vgaddi" + ; VMware SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Group",0x00000000,"Vi deo"

19 years, 3 months

[hpoussin] 15481: Add ReactOS version at the start of the debug log

by hpoussin＠svn.reactos.com

Add ReactOS version at the start of the debug log Modified: trunk/reactos/ntoskrnl/ke/main.c _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-05-23 19:30:22 UTC (rev 15480) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-05-23 20:31:53 UTC (rev 15481) @@ -288,6 +288,10 @@ /* Initialize HAL */ HalInitSystem (0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + /* Display separator + ReactOS version at start of the debug log */ + DPRINT1("--------------------------------------------------------------- \n"); + DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + /* Do general System Startup */ KiSystemStartup(1); }

19 years, 3 months

← Newer
1
...
20
21
22
23
24
25
26
...
82
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 May 2005