Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 33210: add regkey HKLM\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI\Timeout for dxg.sys it is the second timeout value for a surface lock see url for more informations http://www.microsoft.com/technet/prodtechnol/windows2000serv/reskit/regentry/28237.mspx?mfr=true thx irc:stefan100 for the url remove one hack in intEnableReactXDriver thx to this info.
by greatlrd＠svn.reactos.org 01 May '08

01 May '08

Author: greatlrd Date: Thu May 1 07:08:02 2008 New Revision: 33210 URL: http://svn.reactos.org/svn/reactos?rev=33210&view=rev Log: add regkey HKLM\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI\Timeout for dxg.sys it is the second timeout value for a surface lock see url for more informations http://www.microsoft.com/technet/prodtechnol/windows2000serv/reskit/regentr… thx irc:stefan100 for the url remove one hack in intEnableReactXDriver thx to this info. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu May 1 07:08:02 2008 @@ -457,6 +457,9 @@ "PlugPlay", \ "Extended Base" +; Set the timeout for directx/ReactX graphic surface lock see _EDD_DIRECTDRAW_GLOBAL struct for more info +HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI","Timeout",0x00010001,0x00000007 + ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Video Save", 0x00000001, \ Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Thu May 1 07:08:02 2008 @@ -106,13 +106,13 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL { -/* 0x000 */ PVOID dhpdev; +/* 0x000 */ PVOID dhpdev; // 0x000 <-- verified to match Windows XP, dhpdev, the drv hPDev --> /* 0x004 */ DWORD dwReserved1; /* 0x008 */ DWORD dwReserved2; /* 0x00C */ ULONG unk_000c[3]; /* 0x018 */ LONG cDriverReferences; /* 0x01C */ ULONG unk_01c; -/* 0x020 */ DWORD dwCallbackFlags; /* <-- verified to match Windows XP, dwCallbackFlags +/* 0x020 */ DWORD dwCallbackFlags; /* 0x020 <-- verified to match Windows XP, dwCallbackFlags Flags value 0x0002 = ddVideoPortCallback and GUID_VideoPortCaps 0x0004 = GUID_ColorControlCallbacks @@ -125,7 +125,13 @@ /* 0x024 */ ULONG unk_024; #ifdef _WIN32 -/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; // 0x028 <-- verified to match Windows XP, llAssertModeTimeout +/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, it + using regkey + HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI + Specifies how long a DirectDraw application can keep a graphics-device frame-buffer locked + in second, if this value are set to 0 it disable directdraw acclatrions. + it is normal set to 7 (7 sec in windwos xp/2003) + */ #else /* 0x028 */ DWORD llAssertModeTimeoutLowPart; /* 0x02C */ DWORD llAssertModeTimeoutHighPart; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu May 1 07:08:02 2008 @@ -54,6 +54,7 @@ success = pfnDdEnableDirectDraw(pDC->pPDev, TRUE); dump_edd_directdraw_global(pEddgbl); + dump_halinfo(&pEddgbl->ddHalInfo); DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } @@ -263,13 +264,6 @@ /* setup missing data in ddHalInfo */ //pEddgbl->ddHalInfo.GetDriverInfo = (PVOID)pDev->DriverFunctions.GetDirectDrawInfo; - - - /* FIXME : hack ? it will let us DxDdQueryDirectDrawObject if the llAssertModeTimeout contain negtive value -1*/ - pEddgbl->llAssertModeTimeout.QuadPart = -1; - - - /* FIXME : remove this when we are done with debuging of dxg */ dump_edd_directdraw_global(pEddgbl);

1 0

[gedmurphy] 33209: - Add IMenuBand COM interface - Add IInitializeObject and IBanneredBar COM interfaces. Manually add the members, which is a bit of a hack. We need to fix DECLARE_INTERFACE_IID_ to pre-register interfaces - explorer_new no longer has redefinition errors when attempting to build with msvc9
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 06:01:10 2008 New Revision: 33209 URL: http://svn.reactos.org/svn/reactos?rev=33209&view=rev Log: - Add IMenuBand COM interface - Add IInitializeObject and IBanneredBar COM interfaces. Manually add the members, which is a bit of a hack. We need to fix DECLARE_INTERFACE_IID_ to pre-register interfaces - explorer_new no longer has redefinition errors when attempting to build with msvc9 Modified: trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/include/psdk/objbase.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/shtypes.idl Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Thu May 1 06:01:10 2008 @@ -80,7 +80,7 @@ #define IShellService_SetOwner(T,a) (T)->lpVtbl->SetOwner(T,a) #endif -#if 0 +#if _MSC_VER HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*);/* FIXME: Parameter should be PCIDLIST_ABSOLUTE */ #else typedef HRESULT (WINAPI *PSHGetViewStatePropertyBag)(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*); @@ -116,77 +116,4 @@ #define PIDLIST_ABSOLUTE LPITEMIDLIST PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwnd, int csidl, BOOL fCreate); -enum -{ - BMICON_LARGE = 0, - BMICON_SMALL -}; -#define INTERFACE IBanneredBar -DECLARE_INTERFACE_(IBanneredBar,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IBanneredBar methods ***/ - STDMETHOD_(HRESULT,SetIconSize)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,GetIconSize)(THIS_ DWORD*) PURE; - STDMETHOD_(HRESULT,SetBitmap)(THIS_ HBITMAP) PURE; - STDMETHOD_(HRESULT,GetBitmap)(THIS_ HBITMAP*) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IBanneredBar_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IBanneredBar_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IBanneredBar_Release(T) (T)->lpVtbl->Release(T) -#define IBanneredBar_SetIconSize(T,a) (T)->lpVtbl->SetIconSize(T,a) -#define IBanneredBar_GetIconSize(T,a) (T)->lpVtbl->GetIconSize(T,a) -#define IBanneredBar_SetBitmap(T,a) (T)->lpVtbl->SetBitmap(T,a) -#define IBanneredBar_GetBitmap(T,a) (T)->lpVtbl->GetBitmap(T,a) -#endif - - - - -#define INTERFACE IMenuBand -DECLARE_INTERFACE_(IMenuBand,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IMenuBand methods ***/ - STDMETHOD_(HRESULT,IsMenuMessage)(THIS_ MSG*) PURE; - STDMETHOD_(HRESULT,TranslateMenuMessage)(THIS_ MSG*,LRESULT*) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IMenuBand_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IMenuBand_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IMenuBand_Release(T) (T)->lpVtbl->Release(T) -#define IMenuBand_IsMenuMessage(T,a) (T)->lpVtbl->IsMenuMessage(T,a) -#define IMenuBand_TranslateMenuMessage(T,a,b) (T)->lpVtbl->TranslateMenuMessage(T,a,b) -#endif - -#define INTERFACE IInitializeObject -DECLARE_INTERFACE_(IInitializeObject,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IInitializeObject methods ***/ - STDMETHOD_(HRESULT,Initialize)(THIS) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IInitializeObject_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IInitializeObject_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IInitializeObject_Release(T) (T)->lpVtbl->Release(T) -#define IInitializeObject_Initialize(T) (T)->lpVtbl->Initialize(T) -#endif - #endif /* __TODO_H */ Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Thu May 1 06:01:10 2008 @@ -227,6 +227,8 @@ #define interface struct #define DECLARE_INTERFACE(iface) interface iface #define DECLARE_INTERFACE_(iface,ibase) interface iface : public ibase +#define DECLARE_INTERFACE_IID(iface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface +#define DECLARE_INTERFACE_IID_(iface, baseiface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface : public baseiface #define BEGIN_INTERFACE #define END_INTERFACE Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Thu May 1 06:01:10 2008 @@ -1516,6 +1516,60 @@ const OPENASINFO *poainfo ); +/***************************************************************************** + * IInitializeObject interface + */ +#undef INTERFACE +#define INTERFACE IInitializeObject + +DECLARE_INTERFACE_(IInitializeObject, IUnknown)//, "4622AD16-FF23-11d0-8D34-00A0C90F2719") +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + + STDMETHOD(Initialize)(THIS) PURE; +}; +#undef INTERFACE +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IInitializeObject_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IInitializeObject_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IInitializeObject_Release(T) (T)->lpVtbl->Release(T) +#define IInitializeObject_Initialize(T) (T)->lpVtbl->Initialize(T) +#endif + + +/***************************************************************************** + * IBanneredBar interface + */ +enum +{ + BMICON_LARGE = 0, + BMICON_SMALL +}; +#define INTERFACE IBanneredBar +DECLARE_INTERFACE_(IBanneredBar, IUnknown)//, "596A9A94-013E-11d1-8D34-00A0C90F2719") +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + + STDMETHOD(SetIconSize)(THIS_ DWORD iIcon) PURE; + STDMETHOD(GetIconSize)(THIS_ DWORD* piIcon) PURE; + STDMETHOD(SetBitmap)(THIS_ HBITMAP hBitmap) PURE; + STDMETHOD(GetBitmap)(THIS_ HBITMAP* phBitmap) PURE; + +}; +#undef INTERFACE +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IBanneredBar_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IBanneredBar_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IBanneredBar_Release(T) (T)->lpVtbl->Release(T) +#define IBanneredBar_SetIconSize(T,a) (T)->lpVtbl->SetIconSize(T,a) +#define IBanneredBar_GetIconSize(T,a) (T)->lpVtbl->GetIconSize(T,a) +#define IBanneredBar_SetBitmap(T,a) (T)->lpVtbl->SetBitmap(T,a) +#define IBanneredBar_GetBitmap(T,a) (T)->lpVtbl->GetBitmap(T,a) +#endif #ifdef __cplusplus } /* extern "C" */ Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Thu May 1 06:01:10 2008 @@ -1742,6 +1742,26 @@ cpp_quote("#endif /* _WIN32_IE_IE40 */") - - - +/***************************************************************************** + * IMenuBand interface + */ +[ + uuid(568804CD-CBD7-11d0-9816-00C04FD91972), + object, + pointer_default(unique), + local +] +interface IMenuBand : IUnknown +{ + enum tagMENUBANDHANDLERCID { + MBHANDCID_PIDLSELECT = 0, + }; + + HRESULT IsMenuMessage([in] MSG* pmsg); + + HRESULT TranslateMenuMessage( + [in, out] MSG* pmsg, + [out] LRESULT* plRet); +} + + Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] Thu May 1 06:01:10 2008 @@ -69,7 +69,7 @@ typedef PCUIDLIST_RELATIVE const *PCUIDLIST_RELATIVE_ARRAY; typedef PCIDLIST_ABSOLUTE const *PCIDLIST_ABSOLUTE_ARRAY; typedef PCUIDLIST_ABSOLUTE const *PCUIDLIST_ABSOLUTE_ARRAY; -cpp_quote("#else // !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus))") +cpp_quote("#else /* !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)) */") cpp_quote("#define PIDLIST_ABSOLUTE LPITEMIDLIST") cpp_quote("#define PCIDLIST_ABSOLUTE LPCITEMIDLIST") cpp_quote("#define PCUIDLIST_ABSOLUTE LPCITEMIDLIST") @@ -85,7 +85,7 @@ cpp_quote("#define PCUIDLIST_RELATIVE_ARRAY LPCITEMIDLIST *") cpp_quote("#define PCIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") cpp_quote("#define PCUIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") -cpp_quote("#endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") +cpp_quote("#endif /* defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus) */") #ifndef MAX_PATH

