Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by chorns＠svn.reactos.com

Tag w32api 2.5 Added: vendor/mingw/w32api/2.5/ _____ Copied: vendor/mingw/w32api/2.5 (from rev 15127, vendor/mingw/w32api/current)

19 years, 4 months

[chorns] 15127: Import w32api 2.5

by chorns＠svn.reactos.com

Import w32api 2.5 Added: vendor/mingw/w32api/current/ Added: vendor/mingw/w32api/current/CONTRIBUTIONS Added: vendor/mingw/w32api/current/ChangeLog Added: vendor/mingw/w32api/current/Makefile.in Added: vendor/mingw/w32api/current/README.w32api Added: vendor/mingw/w32api/current/TODO Added: vendor/mingw/w32api/current/config.guess Added: vendor/mingw/w32api/current/config.sub Added: vendor/mingw/w32api/current/configure Added: vendor/mingw/w32api/current/configure.in Added: vendor/mingw/w32api/current/include/ Added: vendor/mingw/w32api/current/include/GL/ Added: vendor/mingw/w32api/current/include/GL/gl.h Added: vendor/mingw/w32api/current/include/GL/glext.h Added: vendor/mingw/w32api/current/include/GL/glu.h Added: vendor/mingw/w32api/current/include/accctrl.h Added: vendor/mingw/w32api/current/include/aclapi.h Added: vendor/mingw/w32api/current/include/afxres.h Added: vendor/mingw/w32api/current/include/basetsd.h Added: vendor/mingw/w32api/current/include/basetyps.h Added: vendor/mingw/w32api/current/include/cderr.h Added: vendor/mingw/w32api/current/include/cguid.h Added: vendor/mingw/w32api/current/include/comcat.h Added: vendor/mingw/w32api/current/include/commctrl.h Added: vendor/mingw/w32api/current/include/commdlg.h Added: vendor/mingw/w32api/current/include/cpl.h Added: vendor/mingw/w32api/current/include/cplext.h Added: vendor/mingw/w32api/current/include/custcntl.h Added: vendor/mingw/w32api/current/include/dbt.h Added: vendor/mingw/w32api/current/include/dde.h Added: vendor/mingw/w32api/current/include/ddeml.h Added: vendor/mingw/w32api/current/include/ddk/ Added: vendor/mingw/w32api/current/include/ddk/atm.h Added: vendor/mingw/w32api/current/include/ddk/batclass.h Added: vendor/mingw/w32api/current/include/ddk/cfg.h Added: vendor/mingw/w32api/current/include/ddk/cfgmgr32.h Added: vendor/mingw/w32api/current/include/ddk/d4drvif.h Added: vendor/mingw/w32api/current/include/ddk/d4iface.h Added: vendor/mingw/w32api/current/include/ddk/ddkmapi.h Added: vendor/mingw/w32api/current/include/ddk/hidclass.h Added: vendor/mingw/w32api/current/include/ddk/hidpi.h Added: vendor/mingw/w32api/current/include/ddk/hidusage.h Added: vendor/mingw/w32api/current/include/ddk/mcd.h Added: vendor/mingw/w32api/current/include/ddk/miniport.h Added: vendor/mingw/w32api/current/include/ddk/minitape.h Added: vendor/mingw/w32api/current/include/ddk/mountdev.h Added: vendor/mingw/w32api/current/include/ddk/mountmgr.h Added: vendor/mingw/w32api/current/include/ddk/ndis.h Added: vendor/mingw/w32api/current/include/ddk/ndisguid.h Added: vendor/mingw/w32api/current/include/ddk/ndistapi.h Added: vendor/mingw/w32api/current/include/ddk/ndiswan.h Added: vendor/mingw/w32api/current/include/ddk/netevent.h Added: vendor/mingw/w32api/current/include/ddk/netpnp.h Added: vendor/mingw/w32api/current/include/ddk/newdev.h Added: vendor/mingw/w32api/current/include/ddk/ntapi.h Added: vendor/mingw/w32api/current/include/ddk/ntdd8042.h Added: vendor/mingw/w32api/current/include/ddk/ntddbeep.h Added: vendor/mingw/w32api/current/include/ddk/ntddcdrm.h Added: vendor/mingw/w32api/current/include/ddk/ntddcdvd.h Added: vendor/mingw/w32api/current/include/ddk/ntddchgr.h Added: vendor/mingw/w32api/current/include/ddk/ntdddisk.h Added: vendor/mingw/w32api/current/include/ddk/ntddk.h Added: vendor/mingw/w32api/current/include/ddk/ntddkbd.h Added: vendor/mingw/w32api/current/include/ddk/ntddmou.h Added: vendor/mingw/w32api/current/include/ddk/ntddndis.h Added: vendor/mingw/w32api/current/include/ddk/ntddpar.h Added: vendor/mingw/w32api/current/include/ddk/ntddpcm.h Added: vendor/mingw/w32api/current/include/ddk/ntddscsi.h Added: vendor/mingw/w32api/current/include/ddk/ntddser.h Added: vendor/mingw/w32api/current/include/ddk/ntddstor.h Added: vendor/mingw/w32api/current/include/ddk/ntddtape.h Added: vendor/mingw/w32api/current/include/ddk/ntddtdi.h Added: vendor/mingw/w32api/current/include/ddk/ntddvdeo.h Added: vendor/mingw/w32api/current/include/ddk/ntddvol.h Added: vendor/mingw/w32api/current/include/ddk/ntifs.h Added: vendor/mingw/w32api/current/include/ddk/ntpoapi.h Added: vendor/mingw/w32api/current/include/ddk/ntstatus.h Added: vendor/mingw/w32api/current/include/ddk/parallel.h Added: vendor/mingw/w32api/current/include/ddk/pfhook.h Added: vendor/mingw/w32api/current/include/ddk/poclass.h Added: vendor/mingw/w32api/current/include/ddk/scsi.h Added: vendor/mingw/w32api/current/include/ddk/scsiscan.h Added: vendor/mingw/w32api/current/include/ddk/scsiwmi.h Added: vendor/mingw/w32api/current/include/ddk/smbus.h Added: vendor/mingw/w32api/current/include/ddk/srb.h Added: vendor/mingw/w32api/current/include/ddk/storport.h Added: vendor/mingw/w32api/current/include/ddk/tdi.h Added: vendor/mingw/w32api/current/include/ddk/tdiinfo.h Added: vendor/mingw/w32api/current/include/ddk/tdikrnl.h Added: vendor/mingw/w32api/current/include/ddk/tdistat.h Added: vendor/mingw/w32api/current/include/ddk/tvout.h Added: vendor/mingw/w32api/current/include/ddk/upssvc.h Added: vendor/mingw/w32api/current/include/ddk/usb.h Added: vendor/mingw/w32api/current/include/ddk/usb100.h Added: vendor/mingw/w32api/current/include/ddk/usbcamdi.h Added: vendor/mingw/w32api/current/include/ddk/usbdi.h Added: vendor/mingw/w32api/current/include/ddk/usbioctl.h Added: vendor/mingw/w32api/current/include/ddk/usbiodef.h Added: vendor/mingw/w32api/current/include/ddk/usbscan.h Added: vendor/mingw/w32api/current/include/ddk/usbuser.h [truncated at 100 lines; 289 more skipped] _____ Added: vendor/mingw/w32api/current/CONTRIBUTIONS --- vendor/mingw/w32api/current/CONTRIBUTIONS 2005-05-08 15:50:00 UTC (rev 15126) +++ vendor/mingw/w32api/current/CONTRIBUTIONS 2005-05-08 15:55:40 UTC (rev 15127) @@ -0,0 +1,5 @@ +2000-10-23 Danny R. Smith <danny_r_smith_2001(a)yahoo.co.nz> + * include/basetsd.h + * include/ras.h + * include/raserror.h + * include/rassapi.h Property changes on: vendor/mingw/w32api/current/CONTRIBUTIONS ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/mingw/w32api/current/ChangeLog --- vendor/mingw/w32api/current/ChangeLog 2005-05-08 15:50:00 UTC (rev 15126) +++ vendor/mingw/w32api/current/ChangeLog 2005-05-08 15:55:40 UTC (rev 15127) @@ -0,0 +1,7415 @@ +2004-02-13 Earnie Boyd <earnie(a)users.sourceforge.net> + + * include/ddk/winddk.h (DIRECTORY_QUERY): Add define. + (DIRECTORY_TRAVERSE): Ditto. + (DIRECTORY_CREATE_OBJECT): Ditto. + (DIRECTORY_CREATE_SUBDIRECTORY): Ditto. + (DIRECTORY_ALL_ACCESS): Ditto. + Thanks to Konstantin Stepaniuk <skostia(a)users.sourceforge.net> + +2004-02-12 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/basetypes.h (_REFIID_DEFINED): Correct typo. + + * include/winuser.h (NCCALCSIZE_PARAMS): Define structure. + Thanks to Mike Nordell <tamlin at algonet dot se>. + +2004-02-11 Danny Smith <dannysmith(a)users.sourceforge.net> + + * lib/dnsapi.a: New file. + * lib/test.c: Include windns,h. + +2004-02-11 Pierre A. Humblet <Pierre.Humblet(a)ieee.org> + + * include/windns.h: New file. + +2004-02-11 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/sqlucode.h (SQLGetStmtAttr[AW]): Remove duplicate + defines. + (SQLSetStmtAttr[AW]): Move into ODBCVER >= 0x0300 block. + (SQLSetDescFieldW): Correct prototype. + (SQLSetDescFieldA): Add prototype. + (SQLGetDescFieldW): Add prototype. + +2004-02-11 Pat Thoyts <patthoyts(a)users.sourceforge.net> + + * include/winuser.h (DFC_POPUPMENU): Add define. + +2004-02-07 Dan Aloni <da-x(a)gmx.net> + + * lib/ddk/ntoskrnl.def (KeSetTimer,KeSetTimerEx): Correct + suffix. + +2004-02-02 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/oleacc.h (LIBID_Accessibility): Declare. + * lib/uuid.c (LIBID_Accessibility): Define. + +2004-02-02 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/winioctl.h (NTFS_VOLUME_DATA_BUFFER): Add structure. + (FSCTL_GET_NTFS_VOLUME_DATA): Add macro. + +2004-02-02 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/commctrl.h (ICC_STANDARD_CLASSES, ICC_LINK_CLASS): Add + defines. + +2004-01-31 Jiri Malak <Jiri.Malak(a)geac.cz> + + * include/winuser.h (RT_MANIFEST): Make conditional on + RC_INVOKED. + (CREATEPROCESS_MANIFEST_RESOURCE_ID, + ISOLATIONAWARE_MANIFEST_RESOURCE_ID, + ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID): Add + defines. + +2004-01-16 Martin Fuchs <martin-fuchs(a)gmx.net> + + * include/shlobj.h (SHGDN_INCLUDE_NONFILESYS): Add define. + +2004-01-15 Filip Navara <xnavara(a)volny.cz> + + * include/ddk/mcd.h: Don't care about value of DBG define. + * include/ddk/srb.h: Ditto. + * include/ddk/storport.h: Ditto. + * include/ddk/video.h: Ditto. + * include/nspapi.h (SetServiceW, GetAddressByNameA, + GetAddressByNameW): Correct protoype. + * include/ntsecapi.h (PCUNICODE_STRING): Define. + +2004-01-05 Filip Navara <xnavara(a)volny.cz> + + * include/prsht.h (LPCPROPSHEETPAGEW): Fix definition. + * include/shlwapi.h (SHRegQueryInfoUSKey[AW]): Fix prototype. + * include/cpl.h (CPL_STARTWPARMS[AW]): Correct. + * include/shellapi.h (ABS_AUTOHIDE, ABS_ALWAYSONTOP, + SEE_MASK_NO_CONSOLE, SEE_MASK_ASYNCOK, SEE_MASK_HMONITOR, + FOF_NOCOPYSECURITYATTRIBS): Add defines. + * include/shlobj.h (BFFM_SETOKTEXT, BFFM_SETEXPANDED, + CSIDL_FLAG_DONT_VERIFY, CSIDL_FLAG_CREATE, CSIDL_FLAG_MASK, + CFSTR_INETURL[AW], SHGDN_FOREDITING, SHGDN_FORADDRESSBAR, + SSF_*): Add defines. + (SHCNF_PATH[AW], SHCNF_PRINTER[AW], CFSTR_FILENAME[AW], + CFSTR_FILENAMEMAP[AW], CFSTR_FILEDESCRIPTOR[AW], CFSTR_SHELLURL, + CMDSTR_NEWFOLDER[AW], CMDSTR_VIEWLIST[AW], CMDSTR_VIEWDETAILS[AW]): + Correct. + (IEnumIDList): Add COBJMACROS. + * include/winuser.h (MIM_*): Add define. + +2004-01-04 Filip Navara <xnavara(a)volny.cz> + + * include/shlguid.h (IID_IPersistFolder2, IID_IPersistFolder3, + IID_IShellFolder2, IID_IFileSystemBindData): Add declarations. + * include/shlobj.h (EXTRASEARCH, SHCOLSTATEF, SHELLDETAILS, + PERSIST_FOLDER_TARGET_INFO): Define structures. + (IEnumExtraSearch, IShellFolder2, IFileSystemBindData, + IPersistFolder2, IPersistFolder3): Add COM interface + definitions. + (IExtractIcon[AW], IShellLink[AW], IPersistFolder, IShellView, + ICommDlgBrowser, IShellFolder2, IPersistFolder2, IPersistFolder3): + Add COBJMACROS. + (SHCreateDirectoryEx[AW], SHBindToParent): Add prototypes. + * lib/shell32.c (IID_IPersistFolder2, IID_IPersistFolder3, + IID_IShellFolder2, IID_IFileSystemBindData): Add definitions. + +2004-01-03 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/mshtml.h (IHTMLDocument2): Correct write, writeln + declarations. + Thanks to: Rene Nyffenegger <renenyffenegger(a)users.sf.net>. + +2004-01-03 Filip Navara <xnavara(a)volny.cz> + + * include/cguid.h (CLSID_StdGlobalInterfaceTable): Declare IID. + * include/oaidl.h (ITypeLib2, ITypeInfo2): Define interfaces, + declare IID's. + (IErrorInfo): Add COBJMACROS. + * include/objbase.h (STGM_NOSNAPSHOT): Add define. + (CoGetPSClsid): Add protototype, + (CoRegisterPSClsid): Likewise. + * include/objidl.h (IMarshal): Correct methods. + (IMallocSpy): Likewise, + (LPPSFACTORYBUFFER): Add typedef. + (IGlobalInterfaceTable): Define interface and COBJMACROS. Declare + IID. + (IStorage_CreateStorage, IRpcStubBuffer_Invoke): Fix macros. + * include/ocidl.h (PROPBAG2_TYPE): Define enum. + (PROPBAG2, QACONTAINERFLAGS, QACONTAINER, QACONTROL): Define + structures. + (IPropertyBag2, IPersistPropertyBag2,IAdviseSinkEx, IPointerInactive, + IOleUndoUnit, IOleParentUndoUnit, IEnumOleUndoUnits, IOleUndoManager, + IQuickActivate): Define interfaces. Declare IID's. + (IPersistPropertyBag2): Add COBJMACROS. + (LPOLEUNDOMANAGER): Add typedef. + (LPPROPERTYBAG2): Likewise. + * include/oleidl.h (LPPARSEDISPLAYNAME): Fix definiton. + (BINDSPEED): Add definition. + (IParseDisplayName, IOleItemContainer, IOleObject, IDropSource, + IDropTarget): Add COBJMACROS. + * include/wtypes.h (MEMCTX, MSHCTX): Fix enum. + * include/winerror.h (CO_S_NOTALLINTERFACES): Add define. + * lib/uuid.c (IID_IGlobalInterfaceTable, IID_IOleUndoManager, + IID_IPersistPropertyBag2, IID_IPropertyBag2, IID_IRpcProxyBuffer): + Add IID definitions. + +2004-01-02 Filip Navara <xnavara(a)volny.cz> + + * include/ddk/winddk.h: Don't care about value of + DBG define. + +2004-01-02 Danny Smith <dannysmith(a)users.sourceforge.net> + Filip Navara <xnavara(a)volny.cz> + + * include/ddk/winddk.h (_DDK_DUMMYUNION_MEMBER, + _DDK_DUMMYUNION_N_MEMBER): New macros. + (ExAllocateFromPagedLookasideList,ExFreeToPagedLookasideList, + ExAllocateFromNPagedLookasideList, ExFreeToNPagedLookasideList): + Use them. + +2004-01-01 Filip Navara <xnavara(a)volny.cz> + + * include/objbase.h: Don't care about value of DBG define. + * include/objidl.h: Add some COBJMACROS. + * include/ocidl.h: Ditto. + * include/oleidl.h: Ditto. + * include/servprov.h: Ditto. + * include/shlobj.h: Ditto. + * include/shlobj.h (IContextMenu2): Correct parent in + DECLARE_INTERFACE. + * include/oleidl.h (IOleCache, IOleCache2, IOleCacheControl): + Define interfaces. + * include/setupapi.h (SetupGetLineTextA): Correct prototype. + Add new constants for _SETUPAPI_VER >= 0x501. + +2004-01-01 Filip Navara <xnavara(a)volny.cz> + + * include/winnt.h (NtCurrentTeb): Add inline definition. + +2004-01-01 Martin Fuchs <martin-fuchs(a)gmx.net> + + * include/shlobj.h (SHCoCreateInstance): Add prototype. + * lib/shell32.def (SHCoCreateInstance): Add export stub. + +2004-01-01 Igor Pechtchanski <pechtcha(a)cs.nyu.edu> + + * lib/setupapi.def (CM_Request_Device_Eject[AW]): Add export. + (CM_Request_Device_Eject_Ex[AW]): Likwise. + * include/ddk/cfg.h (DN_*): Add defines. + +2004-01-01 Danny Smith <dannysmith(a)users.sourceforge.net> + + * lib/ddk/cfgmgr32.def: Remove duplicate symbol names. + +2004-01-01 Mattia Barbon <mbarbon(a)users.sourceforge.net> + + * include/commctrl.h (TVN_GETINFOTIP): Add UNICODE mappings. + (NMTVGETINFOTIP): Add structure. + +2003-12-08 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/winuser.h (DISPLAY_DEVICE_*): Remove defines. + * include/wingdi.h (DISPLAY_DEVICE_REMOVABLE, + DISPLAY_DEVICE_MODESPRUNED): Add defines. + +2003-12-08 Hartmut Honisch <hhonisch(a)users.sourceforge.net> + + * include/commctrl.h (ListView_Get_State, ListView_Check_State): + Add macros. + * include/wingdi.h (DISPLAY_DEVICE_*): Add multi-monitor + constants. + * include/shlobj.h (SHCOLUMNINIT); Add structure. + (SHCOLUMNDAT): Likwise. + (SHCOLUMNID): Likewise. + (SHCOLUMNINFO): Likewise. + (SHCOLSTATE): Add enum. + (IColumnProvider): Add COM interface. + (IQueryInfo): Likewise. + (IShellIconOverlayIdentifier): Likewise. + * include/shlguid.h (IID_IColumnProvider) Declare. + (IID_IQueryInfo): Likweise. + (IID_IShellIconOverlayIdentifier): Likwise. + * lib/shell32.c (IID_IColumnProvider) Define. + (IID_IQueryInfo): Likweise. + (IID_IShellIconOverlayIdentifier): Likwise. + +2003-12-08 Roald Ribe <rrib(a)users.sourceforge.net> + + * include/winuser.h (RT_MANIFEST): Add define. + +2003-12-08 Pascal Buhler <pbuhler(a)users.sourceforge.net> + + * include/oleidl.h (IViewObject2): Inherit from IViewObject. + +2003-12-01 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/winnt.h (GetCurrentFiber): Remove duplicate prototype. + (GetFiberData); Likewise. + (GetCurrentFiber): Change volatile to __volatile__. + (GetFiberData); Likewise. + +2003-11-27 Christopher Faylor <cgf(a)redhat.com> + + * lib/Makefile.in: Use make function to locate .mri file to allow + building in directory other than source directory. + +2003-11-27 Danny Smith <dannysmith(a)users.sourceforge.net> + + * lib/vfw32.def: Remove, replacing with ... + * lib/msvfw32.def: New file. + * lib/avicap32.def: New file. + * lib/avifil32.def: New file. + * lib/vfw32.mri: New file. + * Makefile.in: (MRI_FILES, MIMPLIBS): New vars for + import libs with multiple dll's. + (LIBS): Add MIMPLIBS. + (DISTFILES): Add MRI_FILES. + (libvfw32.a): Build using mri script. + +2003-11-23 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/winnt.h (PAGE_*): Group defines together. Change + constants to hex notation. + +2003-11-15 Manu B <manubee(a)users.sourceforge.net> + + * include/commctrl.h (TabCtrl_GetImageList): Add macro. + +2003-11-13 Martin Fuchs <martin-fuchs(a)gmx.net> + + * include/shlobj.h (ILAppendID, ILClone, ILCloneFirst, ILCombine, + ILFindChild, ILFindLastID, ILFree, ILGetNext, ILGetSize, ILIsEqual, + ILIsParent, ILLoadFromStream, ILRemoveLastID, ILSaveToStream): + Add prototypes. + * lib/shell32.def: Add stubs. + + * include/commctrl.h (ListView_FindItem): Add type cast to avoid + compiler warnings. + +2003-11-13 Hans Leidekker <hans(a)it.vu.nl> + + * include/winbase.h (WIN32_STREAM_ID): Correct typedef. + +2003-10-13 Andre Auzi <aauzi(a)users.sourceforge.net> + + * include/windows.h (CopyCursor): Define as macro. + +2003-10-13 Steven Edwards <Steven_Ed4153(a)yahoo.com> + + * include/winnt.h (CONTAINING_RECORD): Add macro. + +2003-10-13 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/winnt.h: (FILE_SUPERSEDED, FILE_OPENED, FILE_CREATED, + FILE_OVERWRITTEN, FILE_EXISTS, FILE_DOES_NOT_EXIST): Remove + defines. + +2003-10-13 Filip Navara <xnavara(a)volny.cz> + + * include/commctrl.h: (DSA_*):Add prototypes, typedefs and + defines for Dynamic Storage Arrays. + (DPA_*): Likewise, for Dynamic Pointer Arrays. + (FlatSB_*, InitializeFlatSB, InitializeFlatSB): Add prototypes + and defines for Flat ScrollBars. + (SetWindowSubclass, GetWindowSubclass, RemoveWindowSubclass, + DefSubclassProc): Add prototypes for subclassing. + (DrawShadowText) Add prototype. + (COMCTL32_VERSION): Define. + +2003-10-13 Martin Fuchs <Martin-Fuchs(a)gmx.net> + + * include/shlobj.h (CFSTR_FILENAME, CFSTR_FILEDESCRIPTOR, + CFSTR_FILENAMEMAP, CFSTR_SHELLURL): Correct UNICODE definitions. + +2003-10-13 Pierre Humblet <pierre.humblet(a)ieee.org> + + * include/winnt.h (SM_REMOTESESSION): Add define. + * include/winuser.h (SE_CREATE_GLOBAL_NAME): Ditto. + +2003-10-13 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/wincrypt (KP_IV, KP_SALT, KP_PADDING, KP_MODE, + KP_MODE_BITS, KP_PERMISSIONS, KP_ALGID, KP_BLOCKLEN): Remove + duplicate definitions. + (KP_X, KP_Y): Correct typos. + +2003-10-11 Manu B <manubee(a)users.sourceforge.net> + + * include/afxres.h: New file. + + * include/richedit.h (ES_NOOLEDRAGDROP, ENM_DRAGDROPDONE, + ENM_IMECHANGE, ENM_LANGCHANGE, ENM_OBJECTPOSITIONS, + ENM_SCROLLEVENTS): Add constants. + + * include/richedit.h (ES_SELECTIONBAR, ENM_LINK): Sort constants. + +2003-10-09 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/errorep.h: New file. + + * lib/faultrep.def: New file. + +2003-10-09 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h (AddVectoredExceptionHandler): Define if + _WIN32_WINNT >= 0x0500. + + * include/winnt.h (PVECTORED_EXCEPTION_HANDLER): Define if + _WIN32_WINNT >= 0x0500. + +2003-10-08 Corinna Vinschen <corinna(a)vinschen.de> + + * include/winbase.h (AddVectoredExceptionHandler): Only define if + _WIN32_WINNT >= 0x0501. + +2003-10-07 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h [_WIN32_WINNT >= 0x0500] (SetComputerNameEx[AW], + UnregisterWaitEx): Add functions. + + * include/winbase.h [_WIN32_WINNT >= 0x0500] + (AddVectoredExceptionHandler, RemoveVectoredExceptionHandler): Add + or guard function. The MSDN says it is available on Windows XP and + better, and then it says it is declared for _WIN32_WINNT >= 0x0500. + Huh? + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (AddRefActCtx, + CreateActCtx[AW], SetFileShortName[AW], SetFileValidData, + ZombifyActCtx, QueryActCtxW): Add functions. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] + (QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, + QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE, + QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS): Add constants. + + * include/winbase.h [_WIN32_WINNT >= 0x0502] (SetDllDirectory[AW], + SetFirmwareEnvironmentVariable[AW]): Add functions. + + * include/winnt.h [_WIN32_WINNT >= 0x0500] (VER_BUILDNUMBER, + VER_MAJORVERSION, VER_MINORVERSION, VER_PLATFORMID, + VER_SERVICEPACKMAJOR, VER_SERVICEPACKMINOR, VER_SUITENAME, + VER_PRODUCT_TYPE, VER_EQUAL, VER_GREATER, VER_GREATER_EQUAL, + VER_LESS, VER_LESS_EQUAL, VER_AND, VER_OR): Add constants. + + * include/winnt.h [_WIN32_WINNT >= 0x0501] + (PVECTORED_EXCEPTION_HANDLER): Add callback. + + * include/winnt.h [_WIN32_WINNT >= 0x0501] + (ACTIVATION_CONTEXT_INFO_CLASS, + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION, + ACTIVATION_CONTEXT_DETAILED_INFORMATION, + ACTIVATION_CONTEXT_QUERY_INDEX, ASSEMBLY_FILE_DETAILED_INFORMATION): + Add structures. + + * lib/user32.def (AddRefActCtx, AddVectoredExceptionHandler, + CreateActCtx[AW], SetComputerNameEx[AW], SetDllDirectory[AW], + SetFileShortName[AW], SetFileValidData, + SetFirmwareEnvironmentVariable[AW], UnregisterWaitEx, + VerSetConditionMask, ZombifyActCtx, QueryActCtxW): Add functions. + +2003-10-07 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h (GetWriteWatch, IsSystemResumeAutomatic, + ResetWriteWatch): Add function. + + * include/winbase.h [_WIN32_WINNT >= 0x0500] + (GetSystemWindowsDirectory[AW], ProcessIdToSessionId, ReplaceFile[AW]): + Add functions. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] + (GetSystemWow64Directory[AW], HeapQueryInformation, + HeapSetInformation, InitializeSListHead, InterlockedFlushSList, + InterlockedPopEntrySList, InterlockedPushEntrySList, IsProcessInJob, + IsWow64Process, QueryMemoryResourceNotification, ReleaseActCtx, + RemoveVectoredExceptionHandler): Add functions. + + * include/winnt.h [_WIN32_WINNT >= 0x0501] (HEAP_INFORMATION_CLASS): + Add enumeration. + + * include/winbase.h [_WIN32_WINNT >= 0x0502] (GetThreadIOPendingFlag): + Add function. + + * include/winbase.h [_WIN32_WINNT >= 0x0510] (RestoreLastError): + Add function. The MSDN Magazine of June 2003 reads: + RestoreLastError is an enigma. It's code is identical to + SetLastError. It's unclear to me why it was made into a + separate API. + + * lib/user32.def (GetSystemWindowsDirectory[AW], + GetSystemWow64Directory[AW], GetThreadIOPendingFlag, + HeapQueryInformation, HeapSetInformation, InitializeSListHead, + InterlockedFlushSList, InterlockedPopEntrySList, + InterlockedPushEntrySList, IsSystemResumeAutomatic, IsWow64Process, + ProcessIdToSessionId, QueryMemoryResourceNotification, ReleaseActCtx, + RemoveVectoredExceptionHandler, ReplaceFile[AW], ResetWriteWatch, + RestoreLastError): Add functions. + +2003-10-07 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h [_WIN32_WINNT >= 0x0500] (GetComputerNameEx[AW], + GetProcessIoCounters): Add functions. + + * include/winbase.h [_WIN32_WINNT >= 0x0500] (COMPUTER_NAME_FORMAT): + Move around, needed by GetComputerNameEx. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (FindActCtxSectionGuid, + FindActCtxSectionString[AW], GetCurrentActCtx, GetNativeSystemInfo): + Add functions. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] + (ACTCTX_SECTION_KEYED_DATA): Add structure. + + * include/winbase.h [_WIN32_WINNT >= 0x0502] (GetDllDirectory[AW], + GetFirmwareEnvironmentVariable[AW], GetProcessHandleCount, + GetProcessId, GetSystemRegistryQuota): Add functions, available on + Windows XP SP1 and better. + + * include/winnt.h [_WIN32_WINNT >= 0x0501] + (ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, + ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, + ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, + ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES): Add constants. + + * lib/user32.def (FindActCtxSectionGuid, FindActCtxSectionString[AW], + GetComputerNameEx[AW], GetCurrentActCtx, GetDllDirectory[AW], + GetFirmwareEnvironmentVariable[AW], GetModuleHandleEx[AW], + GetNativeSystemInfo, GetProcessHandleCount, GetProcessIoCounters): + Add functions. + +2003-10-07 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h [_WIN32_WINNT >= 0x0501] + (CheckRemoteDebuggerPresent, DebugActiveProcessStop, DebugBreakProcess, + DebugSetProcessKillOnExit): Add functions. + + * include/winbase.h [_WIN32_WINNT >= 0x0500] (DeleteTimerQueue, + DeleteTimerQueueEx, DeleteTimerQueueTimer, + DnsHostnameToComputerName[AW]): Add functions. + + * lib/user32.def (CheckRemoteDebuggerPresent, DebugActiveProcessStop, + DebugBreakProcess, DebugSetProcessKillOnExit, DeleteTimerQueueEx, + DeleteTimerQueueTimer, DnsHostnameToComputerName[AW]): Add functions. + +2003-10-07 Kobun Fujimori <kobun(a)users.sourceforge.net> + + * include/winbase.h (GetVolumePathNamesForVolumeName): Available + on Windows XP and later. + +2003-10-07 Manu B <manubee(a)users.sourceforge.net> + + * include/commctrl.h (TreeView_Select): Returns BOOL. + +2003-10-06 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h (CancelDeviceWakeupRequest): Add function. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] + (CreateMemoryResourceNotification, DeactivateActCtx): Add functions. + + * include/winbase.h [_WIN32_WINNT >= 0x0500] (CreateTimerQueue, + CreateTimerQueueTimer): Add function. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] + (MEMORY_RESOURCE_NOTIFICATION_TYPE): Add enumeration. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] + (DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION): Add constant. + + * include/winnt.h (WT_*): Add constants. + + * lib/user32.def (CancelDeviceWakeupRequest, + CreateMemoryResourceNotification, CreateTimerQueueTimer, + DeactivateActCtx): Add functions. + +2003-10-06 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h [_WIN32_WINNT >= 0x0400] (ConvertFiberToThread): + Add function. Sometimes I don't understand MSDN. This function is + available on Windows XP and Server 2003, but the SDK is supposed to + make it available when _WIN32_WINNT >= 0x0400, or so says the MSDN. + Mmmh... + + * include/winbase.h [_WIN32_WINNT >= 0x0400] (CreateFiberEx): + Guard function. Same remark as above. + + * lib/user32.def (ConvertFiberToThread, CreateFiberEx): + Add functions. + +2003-10-06 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (ACTCTX_FLAG_*): + Add constants. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (ACTCTX[AW]): Add + structures. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (ActivateActCtx): Add + function. MSDN says the first argument is HACTCTX but I'm not sure + where such a specialized handle is defined, so use HANDLE instead. + + * include/winbase.h [_WIN32_WINNT >= 0x0501] (AttachConsole, + CheckNameLegalDOS8Dot3[AW]): Add functions. + + * lib/user32.def (ActivateActCtx, AttachConsole, + CheckNameLegalDOS8Dot3[AW]): Add functions. + + * lib/user32.def (AddLocalAlternateComputerName[AW]): Add functions. + Unfortunately I don't know which header to put the declarations in. + +2003-10-06 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winnls.h (CTRY_KYRGYZSTAN, CTRY_MALDIVES, CTRY_MONGOLIA): + Add constants. + + * include/winnls.h (NLS_FUNCTION, SYSGEOCLASS, SYSGEOTYPE): Add + constants for National Language Support. + + * include/winnls.h (NLSVERSIONINFO): Add structure for National + Language Support. + + * include/winnls.h (GEO_ENUMPROC): Add callback for National + Language Support. + + * include/winnls.h (EnumSystemGeoID, GetCalendarInfo[AW], + GetGeoInfo[AW], GetUserGeoID, SetCalendarInfo[AW], SetUserGeoID): + Add functions. + + * include/winnls.h (IsNLSDefinedString, GetNLSVersion): Add + functions. Strange... I am unable to find which library contains + these functions. Can't find anything with pexports. Any clue? + + * lib/user32.def (EnumSystemGeoID, GetGeoInfo[AW], GetUserGeoID, + SetUserGeoID): Add functions. + +2003-10-06 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winnt.h (LANG_KYRGYZ, LANG_MONGOLIAN, LANG_GALICIAN, + LANG_SYRIAC, LANG_INVARIANT, SUBLANG_KASHMIRI_SASIA): Add constants. + + * include/winnt.h (SUBLANG_AZERI_LATIN, SUBLANG_AZERI_CYRILLIC, + SUBLANG_ENGLISH_ZIMBABWE, SUBLANG_ENGLISH_PHILIPPINES): Fix wrong + value for constants. + +2003-10-03 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/wincrypt.h (SCHANNEL_MAC_KEY, SCHANNEL_ENC_KEY, + INTERNATIONAL_USAGE, KP_SCHANNEL_ALG): Add constants. Specifying + the algorithms. + +2003-10-03 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/wincrypt.h (CRYPT_FLAGS_*): Add constants. Protocol flags. + +2003-10-03 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/wincrypt.h (KP_*): Add constants. Needed by + CryptSetKeyParam() and other functions. + +2003-10-03 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (EVENT_*, CONSOLE_*): + Add constants, related to Console Accessibility. + +2003-10-03 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (EVENT_MAX): Ooops... + wrong value for constant. + +2003-10-03 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (EVENT_*): Add constants. + + * include/uxtheme.h: Cleanup. + * include/tmschema.h: Cleanup. + +2003-10-02 Luke Dunstan <infidel(a)users.sourceforge.net> + + * include/winspool.h (GetDefaultPrinter[AW]): Add functions. + * lib/winspool.def (GetDefaultPrinter[AW]): Add stubs. + +2003-10-01 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/winnt.h (INVALID_FILE_ATTRIBUTES): Fix define. + +2003-09-30 Danny Smith <dannysmith(a)users.sourceforge.net> + + * include/winuser.h (BSF_*, BSM_*): Sync constants defined in + both winuser.h and dbt.h. + * include/dbt.h (BSF_*, BSM_*): Likewise. + + * include/winuser.h (struct tagRAWINPUT): Remove + _ANONYMOUS_UNION tag from named union. + (struct tagRAWMOUSE): Add _ANONYMOUS_STRUCT to nameless struct. + +2003-09-30 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/dhcpcdsk.h: New file. + Note that MSDN is confused about whether it should start constant + and structure names with DHCPCAPI or DHCPAPI. It's using both but + experience suggests it's DHCPCAPI with `C'. + + * lib/dhcpcsvc.def: New file. + +2003-09-30 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_INPUT, + RIM_INPUTSINK): Add constants, for use by WM_INPUT notification. + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (RIDEV_REMOVE, + RIDEV_EXCLUDE, RIDEV_PAGEONLY, RIDEV_NOLEGACY, RIDEV_INPUTSINK, + RIDEV_CAPTUREMOUSE, RIDEV_NOHOTKEYS, RIDEV_APPKEYS): Add constants, + for use in RAWINPUTDEVICE. + + * include/winuser.h [_WIN32_WINNT >= 0x0501] + (GetRawInputDeviceInfo[AW]): Ooops... there are + ANSI/Unicode versions of this function. + + * lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there + are ANSI/Unicode versions of this function. + +2003-09-29 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE, + RIM_TYPEKEYBOARD, RIM_TYPEHID, MOUSE_MOVE_RELATIVE, + MOUSE_MOVE_ABSOLUTE, MOUSE_VIRTUAL_DESKTOP, + MOUSE_ATTRIBUTES_CHANGED, RI_MOUSE_LEFT_BUTTON_DOWN, + RI_MOUSE_LEFT_BUTTON_UP, RI_MOUSE_RIGHT_BUTTON_DOWN, + RI_MOUSE_RIGHT_BUTTON_UP, RI_MOUSE_MIDDLE_BUTTON_DOWN, + RI_MOUSE_MIDDLE_BUTTON_UP, RI_MOUSE_BUTTON_1_DOWNT_BUTTON_DOWN, + RI_MOUSE_BUTTON_1_UP, RI_MOUSE_BUTTON_2_DOWNHT_BUTTON_DOWN, + RI_MOUSE_BUTTON_2_UP, RI_MOUSE_BUTTON_3_DOWNDLE_BUTTON_DOWN, + RI_MOUSE_BUTTON_3_UP, RI_MOUSE_BUTTON_4_DOWN, + RI_MOUSE_BUTTON_4_UP, RI_MOUSE_BUTTON_5_DOWN, + RI_MOUSE_BUTTON_5_UP, RI_MOUSE_WHEEL, KEYBOARD_OVERRUN_MAKE_CODE, + RI_KEY_MAKE, RI_KEY_BREAK, RI_KEY_E0, RI_KEY_E1, + RI_KEY_TERMSRV_SET_LED, RI_KEY_TERMSRV_SHADOW, RID_INPUT, + RID_HEADER, RIDI_PREPARSEDDATA, RIDI_DEVICENAME, + RIDI_DEVICEINFO): Add constants. + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (RAWINPUTHEADER, + RAWMOUSE, RAWKEYBOARD, RAWHID, RAWINPUT, RAWINPUTDEVICE, + RAWINPUTDEVICELIST): Add structures. + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (DefRawInputProc, + GetRawInputBuffer, GetRawInputData, GetRawInputDeviceInfo, + GetRawInputDeviceList, GetRegisteredRawInputDevices): Add functions. + + * lib/user32.def (DefRawInputProc, GetRawInputBuffer, + GetRawInputData, GetRawInputDeviceInfo, GetRawInputDeviceList, + GetRegisteredRawInputDevices): Add functions. + +2003-09-26 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winable.h (BlockInput): Add function. + + * include/winable.h (WS_ACTIVECAPTION): Add constant. + For use with WINDOWINFO structure. + + * include/winuser.h [_WIN32_WINNT >= 0x0500] (LockWorkStation): + Add function. + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (IsWinEventHookInstalled): + Add function. + + * include/winuser.h [WINVER >= 0x0500] (UnhookWinEvent): + Add function... + + * include/winable.h [WINVER < 0x0500] (UnhookWinEvent): + ...and duplicate. + + * include/winuser.h [_WIN32_WINNT >= 0x0403] (SendInput): + Guard function... + + * include/winable.h [_WIN32_WINNT < 0x0403] (SendInput): + ...and duplicate. + + * include/winuser.h [WINVER >= 0x0500] (NotifyWinEvent): + Guard function... + + * include/winable.h [WINVER < 0x0500] (NotifyWinEvent): + ...and duplicate. + + * include/winuser.h [WINVER >= 0x0500] (MOUSEINPUT, KEYBDINPUT, + HARDWAREINPUT, INPUT): Guard structures... + + * include/winable.h [WINVER < 0x0500] (MOUSEINPUT, KEYBDINPUT, + HARDWAREINPUT, INPUT): ...and duplicate. + + * include/winuser.h [_WIN32_WINNT >= 0x0403] (INPUT_MOUSE, + INPUT_KEYBOARD, INPUT_HARDWARE): Guard constants... + + * include/winable.h [_WIN32_WINNT < 0x0403] (INPUT_MOUSE, + INPUT_KEYBOARD, INPUT_HARDWARE): ...and duplicate. + + * include/winuser.h: Move around some lines. Reformat according + to recommended or dominant style. Remove FAR keyword. + + * include/winable.h: Move around some lines. + + * lib/user32.def (BlockInput, IsWinEventHookInstalled, + LockWorkStation, UnhookWinEvent): Add functions. + +2003-09-26 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [_WIN32_WINNT >= 0x0501] (PrintWindow, + PW_CLIENTONLY): Add function and constant. + + * lib/user32.def (PrintWindow): Add function. + +2003-09-26 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h (RealGetWindowClassA[AW]): Add function. + + * lib/user32.def (RealGetWindowClassA[AW]): Add function. + +2003-09-26 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (RegisterDeviceNotification[AW], + DEVICE_NOTIFY_WINDOW_HANDLE, DEVICE_NOTIFY_SERVICE_HANDLE, + DEVICE_NOTIFY_ALL_INTERFACE_CLASSES): Add function and constants. + + * lib/user32.def (RegisterDeviceNotification[AW]): Add function. + +2003-09-26 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (SetWinEventHook, WINEVENTPROC, + WINEVENT_OUTOFCONTEXT, WINEVENT_SKIPOWNTHREAD, WINEVENT_SKIPOWNPROCESS, + WINEVENT_INCONTEXT): Add function, typedef, and constants. + + * include/winable.h [WINVER < 0x0500] (SetWinEventHook, WINEVENTPROC, + WINEVENT_OUTOFCONTEXT, WINEVENT_SKIPOWNTHREAD, WINEVENT_SKIPOWNPROCESS, + WINEVENT_INCONTEXT): Add function, typedef, and constants. + + * include/winuser.h [_WIN32_WINNT >= 0x0500] (UserHandleGrantAccess): + Add function. + + * lib/user32.def (SetWinEventHook, UserHandleGrantAccess): + Add functions. + +2003-09-26 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winnt.h (ACE_INHERITED_OBJECT_TYPE_PRESENT, + ACE_OBJECT_TYPE_PRESENT): Add constants. + For use with OBJECTS_AND_NAME structure. + +2003-09-26 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/aclapi.h [_WIN32_WINNT >= 0x0501] (GetInheritanceSource[AW]): + Add functions. Don't know what PFN_OBJECT_MGR_FUNCTS is so use + void* instead. + + * include/accctrl.h [_WIN32_WINNT >= 0x0501] (INHERITED_FROM[AW], + PINHERITED_FROM[AW]): Add structures. + + * lib/user32.def (GetInheritanceSource[AW]): Add functions. + +2003-09-26 Corinna Vinschen <corinna(a)vinschen.de> + + * include/winuser.h (FLASHWINFO, PFLASHWINFO): Define for 98/Me, too. + +2003-09-25 Danny Smith <dannysmith(a)users.sourceforge.net> + + * lib/version.def (LIBRARY): Quote name. + +2003-09-25 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h (GetClipboardSequenceNumber): Add functions + and constants. + + * include/winuser.h (GetGuiResources, GR_GDIOBJECTS, + GR_USEROBJECTS): Add functions and constants. + + * include/winuser.h (GetMouseMovePointsEx, GMMP_USE_DISPLAY_POINTS, + GMMP_USE_HIGH_RESOLUTION_POINTS): Add functions and constants. + + * include/winuser.h (InSendMessageEx, ISMEX_NOSEND, ISMEX_CALLBACK, + ISMEX_NOTIFY, ISMEX_REPLIED, ISMEX_SEND): Add functions and + constants. + + * lib/user32.def (GetClipboardSequenceNumber, GetGuiResources, + GetMouseMovePointsEx, InSendMessageEx): Add functions. + +2003-09-25 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h (BroadcastSystemMessage, BroadcastSystemMessageA, + BroadcastSystemMessageW, BroadcastSystemMessageEx, + BroadcastSystemMessageExA, BroadcastSystemMessageExW, + BSMINFO, BSF_ALLOWSFW, BSF_SENDNOTIFYMESSAGE, BSF_LUID, + BSF_RETURNHDESK): Add functions and constants. + + * include/winuser.h (EnumDisplaySettingsEx, EnumDisplaySettingsExA, + EnumDisplaySettingsExW, EDS_RAWMODE): Add functions and constant. + + * include/winuser.h (IsGUIThread, IsHungAppWindow, FlashWindowEx, + GetProcessDefaultLayout, SetProcessDefaultLayout, + RealChildWindowFromPoint, SetProcessDefaultLayout, + SwitchToThisWindow): Add functions. + + * lib/user32.def (BroadcastSystemMessageA, BroadcastSystemMessageW, + BroadcastSystemMessageExA, BroadcastSystemMessageExW, + EnumDisplaySettingsExA, EnumDisplaySettingsExW, FlashWindowEx, + GetProcessDefaultLayout, IsGUIThread, IsHungAppWindow, + RealChildWindowFromPoint, SetProcessDefaultLayout, + SwitchToThisWindow): Add function. + +2003-09-25 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h (DeregisterShellHookWindow): Add function. + + * include/winuser.h [_WIN32_WINNT >= 0x0500] (EndTask): Add function. + + * lib/user32.def (EndTask): Add function. + + * include/winuser.h (WINVER, _WIN32_WINNT): It's better (?) to + use _WIN32_WINNT instead of WINVER to test for Windows 2000. + + * include/winable.h: Reorder target macros. + + * lib/*.def: Cleanup. + +2003-09-25 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (AnimateWindow): Add + function. + + * lib/user32.def (AnimateWindow): Add function. By the way + there are ~ 140 symbols missing from this file when comparing + to user32.dll on Windows XP. + +2003-09-25 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (AW_SLIDE, AW_ACTIVATE, + AW_BLEND, AW_HIDE, AW_CENTER, AW_HOR_POSITIVE, AW_HOR_NEGATIVE, + AW_VER_POSITIVE, AW_VER_NEGATIVE): Add constants. For use by + AnimateWindow(). + +2003-09-25 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (GetGUIThreadInfo, + LPGUITHREADINFO): Add function and associated typedef... + + * include/winable.h [WINVER < 0x0500] (GetGUIThreadInfo, + LPGUITHREADINFO): ...and duplicate them in <winable.h> as + seems to be required on older versions of Windows. + +2003-09-24 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/GL/glu.h (gluErrorUnicodeStringWIN): Add macro + function. MSDN suggests using gluErrorUnicodeStringWIN + instead of gluErrorString, as it allows both ANSI and Unicode + error strings. + + * include/GL/glu.h (gluErrorUnicodeStringEXT): Make the + returned pointer const for consistency reasons. + +2003-09-24 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/GL/glu.h (gluErrorUnicodeStringEXT): Add function. + Function exists in glu32.def but is undocumented on MSDN. + A Google search came up with this declaration. + +2003-09-24 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/GL/glu.h: Rewritten from scratch. Started from GLU 1.3 + headers from OpenGL Sample Implementation. Windows ships with + GLU 1.2 so some constants and functions were removed. Then some + typedef's and function declarations were reworked to look like + the previous GL/glu.h. + +2003-09-24 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/uxtheme.h (PROPERTYORIGIN): the documentation of + PROPERTYORIGIN suggests it's `PROPERTYORIGIN' but experimentation + suggests it's actually `enum PROPERTYORIGIN'. Keep both. + + * include/uxtheme.h (THEME_SIZE, THEMESIZE): MSDN suggests + it's either `THEME_SIZE' or `THEMESIZE' but experimentation + suggests it's actually `enum THEMESIZE'. Keep `THEME_SIZE' + and `enum THEMESIZE'. + +2003-09-24 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/uxtheme.h: New file. + * include/tmschema.h: New file. + * include/uxtheme.def: New file. + * lib/test.c: Include uxtheme.h, tmschema.h. + +2003-09-23 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h (KEYEVENTF_UNICODE, KEYEVENTF_SCANCODE): + Add defines. + +2003-09-23 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winable.h [_WIN32_WINNT < 0x0403] (INPUT_MOUSE, + INPUT_KEYBOARD, INPUT_HARDWARE): Duplicate defines in + <winable.h> as seems to be required on older versions of + Windows. + +2003-09-23 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (CHILDID_SELF, + GUI_CARETBLINKING, GUI_INMOVESIZE, GUI_INMENUMODE, + GUI_SYSTEMMENUMODE, GUI_POPUPMENUMODE, GUI_16BITTASK): + Add defines, the last one only on Windows XP... + + * include/winable.h [WINVER < 0x0500] (CHILDID_SELF, + GUI_CARETBLINKING, GUI_INMOVESIZE, GUI_INMENUMODE, + GUI_SYSTEMMENUMODE, GUI_POPUPMENUMODE): ...and duplicate + them in <winable.h> as seems to be required on older + versions of Windows. + +2003-09-23 Dimitri Papadopoulos <papadopo(a)users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (GUITHREADINFO, + OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, OBJID_MENU, + OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, OBJID_SIZEGRIP, + OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, OBJID_SOUND): Bring + back into <winuser.h>... + + * include/winable.h [WINVER < 0x0500] (GUITHREADINFO, + OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, OBJID_MENU, + OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, OBJID_SIZEGRIP, + OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, OBJID_SOUND): ...and + comment out in <winable.h>. MSDN may say <winable.h> but this + breaks many programs. It seems it used to be <winable.h> on + older versions of Windows. [truncated at 1000 lines; 151137 more skipped]

