Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat May 23 14:17:04 2009 New Revision: 41057 URL: http://svn.reactos.org/svn/reactos?rev=41057&view=rev Log: - Update headers Added: trunk/reactos/include/psdk/traffic.h (with props) Modified: trunk/reactos/include/psdk/gdiplusenums.h trunk/reactos/include/psdk/msctf.idl trunk/reactos/include/psdk/oaidl.idl trunk/reactos/include/psdk/setupapi.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/textstor.idl trunk/reactos/include/psdk/urlmon.idl trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/wininet.h Modified: trunk/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusenums.… ============================================================================== --- trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] Sat May 23 14:17:04 2009 @@ -179,6 +179,11 @@ ImageTypeUnknown, ImageTypeBitmap, ImageTypeMetafile +}; + +enum WarpMode { + WarpModePerspective, + WarpModeBilinear }; enum WrapMode @@ -436,6 +441,7 @@ typedef enum MatrixOrder MatrixOrder; typedef enum ImageType ImageType; typedef enum ImageFlags ImageFlags; +typedef enum WarpMode WarpMode; typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode; Modified: trunk/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Sat May 23 14:17:04 2009 @@ -30,7 +30,10 @@ cpp_quote("#endif") cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") +cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0504)") cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") +cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") + cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") @@ -92,6 +95,8 @@ UINT uModifiers; } TF_PRESERVEDKEY; +typedef [uuid(5a886226-ae9a-489b-b991-2b1e25ee59a9)] enum { TF_ANCHOR_START = 0, TF_ANCHOR_END = 1 } TfAnchor; + [ object, uuid(aa80e801-2021-11d2-93e0-0060b067b86e), @@ -704,3 +709,167 @@ [in] REFCLSID rclsid, [out] TfClientId *ptid); }; + +[ + object, + uuid(43c9fe15-f494-4c17-9de2-b8a4ac350aa8), + pointer_default(unique) +] +interface ITfLanguageProfileNotifySink : IUnknown +{ + HRESULT OnLanguageChange( + [in] LANGID langid, + [out] BOOL *pfAccept); + + HRESULT OnLanguageChanged(); +} + +[ + object, + uuid(aa80e803-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfEditSession : IUnknown +{ + HRESULT DoEditSession( + [in] TfEditCookie ec); +} + +[ + object, + uuid(aa80e7ff-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfRange : IUnknown +{ + const WCHAR TF_CHAR_EMBEDDED = TS_CHAR_EMBEDDED; + + typedef [uuid(cf610f06-2882-46f6-abe5-298568b664c4)] enum { TF_GRAVITY_BACKWARD = 0, TF_GRAVITY_FORWARD = 1 } TfGravity; + + typedef [uuid(1e512533-bbdc-4530-9a8e-a1dc0af67468)] enum { TF_SD_BACKWARD = 0, TF_SD_FORWARD = 1 } TfShiftDir; + + const DWORD TF_HF_OBJECT = 1; + const DWORD TF_TF_MOVESTART = 1; + const DWORD TF_TF_IGNOREEND = 2; + const DWORD TF_ST_CORRECTION = 1; + const DWORD TF_IE_CORRECTION = 1; + + typedef [uuid(49930d51-7d93-448c-a48c-fea5dac192b1)] struct TF_HALTCOND + { + ITfRange *pHaltRange; + TfAnchor aHaltPos; + DWORD dwFlags; + } TF_HALTCOND; + + HRESULT GetText( + [in] TfEditCookie ec, + [in] DWORD dwFlags, + [out, size_is(cchMax), length_is(*pcch)] WCHAR *pchText, + [in] ULONG cchMax, + [out] ULONG *pcch); + + HRESULT SetText( + [in] TfEditCookie ec, + [in] DWORD dwFlags, + [in, size_is(cch), unique] const WCHAR *pchText, + [in] LONG cch); + + HRESULT GetFormattedText( + [in] TfEditCookie ec, + [out] IDataObject **ppDataObject); + + HRESULT GetEmbedded( + [in] TfEditCookie ec, + [in] REFGUID rguidService, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppunk); + + HRESULT InsertEmbedded( + [in] TfEditCookie ec, + [in] DWORD dwFlags, + [in] IDataObject *pDataObject); + + HRESULT ShiftStart( + [in] TfEditCookie ec, + [in] LONG cchReq, + [out] LONG *pcch, + [in, unique] const TF_HALTCOND *pHalt); + + HRESULT ShiftEnd( + [in] TfEditCookie ec, + [in] LONG cchReq, + [out] LONG *pcch, + [in, unique] const TF_HALTCOND *pHalt); + + HRESULT ShiftStartToRange( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [in] TfAnchor aPos); + + HRESULT ShiftEndToRange( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [in] TfAnchor aPos); + + HRESULT ShiftStartRegion( + [in] TfEditCookie ec, + [in] TfShiftDir dir, + [out] BOOL *pfNoRegion); + + HRESULT ShiftEndRegion( + [in] TfEditCookie ec, + [in] TfShiftDir dir, + [out] BOOL *pfNoRegion); + + HRESULT IsEmpty( + [in] TfEditCookie ec, + [out] BOOL *pfEmpty); + + HRESULT Collapse( + [in] TfEditCookie ec, + [in] TfAnchor aPos); + + HRESULT IsEqualStart( + [in] TfEditCookie ec, + [in] ITfRange *pWith, + [in] TfAnchor aPos, + [out] BOOL *pfEqual); + + HRESULT IsEqualEnd( + [in] TfEditCookie ec, + [in] ITfRange *pWith, + [in] TfAnchor aPos, + [out] BOOL *pfEqual); + + HRESULT CompareStart( + [in] TfEditCookie ec, + [in] ITfRange *pWith, + [in] TfAnchor aPos, + [out] LONG *plResult); + + HRESULT CompareEnd( + [in] TfEditCookie ec, + [in] ITfRange *pWith, + [in] TfAnchor aPos, + [out] LONG *plResult); + + HRESULT AdjustForInsert( + [in] TfEditCookie ec, + [in] ULONG cchInsert, + [out] BOOL *pfInsertOk); + + HRESULT GetGravity( + [out] TfGravity *pgStart, + [out] TfGravity *pgEnd); + + HRESULT SetGravity( + [in] TfEditCookie ec, + [in] TfGravity gStart, + [in] TfGravity gEnd); + + HRESULT Clone( + [out] ITfRange **ppClone); + + HRESULT GetContext( + [out] ITfContext **ppContext); +}; Modified: trunk/reactos/include/psdk/oaidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oaidl.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/oaidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oaidl.idl [iso-8859-1] Sat May 23 14:17:04 2009 @@ -989,7 +989,8 @@ typedef [v1_enum] enum tagSYSKIND { SYS_WIN16 = 0, SYS_WIN32, - SYS_MAC + SYS_MAC, + SYS_WIN64 } SYSKIND; typedef [v1_enum] enum tagLIBFLAGS { Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sat May 23 14:17:04 2009 @@ -640,6 +640,9 @@ /* Flags for StringTableAddString and StringTableLookUpString */ #define ST_CASE_SENSITIVE_COMPARE 0x00000001 +/* SetupUninstallOEMInf Flags values */ +#define SUOI_FORCEDELETE 0x00000001 + #ifndef RC_INVOKED typedef PVOID HINF; typedef PVOID HDSKSPC; 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] Sat May 23 14:17:04 2009 @@ -65,6 +65,21 @@ typedef IPersistFolder2 *LPPERSISTFOLDER2; HRESULT GetCurFolder( [out] LPITEMIDLIST *ppidl ); +} + + +/***************************************************************************** + * IPersistIDList interface + */ +[ + object, + uuid(1079acfc-29bd-11d3-8e0d-00c04f6837d5), + pointer_default(unique) +] +interface IPersistIDList : IPersist +{ + HRESULT SetIDList( [in] LPCITEMIDLIST pidl ); + HRESULT GetIDList( [out] LPITEMIDLIST *ppidl ); } @@ -340,7 +355,41 @@ HRESULT MapColumnToSCID( [in] UINT iColumn, [in] SHCOLUMNID *pscid ); } - +/***************************************************************************** + * IShellItem interface + */ +[ + object, + uuid(43826d1e-e718-42ee-bc55-a1e261c37bfe), + pointer_default(unique) +] +interface IShellItem : IUnknown +{ + typedef DWORD SIGDN; + + typedef DWORD SICHINTF; + + HRESULT BindToHandler( + [in] IBindCtx *pbc, + [in] REFGUID rbhid, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvOut); + + HRESULT GetParent( [out] IShellItem **ppsi ); + + HRESULT GetDisplayName( + [in] SIGDN sigdnName, + [out] LPWSTR *ppszName); + + HRESULT GetAttributes( + [in] SFGAOF sfgaoMask, + [out] SFGAOF *psfgaoAttribs); + + HRESULT Compare( + [in] IShellItem *psi, + [in] SICHINTF hint, + [out] int *piOrder); +} /***************************************************************************** * FOLDERSETTINGS Modified: trunk/reactos/include/psdk/textstor.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/textstor.idl?… ============================================================================== --- trunk/reactos/include/psdk/textstor.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/textstor.idl [iso-8859-1] Sat May 23 14:17:04 2009 @@ -20,6 +20,10 @@ import "oaidl.idl"; #endif +cpp_quote("#define TS_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)") +cpp_quote("#define TS_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") + + const ULONG TS_DEFAULT_SELECTION = ~0u; const DWORD TS_SD_READONLY = 0x001; @@ -38,6 +42,13 @@ const DWORD TS_AS_ALL_SINKS = (TS_AS_TEXT_CHANGE | TS_AS_SEL_CHANGE | TS_AS_LAYOUT_CHANGE | TS_AS_ATTR_CHANGE | TS_AS_STATUS_CHANGE); +const DWORD TS_LF_SYNC = 0x1; +const DWORD TS_LF_READ = 0x2; +const DWORD TS_LF_READWRITE = 0x6; + +const WCHAR TS_CHAR_EMBEDDED = 0xfffc; +const WCHAR TS_CHAR_REGION = 0x0000; +const WCHAR TS_CHAR_REPLACEMENT = 0xfffd; typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; Added: trunk/reactos/include/psdk/traffic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/traffic.h?rev… ============================================================================== --- trunk/reactos/include/psdk/traffic.h (added) +++ trunk/reactos/include/psdk/traffic.h [iso-8859-1] Sat May 23 14:17:04 2009 @@ -1,0 +1,48 @@ +/* + * TRAFFIC definitions + * + * Copyright (c) 2009 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_TRAFFIC_H +#define __WINE_TRAFFIC_H + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +typedef VOID (CALLBACK * TCI_ADD_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG); +typedef VOID (CALLBACK * TCI_DEL_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG); +typedef VOID (CALLBACK * TCI_MOD_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG); +typedef VOID (CALLBACK * TCI_NOTIFY_HANDLER) + (HANDLE,HANDLE,ULONG,HANDLE,ULONG,PVOID); + +typedef struct _TCI_CLIENT_FUNC_LIST +{ + TCI_NOTIFY_HANDLER ClNotifyHandler; + TCI_ADD_FLOW_COMPLETE_HANDLER ClAddFlowCompleteHandler; + TCI_MOD_FLOW_COMPLETE_HANDLER ClModifyFlowCompleteHandler; + TCI_DEL_FLOW_COMPLETE_HANDLER ClDeleteFlowCompleteHandler; +} TCI_CLIENT_FUNC_LIST, *PTCI_CLIENT_FUNC_LIST; + +ULONG WINAPI TcRegisterClient(ULONG,HANDLE,PTCI_CLIENT_FUNC_LIST,PHANDLE); + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif /* __WINE_TRAFFIC_H */ Propchange: trunk/reactos/include/psdk/traffic.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Sat May 23 14:17:04 2009 @@ -1500,6 +1500,20 @@ } /***************************************************************************** + * IUriContainer interface + */ +[ + local, + object, + uuid(a158a630-ed6f-45fb-b987-f68676f57752), + pointer_default(unique) +] +interface IUriContainer : IUnknown +{ + HRESULT GetIUri([out] IUri **ppIUri); +} + +/***************************************************************************** * IInternetProtocolEx interface */ [ Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat May 23 14:17:04 2009 @@ -2898,6 +2898,7 @@ BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT); BOOL WINAPI FlattenPath(HDC); BOOL WINAPI FloodFill(HDC,int,int,COLORREF); +BOOL WINAPI GdiAlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); BOOL WINAPI GdiComment(HDC,UINT,const BYTE*); BOOL WINAPI GdiFlush(void); DWORD WINAPI GdiGetBatchLimit(void); Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wininet.h [iso-8859-1] Sat May 23 14:17:04 2009 @@ -540,6 +540,7 @@ #define INTERNET_OPTION_ERROR_MASK 62 #define INTERNET_OPTION_FROM_CACHE_TIMEOUT 63 #define INTERNET_OPTION_BYPASS_EDITED_ENTRY 64 +#define INTERNET_OPTION_HTTP_DECODING 65 #define INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO 67 #define INTERNET_OPTION_CODEPAGE 68 #define INTERNET_OPTION_CACHE_TIMESTAMPS 69 @@ -570,6 +571,10 @@ #define INTERNET_OPTION_PROXY_SETTINGS_CHANGED 95 #define INTERNET_OPTION_DATAFILE_EXT 96 + +#define INTERNET_OPTION_CODEPAGE_PATH 100 +#define INTERNET_OPTION_CODEPAGE_EXTRA 101 +#define INTERNET_OPTION_IDN 102 #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK #define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT

15 years, 3 months

[jimtabor] 41056: - Check the pointer for client thread information for null not thread information.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat May 23 08:01:27 2009 New Revision: 41056 URL: http://svn.reactos.org/svn/reactos?rev=41056&view=rev Log: - Check the pointer for client thread information for null not thread information. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat May 23 08:01:27 2009 @@ -1999,7 +1999,7 @@ BOOL APIENTRY IntInitMessagePumpHook() { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) { ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++; return TRUE; @@ -2010,7 +2010,7 @@ BOOL APIENTRY IntUninitMessagePumpHook() { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti) { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <= 0) {

15 years, 3 months

[mjmartin] 41055: - CreateClassDeviceObject/ClassAddDevice: Again do not create device with exclusive access.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 23 06:02:48 2009 New Revision: 41055 URL: http://svn.reactos.org/svn/reactos?rev=41055&view=rev Log: - CreateClassDeviceObject/ClassAddDevice: Again do not create device with exclusive access. Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Sat May 23 06:02:48 2009 @@ -331,7 +331,7 @@ &DeviceNameU, FILE_DEVICE_MOUSE, FILE_DEVICE_SECURE_OPEN, - TRUE, + FALSE, &Fdo); if (NT_SUCCESS(Status)) goto cleanup; @@ -625,7 +625,7 @@ NULL, Pdo->DeviceType, Pdo->Characteristics & FILE_DEVICE_SECURE_OPEN ? FILE_DEVICE_SECURE_OPEN : 0, - TRUE, + FALSE, &Fdo); if (!NT_SUCCESS(Status)) {