1 0

[greatlrd] 33208: Do not double set value that have already been set by ms dxg.sys
by greatlrd＠svn.reactos.org 01 May '08

01 May '08

Author: greatlrd Date: Thu May 1 04:51:25 2008 New Revision: 33208 URL: http://svn.reactos.org/svn/reactos?rev=33208&view=rev Log: Do not double set value that have already been set by ms dxg.sys Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu May 1 04:51:25 2008 @@ -56,11 +56,6 @@ dump_edd_directdraw_global(pEddgbl); DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } - - /* setup hdev for edd_DdirectDraw_Global xp */ - edd_DdirectDraw_Global.hDev = pDC->pPDev; - /*FIXME : edd_DdirectDraw_Global.dhpdev = (PVOID)pDC->PDev; */ - /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || @@ -866,7 +861,7 @@ /* internal debug api */ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) { - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",(((DWORD)&pEddgbl->dhpdev) - (DWORD)pEddgbl), pEddgbl->dhpdev); + DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",(((DWORD)&pEddgbl->dhpdev) - (DWORD)pEddgbl), pEddgbl->dhpdev); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved1 : 0x%08lx\n",(((DWORD)&pEddgbl->dwReserved1) - (DWORD)pEddgbl),pEddgbl->dwReserved1); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved2 : 0x%08lx\n",(((DWORD)&pEddgbl->dwReserved2) - (DWORD)pEddgbl),pEddgbl->dwReserved2); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[0] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_000c[0]) - (DWORD)pEddgbl),pEddgbl->unk_000c[0]);

1 0