19 years, 4 months

[chorns] 15126: Create w32api vendor drop area

by chorns＠svn.reactos.com

Create w32api vendor drop area Added: vendor/mingw/w32api/

19 years, 4 months

[chorns] 15125: Create MinGW vendor drop area

by chorns＠svn.reactos.com

Create MinGW vendor drop area Added: vendor/mingw/

19 years, 4 months

[gvg] 15124: Fix for nasm 0.98

by gvg＠svn.reactos.com

Fix for nasm 0.98 Modified: trunk/reactos/lib/pseh/i386/framebased.asm _____ Modified: trunk/reactos/lib/pseh/i386/framebased.asm --- trunk/reactos/lib/pseh/i386/framebased.asm 2005-05-08 14:48:24 UTC (rev 15123) +++ trunk/reactos/lib/pseh/i386/framebased.asm 2005-05-08 15:40:25 UTC (rev 15124) @@ -56,9 +56,9 @@ push esi push edi - push 0x0 ; ReturnValue - push 0x0 ; ExceptionRecord - push .RestoreRegisters ; TargetIp + push dword 0x0 ; ReturnValue + push dword 0x0 ; ExceptionRecord + push dword .RestoreRegisters ; TargetIp push ebx ; TargetFrame call [__SEHRtlUnwind]