15 years, 4 months

[mjmartin] 41054: - CreateClassDeviceObject/ClassAddDevice: Do not create KeyboardClass device with exclusive access as it will prevent key loggers from working.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 23 05:37:34 2009 New Revision: 41054 URL: http://svn.reactos.org/svn/reactos?rev=41054&view=rev Log: - CreateClassDeviceObject/ClassAddDevice: Do not create KeyboardClass device with exclusive access as it will prevent key loggers from working. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sat May 23 05:37:34 2009 @@ -354,7 +354,7 @@ &DeviceNameU, FILE_DEVICE_KEYBOARD, FILE_DEVICE_SECURE_OPEN, - TRUE, + FALSE, &Fdo); if (NT_SUCCESS(Status)) goto cleanup; @@ -649,7 +649,7 @@ NULL, Pdo->DeviceType, Pdo->Characteristics & FILE_DEVICE_SECURE_OPEN ? FILE_DEVICE_SECURE_OPEN : 0, - TRUE, + FALSE, &Fdo); if (!NT_SUCCESS(Status)) {

15 years, 4 months

[jimtabor] 41053: - Remove the rest...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat May 23 05:15:45 2009 New Revision: 41053 URL: http://svn.reactos.org/svn/reactos?rev=41053&view=rev Log: - Remove the rest... Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat May 23 05:15:45 2009 @@ -91,7 +91,6 @@ LIST_ENTRY DriverObjListHead; struct _KBL* KeyboardLayout; W32HEAP_USER_MAPPING HeapMappings; - PPROCESSINFO ProcessInfo; } W32PROCESS, *PW32PROCESS; typedef struct _PROCESSINFO Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sat May 23 05:15:45 2009 @@ -101,7 +101,7 @@ void FASTCALL DestroyProcessClasses(PW32PROCESS Process ) { PWINDOWCLASS Class; - PPROCESSINFO pi = Process->ProcessInfo; + PPROCESSINFO pi = (PPROCESSINFO)Process; if (pi != NULL) {