[gedmurphy] 33207: - Add IShellView2 and IShellView3 COM interfaces - Add IBandSite interface - Add COM object typedefs and #defines to shtypes.idl
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 04:39:37 2008 New Revision: 33207 URL: http://svn.reactos.org/svn/reactos?rev=33207&view=rev Log: - Add IShellView2 and IShellView3 COM interfaces - Add IBandSite interface - Add COM object typedefs and #defines to shtypes.idl Modified: trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/shtypes.idl trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Thu May 1 04:39:37 2008 @@ -46,145 +46,6 @@ #define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) #endif -#include <pshpack8.h> -typedef struct -{ - DWORD dwMask; - DWORD dwState; - DWORD dwStyle; -} BANDSITEINFO; -#include <poppack.h> - -#define BSIM_STATE 0x1 -#define BSIM_STYLE 0x2 - -#define BSIS_AUTOGRIPPER 0x0 -#define BSIS_NOGRIPPER 0x1 -#define BSIS_ALWAYSGRIPPER 0x2 -#define BSIS_LOCKED 0x100 - -#define BSSF_UNDELETEABLE 0x1000 - -DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); - -#define INTERFACE IBandSite -DECLARE_INTERFACE_(IBandSite,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - /*** IBandSite methods ***/ - STDMETHOD_(HRESULT,AddBand) (THIS_ IUnknown *punk) PURE; - STDMETHOD_(HRESULT,EnumBands) (THIS_ UINT uBand, DWORD *pdwBandID) PURE; - STDMETHOD_(HRESULT,QueryBand) (THIS_ DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) PURE; - STDMETHOD_(HRESULT,SetBandState) (THIS_ DWORD dwBandID, DWORD dwMask, DWORD dwState) PURE; - STDMETHOD_(HRESULT,RemoveBand) (THIS_ DWORD dwBandID) PURE; - STDMETHOD_(HRESULT,GetBandObject) (THIS_ DWORD dwBandID, REFIID riid, VOID **ppv) PURE; - STDMETHOD_(HRESULT,SetBandSiteInfo) (THIS_ const BANDSITEINFO *pbsinfo) PURE; - STDMETHOD_(HRESULT,GetBandSiteInfo) (THIS_ BANDSITEINFO *pbsinfo) PURE; -}; -#undef INTERFACE - -#if defined(COBJMACROS) -/*** IUnknown methods ***/ -#define IBandSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IBandSite_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IBandSite_Release(p) (p)->lpVtbl->Release(p) -/*** IBandSite methods ***/ -#define IBandSite_AddBand(p,a) (p)->lpVtbl->AddBand(p,a) -#define IBandSite_EnumBands(p,a,b) (p)->lpVtbl->EnumBands(p,a,b) -#define IBandSite_QueryBand(p,a,b,c,d,e) (p)->lpVtbl->QueryBand(p,a,b,c,d,e) -#define IBandSite_SetBandState(p,a,b,c) (p)->lpVtbl->SetBandState(p,a,b,c) -#define IBandSite_RemoveBand(p,a) (p)->lpVtbl->RemoveBand(p,a) -#define IBandSite_GetBandObject(p,a,b,c) (p)->lpVtbl->GetBandObject(p,a,b,c) -#define IBandSite_SetBandSiteInfo(p,a) (p)->lpVtbl->SetBandSiteInfo(p,a) -#define IBandSite_GetBandSiteInfo(p,a) (p)->lpVtbl->GetBandSiteInfo(p,a) -#endif - -#include <pshpack8.h> -typedef struct _SV2CVW2_PARAMS -{ - DWORD cbSize; - IShellView *psvPrev; - LPCFOLDERSETTINGS pfs; - IShellBrowser *psbOwner; - RECT *prcView; - SHELLVIEWID const *pvid; - HWND hwndView; -} SV2CVW2_PARAMS, *LPSV2CVW2_PARAMS; -#include <poppack.h> - -typedef ITEMIDLIST ITEMID_CHILD; -#define PITEMID_CHILD LPITEMIDLIST -typedef const ITEMID_CHILD /* __unaligned */ *PCUITEMID_CHILD; - -enum tagSV3CVW3 -{ - SV3CVW3_DEFAULT = 0x0, - SV3CVW3_NONINTERACTIVE = 0x1, - SV3CVW3_FORCEVIEWMODE = 0x2, - SV3CVW3_FORCEFOLDERFLAGS = 0x4 -} ; -typedef DWORD SV3CVW3_FLAGS; -#define INTERFACE IShellView3 -DECLARE_INTERFACE_(IShellView3,IShellView) -{ - - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetWindow)(THIS_ HWND*) PURE; - STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE; - STDMETHOD(TranslateAccelerator) (THIS_ LPMSG) PURE; -#ifdef _FIX_ENABLEMODELESS_CONFLICT - STDMETHOD(EnableModelessSV)(THIS_ BOOL) PURE; -#else - STDMETHOD(EnableModeless)(THIS_ BOOL) PURE; -#endif - STDMETHOD(UIActivate)(THIS_ UINT) PURE; - STDMETHOD(Refresh) (THIS) PURE; - STDMETHOD(CreateViewWindow)(THIS_ IShellView*,LPCFOLDERSETTINGS,LPSHELLBROWSER,RECT*,HWND*) PURE; - STDMETHOD(DestroyViewWindow)(THIS) PURE; - STDMETHOD(GetCurrentInfo)(THIS_ LPFOLDERSETTINGS) PURE; - STDMETHOD(AddPropertySheetPages)(THIS_ DWORD,LPFNADDPROPSHEETPAGE,LPARAM) PURE; - STDMETHOD(SaveViewState)(THIS) PURE; - STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST,UINT) PURE; - STDMETHOD(GetItemObject)(THIS_ UINT,REFIID,PVOID*) PURE; - STDMETHOD(GetView)(THIS_ SHELLVIEWID*,ULONG) PURE; - STDMETHOD(CreateViewWindow2)(THIS_ LPSV2CVW2_PARAMS) PURE; - STDMETHOD(HandleRename)(THIS_ PCUITEMID_CHILD) PURE; - STDMETHOD(SelectAndPositionItem)(THIS_ PCUITEMID_CHILD,UINT,POINT*) PURE; - STDMETHOD(CreateViewWindow3)(THIS_ IShellBrowser*,IShellView*,SV3CVW3_FLAGS,FOLDERFLAGS,FOLDERFLAGS,FOLDERVIEWMODE,const SHELLVIEWID*,const RECT*,HWND*) PURE; -}; -#undef INTERFACE -#ifdef COBJMACROS -#define IShellView3_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IShellView3_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IShellView3_Release(T) (T)->lpVtbl->Release(T) -#define IShellView3_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a) -#define IShellView3_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a) -#define IShellView3_TranslateAccelerator(T,a) (T)->lpVtbl->TranslateAccelerator(T,a) -#ifdef _FIX_ENABLEMODELESS_CONFLICT -#define IShellView3_EnableModeless(T,a) (T)->lpVtbl->EnableModelessSV(T,a) -#else -#define IShellView3_EnableModeless(T,a) (T)->lpVtbl->EnableModeless(T,a) -#endif -#define IShellView3_UIActivate(T,a) (T)->lpVtbl->UIActivate(T,a) -#define IShellView3_Refresh(T) (T)->lpVtbl->Refresh(T) -#define IShellView3_CreateViewWindow(T,a,b,c,d,e) (T)->lpVtbl->CreateViewWindow(T,a,b,c,d,e) -#define IShellView3_DestroyViewWindow(T) (T)->lpVtbl->DestroyViewWindow(T) -#define IShellView3_GetCurrentInfo(T,a) (T)->lpVtbl->GetCurrentInfo(T,a) -#define IShellView3_AddPropertySheetPages(T,a,b,c) (T)->lpVtbl->AddPropertySheetPages(T,a,b,c) -#define IShellView3_SaveViewState(T) (T)->lpVtbl->SaveViewState(T) -#define IShellView3_SelectItem(T,a,b) (T)->lpVtbl->SelectItem(T,a,b) -#define IShellView3_GetItemObject(T,a,b,c) (T)->lpVtbl->GetItemObject(T,a,b,c) -#define IShellView3_GetView(T,a,b) (T)->lpVtbl->GetView(T,a,b) -#define IShellView3_CreateViewWindow2(T,a) (T)->lpVtbl->CreateViewWindow2(T,a) -#define IShellView3_HandleRename(T,a) (T)->lpVtbl->HandleRename(T,a) -#define IShellView3_SelectAndPositionItem(T,a,b,c) (T)->lpVtbl->SelectAndPositionItem(T,a,b,c) -#define IShellView3_CreateViewWindow3(T,a,b,c,d,e,f,g,h,i) (T)->lpVtbl->CreateViewWindow3(T,a,b,c,d,e,f,g,h,i) -#endif #define SHGVSPB_PERUSER 0x1 #define SHGVSPB_PERFOLDER 0x4 @@ -192,7 +53,6 @@ #define SHGVSPB_NOAUTODEFAULTS 0x80000000 #define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) #define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) - #define DBC_SHOW 1 Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Thu May 1 04:39:37 2008 @@ -145,7 +145,6 @@ * IShellView interface */ -typedef GUID SHELLVIEWID; #define SV_CLASS_NAME ("SHELLDLL_DefView") #define FCIDM_SHVIEWFIRST 0x0000 Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Thu May 1 04:39:37 2008 @@ -388,7 +388,7 @@ /***************************************************************************** * IShellView interface */ -interface IShellBrowser; /* forward declaration */ +interface IShellBrowser; [ object, uuid(000214e3-0000-0000-c000-000000000046), @@ -412,7 +412,7 @@ typedef UINT SVSIF; - typedef enum + typedef enum tagSVGIO { SVGIO_BACKGROUND = 0x00000000, SVGIO_SELECTION = 0x00000001, @@ -422,7 +422,7 @@ SVGIO_FLAG_VIEWORDER = 0x80000000, } SVGIO; - typedef enum + typedef enum tagSVUIA_STATUS { SVUIA_DEACTIVATE = 0, SVUIA_ACTIVATE_NOFOCUS = 1, @@ -457,6 +457,80 @@ [in] UINT uItem, [in] REFIID riid, [out, iid_is(riid)] void **ppv); +} + + +[ + uuid(88E39E80-3578-11CF-AE69-08002B2E1262), + object, + pointer_default(unique) +] +interface IShellView2 : IShellView +{ + typedef GUID SHELLVIEWID; + + cpp_quote("#define SV2GV_CURRENTVIEW ((UINT)-1)") + cpp_quote("#define SV2GV_DEFAULTVIEW ((UINT)-2)") + + cpp_quote("#include <pshpack8.h>") + typedef struct _SV2CVW2_PARAMS + { + DWORD cbSize; + + IShellView *psvPrev; + LPCFOLDERSETTINGS pfs; + IShellBrowser *psbOwner; + RECT *prcView; + SHELLVIEWID const *pvid; + HWND hwndView; + + } SV2CVW2_PARAMS, *LPSV2CVW2_PARAMS; + + cpp_quote("#include <poppack.h>") + + HRESULT GetView( + [in, out] SHELLVIEWID* pvid, + [in] ULONG uView); + + HRESULT CreateViewWindow2( + [in] LPSV2CVW2_PARAMS lpParams); + + HRESULT HandleRename( + [in, unique] PCUITEMID_CHILD pidlNew); + + HRESULT SelectAndPositionItem( + [in] PCUITEMID_CHILD pidlItem, + [in] UINT uFlags, + [in, unique] POINT *ppt); +} + + +[ + uuid(ec39fa88-f8af-41c5-8421-38bed28f4673), + object, + pointer_default(unique) +] +interface IShellView3 : IShellView2 +{ + enum tagSV3CVW3 + { + SV3CVW3_DEFAULT = 0x00000000, + SV3CVW3_NONINTERACTIVE = 0x00000001, + SV3CVW3_FORCEVIEWMODE = 0x00000002, + SV3CVW3_FORCEFOLDERFLAGS = 0x00000004, + }; + typedef DWORD SV3CVW3_FLAGS; + + HRESULT CreateViewWindow3( + [in] IShellBrowser *psbOwner, + [in, unique] IShellView *psvPrev, + [in] SV3CVW3_FLAGS dwViewFlags, + [in] FOLDERFLAGS dwMask, + [in] FOLDERFLAGS dwFlags, + [in] FOLDERVIEWMODE fvMode, + [in, unique] const SHELLVIEWID *pvid, + [in] const RECT *prcView, + [out] HWND *phwndView); } @@ -1583,3 +1657,91 @@ } cpp_quote("#endif /* _WIN32_IE_IE60 */") + +cpp_quote("#if (_WIN32_IE >= _WIN32_IE_IE40)") + +/***************************************************************************** + * IBandSite interface + */ +cpp_quote("#include <pshpack8.h>") + +typedef struct tagBANDSITEINFO +{ + DWORD dwMask; + DWORD dwState; + DWORD dwStyle; +} BANDSITEINFO; + +cpp_quote("#include <poppack.h>") + + +enum tagBANDSITECID { + BSID_BANDADDED, + BSID_BANDREMOVED, +}; + +cpp_quote("#define BSIM_STATE 0x00000001") +cpp_quote("#define BSIM_STYLE 0x00000002") + +cpp_quote("#define BSSF_VISIBLE 0x00000001") +cpp_quote("#define BSSF_NOTITLE 0x00000002") +cpp_quote("#define BSSF_UNDELETEABLE 0x00001000") + +cpp_quote("#define BSIS_AUTOGRIPPER 0x00000000") +cpp_quote("#define BSIS_NOGRIPPER 0x00000001") +cpp_quote("#define BSIS_ALWAYSGRIPPER 0x00000002") +cpp_quote("#define BSIS_LEFTALIGN 0x00000004") +cpp_quote("#define BSIS_SINGLECLICK 0x00000008") +cpp_quote("#define BSIS_NOCONTEXTMENU 0x00000010") +cpp_quote("#define BSIS_NODROPTARGET 0x00000020") +cpp_quote("#define BSIS_NOCAPTION 0x00000040") +cpp_quote("#define BSIS_PREFERNOLINEBREAK 0x00000080") +cpp_quote("#define BSIS_LOCKED 0x00000100") +cpp_quote("#if (_WIN32_IE >= _WIN32_IE_IE70)") +cpp_quote("#define BSIS_PRESERVEORDERDURINGLAYOUT 0x00000200") +cpp_quote("#endif /* _WIN32_IE_IE70 */") + +cpp_quote("#define SID_SBandSite IID_IBandSite") +cpp_quote("#define CGID_BandSite IID_IBandSite") + +[ + object, + uuid(4CF504B0-DE96-11D0-8B3F-00A0C911E8E5) +] +interface IBandSite : IUnknown +{ + HRESULT AddBand([in] IUnknown* punk); + + HRESULT EnumBands( + [in] UINT uBand, + [out] DWORD* pdwBandID); + + HRESULT QueryBand( + [in] DWORD dwBandID, + [out] IDeskBand** ppstb, + [out] DWORD* pdwState, + [out, string, size_is(cchName)] LPWSTR pszName, + [in] int cchName); + + HRESULT SetBandState( + [in] DWORD dwBandID, + [in] DWORD dwMask, + [in] DWORD dwState); + + HRESULT RemoveBand([in] DWORD dwBandID); + + HRESULT GetBandObject( + [in] DWORD dwBandID, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT SetBandSiteInfo([in] const BANDSITEINFO *pbsinfo); + + HRESULT GetBandSiteInfo([in, out] BANDSITEINFO *pbsinfo); +} + +cpp_quote("#endif /* _WIN32_IE_IE40 */") + + + + Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] Thu May 1 04:39:37 2008 @@ -21,6 +21,8 @@ import "wtypes.idl"; + + cpp_quote("#include <pshpack1.h>") typedef struct { @@ -32,9 +34,59 @@ typedef struct _ITEMIDLIST { SHITEMID mkid; /* first itemid in list */ -} ITEMIDLIST,*LPITEMIDLIST; -typedef const ITEMIDLIST *LPCITEMIDLIST; +} ITEMIDLIST; + +cpp_quote("#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") +cpp_quote("typedef struct _ITEMIDLIST_RELATIVE : ITEMIDLIST {} ITEMIDLIST_RELATIVE;") +cpp_quote("typedef struct _ITEMID_CHILD : ITEMIDLIST_RELATIVE {} ITEMID_CHILD;") +cpp_quote("typedef struct _ITEMIDLIST_ABSOLUTE : ITEMIDLIST_RELATIVE {} ITEMIDLIST_ABSOLUTE;") +cpp_quote("#else /* !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)) */") +typedef ITEMIDLIST ITEMIDLIST_RELATIVE; +typedef ITEMIDLIST ITEMID_CHILD; +typedef ITEMIDLIST ITEMIDLIST_ABSOLUTE; +cpp_quote("#endif /* defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus) */") + cpp_quote("#include <poppack.h>") + +typedef [unique] BYTE_BLOB * wirePIDL; +typedef ITEMIDLIST /*__unaligned*/ * LPITEMIDLIST; +typedef const ITEMIDLIST /*__unaligned*/ * LPCITEMIDLIST; + +cpp_quote("#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") +typedef ITEMIDLIST_ABSOLUTE * PIDLIST_ABSOLUTE; +typedef const ITEMIDLIST_ABSOLUTE * PCIDLIST_ABSOLUTE; +typedef const ITEMIDLIST_ABSOLUTE /*__unaligned*/ * PCUIDLIST_ABSOLUTE; +typedef ITEMIDLIST_RELATIVE * PIDLIST_RELATIVE; +typedef const ITEMIDLIST_RELATIVE * PCIDLIST_RELATIVE; +typedef ITEMIDLIST_RELATIVE /*__unaligned*/ * PUIDLIST_RELATIVE; +typedef const ITEMIDLIST_RELATIVE /*__unaligned*/ * PCUIDLIST_RELATIVE; +typedef ITEMID_CHILD * PITEMID_CHILD; +typedef const ITEMID_CHILD * PCITEMID_CHILD; +typedef ITEMID_CHILD /*__unaligned*/ * PUITEMID_CHILD; +typedef const ITEMID_CHILD /*__unaligned*/ * PCUITEMID_CHILD; + +typedef PCUITEMID_CHILD const *PCUITEMID_CHILD_ARRAY; +typedef PCUIDLIST_RELATIVE const *PCUIDLIST_RELATIVE_ARRAY; +typedef PCIDLIST_ABSOLUTE const *PCIDLIST_ABSOLUTE_ARRAY; +typedef PCUIDLIST_ABSOLUTE const *PCUIDLIST_ABSOLUTE_ARRAY; +cpp_quote("#else // !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus))") +cpp_quote("#define PIDLIST_ABSOLUTE LPITEMIDLIST") +cpp_quote("#define PCIDLIST_ABSOLUTE LPCITEMIDLIST") +cpp_quote("#define PCUIDLIST_ABSOLUTE LPCITEMIDLIST") +cpp_quote("#define PIDLIST_RELATIVE LPITEMIDLIST") +cpp_quote("#define PCIDLIST_RELATIVE LPCITEMIDLIST") +cpp_quote("#define PUIDLIST_RELATIVE LPITEMIDLIST") +cpp_quote("#define PCUIDLIST_RELATIVE LPCITEMIDLIST") +cpp_quote("#define PITEMID_CHILD LPITEMIDLIST") +cpp_quote("#define PCITEMID_CHILD LPCITEMIDLIST") +cpp_quote("#define PUITEMID_CHILD LPITEMIDLIST") +cpp_quote("#define PCUITEMID_CHILD LPCITEMIDLIST") +cpp_quote("#define PCUITEMID_CHILD_ARRAY LPCITEMIDLIST *") +cpp_quote("#define PCUIDLIST_RELATIVE_ARRAY LPCITEMIDLIST *") +cpp_quote("#define PCIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") +cpp_quote("#define PCUIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *") +cpp_quote("#endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") + #ifndef MAX_PATH #define MAX_PATH 260 Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=33… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Thu May 1 04:39:37 2008 @@ -122,5 +122,4 @@ DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1);