19 years, 4 months

[greatlrd] 15123: found some hard code string move them to En.rc

by greatlrd＠svn.reactos.com

found some hard code string move them to En.rc them new are STRING_CMD_INVALIDDRIVE, STRING_CMD_SHELLINFO, STRING_VERSION_RUNVER remove some #define strings that was not in use. update ver so it output svn version number and update copyright note it take the copyright and buildversion from <reactos/resource.h> and <reactos/buildno.h> so we only need change it on one place Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/ver.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 14:39:46 UTC (rev 15122) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-08 14:48:24 UTC (rev 15123) @@ -560,4 +560,9 @@ STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" + + +STRING_CMD_INVALIDDRIVE, "ERROR: invalid drive" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_VERSION_RUNVER " running on %s" } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-05-08 14:39:46 UTC (rev 15122) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-05-08 14:48:24 UTC (rev 15123) @@ -333,7 +333,7 @@ working = SetCurrentDirectory(str); } - if (!working) ConErrPuts (INVALIDDRIVE); + if (!working) ConErrResPuts (STRING_CMD_INVALIDDRIVE); return; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-05-08 14:39:46 UTC (rev 15122) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-05-08 14:48:24 UTC (rev 15123) @@ -48,18 +48,7 @@ #define BREAK_IGNORE 4 /* define some error messages */ -#define NOENVERR _T("ERROR: no environment") -#define INVALIDDRIVE _T("ERROR: invalid drive") -#define INVALIDFUNCTION _T("ERROR: invalid function") -#define ACCESSDENIED _T("ERROR: access denied") -#define BADENVIROMENT _T("ERROR: bad enviroment") -#define BADFORMAT _T("ERROR: bad format") -#define ERROR_E2BIG _T("ERROR: Argument list too long") -#define ERROR_EINVAL _T("ERROR: Invalid argument") -#define SHELLINFO "ReactOS Command Line Interpreter" - - #define D_ON _T("on") #define D_OFF _T("off") _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-08 14:39:46 UTC (rev 15122) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-08 14:48:24 UTC (rev 15123) @@ -1,3 +1,5 @@ + + #define RC_STRING_MAX_SIZE 3072 @@ -81,126 +83,131 @@ #define STRING_CMD_HELP5 612 #define STRING_CMD_HELP6 613 #define STRING_CMD_HELP7 614 -#define STRING_CMD_HELP8 615 -#define STRING_COLOR_HELP1 616 -#define STRING_COPY_HELP1 617 -#define STRING_COPY_HELP2 618 -#define STRING_DATE_HELP1 619 -#define STRING_DATE_HELP2 620 -#define STRING_DATE_HELP3 621 -#define STRING_DATE_HELP4 622 -#define STRING_DEL_HELP1 623 -#define STRING_DEL_HELP2 624 -#define STRING_DEL_HELP3 625 -#define STRING_DEL_HELP4 626 -#define STRING_DELAY_HELP 627 +#define STRING_CMD_HELP8 615 +#define STRING_CMD_INVALIDDRIVE 617 +#define STRING_CMD_SHELLINFO 624 -#define STRING_DIR_HELP1 628 -#define STRING_DIR_HELP2 629 -#define STRING_DIR_HELP3 630 -#define STRING_DIR_HELP4 631 -#define STRING_DIR_HELP5 632 -#define STRING_DIR_HELP6 633 -#define STRING_DIR_HELP7 634 -#define STRING_DIR_HELP8 635 +#define STRING_COLOR_HELP1 625 +#define STRING_COPY_HELP1 626 +#define STRING_COPY_HELP2 627 -#define STRING_DIRSTACK_HELP1 636 -#define STRING_DIRSTACK_HELP2 637 -#define STRING_DIRSTACK_HELP3 638 -#define STRING_DIRSTACK_HELP4 639 +#define STRING_DATE_HELP1 628 +#define STRING_DATE_HELP2 629 +#define STRING_DATE_HELP3 630 +#define STRING_DATE_HELP4 631 +#define STRING_DEL_HELP1 632 +#define STRING_DEL_HELP2 633 +#define STRING_DEL_HELP3 634 +#define STRING_DEL_HELP4 635 +#define STRING_DELAY_HELP 636 -#define STRING_ECHO_HELP1 640 -#define STRING_ECHO_HELP2 641 -#define STRING_ECHO_HELP3 642 -#define STRING_ECHO_HELP4 643 -#define STRING_ECHO_HELP5 644 +#define STRING_DIR_HELP1 637 +#define STRING_DIR_HELP2 638 +#define STRING_DIR_HELP3 639 +#define STRING_DIR_HELP4 640 +#define STRING_DIR_HELP5 641 +#define STRING_DIR_HELP6 642 +#define STRING_DIR_HELP7 643 +#define STRING_DIR_HELP8 644 -#define STRING_EXIT_HELP 645 +#define STRING_DIRSTACK_HELP1 645 +#define STRING_DIRSTACK_HELP2 646 +#define STRING_DIRSTACK_HELP3 647 +#define STRING_DIRSTACK_HELP4 648 -#define STRING_FOR_HELP1 646 +#define STRING_ECHO_HELP1 649 +#define STRING_ECHO_HELP2 650 +#define STRING_ECHO_HELP3 651 +#define STRING_ECHO_HELP4 652 +#define STRING_ECHO_HELP5 653 -#define STRING_FREE_HELP1 647 -#define STRING_FREE_HELP2 648 +#define STRING_EXIT_HELP 654 -#define STRING_IF_HELP1 650 +#define STRING_FOR_HELP1 655 -#define STRING_GOTO_HELP1 651 +#define STRING_FREE_HELP1 656 +#define STRING_FREE_HELP2 657 -#define STRING_LABEL_HELP1 652 -#define STRING_LABEL_HELP2 653 -#define STRING_LABEL_HELP3 654 -#define STRING_LABEL_HELP4 655 -#define STRING_LABEL_HELP5 656 +#define STRING_IF_HELP1 658 -#define STRING_LOCALE_HELP1 657 +#define STRING_GOTO_HELP1 659 -#define STRING_MKDIR_HELP 658 +#define STRING_LABEL_HELP1 660 +#define STRING_LABEL_HELP2 661 +#define STRING_LABEL_HELP3 662 +#define STRING_LABEL_HELP4 663 +#define STRING_LABEL_HELP5 664 -#define STRING_MEMMORY_HELP1 659 -#define STRING_MEMMORY_HELP2 660 +#define STRING_LOCALE_HELP1 665 -#define STRING_MISC_HELP1 661 +#define STRING_MKDIR_HELP 666 -#define STRING_MOVE_HELP1 662 -#define STRING_MOVE_HELP2 663 +#define STRING_MEMMORY_HELP1 667 +#define STRING_MEMMORY_HELP2 668 -#define STRING_MSGBOX_HELP 664 +#define STRING_MISC_HELP1 669 -#define STRING_PATH_HELP1 665 +#define STRING_MOVE_HELP1 670 +#define STRING_MOVE_HELP2 671 -#define STRING_PAUSE_HELP1 666 +#define STRING_MSGBOX_HELP 672 -#define STRING_PROMPT_HELP1 667 -#define STRING_PROMPT_HELP2 668 -#define STRING_PROMPT_HELP3 669 +#define STRING_PATH_HELP1 673 -#define STRING_REM_HELP 670 +#define STRING_PAUSE_HELP1 674 -#define STRING_REN_HELP1 671 -#define STRING_REN_HELP2 672 -#define STRING_REN_HELP3 673 +#define STRING_PROMPT_HELP1 675 +#define STRING_PROMPT_HELP2 676 +#define STRING_PROMPT_HELP3 677 -#define STRING_RMDIR_HELP 674 +#define STRING_REM_HELP 678 -#define STRING_SCREEN_HELP 675 +#define STRING_REN_HELP1 679 +#define STRING_REN_HELP2 680 +#define STRING_REN_HELP3 681 -#define STRING_SHIFT_HELP 676 +#define STRING_RMDIR_HELP 682 -#define STRING_SET_HELP 677 +#define STRING_SCREEN_HELP 683 -#define STRING_START_HELP1 678 +#define STRING_SHIFT_HELP 684 -#define STRING_TITLE_HELP 679 +#define STRING_SET_HELP 685 -#define STRING_TIME_HELP1 680 -#define STRING_TIME_HELP2 681 +#define STRING_START_HELP1 686 -#define STRING_TIMER_HELP1 682 -#define STRING_TIMER_HELP2 683 -#define STRING_TIMER_HELP3 684 +#define STRING_TITLE_HELP 687 -#define STRING_TYPE_HELP1 685 +#define STRING_TIME_HELP1 688 +#define STRING_TIME_HELP2 689 -#define STRING_VERIFY_HELP1 686 -#define STRING_VERIFY_HELP2 687 -#define STRING_VERIFY_HELP3 688 +#define STRING_TIMER_HELP1 690 +#define STRING_TIMER_HELP2 691 +#define STRING_TIMER_HELP3 692 -#define STRING_VERSION_HELP1 689 -#define STRING_VERSION_HELP2 690 -#define STRING_VERSION_HELP3 691 -#define STRING_VERSION_HELP4 692 -#define STRING_VERSION_HELP5 693 -#define STRING_VERSION_HELP6 694 -#define STRING_VERSION_HELP7 695 +#define STRING_TYPE_HELP1 693 -#define STRING_VOL_HELP1 696 -#define STRING_VOL_HELP2 697 -#define STRING_VOL_HELP3 698 -#define STRING_VOL_HELP4 699 +#define STRING_VERIFY_HELP1 694 +#define STRING_VERIFY_HELP2 695 +#define STRING_VERIFY_HELP3 696 -#define STRING_WINDOW_HELP1 700 -#define STRING_WINDOW_HELP2 701 +#define STRING_VERSION_HELP1 697 +#define STRING_VERSION_HELP2 698 +#define STRING_VERSION_HELP3 699 +#define STRING_VERSION_HELP4 700 +#define STRING_VERSION_HELP5 701 +#define STRING_VERSION_HELP6 702 +#define STRING_VERSION_HELP7 703 +#define STRING_VERSION_RUNVER 705 +#define STRING_VOL_HELP1 706 +#define STRING_VOL_HELP2 707 +#define STRING_VOL_HELP3 708 +#define STRING_VOL_HELP4 709 + +#define STRING_WINDOW_HELP1 710 +#define STRING_WINDOW_HELP2 711 + /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800 #define STRING_REACTOS_DEV 801 _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-05-08 14:39:46 UTC (rev 15122) +++ trunk/reactos/subsys/system/cmd/start.c 2005-05-08 14:48:24 UTC (rev 15123) @@ -39,7 +39,7 @@ SetCurrentDirectory (szPath); GetCurrentDirectory (MAX_PATH, szPath); if (szPath[0] != (TCHAR)_totupper (*first)) - ConErrPuts (INVALIDDRIVE); + ConErrResPuts (STRING_CMD_INVALIDDRIVE); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-05-08 14:39:46 UTC (rev 15122) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-05-08 14:48:24 UTC (rev 15123) @@ -23,6 +23,7 @@ #include "precomp.h" #include "resource.h" +#include <reactos/resource.h> VOID ShortVersion (VOID) @@ -30,15 +31,13 @@ OSVERSIONINFO VersionInfo; unsigned RosVersionLen; LPTSTR RosVersion; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + + ConOutResPuts (STRING_CMD_SHELLINFO ); + VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - ConOutPuts (_T("\n" - SHELLINFO)); - VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); -#ifdef _UNICODE - ConOutPrintf(_T("%S"), SHELLVER); -#else - ConOutPrintf(_T("%s"), SHELLVER); -#endif /* _UNICODE */ + ConOutPrintf(_T("Version %s %s"), _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); + memset(VersionInfo.szCSDVersion, 0, sizeof(VersionInfo.szCSDVersion)); if (GetVersionEx(&VersionInfo)) { @@ -47,7 +46,8 @@ (RosVersion - VersionInfo.szCSDVersion); if (7 <= RosVersionLen && 0 == _tcsnicmp(RosVersion, _T("ReactOS"), 7)) { - ConOutPrintf(_T(" running on %s"), RosVersion); + LoadString( GetModuleHandle(NULL), STRING_VERSION_RUNVER, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, RosVersion); } } ConOutPuts (_T("\n")); @@ -73,12 +73,12 @@ ShortVersion(); ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); - ConOutPuts (_T("Copyright (C) 1998-2005 Eric Kohl and others.")); + ConOutPuts (_T(RES_STR_LEGAL_COPYRIGHT)); /* Basic copyright notice */ if (param[0] == _T('\0')) { - ConOutPuts(_T("\n"SHELLINFO)); + ConOutResPuts (STRING_CMD_SHELLINFO ); ConOutResPuts(STRING_VERSION_HELP2); } else