15 years, 4 months

[tkreuzer] 41052: syssetup: convert to spec

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 05:02:23 2009 New Revision: 41052 URL: http://svn.reactos.org/svn/reactos?rev=41052&view=rev Log: syssetup: convert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.def (removed) @@ -1,31 +1,0 @@ -LIBRARY SYSSETUP.DLL -EXPORTS -;ApplyAcls -;DevInstallW -;GenerateScsiHwIdList -InitializeSetupActionLog@4 -InstallLiveCD@4 -InstallReactOS@4 -KeyboardClassInstaller@12 -;LogItem@8 -;LogItem0 -;LogItem1 -;LogItem2 -;LogItem3 -;LogItemN -MouseClassInstaller@12 -;PnPInitializationThread -;RepairStartMenuItems -;ReportError -;ScsiClassInstaller -SetupChangeFontSize@8 -SetupChangeLocale@8 -SetupChangeLocaleEx@24 -;SetupCreateOptionalComponentsPage -;SetupInfObjectInstallActionW -;SetupSetLargeDialogFont -;TapeClassInstaller -TerminateSetupActionLog@0 -;UpgradePrinters -;ViewSetupActionLog -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] Sat May 23 05:02:23 2009 @@ -1,5 +1,5 @@ <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll" unicode="yes" allowwarnings="true" crt="msvcrt"> - <importlibrary definition="syssetup.def" /> + <importlibrary definition="syssetup.spec" /> <include base="syssetup">.</include> <library>pseh</library> <library>uuid</library> Added: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Sat May 23 05:02:23 2009 @@ -1,0 +1,28 @@ +#@ stdcall ApplyAcls +#@ stdcall DevInstallW +#@ stdcall GenerateScsiHwIdList +@ stdcall InitializeSetupActionLog(long) +@ stdcall InstallLiveCD(ptr) +@ stdcall InstallReactOS(ptr) +@ stdcall KeyboardClassInstaller(long ptr ptr) +#@ stdcall LogItem@8 +#@ stdcall LogItem0 +#@ stdcall LogItem1 +#@ stdcall LogItem2 +#@ stdcall LogItem3 +#@ stdcall LogItemN +@ stdcall MouseClassInstaller(long ptr ptr) +#@ stdcall PnPInitializationThread +#@ stdcall RepairStartMenuItems +#@ stdcall ReportError +#@ stdcall ScsiClassInstaller +@ stdcall SetupChangeFontSize(ptr ptr) +@ stdcall SetupChangeLocale(ptr long) +@ stdcall SetupChangeLocaleEx(ptr long ptr long long long) +#@ stdcall SetupCreateOptionalComponentsPage +#@ stdcall SetupInfObjectInstallActionW +#@ stdcall SetupSetLargeDialogFont +#@ stdcall TapeClassInstaller +@ stdcall TerminateSetupActionLog() +#@ stdcall UpgradePrinters +#@ stdcall ViewSetupActionLog Propchange: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 4 months