1 0

[greatlrd] 33206: Fixed a smaller bug in intEnableReactXDriver it was not the drv hPDev that was the frist param it was hdev aka pDC->pPDev now we see value getting fill in to edd_DdirectDraw_Global from pfnDdEnableDirectDraw fucntion in ms dxg.sys
by greatlrd＠svn.reactos.org 01 May '08

01 May '08

Author: greatlrd Date: Thu May 1 04:24:53 2008 New Revision: 33206 URL: http://svn.reactos.org/svn/reactos?rev=33206&view=rev Log: Fixed a smaller bug in intEnableReactXDriver it was not the drv hPDev that was the frist param it was hdev aka pDC->pPDev now we see value getting fill in to edd_DdirectDraw_Global from pfnDdEnableDirectDraw fucntion in ms dxg.sys Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu May 1 04:24:53 2008 @@ -40,6 +40,9 @@ /*clean up some of the cache entry */ RtlZeroMemory(pEddgbl,sizeof(EDD_DIRECTDRAW_GLOBAL)); + /* setup EDD_DIRECTDRAW_GLOBAL for pDev xp */ + pDev->pEDDgpl = pEddgbl; + if (pfnDdEnableDirectDraw == NULL) { DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); @@ -47,7 +50,10 @@ else { DPRINT1(" call to pfnDdEnableDirectDraw \n "); - success = pfnDdEnableDirectDraw(pDC->PDev, TRUE); + /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ + success = pfnDdEnableDirectDraw(pDC->pPDev, TRUE); + + dump_edd_directdraw_global(pEddgbl); DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } @@ -55,8 +61,6 @@ edd_DdirectDraw_Global.hDev = pDC->pPDev; /*FIXME : edd_DdirectDraw_Global.dhpdev = (PVOID)pDC->PDev; */ - /* setup EDD_DIRECTDRAW_GLOBAL for pDev xp */ - pDev->pEDDgpl = pEddgbl; /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) ||

1 0