19 years, 4 months

[chorns] 15122: Relink executable if definition file changes.

by chorns＠svn.reactos.com

Relink executable if definition file changes. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-08 14:30:04 UTC (rev 15121) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-08 14:39:46 UTC (rev 15122) @@ -1267,10 +1267,12 @@ { string target ( GetTargetMacro ( module ) ); string target_folder ( GetDirectory ( GetTargetFilename ( module, NULL ) ) ); + string def_file = GetDefinitionFilename (); fprintf ( fMakefile, - "%s: %s $(RSYM_TARGET) | %s\n", + "%s: %s %s $(RSYM_TARGET) | %s\n", target.c_str (), + def_file.c_str (), dependencies.c_str (), target_folder.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); @@ -1284,7 +1286,6 @@ CLEAN_FILE ( junk_tmp ); string temp_exp = ros_temp + module.name + ".temp.exp"; CLEAN_FILE ( temp_exp ); - string def_file = GetDefinitionFilename (); fprintf ( fMakefile, "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n",

19 years, 4 months

[chorns] 15121: Be consistent when passing --dll argument to gcc

by chorns＠svn.reactos.com

Be consistent when passing --dll argument to gcc Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-08 13:45:50 UTC (rev 15120) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-08 14:30:04 UTC (rev 15121) @@ -2117,7 +2117,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll -Wl,--dll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll --dll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2163,7 +2163,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll -Wl,--dll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll --dll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2285,7 +2285,7 @@ else linker = "${gcc}"; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll -Wl,--dll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll --dll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies,

19 years, 4 months

[chorns] 15120: Build non-stripped version of ntoskrnl.exe if requested

by chorns＠svn.reactos.com

Build non-stripped version of ntoskrnl.exe if requested Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-08 11:51:28 UTC (rev 15119) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-08 13:45:50 UTC (rev 15120) @@ -1969,67 +1969,34 @@ void MingwKernelModuleHandler::GenerateKernelModuleTarget () { - string targetName ( module.GetTargetName () ); // i.e. "ntoskrnl.exe" - string targetMacro ( GetTargetMacro ( module ) ); // i.e. "$(NTOSKRNL_TARGET)" - string workingDirectory = GetWorkingDirectory (); + string targetMacro ( GetTargetMacro ( module ) ); + string workingDirectory = GetWorkingDirectory ( ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); - string base_tmp = ros_temp + module.name + ".base.tmp"; - CLEAN_FILE ( base_tmp ); - string junk_tmp = ros_temp + module.name + ".junk.tmp"; - CLEAN_FILE ( junk_tmp ); - string temp_exp = ros_temp + module.name + ".temp.exp"; - CLEAN_FILE ( temp_exp ); - string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll -Wl,--dll", - module.GetBasePath ().c_str (), - module.entrypoint.c_str (), - module.baseaddress.c_str () ); - GenerateRules (); - GenerateImportLibraryTargetIfNeeded (); - fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) | %s\n", - targetMacro.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str (), - GetDirectory(GetTargetFilename(module,NULL)).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); - fprintf ( fMakefile, - "\t${gcc} %s %s -Wl,--base-file,%s -o %s %s %s\n", - GetLinkerMacro ().c_str (), - gccOptions.c_str (), - base_tmp.c_str (), - junk_tmp.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - junk_tmp.c_str () ); - string killAt = module.mangledSymbols ? "" : "--kill-at"; - fprintf ( fMakefile, - "\t${dlltool} --dllname %s --base-file %s --def ntoskrnl/ntoskrnl.def --output-exp %s %s\n", - targetName.c_str (), - base_tmp.c_str (), - temp_exp.c_str (), - killAt.c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - base_tmp.c_str () ); - fprintf ( fMakefile, - "\t${gcc} %s %s -Wl,%s -o $@ %s %s\n", - GetLinkerMacro ().c_str (), - gccOptions.c_str (), - temp_exp.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - temp_exp.c_str () ); - fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); - fprintf ( fMakefile, - "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); + if ( module.non_if_data.files.size () > 0 ) + { + GenerateRules (); + + string dependencies = linkDepsMacro + " " + objectsMacro; + + string linkerParameters = ssprintf ( "-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll --dll", + module.GetBasePath ().c_str (), + module.entrypoint.c_str (), + module.baseaddress.c_str () ); + GenerateLinkerCommand ( dependencies, + "${gcc}", + linkerParameters, + objectsMacro, + libsMacro ); + } + else + { + GeneratePhonyTarget(); + } }

19 years, 4 months

[Greatlrd] 15119: "Sync to Wine-20050419" by GvG

by Greatlrd＠svn.reactos.com

"Sync to Wine-20050419" by GvG update reactos specify patch by Magnus Olsen markout better what is reactos specify code but not all code are not mark Modified: trunk/reactos/lib/dinput/Makefile.in Modified: trunk/reactos/lib/dinput/data_formats.c Modified: trunk/reactos/lib/dinput/device.c Modified: trunk/reactos/lib/dinput/dinput_main.c Modified: trunk/reactos/lib/dinput/dinput_private.h Modified: trunk/reactos/lib/dinput/joystick_linux.c Modified: trunk/reactos/lib/dinput/joystick_linuxinput.c Modified: trunk/reactos/lib/dinput/keyboard.c Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/Makefile.in --- trunk/reactos/lib/dinput/Makefile.in 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/Makefile.in 2005-05-08 11:51:28 UTC (rev 15119) @@ -11,7 +11,7 @@ device.c \ dinput_main.c \ joystick_linux.c \ - joystick_linuxinput.c \ + joystick_linuxinput.c \ keyboard.c \ mouse.c \ regsvr.c _____ Modified: trunk/reactos/lib/dinput/data_formats.c --- trunk/reactos/lib/dinput/data_formats.c 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/data_formats.c 2005-05-08 11:51:28 UTC (rev 15119) @@ -16,10 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* TODO: - * add keyboard - */ - #include <stdarg.h> #include "windef.h" @@ -27,7 +23,7 @@ #define numObjects(x) (sizeof(x) / sizeof(x[0])) -DIOBJECTDATAFORMAT dfDIJoystick[] = { +static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -80,10 +76,10 @@ DIDF_ABSAXIS, sizeof(DIJOYSTATE2), numObjects(dfDIJoystick), - dfDIJoystick + (LPDIOBJECTDATAFORMAT)dfDIJoystick }; -DIOBJECTDATAFORMAT dfDIJoystick2[] = { +static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -256,10 +252,10 @@ DIDF_ABSAXIS, sizeof(DIJOYSTATE2), numObjects(dfDIJoystick2), - dfDIJoystick2 + (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; -DIOBJECTDATAFORMAT dfDIMouse[] = { +static const DIOBJECTDATAFORMAT dfDIMouse[] = { { &GUID_XAxis, DIMOFS_X, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_YAxis, DIMOFS_Y, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_ZAxis, DIMOFS_Z, DIDFT_OPTIONAL | DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, @@ -275,10 +271,10 @@ DIDF_RELAXIS, sizeof(DIMOUSESTATE), numObjects(dfDIMouse), - dfDIMouse + (LPDIOBJECTDATAFORMAT)dfDIMouse }; -DIOBJECTDATAFORMAT dfDIMouse2[] = { +static const DIOBJECTDATAFORMAT dfDIMouse2[] = { { &GUID_XAxis, DIMOFS_X, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_YAxis, DIMOFS_Y, DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, { &GUID_ZAxis, DIMOFS_Z, DIDFT_OPTIONAL | DIDFT_ANYINSTANCE | DIDFT_AXIS, 0 }, @@ -298,5 +294,273 @@ DIDF_RELAXIS, sizeof(DIMOUSESTATE2), numObjects(dfDIMouse2), - dfDIMouse2 + (LPDIOBJECTDATAFORMAT)dfDIMouse2 }; + +static const DIOBJECTDATAFORMAT dfDIKeyboard[] = { + { &GUID_Key,0,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(0),0}, + { &GUID_Key,1,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(1),0}, + { &GUID_Key,2,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(2),0}, + { &GUID_Key,3,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3),0}, + { &GUID_Key,4,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(4),0}, + { &GUID_Key,5,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(5),0}, + { &GUID_Key,6,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(6),0}, + { &GUID_Key,7,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(7),0}, + { &GUID_Key,8,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(8),0}, + { &GUID_Key,9,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(9),0}, + { &GUID_Key,10,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(10),0}, + { &GUID_Key,11,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(11),0}, + { &GUID_Key,12,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(12),0}, + { &GUID_Key,13,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(13),0}, + { &GUID_Key,14,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(14),0}, + { &GUID_Key,15,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(15),0}, + { &GUID_Key,16,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(16),0}, + { &GUID_Key,17,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(17),0}, + { &GUID_Key,18,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(18),0}, + { &GUID_Key,19,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(19),0}, + { &GUID_Key,20,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(20),0}, + { &GUID_Key,21,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(21),0}, + { &GUID_Key,22,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(22),0}, + { &GUID_Key,23,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(23),0}, + { &GUID_Key,24,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(24),0}, + { &GUID_Key,25,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(25),0}, + { &GUID_Key,26,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(26),0}, + { &GUID_Key,27,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(27),0}, + { &GUID_Key,28,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(28),0}, + { &GUID_Key,29,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(29),0}, + { &GUID_Key,30,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(30),0}, + { &GUID_Key,31,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(31),0}, + { &GUID_Key,32,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(32),0}, + { &GUID_Key,33,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(33),0}, + { &GUID_Key,34,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(34),0}, + { &GUID_Key,35,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(35),0}, + { &GUID_Key,36,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(36),0}, + { &GUID_Key,37,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(37),0}, + { &GUID_Key,38,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(38),0}, + { &GUID_Key,39,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(39),0}, + { &GUID_Key,40,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(40),0}, + { &GUID_Key,41,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(41),0}, + { &GUID_Key,42,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(42),0}, + { &GUID_Key,43,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(43),0}, + { &GUID_Key,44,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(44),0}, + { &GUID_Key,45,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(45),0}, + { &GUID_Key,46,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(46),0}, + { &GUID_Key,47,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(47),0}, + { &GUID_Key,48,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(48),0}, + { &GUID_Key,49,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(49),0}, + { &GUID_Key,50,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(50),0}, + { &GUID_Key,51,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(51),0}, + { &GUID_Key,52,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(52),0}, + { &GUID_Key,53,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(53),0}, + { &GUID_Key,54,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(54),0}, + { &GUID_Key,55,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(55),0}, + { &GUID_Key,56,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(56),0}, + { &GUID_Key,57,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(57),0}, + { &GUID_Key,58,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(58),0}, + { &GUID_Key,59,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(59),0}, + { &GUID_Key,60,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(60),0}, + { &GUID_Key,61,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(61),0}, + { &GUID_Key,62,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(62),0}, + { &GUID_Key,63,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(63),0}, + { &GUID_Key,64,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(64),0}, + { &GUID_Key,65,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(65),0}, + { &GUID_Key,66,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(66),0}, + { &GUID_Key,67,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(67),0}, + { &GUID_Key,68,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(68),0}, + { &GUID_Key,69,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(69),0}, + { &GUID_Key,70,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(70),0}, + { &GUID_Key,71,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(71),0}, + { &GUID_Key,72,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(72),0}, + { &GUID_Key,73,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(73),0}, + { &GUID_Key,74,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(74),0}, + { &GUID_Key,75,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(75),0}, + { &GUID_Key,76,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(76),0}, + { &GUID_Key,77,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(77),0}, + { &GUID_Key,78,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(78),0}, + { &GUID_Key,79,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(79),0}, + { &GUID_Key,80,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(80),0}, + { &GUID_Key,81,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(81),0}, + { &GUID_Key,82,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(82),0}, + { &GUID_Key,83,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(83),0}, + { &GUID_Key,84,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(84),0}, + { &GUID_Key,85,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(85),0}, + { &GUID_Key,86,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(86),0}, + { &GUID_Key,87,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(87),0}, + { &GUID_Key,88,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(88),0}, + { &GUID_Key,89,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(89),0}, + { &GUID_Key,90,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(90),0}, + { &GUID_Key,91,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(91),0}, + { &GUID_Key,92,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(92),0}, + { &GUID_Key,93,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(93),0}, + { &GUID_Key,94,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(94),0}, + { &GUID_Key,95,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(95),0}, + { &GUID_Key,96,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(96),0}, + { &GUID_Key,97,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(97),0}, + { &GUID_Key,98,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(98),0}, + { &GUID_Key,99,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(99),0}, + { &GUID_Key,100,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(100),0}, + { &GUID_Key,101,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(101),0}, + { &GUID_Key,102,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(102),0}, + { &GUID_Key,103,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(103),0}, + { &GUID_Key,104,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(104),0}, + { &GUID_Key,105,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(105),0}, + { &GUID_Key,106,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(106),0}, + { &GUID_Key,107,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(107),0}, + { &GUID_Key,108,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(108),0}, + { &GUID_Key,109,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(109),0}, + { &GUID_Key,110,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(110),0}, + { &GUID_Key,111,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(111),0}, + { &GUID_Key,112,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(112),0}, + { &GUID_Key,113,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(113),0}, + { &GUID_Key,114,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(114),0}, + { &GUID_Key,115,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(115),0}, + { &GUID_Key,116,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(116),0}, + { &GUID_Key,117,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(117),0}, + { &GUID_Key,118,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(118),0}, + { &GUID_Key,119,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(119),0}, + { &GUID_Key,120,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(120),0}, + { &GUID_Key,121,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(121),0}, + { &GUID_Key,122,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(122),0}, + { &GUID_Key,123,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(123),0}, + { &GUID_Key,124,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(124),0}, + { &GUID_Key,125,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(125),0}, + { &GUID_Key,126,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(126),0}, + { &GUID_Key,127,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(127),0}, + { &GUID_Key,128,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(128),0}, + { &GUID_Key,129,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(129),0}, + { &GUID_Key,130,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(130),0}, + { &GUID_Key,131,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(131),0}, + { &GUID_Key,132,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(132),0}, + { &GUID_Key,133,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(133),0}, + { &GUID_Key,134,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(134),0}, + { &GUID_Key,135,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(135),0}, + { &GUID_Key,136,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(136),0}, + { &GUID_Key,137,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(137),0}, + { &GUID_Key,138,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(138),0}, + { &GUID_Key,139,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(139),0}, + { &GUID_Key,140,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(140),0}, + { &GUID_Key,141,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(141),0}, + { &GUID_Key,142,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(142),0}, + { &GUID_Key,143,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(143),0}, + { &GUID_Key,144,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(144),0}, + { &GUID_Key,145,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(145),0}, + { &GUID_Key,146,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(146),0}, + { &GUID_Key,147,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(147),0}, + { &GUID_Key,148,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(148),0}, + { &GUID_Key,149,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(149),0}, + { &GUID_Key,150,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(150),0}, + { &GUID_Key,151,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(151),0}, + { &GUID_Key,152,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(152),0}, + { &GUID_Key,153,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(153),0}, + { &GUID_Key,154,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(154),0}, + { &GUID_Key,155,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(155),0}, + { &GUID_Key,156,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(156),0}, + { &GUID_Key,157,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(157),0}, + { &GUID_Key,158,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(158),0}, + { &GUID_Key,159,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(159),0}, + { &GUID_Key,160,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(160),0}, + { &GUID_Key,161,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(161),0}, + { &GUID_Key,162,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(162),0}, + { &GUID_Key,163,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(163),0}, + { &GUID_Key,164,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(164),0}, + { &GUID_Key,165,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(165),0}, + { &GUID_Key,166,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(166),0}, + { &GUID_Key,167,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(167),0}, + { &GUID_Key,168,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(168),0}, + { &GUID_Key,169,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(169),0}, + { &GUID_Key,170,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(170),0}, + { &GUID_Key,171,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(171),0}, + { &GUID_Key,172,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(172),0}, + { &GUID_Key,173,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(173),0}, + { &GUID_Key,174,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(174),0}, + { &GUID_Key,175,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(175),0}, + { &GUID_Key,176,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(176),0}, + { &GUID_Key,177,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(177),0}, + { &GUID_Key,178,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(178),0}, + { &GUID_Key,179,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(179),0}, + { &GUID_Key,180,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(180),0}, + { &GUID_Key,181,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(181),0}, + { &GUID_Key,182,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(182),0}, + { &GUID_Key,183,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(183),0}, + { &GUID_Key,184,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(184),0}, + { &GUID_Key,185,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(185),0}, + { &GUID_Key,186,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(186),0}, + { &GUID_Key,187,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(187),0}, + { &GUID_Key,188,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(188),0}, + { &GUID_Key,189,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(189),0}, + { &GUID_Key,190,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(190),0}, + { &GUID_Key,191,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(191),0}, + { &GUID_Key,192,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(192),0}, + { &GUID_Key,193,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(193),0}, + { &GUID_Key,194,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(194),0}, + { &GUID_Key,195,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(195),0}, + { &GUID_Key,196,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(196),0}, + { &GUID_Key,197,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(197),0}, + { &GUID_Key,198,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(198),0}, + { &GUID_Key,199,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(199),0}, + { &GUID_Key,200,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(200),0}, + { &GUID_Key,201,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(201),0}, + { &GUID_Key,202,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(202),0}, + { &GUID_Key,203,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(203),0}, + { &GUID_Key,204,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(204),0}, + { &GUID_Key,205,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(205),0}, + { &GUID_Key,206,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(206),0}, + { &GUID_Key,207,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(207),0}, + { &GUID_Key,208,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(208),0}, + { &GUID_Key,209,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(209),0}, + { &GUID_Key,210,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(210),0}, + { &GUID_Key,211,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(211),0}, + { &GUID_Key,212,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(212),0}, + { &GUID_Key,213,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(213),0}, + { &GUID_Key,214,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(214),0}, + { &GUID_Key,215,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(215),0}, + { &GUID_Key,216,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(216),0}, + { &GUID_Key,217,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(217),0}, + { &GUID_Key,218,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(218),0}, + { &GUID_Key,219,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(219),0}, + { &GUID_Key,220,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(220),0}, + { &GUID_Key,221,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(221),0}, + { &GUID_Key,222,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(222),0}, + { &GUID_Key,223,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(223),0}, + { &GUID_Key,224,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(224),0}, + { &GUID_Key,225,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(225),0}, + { &GUID_Key,226,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(226),0}, + { &GUID_Key,227,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(227),0}, + { &GUID_Key,228,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(228),0}, + { &GUID_Key,229,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(229),0}, + { &GUID_Key,230,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(230),0}, + { &GUID_Key,231,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(231),0}, + { &GUID_Key,232,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(232),0}, + { &GUID_Key,233,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(233),0}, + { &GUID_Key,234,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(234),0}, + { &GUID_Key,235,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(235),0}, + { &GUID_Key,236,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(236),0}, + { &GUID_Key,237,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(237),0}, + { &GUID_Key,238,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(238),0}, + { &GUID_Key,239,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(239),0}, + { &GUID_Key,240,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(240),0}, + { &GUID_Key,241,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(241),0}, + { &GUID_Key,242,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(242),0}, + { &GUID_Key,243,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(243),0}, + { &GUID_Key,244,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(244),0}, + { &GUID_Key,245,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(245),0}, + { &GUID_Key,246,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(246),0}, + { &GUID_Key,247,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(247),0}, + { &GUID_Key,248,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(248),0}, + { &GUID_Key,249,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(249),0}, + { &GUID_Key,250,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(250),0}, + { &GUID_Key,251,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(251),0}, + { &GUID_Key,252,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(252),0}, + { &GUID_Key,253,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(253),0}, + { &GUID_Key,254,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(254),0}, + { &GUID_Key,255,DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(255),0} +}; + +const DIDATAFORMAT c_dfDIKeyboard = { + sizeof(DIDATAFORMAT), + sizeof(DIOBJECTDATAFORMAT), + DIDF_RELAXIS, + 256, + numObjects(dfDIKeyboard), + (LPDIOBJECTDATAFORMAT)dfDIKeyboard +}; _____ Modified: trunk/reactos/lib/dinput/device.c --- trunk/reactos/lib/dinput/device.c 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/device.c 2005-05-08 11:51:28 UTC (rev 15119) @@ -290,12 +290,12 @@ int index = 0; DWORD next = 0; - ret = (DataFormat *) HeapAlloc(GetProcessHeap(), 0, sizeof(DataFormat)); + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DataFormat)); - done = (int *) HeapAlloc(GetProcessHeap(), 0, sizeof(int) * asked_format->dwNumObjs); + done = HeapAlloc(GetProcessHeap(), 0, sizeof(int) * asked_format->dwNumObjs); memset(done, 0, sizeof(int) * asked_format->dwNumObjs); - dt = (DataTransform *) HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs * sizeof(DataTransform)); + dt = HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs * sizeof(DataTransform)); TRACE("Creating DataTransform : \n"); _____ Modified: trunk/reactos/lib/dinput/dinput_main.c --- trunk/reactos/lib/dinput/dinput_main.c 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/dinput_main.c 2005-05-08 11:51:28 UTC (rev 15119) @@ -53,10 +53,14 @@ static IDirectInput8AVtbl ddi8avt; static IDirectInput8WVtbl ddi8wvt; -/* This array will be filled a dinput.so loading */ -#define MAX_WINE_DINPUT_DEVICES 4 -static dinput_device * dinput_devices[MAX_WINE_DINPUT_DEVICES]; -static int nrof_dinput_devices = 0; +static const struct dinput_device *dinput_devices[] = +{ + &mouse_device, + &keyboard_device, + &joystick_linuxinput_device, + &joystick_linux_device +}; +#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) HINSTANCE DINPUT_instance = NULL; @@ -74,29 +78,8 @@ return TRUE; } -/* register a direct draw driver. We better not use malloc for we are in - * the ELF startup initialisation at this point. - */ -void dinput_register_device(dinput_device *device) { - int i; - /* insert according to priority */ - for (i=0;i<nrof_dinput_devices;i++) { - if (dinput_devices[i]->pref <= device->pref) { - memcpy(dinput_devices+i+1,dinput_devices+i,sizeof(dinput_devices[0])*(nr of_dinput_devices-i)); - dinput_devices[i] = device; - break; - } - } - if (i==nrof_dinput_devices) /* not found, or too low priority */ - dinput_devices[nrof_dinput_devices] = device; - nrof_dinput_devices++; - - /* increase MAX_DDRAW_DRIVERS if the line below triggers */ - assert(nrof_dinput_devices <= MAX_WINE_DINPUT_DEVICES); -} - /*********************************************************************** ******* * DirectInputCreateEx (DINPUT.@) */ @@ -111,7 +94,7 @@ if (IsEqualGUID(&IID_IDirectInputA,riid) || IsEqualGUID(&IID_IDirectInput2A,riid) || IsEqualGUID(&IID_IDirectInput7A,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7avt; This->ref = 1; This->version = 1; @@ -123,7 +106,7 @@ if (IsEqualGUID(&IID_IDirectInputW,riid) || IsEqualGUID(&IID_IDirectInput2W,riid) || IsEqualGUID(&IID_IDirectInput7W,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7wvt; This->ref = 1; This->version = 1; @@ -133,7 +116,7 @@ } if (IsEqualGUID(&IID_IDirectInput8A,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi8avt; This->ref = 1; This->version = 8; @@ -143,7 +126,7 @@ } if (IsEqualGUID(&IID_IDirectInput8W,riid)) { - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi8wvt; This->ref = 1; This->version = 8; @@ -164,7 +147,7 @@ TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); //trace:dinput:DirectInputCreateA (0x00400000,0500,0x42bafc54,(nil)) - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7avt; This->ref = 1; if (dwVersion > 0x0700) { @@ -185,7 +168,7 @@ { IDirectInputImpl* This; TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); - This = (IDirectInputImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl) ); + This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7wvt; This->ref = 1; if (dwVersion >= 0x0800) { @@ -202,7 +185,7 @@ switch (dwDevType) { case 0: return "All devices"; case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; - case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; + case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; default: return "Unkown"; @@ -248,16 +231,22 @@ TRACE("(this=%p,0x%04lx '%s',%p,%p,%04lx)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); - - if (nrof_dinput_devices==0){ +#ifdef __REACTOS__ + /* hack geting keyboard and mouse working */ + if (NB_DINPUT_DEVICES==0){ scan_mouse(); scan_keyboard(); } - +#endif TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n"); - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { +#ifndef __REACTOS__ + /* Wine Dinput does not support windows enum + we need a hack here */ + if (!dinput_devices[i]->enum_deviceA) continue; +#endif for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); @@ -283,10 +272,13 @@ DIDEVICEINSTANCEW devInstance; int i, j, r; - if (nrof_dinput_devices==0){ +#ifdef __REACTOS__ + /* hack geting keyboard and mouse working */ + if (NB_DINPUT_DEVICES==0){ scan_mouse(); scan_keyboard(); } +#endif TRACE("(this=%p,0x%04lx '%s',%p,%p,%04lx)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), @@ -294,7 +286,13 @@ TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n"); - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { +#ifndef __REACTOS__ + /* Wine Dinput does not support windows enum + we need a hack here */ + if (!dinput_devices[i]->enum_deviceW) continue; +#endif + for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); @@ -366,14 +364,18 @@ TRACE("(this=%p,%s,%p,%p)\n",This,debugstr_guid(rguid),pdev,punk); - if (nrof_dinput_devices==0){ +#ifdef __REACTOS__ + /* hack geting keyboard and mouse working */ + if (NB_DINPUT_DEVICES==0){ scan_mouse(); scan_keyboard(); } +#endif /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceA) continue; if ((ret = dinput_devices[i]->create_deviceA(This, rguid, NULL, pdev)) == DI_OK) return DI_OK; @@ -392,14 +394,18 @@ TRACE("(this=%p,%s,%p,%p)\n",This,debugstr_guid(rguid),pdev,punk); - if (nrof_dinput_devices==0){ +#ifdef __REACTOS__ + /* hack geting keyboard and mouse working */ + if (NB_DINPUT_DEVICES==0){ scan_mouse(); scan_keyboard(); } +#endif /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceW) continue; if ((ret = dinput_devices[i]->create_deviceW(This, rguid, NULL, pdev)) == DI_OK) return DI_OK; @@ -457,14 +463,18 @@ TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); - if (nrof_dinput_devices==0){ - scan_mouse(); - scan_keyboard(); - } +#ifdef __REACTOS__ + /* hack geting keyboard and mouse working */ + if (NB_DINPUT_DEVICES==0){ + scan_mouse(); + scan_keyboard(); + } +#endif /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceA) continue; if ((ret = dinput_devices[i]->create_deviceA(This, rguid, riid, (LPDIRECTINPUTDEVICEA*) pvOut)) == DI_OK) return DI_OK; @@ -484,7 +494,7 @@ TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); - if (nrof_dinput_devices==0){ + if (NB_DINPUT_DEVICES==0){ scan_mouse(); scan_keyboard(); } @@ -492,8 +502,9 @@ /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < nrof_dinput_devices; i++) { + for (i = 0; i < NB_DINPUT_DEVICES; i++) { HRESULT ret; + if (!dinput_devices[i]->create_deviceW) continue; if ((ret = dinput_devices[i]->create_deviceW(This, rguid, riid, (LPDIRECTINPUTDEVICEW*) pvOut)) == DI_OK) return DI_OK; _____ Modified: trunk/reactos/lib/dinput/dinput_private.h --- trunk/reactos/lib/dinput/dinput_private.h 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/dinput_private.h 2005-05-08 11:51:28 UTC (rev 15119) @@ -39,16 +39,18 @@ }; /* Function called by all devices that Wine supports */ -typedef struct dinput_device { - INT pref; +struct dinput_device { const char *name; BOOL (*enum_deviceA)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, int version, int id); BOOL (*enum_deviceW)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, int version, int id); HRESULT (*create_deviceA)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev); HRESULT (*create_deviceW)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev); -} dinput_device; +}; -extern void dinput_register_device(dinput_device *device); +extern const struct dinput_device mouse_device; +extern const struct dinput_device keyboard_device; +extern const struct dinput_device joystick_linux_device; +extern const struct dinput_device joystick_linuxinput_device; extern HINSTANCE DINPUT_instance; _____ Modified: trunk/reactos/lib/dinput/joystick_linux.c --- trunk/reactos/lib/dinput/joystick_linux.c 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/joystick_linux.c 2005-05-08 11:51:28 UTC (rev 15119) @@ -28,8 +28,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_LINUX_22_JOYSTICK_API - #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -55,7 +53,6 @@ #ifdef HAVE_LINUX_JOYSTICK_H # include <linux/joystick.h> #endif -#define JOYDEV "/dev/js" #include "wine/debug.h" #include "wine/unicode.h" @@ -70,6 +67,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#ifdef HAVE_LINUX_22_JOYSTICK_API + +#define JOYDEV "/dev/js" + typedef struct { LONG lMin; LONG lMax; @@ -646,8 +647,7 @@ return DIERR_DEVICENOTREG; } -static dinput_device joydev = { - 10, +const struct dinput_device joystick_linux_device = { "Wine Linux joystick driver", joydev_enum_deviceA, joydev_enum_deviceW, @@ -655,10 +655,8 @@ joydev_create_deviceW }; -DECL_GLOBAL_CONSTRUCTOR(joydev_register) { dinput_register_device(&joydev); } - /*********************************************************************** ******* * Joystick */ @@ -1697,4 +1695,14 @@ }; #undef XCAST +#else /* HAVE_LINUX_22_JOYSTICK_API */ + +const struct dinput_device joystick_linux_device = { + "Wine Linux joystick driver", + NULL, + NULL, + NULL, + NULL +}; + #endif /* HAVE_LINUX_22_JOYSTICK_API */ _____ Modified: trunk/reactos/lib/dinput/joystick_linuxinput.c --- trunk/reactos/lib/dinput/joystick_linuxinput.c 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/joystick_linuxinput.c 2005-05-08 11:51:28 UTC (rev 15119) @@ -22,8 +22,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_LINUX_INPUT_H - #include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -43,16 +41,10 @@ #ifdef HAVE_SYS_ERRNO_H # include <sys/errno.h> #endif - -#ifdef HAVE_CORRECT_LINUXINPUT_H - #ifdef HAVE_LINUX_INPUT_H # include <linux/input.h> #endif - -#define EVDEVPREFIX "/dev/input/event" - #include "wine/debug.h" #include "wine/unicode.h" #include "windef.h" @@ -65,6 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#ifdef HAVE_CORRECT_LINUXINPUT_H + +#define EVDEVPREFIX "/dev/input/event" + /* Wine joystick driver object instances */ #define WINE_JOYSTICK_AXIS_BASE 0 #define WINE_JOYSTICK_BUTTON_BASE 8 @@ -322,8 +318,7 @@ return DIERR_DEVICENOTREG; } -static dinput_device joydev = { - 20, +const struct dinput_device joystick_linuxinput_device = { "Wine Linux-input joystick driver", joydev_enum_deviceA, joydev_enum_deviceW, @@ -331,8 +326,6 @@ joydev_create_deviceW }; -DECL_GLOBAL_CONSTRUCTOR(joydev_register) { dinput_register_device(&joydev); } - /*********************************************************************** ******* * Joystick */ @@ -1094,6 +1087,14 @@ }; #undef XCAST -#endif /* HAVE_LINUX_INPUT_H */ +#else /* HAVE_CORRECT_LINUXINPUT_H */ -#endif +const struct dinput_device joystick_linuxinput_device = { + "Wine Linux-input joystick driver", + NULL, + NULL, + NULL, + NULL +}; + +#endif /* HAVE_CORRECT_LINUXINPUT_H */ _____ Modified: trunk/reactos/lib/dinput/keyboard.c --- trunk/reactos/lib/dinput/keyboard.c 2005-05-08 10:33:45 UTC (rev 15118) +++ trunk/reactos/lib/dinput/keyboard.c 2005-05-08 11:51:28 UTC (rev 15119) @@ -3,6 +3,7 @@ * Copyright 1998 Marcus Meissner * Copyright 1998,1999 Lionel Ulmer * Copyright 2000-2001 TransGaming Technologies Inc. + * Copyright 2005 Raphael Junqueira * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -45,6 +46,8 @@ #define LLKHF_UP (KF_UP >> 8) #endif +#define WINE_DINPUT_KEYBOARD_MAX_KEYS 256 + static IDirectInputDevice8AVtbl SysKeyboardAvt; static IDirectInputDevice8WVtbl SysKeyboardWvt; @@ -73,14 +76,15 @@ CRITICAL_SECTION crit; }; -SysKeyboardImpl *current; /* Today's acquired device -FIXME: currently this can be only one. -Maybe this should be a linked list or st. -I don't know what the rules are for multiple acquired keyboards, -but 'DI_LOSTFOCUS' and 'DI_UNACQUIRED' exist for a reason. +static SysKeyboardImpl* current_lock = NULL; +/* Today's acquired device + * FIXME: currently this can be only one. + * Maybe this should be a linked list or st. + * I don't know what the rules are for multiple acquired keyboards, + * but 'DI_LOSTFOCUS' and 'DI_UNACQUIRED' exist for a reason. */ -static BYTE DInputKeyState[256]; /* array for 'GetDeviceState' */ +static BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; /* array for 'GetDeviceState' */ static CRITICAL_SECTION keyboard_crit; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -94,7 +98,8 @@ static DWORD keyboard_users; #ifndef __REACTOS__ -static HHOOK keyboard_hook; +static DWORD keyboard_users = 0; +static HHOOK keyboard_hook = NULL; #endif #ifdef __REACTOS__ @@ -119,24 +124,24 @@ if (disk_code!=-1) { - if (current->buffer != NULL) + if (current_lock->buffer != NULL) { int n; - n = (current->start + current->count) % current->buffersize; + n = (current_lock->start + current_lock->count) % current_lock->buffersize; - current->buffer[n].dwOfs = (BYTE) disk_code; - current->buffer[n].dwData = DInputKeyState[disk_code]; - current->buffer[n].dwTimeStamp = 10; - current->buffer[n].dwSequence = current->dinput->evsequence++; + current_lock->buffer[n].dwOfs = (BYTE) disk_code; + current_lock->buffer[n].dwData = DInputKeyState[disk_code]; + current_lock->buffer[n].dwTimeStamp = 10; + current_lock->buffer[n].dwSequence = current_lock->dinput->evsequence++; - if (current->count == current->buffersize) + if (current_lock->count == current_lock->buffersize) { - current->start = ++current->start % current->buffersize; - current->overflow = TRUE; + current_lock->start = ++current_lock->start % current_lock->buffersize; + current_lock->overflow = TRUE; } else - current->count++; + current_lock->count++; } } @@ -147,59 +152,58 @@ #ifndef __REACTOS__ LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam ) { + BYTE dik_code; + BOOL down; + DWORD timestamp; + KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; + BYTE new_diks; + TRACE("(%d,%d,%ld)\n", code, wparam, lparam); - if (code == HC_ACTION) - { - BYTE dik_code; - BOOL down; - DWORD timestamp; - - { - KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; - dik_code = hook->scanCode; - if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; - down = !(hook->flags & LLKHF_UP); - timestamp = hook->time; - } + /** returns now if not HC_ACTION */ + if (code != HC_ACTION) return CallNextHookEx(keyboard_hook, code, wparam, lparam); + + { + dik_code = hook->scanCode; + if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; + down = !(hook->flags & LLKHF_UP); + timestamp = hook->time; + } - DInputKeyState[dik_code] = (down ? 0x80 : 0); - TRACE(" setting %02X to %02X\n", dik_code, DInputKeyState[dik_code]); + /** returns now if key event already known */ + new_diks = (down ? 0x80 : 0); + /*if (new_diks != DInputKeyState[dik_code]) return CallNextHookEx(keyboard_hook, code, wparam, lparam); TO BE FIXED */ + + DInputKeyState[dik_code] = new_diks; + TRACE(" setting %02X to %02X\n", dik_code, DInputKeyState[dik_code]); - if (current != NULL) - { - if (current->hEvent) - SetEvent(current->hEvent); - - if (current->buffer != NULL) - { - int n; - - EnterCriticalSection(&(current->crit)); - - n = (current->start + current->count) % current->buffersize; - - current->buffer[n].dwOfs = dik_code; - current->buffer[n].dwData = down ? 0x80 : 0; - current->buffer[n].dwTimeStamp = timestamp; - current->buffer[n].dwSequence = current->dinput->evsequence++; - - TRACE("Adding event at offset %d : %ld - %ld - %ld - %ld\n", n, - current->buffer[n].dwOfs, current->buffer[n].dwData, current->buffer[n].dwTimeStamp, current->buffer[n].dwSequence); - - if (current->count == current->buffersize) - { - current->start = ++current->start % current->buffersize; - current->overflow = TRUE; - } - else - current->count++; - - LeaveCriticalSection(&(current->crit)); - } - } + if (current_lock != NULL) { + if (current_lock->hEvent) SetEvent(current_lock->hEvent); + + if (current_lock->buffer != NULL) { + int n; + + EnterCriticalSection(&(current_lock->crit)); + + n = (current_lock->start + current_lock->count) % current_lock->buffersize; + + current_lock->buffer[n].dwOfs = dik_code; + current_lock->buffer[n].dwData = down ? 0x80 : 0; + current_lock->buffer[n].dwTimeStamp = timestamp; + current_lock->buffer[n].dwSequence = current_lock->dinput->evsequence++; + + TRACE("Adding event at offset %d : %ld - %ld - %ld - %ld\n", n, + current_lock->buffer[n].dwOfs, current_lock->buffer[n].dwData, current_lock->buffer[n].dwTimeStamp, current_lock->buffer[n].dwSequence); + + if (current_lock->count == current_lock->buffersize) { + current_lock->start = ++current_lock->start % current_lock->buffersize; + current_lock->overflow = TRUE; + } else + current_lock->count++; + + LeaveCriticalSection(&(current_lock->crit)); } - + } return CallNextHookEx(keyboard_hook, code, wparam, lparam); } #endif @@ -298,17 +302,27 @@ static SysKeyboardImpl *alloc_device_keyboard(REFGUID rguid, LPVOID kvt, IDirectInputImpl *dinput) { [truncated at 1000 lines; 434 more skipped]

19 years, 4 months

← Newer
1
...
56
57
58
59
60
61
62
...
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