[jimtabor] 41051: - Move Process Information structure back into kernel space. We use client information via TEB to provide a pointer for user space as a reference pointer.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat May 23 04:57:51 2009 New Revision: 41051 URL: http://svn.reactos.org/svn/reactos?rev=41051&view=rev Log: - Move Process Information structure back into kernel space. We use client information via TEB to provide a pointer for user space as a reference pointer. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat May 23 04:57:51 2009 @@ -1,7 +1,7 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H -struct _PROCESSINFO; +typedef struct _PROCESSINFO *PPROCESSINFO; struct _W32THREADINFO; struct _WINDOW; @@ -334,20 +334,6 @@ DWORD TimeTick; DWORD SrvEventActivity; } SERVERINFO, *PSERVERINFO; - -typedef struct _PROCESSINFO -{ - PVOID UserHandleTable; - HANDLE hUserHeap; - ULONG_PTR UserHeapDelta; - HINSTANCE hModUser; - PWINDOWCLASS LocalClassList; - PWINDOWCLASS GlobalClassList; - PWINDOWCLASS SystemClassList; - - UINT RegisteredSysClasses : 1; - -} PROCESSINFO, *PPROCESSINFO; #define CTI_INSENDMESSAGE 0x0002 Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat May 23 04:57:51 2009 @@ -94,4 +94,17 @@ PPROCESSINFO ProcessInfo; } W32PROCESS, *PW32PROCESS; +typedef struct _PROCESSINFO +{ + W32PROCESS XzyxW32Process; /* Place holder. */ + /* ReactOS */ + HINSTANCE hModUser; + PWINDOWCLASS LocalClassList; + PWINDOWCLASS GlobalClassList; + PWINDOWCLASS SystemClassList; + + UINT RegisteredSysClasses : 1; + +} PROCESSINFO; + #endif /* __INCLUDE_NAPI_WIN32_H */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat May 23 04:57:51 2009 @@ -67,12 +67,12 @@ { /* FIXME - lock the process */ Win32Process = ExAllocatePoolWithTag(NonPagedPool, - sizeof(W32PROCESS), + sizeof(PROCESSINFO), TAG('W', '3', '2', 'p')); if (Win32Process == NULL) RETURN( STATUS_NO_MEMORY); - RtlZeroMemory(Win32Process, sizeof(W32PROCESS)); + RtlZeroMemory(Win32Process, sizeof(PROCESSINFO)); PsSetProcessWin32Process(Process, Win32Process); /* FIXME - unlock the process */ @@ -151,12 +151,6 @@ if(LogonProcess == Win32Process) { LogonProcess = NULL; - } - - if (Win32Process->ProcessInfo != NULL) - { - UserHeapFree(Win32Process->ProcessInfo); - Win32Process->ProcessInfo = NULL; } } @@ -339,12 +333,12 @@ if (Process->Win32Process == NULL) { /* FIXME - lock the process */ - Process->Win32Process = ExAllocatePool(NonPagedPool, sizeof(W32PROCESS)); + Process->Win32Process = ExAllocatePool(NonPagedPool, sizeof(PROCESSINFO)); if (Process->Win32Process == NULL) return STATUS_NO_MEMORY; - RtlZeroMemory(Process->Win32Process, sizeof(W32PROCESS)); + RtlZeroMemory(Process->Win32Process, sizeof(PROCESSINFO)); /* FIXME - unlock the process */ Win32kProcessCallback(Process, TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sat May 23 04:57:51 2009 @@ -463,43 +463,7 @@ PPROCESSINFO GetW32ProcessInfo(VOID) { - PPROCESSINFO pi; - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); - - if (W32Process == NULL) - { - /* FIXME - temporary hack for system threads... */ - return NULL; - } - - if (W32Process->ProcessInfo == NULL) - { - pi = UserHeapAlloc(sizeof(PROCESSINFO)); - if (pi != NULL) - { - RtlZeroMemory(pi, - sizeof(PROCESSINFO)); - - /* initialize it */ - pi->UserHandleTable = gHandleTable; - pi->hUserHeap = W32Process->HeapMappings.KernelMapping; - pi->UserHeapDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - - (ULONG_PTR)W32Process->HeapMappings.UserMapping; - - if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo, - pi, - NULL) != NULL) - { - UserHeapFree(pi); - } - } - else - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - } - } - - return W32Process->ProcessInfo; + return (PPROCESSINFO)PsGetCurrentProcessWin32Process(); } PW32THREADINFO Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat May 23 04:57:51 2009 @@ -893,12 +893,13 @@ { UserEnterShared(); GetW32ThreadInfo(); - PPROCESSINFO ppi = GetW32ProcessInfo(); + PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); _SEH2_TRY { pUserConnect->siClient.psi = gpsi; - pUserConnect->siClient.aheList = ppi->UserHandleTable; - pUserConnect->siClient.ulSharedDelta = ppi->UserHeapDelta; + pUserConnect->siClient.aheList = gHandleTable; + pUserConnect->siClient.ulSharedDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - + (ULONG_PTR)W32Process->HeapMappings.UserMapping; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -909,7 +910,6 @@ { SetLastNtError(Status); } - DPRINT("NtUserPC SI 0x%x : HT 0x%x : D 0x%x\n", gpsi, ppi->UserHandleTable, ppi->UserHeapDelta); UserLeave(); return Status; }

15 years, 4 months

[tkreuzer] 41050: sndblast: convert to spec

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 04:53:54 2009 New Revision: 41050 URL: http://svn.reactos.org/svn/reactos?rev=41050&view=rev Log: sndblast: convert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.def (removed) @@ -1,15 +1,0 @@ -; $Id: sndblst.def 34299 2008-07-05 02:43:17Z silverblade $ -; -; sndblst.def -; -; ReactOS Operating System -; -LIBRARY sndblst.dll -EXPORTS -DriverProc@20 -widMessage@20 -wodMessage@20 -midMessage@20 -modMessage@20 -mxdMessage@20 -auxMessage@20 Modified: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] Sat May 23 04:53:54 2009 @@ -1,7 +1,7 @@  <module name="sndblst" type="win32dll" installbase="system32" installname="sndblst.dll" unicode="yes"> - <importlibrary definition="sndblst.def" /> + <importlibrary definition="sndblst.spec" /> <include base="ReactOS">include/reactos/libs/sound</include> <include base="sndblst">.</include> <define name="DEBUG_NT4" /> Added: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec [iso-8859-1] Sat May 23 04:53:54 2009 @@ -1,0 +1,7 @@ +@ stdcall DriverProc(long ptr long long long) +@ stdcall widMessage(long long long long long) +@ stdcall wodMessage(long long long long long) +@ stdcall midMessage(long long long long long) +@ stdcall modMessage(long long long long long) +@ stdcall mxdMessage(long long long long long) +@ stdcall auxMessage(long long long long long) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 4 months

[tkreuzer] 41049: Change return type of OpenMRUListW and CreateMRUListW to HANDLE, add a comment that CREATEMRULISTW is already defined differently in explorer_new/undoc.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 04:15:56 2009 New Revision: 41049 URL: http://svn.reactos.org/svn/reactos?rev=41049&view=rev Log: Change return type of OpenMRUListW and CreateMRUListW to HANDLE, add a comment that CREATEMRULISTW is already defined differently in explorer_new/undoc.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 23 04:15:56 2009 @@ -81,7 +81,8 @@ #define MRUF_STRING_LIST 0 -typedef int (WINAPI *CREATEMRULISTW)( +// FIXME: CREATEMRULISTW is also a structure, see explorer_new/undoc.h +typedef HANDLE (WINAPI *CREATEMRULISTW)( LPMRUINFO lpmi ); @@ -105,7 +106,7 @@ static HRESULT WINAPI SHEOWCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj); static ULONG WINAPI SHEOWCm_fnRelease(IContextMenu2 *iface); -int OpenMRUList(HKEY hKey); +HANDLE OpenMRUList(HKEY hKey); void LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, WCHAR * szExt); void LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, WCHAR * szExt); void InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName); @@ -424,7 +425,7 @@ WCHAR * pFileExt; HKEY hKey; LONG result; - int hList; + HANDLE hList; /* get file extension */ pFileExt = wcsrchr(szFileName, L'.'); @@ -448,10 +449,10 @@ } /* insert the entry */ - result = (*AddMRUStringW)((HANDLE)hList, szAppName); + result = (*AddMRUStringW)(hList, szAppName); /* close mru list */ - (*FreeMRUList)((HANDLE)hList); + (*FreeMRUList)(hList); /* create mru list key */ RegCloseKey(hKey); } @@ -994,7 +995,7 @@ FIXME("implement me :)))\n"); } -int +HANDLE OpenMRUList(HKEY hKey) { MRUINFO info; @@ -1031,7 +1032,7 @@ void AddItemFromMRUList(POPEN_WITH_CONTEXT pContext, HKEY hKey) { - int hList; + HANDLE hList; int nItem, nCount, nResult; WCHAR szBuffer[MAX_PATH];