[gedmurphy] 33205: More COM interfaces needed for the new explorer
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 03:21:15 2008 New Revision: 33205 URL: http://svn.reactos.org/svn/reactos?rev=33205&view=rev Log: More COM interfaces needed for the new explorer Modified: trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Thu May 1 03:21:15 2008 @@ -44,35 +44,6 @@ #define IDeskBarClient_SetModeDBC(T,a) (T)->lpVtbl->SetModeDBC(T,a) #define IDeskBarClient_UIActivateDBC(T,a) (T)->lpVtbl->UIActivateDBC(T,a) #define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) -#endif - - -#define INTERFACE IDeskBar -DECLARE_INTERFACE_(IDeskBar,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IOleWindow methods ***/ - STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; - STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; - /*** IDeskBar methods ***/ - STDMETHOD_(HRESULT,SetClient)(THIS_ IUnknown*) PURE; - STDMETHOD_(HRESULT,GetClient)(THIS_ IUnknown**) PURE; - STDMETHOD_(HRESULT,OnPosRectChangeDB)(THIS_ RECT*) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IDeskBar_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IDeskBar_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IDeskBar_Release(T) (T)->lpVtbl->Release(T) -#define IDeskBar_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a) -#define IDeskBar_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a) -#define IDeskBar_SetClient(T,a) (T)->lpVtbl->SetClient(T,a) -#define IDeskBar_GetClient(T,a) (T)->lpVtbl->GetClient(T,a) -#define IDeskBar_OnPosRectChangeDB(T,a) (T)->lpVtbl->OnPosRectChangeDB(T,a) #endif #include <pshpack8.h> @@ -315,59 +286,8 @@ #define IBanneredBar_GetBitmap(T,a) (T)->lpVtbl->GetBitmap(T,a) #endif -enum tagMENUPOPUPPOPUPFLAGS -{ - MPPF_SETFOCUS = 0x1, - MPPF_INITIALSELECT = 0x2, - MPPF_NOANIMATE = 0x4, - MPPF_KEYBOARD = 0x10, - MPPF_REPOSITION = 0x20, - MPPF_FORCEZORDER = 0x40, - MPPF_FINALSELECT = 0x80, - MPPF_TOP = 0x20000000, - MPPF_LEFT = 0x40000000, - MPPF_RIGHT = 0x60000000, - MPPF_BOTTOM = 0x80000000, - MPPF_POS_MASK = 0xE0000000, - MPPF_ALIGN_LEFT = 0x2000000, - MPPF_ALIGN_RIGHT = 0x4000000, -}; -typedef int MP_POPUPFLAGS; - -#define INTERFACE IMenuPopup -DECLARE_INTERFACE_(IMenuPopup,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IOleWindow methods ***/ - STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; - STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; - /*** IDeskBar methods ***/ - STDMETHOD_(HRESULT,SetClient)(THIS_ IUnknown*) PURE; - STDMETHOD_(HRESULT,GetClient)(THIS_ IUnknown**) PURE; - STDMETHOD_(HRESULT,OnPosRectChangeDB)(THIS_ RECT*) PURE; - /*** IMenuPopup methods ***/ - STDMETHOD_(HRESULT,Popup)(THIS_ POINTL*,RECTL*,MP_POPUPFLAGS) PURE; - STDMETHOD_(HRESULT,OnSelect)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,SetSubMenu)(THIS_ IMenuPopup*,BOOL) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IMenuPopup_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IMenuPopup_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IMenuPopup_Release(T) (T)->lpVtbl->Release(T) -#define IMenuPopup_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a) -#define IMenuPopup_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a) -#define IMenuPopup_SetClient(T,a) (T)->lpVtbl->SetClient(T,a) -#define IMenuPopup_GetClient(T,a) (T)->lpVtbl->GetClient(T,a) -#define IMenuPopup_OnPosRectChangeDB(T,a) (T)->lpVtbl->OnPosRectChangeDB(T,a) -#define IMenuPopup_Popup(T,a,b,c) (T)->lpVtbl->Popup(T,a,b,c) -#define IMenuPopup_OnSelect(T,a) (T)->lpVtbl->OnSelect(T,a) -#define IMenuPopup_SetSubMenu(T,a,b) (T)->lpVtbl->SetSubMenu(T,a,b) -#endif + + #define INTERFACE IMenuBand DECLARE_INTERFACE_(IMenuBand,IUnknown) Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Thu May 1 03:21:15 2008 @@ -1510,3 +1510,76 @@ cpp_quote("#endif // NTDDI_LONGHORN") + + +cpp_quote("#if (_WIN32_IE >= _WIN32_IE_IE60)") + +[ + uuid(EB0FE173-1A3A-11D0-89B3-00A0C90A90AC), + object, + pointer_default(unique), + local +] +interface IDeskBar : IOleWindow +{ + HRESULT SetClient([in] IUnknown* punkClient); + + HRESULT GetClient([out] IUnknown** ppunkClient); + + HRESULT OnPosRectChangeDB([in] RECT *prc); +} + + +/***************************************************************************** + * IMenuPopup interface + */ +[ + uuid(D1E7AFEB-6A2E-11d0-8C78-00C04FD918B4), + object, + pointer_default(unique), + local +] +interface IMenuPopup : IDeskBar +{ + enum tagMENUPOPUPSELECT + { + MPOS_EXECUTE = 0, + MPOS_FULLCANCEL, + MPOS_CANCELLEVEL, + MPOS_SELECTLEFT, + MPOS_SELECTRIGHT, + MPOS_CHILDTRACKING + }; + + enum tagMENUPOPUPPOPUPFLAGS + { + MPPF_SETFOCUS = 0x00000001, + MPPF_INITIALSELECT = 0x00000002, + MPPF_NOANIMATE = 0x00000004, + MPPF_KEYBOARD = 0x00000010, + MPPF_REPOSITION = 0x00000020, + MPPF_FORCEZORDER = 0x00000040, + MPPF_FINALSELECT = 0x00000080, + MPPF_TOP = 0x20000000, + MPPF_LEFT = 0x40000000, + MPPF_RIGHT = 0x60000000, + MPPF_BOTTOM = 0x80000000, + MPPF_POS_MASK = 0xE0000000, + MPPF_ALIGN_LEFT = 0x02000000, + MPPF_ALIGN_RIGHT = 0x04000000 + }; + typedef int MP_POPUPFLAGS; + + HRESULT Popup( + [in] POINTL *ppt, + [in] RECTL *prcExclude, + [in] MP_POPUPFLAGS dwFlags); + + HRESULT OnSelect([in] DWORD dwSelectType); + + HRESULT SetSubMenu( + [in] IMenuPopup* pmp, + [in] BOOL fSet); +} + +cpp_quote("#endif /* _WIN32_IE_IE60 */")

1 0

[gedmurphy] 33204: Start to fix some COM interfaces which will be used by the new explorer shell
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 02:39:21 2008 New Revision: 33204 URL: http://svn.reactos.org/svn/reactos?rev=33204&view=rev Log: Start to fix some COM interfaces which will be used by the new explorer shell Modified: trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/include/psdk/rpcndr.h trunk/reactos/include/psdk/shlguid.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Thu May 1 02:39:21 2008 @@ -32,17 +32,6 @@ #define SID_SMenuPopup SID_HACK_SMenuPopup - -#ifdef COBJMACROS -#define IDockingWindow_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IDockingWindow_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IDockingWindow_Release(T) (T)->lpVtbl->Release(T) -#define IDockingWindow_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a) -#define IDockingWindow_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a) -#define IDockingWindow_ShowDW(T,a) (T)->lpVtbl->ShowDW(T,a) -#define IDockingWindow_CloseDW(T,a) (T)->lpVtbl->CloseDW(T,a) -#define IDockingWindow_ResizeBorderDW(T,a,b,c) (T)->lpVtbl->ResizeBorderDW(T,a,b,c) -#endif #ifdef COBJMACROS @@ -57,55 +46,6 @@ #define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) #endif -#define DBIM_TITLE 0x10 -#define DBIMF_VARIABLEHEIGHT 0x8 -#define DBIMF_DEBOSSED 0x20 -#define DBIF_VIEWMODE_VERTICAL 0x1 - -#include <pshpack8.h> -typedef struct tagDESKBANDINFO -{ - DWORD dwMask; - POINTL ptMinSize; - POINTL ptMaxSize; - POINTL ptIntegral; - POINTL ptActual; - WCHAR wszTitle[256]; - DWORD dwModeFlags; - COLORREF crBkgnd; -} DESKBANDINFO; -#include <poppack.h> - -#define INTERFACE IDeskBand -DECLARE_INTERFACE_(IDeskBand,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IOleWindow methods ***/ - STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; - STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; - /*** IDockingWindow methods ***/ - STDMETHOD_(HRESULT,ShowDW)(THIS_ BOOL) PURE; - STDMETHOD_(HRESULT,CloseDW)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,ResizeBoderDW)(THIS_ LPCRECT,IUnknown*,BOOL) PURE; - /*** IDeskBand methods ***/ - STDMETHOD_(HRESULT,GetBandInfo)(THIS_ DWORD,DWORD,DESKBANDINFO*) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -#define IDeskBand_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) -#define IDeskBand_AddRef(T) (T)->lpVtbl->AddRef(T) -#define IDeskBand_Release(T) (T)->lpVtbl->Release(T) -#define IDeskBand_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a) -#define IDeskBand_ContextSensitiveHelp(T,a) (T)->lpVtbl->ContextSensitiveHelp(T,a) -#define IDeskBand_ShowDW(T,a) (T)->lpVtbl->ShowDW(T,a) -#define IDeskBand_CloseDW(T,a) (T)->lpVtbl->CloseDW(T,a) -#define IDeskBand_ResizeBorderDW(T,a,b,c) (T)->lpVtbl->ResizeBorderDW(T,a,b,c) -#define IDeskBand_GetBandInfo(T,a,b,c) (T)->lpVtbl->GetBandInfo(T,a,b,c) -#endif #define INTERFACE IDeskBar DECLARE_INTERFACE_(IDeskBar,IUnknown) @@ -283,20 +223,6 @@ #define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) -/* - * DeskBand Command IDs - */ -enum tagDESKBANDCID -{ - DBID_BANDINFOCHANGED = 0, - DBID_SHOWONLY, - DBID_MAXIMIZEBAND, - DBID_PUSHCHEVRON, - DBID_DELAYINIT, - DBID_FINISHINIT, - DBID_SETWINDOWTHEME, - DBID_PERMITAUTOHIDE -}; #define DBC_SHOW 1 #define DBC_HIDE 0 Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Thu May 1 02:39:21 2008 @@ -18,7 +18,7 @@ #ifndef __RPCNDR_H_VERSION__ /* FIXME: What version? Perhaps something is better than nothing, however incorrect */ -#define __RPCNDR_H_VERSION__ ( 399 ) +#define __RPCNDR_H_VERSION__ ( 500 ) #endif #ifndef __WINE_RPCNDR_H Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Thu May 1 02:39:21 2008 @@ -97,7 +97,6 @@ #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) -DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Thu May 1 02:39:21 2008 @@ -422,24 +422,6 @@ #define IProgressDialog_SetCancelMsg(p,a,b) (p)->lpVtbl->SetCancelMsg(p,a,b) #define IProgressDialog_Timer(p,a,b) (p)->lpVtbl->Timer(p,a,b) #endif - -/* IDockingWindowFrame interface */ -#define INTERFACE IDockingWindow -DECLARE_INTERFACE_(IDockingWindow,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IOleWindow methods ***/ - STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; - STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; - /*** IDockingWindow methods ***/ - STDMETHOD_(HRESULT,ShowDW)(THIS_ BOOL) PURE; - STDMETHOD_(HRESULT,CloseDW)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,ResizeBoderDW)(THIS_ LPCRECT,IUnknown*,BOOL) PURE; -}; -#undef INTERFACE /* IDeskBarClient interface */ Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Thu May 1 02:39:21 2008 @@ -1375,3 +1375,138 @@ [in] LPCWSTR pszFile, [in] int iIcon); } + + +/***************************************************************************** + * IDockingWindow interface + */ +[ + uuid(012dd920-7b26-11d0-8ca9-00a0c92dbfe8), + object +] +interface IDockingWindow : IOleWindow +{ + HRESULT ShowDW([in] BOOL fShow); + + HRESULT CloseDW([in] DWORD dwReserved); + + HRESULT ResizeBorderDW( + [in] LPCRECT prcBorder, + [in] IUnknown* punkToolbarSite, + [in] BOOL fReserved); +} + + +/***************************************************************************** + * IDeskBand interface + */ +cpp_quote("#define DBIM_MINSIZE 0x0001") +cpp_quote("#define DBIM_MAXSIZE 0x0002") +cpp_quote("#define DBIM_INTEGRAL 0x0004") +cpp_quote("#define DBIM_ACTUAL 0x0008") +cpp_quote("#define DBIM_TITLE 0x0010") +cpp_quote("#define DBIM_MODEFLAGS 0x0020") +cpp_quote("#define DBIM_BKCOLOR 0x0040") + +cpp_quote("#include <pshpack8.h>") + +typedef struct tagDESKBANDINFO +{ + DWORD dwMask; + POINTL ptMinSize; + POINTL ptMaxSize; + POINTL ptIntegral; + POINTL ptActual; + WCHAR wszTitle[256]; + DWORD dwModeFlags; + COLORREF crBkgnd; +} DESKBANDINFO; + +cpp_quote("#include <poppack.h>") + +cpp_quote("#define DBIMF_NORMAL 0x0000") +cpp_quote("#define DBIMF_FIXED 0x0001") +cpp_quote("#define DBIMF_FIXEDBMP 0x0004 // a fixed background bitmap (if supported)") +cpp_quote("#define DBIMF_VARIABLEHEIGHT 0x0008") +cpp_quote("#define DBIMF_UNDELETEABLE 0x0010") +cpp_quote("#define DBIMF_DEBOSSED 0x0020") +cpp_quote("#define DBIMF_BKCOLOR 0x0040") +cpp_quote("#define DBIMF_USECHEVRON 0x0080") +cpp_quote("#define DBIMF_BREAK 0x0100") +cpp_quote("#define DBIMF_ADDTOFRONT 0x0200") +cpp_quote("#define DBIMF_TOPALIGN 0x0400") +cpp_quote("#if (NTDDI_VERSION >= NTDDI_LONGHORN)") +cpp_quote("#define DBIMF_NOGRIPPER 0x0800") +cpp_quote("#define DBIMF_ALWAYSGRIPPER 0x1000") +cpp_quote("#define DBIMF_NOMARGINS 0x2000") +cpp_quote("#endif // NTDDI_LONGHORN") + +cpp_quote("#define DBIF_VIEWMODE_NORMAL 0x0000") +cpp_quote("#define DBIF_VIEWMODE_VERTICAL 0x0001") +cpp_quote("#define DBIF_VIEWMODE_FLOATING 0x0002") +cpp_quote("#define DBIF_VIEWMODE_TRANSPARENT 0x0004") + +enum tagDESKBANDCID { + DBID_BANDINFOCHANGED = 0, + DBID_SHOWONLY = 1, + DBID_MAXIMIZEBAND = 2, + DBID_PUSHCHEVRON = 3, + DBID_DELAYINIT = 4, + DBID_FINISHINIT = 5, + DBID_SETWINDOWTHEME = 6, + DBID_PERMITAUTOHIDE = 7, +}; + +cpp_quote("#define DBPC_SELECTFIRST (DWORD)-1") +cpp_quote("#define DBPC_SELECTLAST (DWORD)-2") + +cpp_quote("#define CGID_DeskBand IID_IDeskBand") + +[ + uuid(EB0FE172-1A3A-11D0-89B3-00A0C90A90AC), + object, +] +interface IDeskBand : IDockingWindow +{ + HRESULT GetBandInfo( + [in] DWORD dwBandID, + [in] DWORD dwViewMode, + [in, out] DESKBANDINFO* pdbi); +} + +cpp_quote("#if (NTDDI_VERSION >= NTDDI_LONGHORN)") + +/***************************************************************************** + * IDeskBandInfo interface + */ +[ + uuid(77E425FC-CBF9-4307-BA6A-BB5727745661), + object, +] +interface IDeskBandInfo : IUnknown +{ + HRESULT GetDefaultBandWidth( + [in] DWORD dwBandID, + [in] DWORD dwViewMode, + [out] int *pnWidth); +} + + +/***************************************************************************** + * IDeskBand2 interface + */ +[ + uuid(79D16DE4-ABEE-4021-8D9D-9169B261D657), + object, +] +interface IDeskBand2 : IDeskBand +{ + HRESULT CanRenderComposited([out] BOOL *pfCanRenderComposited); + + HRESULT SetCompositionState([in] BOOL fCompositionEnabled); + + HRESULT GetCompositionState([out] BOOL *pfCompositionEnabled); +} + +cpp_quote("#endif // NTDDI_LONGHORN") + Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=33… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Thu May 1 02:39:21 2008 @@ -124,4 +124,3 @@ DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); -DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC);

1 0

[dchapyshev] 33203: - Remove kbswitch from autorun
by dchapyshev＠svn.reactos.org 01 May '08

01 May '08

Author: dchapyshev Date: Thu May 1 02:36:47 2008 New Revision: 33203 URL: http://svn.reactos.org/svn/reactos?rev=33203&view=rev Log: - Remove kbswitch from autorun Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu May 1 02:36:47 2008 @@ -805,6 +805,6 @@ HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.reactos.org/mozactivex" ; Keyboard layout switcher -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe" +;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe" ; EOF

1 0

[dchapyshev] 33202: - Add new layouts to bootcd
by dchapyshev＠svn.reactos.org 01 May '08

01 May '08

Author: dchapyshev Date: Thu May 1 02:33:59 2008 New Revision: 33202 URL: http://svn.reactos.org/svn/reactos?rev=33202&view=rev Log: - Add new layouts to bootcd Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu May 1 02:33:59 2008 @@ -140,6 +140,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout Text",0x00000000,"Canadian Multilingual Standard" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout File",0x00000000,"kbdfc.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout Text",0x00000000,"Canadian French (Legacy)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout File",0x00000000,"kbdycc.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout Text",0x00000000,"Serbian (Cyrillic)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout File",0x00000000,"kbdycl.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout Text",0x00000000,"Serbian (Latin)" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu May 1 02:33:59 2008 @@ -186,6 +186,8 @@ dll\keyboard\kbdusl\kbdusl.dll 1 dll\keyboard\kbdusr\kbdusr.dll 1 dll\keyboard\kbdusx\kbdusx.dll 1 +dll\keyboard\kbdycc\kbdycc.dll 1 +dll\keyboard\kbdycl\kbdycl.dll 1 dll\ntdll\ntdll.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu May 1 02:33:59 2008 @@ -171,6 +171,8 @@ 00000418 = "Romanian" 00000419 = "Russian" 00010419 = "Russian (Typewriter)" +00000C1A = "Serbian (Cyrillic)" +0000081A = "Serbian (Latin)" 0000041B = "Slovak (QWERTZ)" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" @@ -221,6 +223,7 @@ 00000419 = kbdru.dll 00010419 = kbdru1.dll 00000807 = kbdsg.dll +0000081A = kbdycl.dll 0000041B = kbdsk.dll 0000041D = kbdsw.dll 0000041E = kbdth.dll @@ -233,6 +236,7 @@ 00000444 = kbdtat.dll 00011009 = kbdcan.dll 00000C0C = kbdfc.dll +00000C1A = kbdycc.dll [HiveInfs.Install] AddReg=hivecls.inf,AddReg

1 0

[dchapyshev] 33201: Add keyboard layouts: - Serbian (Cyrillic) - Serbian (Latin)
by dchapyshev＠svn.reactos.org 01 May '08

01 May '08