15 years, 4 months

[tkreuzer] 41048: Shel32: - DialogProc returns INT_PTR and not BOOL - Don't cast a pointer to LONG - Use INT_PTR instead of int for pointer math

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 23 03:56:31 2009 New Revision: 41048 URL: http://svn.reactos.org/svn/reactos?rev=41048&view=rev Log: Shel32: - DialogProc returns INT_PTR and not BOOL - Don't cast a pointer to LONG - Use INT_PTR instead of int for pointer math Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -1164,7 +1164,7 @@ } -BOOL +INT_PTR CALLBACK FormatDriveDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -536,7 +536,7 @@ SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); - SetWindowLongPtr(hwndDlg, DWL_USER, (LONG)pBuf); + SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)pBuf); /* select first item */ hDlgCtrl = GetDlgItem(hwndDlg, 14009); Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -623,7 +623,7 @@ } -static BOOL CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -61,7 +61,7 @@ #define AdminToolsHELLVIEWCOLUMNS (4) -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -41,9 +41,9 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; static const IContextMenu2Vtbl vt_ContextMenu2FontItem; -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); -#define _IContextMenuFontItem_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem))) +#define _IContextMenuFontItem_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem))) #define _ICOM_THIS_From_IContextMenu2FontItem(class, name) class* This = (class*)(((char*)name)-_IContextMenuFontItem_Offset); #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -41,7 +41,7 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Sat May 23 03:56:31 2009 @@ -35,7 +35,7 @@ LPITEMIDLIST pidl; } IExtractIconWImpl; -#define _IExtractIconA_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA))) +#define _IExtractIconA_Offset ((INT_PTR)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA))) #define _ICOM_THIS_From_IExtractIconA(class, name) class* This = (class*)(((char*)name)-_IExtractIconA_Offset); static shvheader PrinterSFHeader[] = { @@ -305,7 +305,7 @@ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } IGenericSFImpl; -#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl)

15 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
51
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 2009