Author: dchapyshev Date: Thu May 1 02:33:29 2008 New Revision: 33201 URL: http://svn.reactos.org/svn/reactos?rev=33201&view=rev Log: Add keyboard layouts: - Serbian (Cyrillic) - Serbian (Latin) Added: trunk/reactos/dll/keyboard/kbdycc/ trunk/reactos/dll/keyboard/kbdycc/kbdycc.c (with props) trunk/reactos/dll/keyboard/kbdycc/kbdycc.def (with props) trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild (with props) trunk/reactos/dll/keyboard/kbdycc/kbdycc.rc (with props) trunk/reactos/dll/keyboard/kbdycl/ trunk/reactos/dll/keyboard/kbdycl/kbdycl.c (with props) trunk/reactos/dll/keyboard/kbdycl/kbdycl.def (with props) trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild (with props) trunk/reactos/dll/keyboard/kbdycl/kbdycl.rc (with props) Modified: trunk/reactos/dll/keyboard/keyboard.rbuild Added: trunk/reactos/dll/keyboard/kbdycc/kbdycc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/kbdycc.c (added) +++ trunk/reactos/dll/keyboard/kbdycc/kbdycc.c [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,414 @@ +/* + * ReactOS Serbian (Cyrillic) Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 6, + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, NOCAPS, {'`', '~' } }, + { '1', NOCAPS, {'1', '!' } }, + { '2', NOCAPS, {'2', '\"' } }, + { '3', NOCAPS, {'3', '#' } }, + { '4', NOCAPS, {'4', '$' } }, + { '5', NOCAPS, {'5', '%' } }, + { '7', NOCAPS, {'7', '/' } }, + { '8', NOCAPS, {'8', '(' } }, + { '9', NOCAPS, {'9', ')' } }, + { '0', NOCAPS, {'0', '=' } }, + { VK_OEM_PLUS, NOCAPS, {'+', '*' } }, + { 'Q', CAPS, {0x0459, 0x0409} }, + { 'W', CAPS, {0x045a, 0x040a} }, + { 'R', CAPS, {0x0440, 0x0420} }, + { 'T', CAPS, {0x0442, 0x0422} }, + { 'Y', CAPS, {0x0437, 0x0417} }, + { 'U', CAPS, {0x0443, 0x0423} }, + { 'I', CAPS, {0x0438, 0x0418} }, + { 'O', CAPS, {0x043e, 0x041e} }, + { 'P', CAPS, {0x043f, 0x041f} }, + { VK_OEM_4, CAPS, {0x0448, 0x0428} }, + { 'A', CAPS, {0x0430, 0x0410} }, + { 'S', CAPS, {0x0441, 0x0421} }, + { 'D', CAPS, {0x0434, 0x0414} }, + { 'F', CAPS, {0x0444, 0x0424} }, + { 'G', CAPS, {0x0433, 0x0413} }, + { 'H', CAPS, {0x0445, 0x0425} }, + { 'J', CAPS, {0x0458, 0x0408} }, + { 'K', CAPS, {0x043a, 0x041a} }, + { 'L', CAPS, {0x043b, 0x041b} }, + { VK_OEM_7, CAPS, {0x045b, 0x040b} }, + { 'Z', CAPS, {0x0455, 0x0405} }, + { 'X', CAPS, {0x045f, 0x040f} }, + { 'C', CAPS, {0x0446, 0x0426} }, + { 'V', CAPS, {0x0432, 0x0412} }, + { 'B', CAPS, {0x0431, 0x0411} }, + { 'N', CAPS, {0x043d, 0x041d} }, + { 'M', CAPS, {0x043c, 0x041c} }, + { VK_OEM_2, NOCAPS, {'-', '_' } }, + { VK_TAB, NOCAPS, {'\t', '\t' } }, + { VK_ADD, NOCAPS, {'+', '+' } }, + { VK_DIVIDE, NOCAPS, {'/', '/' } }, + { VK_MULTIPLY, NOCAPS, {'*', '*' } }, + { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { VK_OEM_MINUS, NOCAPS, {WCH_DEAD, '?', 0x001f } }, + { 0xff, NOCAPS, {'\'', WCH_NONE, WCH_NONE} }, + { VK_OEM_6, CAPS, {0x0452, 0x0402, 0x001b } }, + { VK_OEM_5, CAPS, {0x0436, 0x0416, 0x001c } }, + { VK_OEM_1, CAPS, {0x0447, 0x0427, 0x001d } }, + { VK_OEM_102, NOCAPS, {'<', '>', 0x001c } }, + { VK_BACK, NOCAPS, {'\b', '\b', 0x007f } }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, 0x001b } }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, 0x0003 } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { 'E', CAPS, {0x0435, 0x0415, WCH_NONE, 0x20ac} }, + { VK_OEM_COMMA, NOCAPS, {',', ';', WCH_NONE, '<' } }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x001e} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\'" L"APOSTROPHE", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(0x0433, '\'', 0x0453, 0x0000) }, + { DEADTRANS(0x0413, '\'', 0x0403, 0x0000) }, + { DEADTRANS(0x043a, '\'', 0x045c, 0x0000) }, + { DEADTRANS(0x041a, '\'', 0x040c, 0x0000) }, + { DEADTRANS(L' ', '\'', '\'', 0x0000) }, + {0, 0} +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdycc/kbdycc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdycc/kbdycc.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/kbdycc.def (added) +++ trunk/reactos/dll/keyboard/kbdycc/kbdycc.def [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdycc.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdycc/kbdycc.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdycc" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdycc.dll" allowwarnings="true"> + <importlibrary definition="kbdycc.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdycc.c</file> + <file>kbdycc.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdycc/kbdycc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdycc/kbdycc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/kbdycc.rc (added) +++ trunk/reactos/dll/keyboard/kbdycc/kbdycc.rc [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Serbian (Cyrillic) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdycc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdycc.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdycc/kbdycc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdycl/kbdycl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/kbdycl.c (added) +++ trunk/reactos/dll/keyboard/kbdycl/kbdycl.c [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,534 @@ +/* + * ReactOS Serbian (Latin) Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 6, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, NOCAPS, {WCH_LGTR, '~' } }, + { 'R', CAPS, {'r', 'R' } }, + { 'T', CAPS, {'t', 'T' } }, + { 'Z', CAPS, {'z', 'Z' } }, + { 'U', CAPS, {'u', 'U' } }, + { 'I', CAPS, {'i', 'I' } }, + { 'O', CAPS, {'o', 'O' } }, + { 'P', CAPS, {'p', 'P' } }, + { 'A', CAPS, {'a', 'A' } }, + { 'S', CAPS, {'s', 'S' } }, + { 'D', CAPS, {'d', 'D' } }, + { 'H', CAPS, {'h', 'H' } }, + { 'J', CAPS, {'j', 'J' } }, + { VK_OEM_1, CAPS, {0x010d, 0x010c} }, + { 'Y', CAPS, {'y', 'Y' } }, + { 'X', CAPS, {'x', 'X' } }, + { 'C', CAPS, {'c', 'C' } }, + { VK_OEM_MINUS, NOCAPS, {'-', '_' } }, + { VK_DECIMAL, NOCAPS, {'.', '.' } }, + { VK_TAB, NOCAPS, {'\t', '\t' } }, + { VK_ADD, NOCAPS, {'+', '+' } }, + { VK_DIVIDE, NOCAPS, {'/', '/' } }, + { VK_MULTIPLY, NOCAPS, {'*', '*' } }, + { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { '1', NOCAPS, {'1', '!', '~' } }, + { '3', NOCAPS, {'3', '#', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '^' } }, + { '4', NOCAPS, {'4', '$', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02d8 } }, + { '5', NOCAPS, {'5', '%', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b0 } }, + { '7', NOCAPS, {'7', '/', '`' } }, + { '8', NOCAPS, {'8', '(', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02d9 } }, + { '9', NOCAPS, {'9', ')', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b4 } }, + { '0', NOCAPS, {'0', '=', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02dd } }, + { VK_OEM_PLUS, NOCAPS, {'+', '*', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b8 } }, + { 'Q', CAPS, {'q', 'Q', '\\' } }, + { 'W', CAPS, {'w', 'W', '|' } }, + { 'E', CAPS, {'e', 'E', 0x20ac } }, + { 'F', CAPS, {'f', 'F', '[' } }, + { 'G', CAPS, {'g', 'G', ']' } }, + { 'K', CAPS, {'k', 'K', 0x0142 } }, + { 'L', CAPS, {'l', 'L', 0x0141 } }, + { VK_OEM_7, CAPS, {0x0107, 0x0106, 0x00df } }, + { 'V', CAPS, {'v', 'V', '@' } }, + { 'B', CAPS, {'b', 'B', '{' } }, + { 'N', CAPS, {'n', 'N', '}' } }, + { 'M', CAPS, {'m', 'M', 0x00a7 } }, + { VK_OEM_COMMA, NOCAPS, {',', ';', '<' } }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', '>' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_4, CAPS, {0x0161, 0x0160, 0x00f7, 0x001b} }, + { VK_OEM_6, CAPS, {0x0111, 0x0110, 0x00d7, 0x001d} }, + { VK_OEM_5, CAPS, {0x017e, 0x017d, 0x00a4, 0x001c} }, + { VK_OEM_102, NOCAPS, {'<', '>', WCH_NONE, 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '2', NOCAPS, {'2', '\"', WCH_DEAD, WCH_NONE, 0x0000 } }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02c7, WCH_NONE, WCH_NONE} }, + { '6', NOCAPS, {'6', '&', WCH_DEAD, WCH_NONE, 0x001e } }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x02db, WCH_NONE, WCH_NONE} }, + { VK_OEM_2, NOCAPS, {'\'', '?', WCH_DEAD, WCH_NONE, 0x001f } }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8, WCH_NONE, WCH_NONE} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x201a" L"TURNED COMMA", + L"\x02c7" L"HACEK", + L"\x02d8" L"BREVE", + L"\x00b0" L"RING", + L"\x02db" L"OGONEK", + L"\x02d9" L"DOT", + L"\x00b4" L"ACUTE", + L"\x02dd" L"DOUBLE ACUTE", + L"^" L"CIRCUMFLEX", + L"\x00a8" L"UMLAUT", + L"\x00b8" L"CEDILLA", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(L'I', L'^', 0x00ce, 0x0000) }, + { DEADTRANS(L'i', L'^', 0x00ee, 0x0000) }, + { DEADTRANS(L'O', L'^', 0x00d4, 0x0000) }, + { DEADTRANS(L'o', L'^', 0x00f4, 0x0000) }, + { DEADTRANS(L'A', L'^', 0x00c2, 0x0000) }, + { DEADTRANS(L'a', L'^', 0x00e2, 0x0000) }, + { DEADTRANS(L' ', L'^', L'^', 0x0000) }, + + { DEADTRANS(L'A', 0x02d8, 0x0102, 0x0000) }, + { DEADTRANS(L'a', 0x02d8, 0x0103, 0x0000) }, + { DEADTRANS(L' ', 0x02d8, 0x02d8, 0x0000) }, + + { DEADTRANS(L'U', 0x00b0, 0x016e, 0x0000) }, + { DEADTRANS(L'u', 0x00b0, 0x016f, 0x0000) }, + { DEADTRANS(L' ', 0x00b0, 0x00b0, 0x0000) }, + + { DEADTRANS(L'Z', 0x02d9, 0x017b, 0x0000) }, + { DEADTRANS(L'z', 0x02d9, 0x017c, 0x0000) }, + { DEADTRANS(L' ', 0x02d9, 0x02d9, 0x0000) }, + + { DEADTRANS(L'A', 0x00b4, 0x00c1, 0x0000) }, + { DEADTRANS(L'a', 0x00b4, 0x00e1, 0x0000) }, + { DEADTRANS(L'C', 0x00b4, 0x0106, 0x0000) }, + { DEADTRANS(L'c', 0x00b4, 0x0107, 0x0000) }, + { DEADTRANS(L'E', 0x00b4, 0x00c9, 0x0000) }, + { DEADTRANS(L'e', 0x00b4, 0x00e9, 0x0000) }, + { DEADTRANS(L'I', 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(L'i', 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(L'L', 0x00b4, 0x0139, 0x0000) }, + { DEADTRANS(L'l', 0x00b4, 0x013a, 0x0000) }, + { DEADTRANS(L'N', 0x00b4, 0x0143, 0x0000) }, + { DEADTRANS(L'n', 0x00b4, 0x0144, 0x0000) }, + { DEADTRANS(L'O', 0x00b4, 0x00d3, 0x0000) }, + { DEADTRANS(L'o', 0x00b4, 0x00f3, 0x0000) }, + { DEADTRANS(L'R', 0x00b4, 0x0154, 0x0000) }, + { DEADTRANS(L'r', 0x00b4, 0x0155, 0x0000) }, + { DEADTRANS(L'S', 0x00b4, 0x015a, 0x0000) }, + { DEADTRANS(L's', 0x00b4, 0x015b, 0x0000) }, + { DEADTRANS(L'U', 0x00b4, 0x00da, 0x0000) }, + { DEADTRANS(L'u', 0x00b4, 0x00fa, 0x0000) }, + { DEADTRANS(L'Y', 0x00b4, 0x00dd, 0x0000) }, + { DEADTRANS(L'y', 0x00b4, 0x00fd, 0x0000) }, + { DEADTRANS(L'Z', 0x00b4, 0x0179, 0x0000) }, + { DEADTRANS(L'z', 0x00b4, 0x017a, 0x0000) }, + { DEADTRANS(L' ', 0x00b4, 0x00b4, 0x0000) }, + + { DEADTRANS(L'U', 0x02dd, 0x0170, 0x0000) }, + { DEADTRANS(L'u', 0x02dd, 0x0171, 0x0000) }, + { DEADTRANS(L'O', 0x02dd, 0x0150, 0x0000) }, + { DEADTRANS(L'o', 0x02dd, 0x0151, 0x0000) }, + { DEADTRANS(L' ', 0x02dd, 0x02dd, 0x0000) }, + + { DEADTRANS(L'C', 0x00b8, 0x00c7, 0x0000) }, + { DEADTRANS(L'c', 0x00b8, 0x00e7, 0x0000) }, + { DEADTRANS(L'S', 0x00b8, 0x015e, 0x0000) }, + { DEADTRANS(L's', 0x00b8, 0x015f, 0x0000) }, + { DEADTRANS(L' ', 0x00b8, 0x00b8, 0x0000) }, + + { DEADTRANS(L'C', 0x201a, 0x00c7, 0x0000) }, + { DEADTRANS(L'c', 0x201a, 0x00e7, 0x0000) }, + { DEADTRANS(L'S', 0x201a, 0x015e, 0x0000) }, + { DEADTRANS(L's', 0x201a, 0x015f, 0x0000) }, + { DEADTRANS(L' ', 0x201a, 0x201a, 0x0000) }, + + { DEADTRANS(L'c', 0x02c7, 0x010d, 0x0000) }, + { DEADTRANS(L'C', 0x02c7, 0x010c, 0x0000) }, + { DEADTRANS(L'd', 0x02c7, 0x010f, 0x0000) }, + { DEADTRANS(L'D', 0x02c7, 0x010e, 0x0000) }, + { DEADTRANS(L'e', 0x02c7, 0x011b, 0x0000) }, + { DEADTRANS(L'E', 0x02c7, 0x011a, 0x0000) }, + { DEADTRANS(L'l', 0x02c7, 0x013e, 0x0000) }, + { DEADTRANS(L'L', 0x02c7, 0x013d, 0x0000) }, + { DEADTRANS(L'n', 0x02c7, 0x0148, 0x0000) }, + { DEADTRANS(L'N', 0x02c7, 0x0147, 0x0000) }, + { DEADTRANS(L'r', 0x02c7, 0x0159, 0x0000) }, + { DEADTRANS(L'R', 0x02c7, 0x0158, 0x0000) }, + { DEADTRANS(L's', 0x02c7, 0x0161, 0x0000) }, + { DEADTRANS(L'S', 0x02c7, 0x0160, 0x0000) }, + { DEADTRANS(L't', 0x02c7, 0x0165, 0x0000) }, + { DEADTRANS(L'T', 0x02c7, 0x0164, 0x0000) }, + { DEADTRANS(L'z', 0x02c7, 0x017e, 0x0000) }, + { DEADTRANS(L'Z', 0x02c7, 0x017d, 0x0000) }, + { DEADTRANS(L' ', 0x02c7, 0x02c7, 0x0000) }, + + { DEADTRANS(L'E', 0x02db, 0x0118, 0x0000) }, + { DEADTRANS(L'e', 0x02db, 0x0119, 0x0000) }, + { DEADTRANS(L'A', 0x02db, 0x0104, 0x0000) }, + { DEADTRANS(L'a', 0x02db, 0x0105, 0x0000) }, + { DEADTRANS(L' ', 0x02db, 0x02db, 0x0000) }, + + { DEADTRANS(L'E', 0x00a8, 0x00cb, 0x0000) }, + { DEADTRANS(L'e', 0x00a8, 0x00eb, 0x0000) }, + { DEADTRANS(L'U', 0x00a8, 0x00dc, 0x0000) }, + { DEADTRANS(L'u', 0x00a8, 0x00fc, 0x0000) }, + { DEADTRANS(L'O', 0x00a8, 0x00d6, 0x0000) }, + { DEADTRANS(L'o', 0x00a8, 0x00f6, 0x0000) }, + { DEADTRANS(L'A', 0x00a8, 0x00c4, 0x0000) }, + { DEADTRANS(L'a', 0x00a8, 0x00e4, 0x0000) }, + { DEADTRANS(L' ', 0x00a8, 0x00a8, 0x0000) }, + + {0, 0} +}; + +ROSDATA LIGATURE2 Ligature[] = { + { VK_OEM_3, NOCAPS, {0x201a, 0x201a } }, + {0, 0} +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures */ + 2, + sizeof(Ligature[0]), + (PLIGATURE1)Ligature +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdycl/kbdycl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdycl/kbdycl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/kbdycl.def (added) +++ trunk/reactos/dll/keyboard/kbdycl/kbdycl.def [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdycl.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdycl/kbdycl.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdycl" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdycl.dll" allowwarnings="true"> + <importlibrary definition="kbdycl.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdycl.c</file> + <file>kbdycl.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdycl/kbdycl.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdycl/kbdycl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/kbdycl.rc (added) +++ trunk/reactos/dll/keyboard/kbdycl/kbdycl.rc [iso-8859-1] Thu May 1 02:33:29 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Serbian (Latin) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdycl\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdycl.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdycl/kbdycl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Thu May 1 02:33:29 2008 @@ -145,4 +145,10 @@ <directory name="kbdusx"> <xi:include href="kbdusx/kbdusx.rbuild" /> </directory> + <directory name="kbdycc"> + <xi:include href="kbdycc/kbdycc.rbuild" /> + </directory> + <directory name="kbdycl"> + <xi:include href="kbdycl/kbdycl.rbuild" /> + </directory> </group>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs