Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 29977: - fix a bug in ShellView_DoContextMenu which made shell extensions crash on click - pass the pidl of the parent folder to IShellExtInit function. - shell extension dont run yet due SHGetPathFromIDList[A/W] cant return right information
by janderwald＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: janderwald Date: Tue Oct 30 15:05:24 2007 New Revision: 29977 URL: http://svn.reactos.org/svn/reactos?rev=29977&view=rev Log: - fix a bug in ShellView_DoContextMenu which made shell extensions crash on click - pass the pidl of the parent folder to IShellExtInit function. - shell extension dont run yet due SHGetPathFromIDList[A/W] cant return right information Modified: trunk/reactos/dll/win32/shell32/shlview.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Tue Oct 30 15:05:24 2007 @@ -948,7 +948,6 @@ HMENU hMenu; BOOL fExplore = FALSE; HWND hwndTree = 0; - LPCONTEXTMENU pContextMenu = NULL; CMINVOKECOMMANDINFO cmi; TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault); @@ -1011,7 +1010,7 @@ cmi.cbSize = sizeof(cmi); cmi.hwnd = This->hWndParent; /* this window has to answer CWM_GETISHELLBROWSER */ cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); - IContextMenu_InvokeCommand(pContextMenu, &cmi); + IContextMenu_InvokeCommand(This->pCM, &cmi); } } DestroyMenu(hMenu); Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Tue Oct 30 15:05:24 2007 @@ -62,7 +62,7 @@ } ItemCmImpl; UINT -SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj); +SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, LPITEMIDLIST pidlFolder); static const IContextMenu2Vtbl cmvt; @@ -310,7 +310,7 @@ UINT idCmdLast = 0xFFF0; static WCHAR szAny[] = { '*',0}; - SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj); + SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj, This->pidl); for (i = 0; i < This->cidl; i++) { @@ -324,7 +324,7 @@ if (hr == S_OK) { memcpy(&buffer[6], pwszCLSID, 38 * sizeof(WCHAR)); - SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj, This->pidl); } } @@ -333,7 +333,7 @@ ebuf[0] = L'.'; buffer[0] = L'\0'; if (MultiByteToWideChar(CP_ACP, 0, ebuf, -1, buffer, 111)) - SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj, This->pidl); } } @@ -778,12 +778,12 @@ }; HRESULT -SH_LoadDynamicContextMenuHandler(HKEY hKey, const CLSID * szClass, IContextMenu** ppv, IDataObject * pDataObj) +SH_LoadDynamicContextMenuHandler(HKEY hKey, const CLSID * szClass, IContextMenu** ppv, IDataObject * pDataObj, LPITEMIDLIST pidlFolder) { HRESULT hr; IContextMenu * cmobj; IShellExtInit *shext; - + TRACE("SH_LoadDynamicContextMenuHandler entered with %s\n",wine_dbgstr_guid(szClass)); hr = SHCoCreateInstance(NULL, szClass, NULL, &IID_IContextMenu, (void**)&cmobj); @@ -800,8 +800,7 @@ cmobj->lpVtbl->Release(cmobj); return FALSE; } - - hr = shext->lpVtbl->Initialize(shext, NULL, pDataObj, hKey); + hr = shext->lpVtbl->Initialize(shext, pidlFolder, pDataObj, hKey); if (hr != S_OK) { TRACE("Failed to initialize shell extension\n"); @@ -817,7 +816,7 @@ } UINT -SH_EnumerateDynamicContextHandlerForKey(const LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj) +SH_EnumerateDynamicContextHandlerForKey(const LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, LPITEMIDLIST pidlFolder) { HKEY hKey; WCHAR szKey[MAX_PATH] = {0}; @@ -861,7 +860,7 @@ TRACE("hResult %x szKey %s name %s\n",hResult, debugstr_w(szKey), debugstr_w(szName)); if (hResult == S_OK) { - hResult = SH_LoadDynamicContextMenuHandler(hKey, &clsid, &cmobj, pDataObj); + hResult = SH_LoadDynamicContextMenuHandler(hKey, &clsid, &cmobj, pDataObj, pidlFolder); } if (hResult == S_OK) {

1 0

[hpoussin] 29976: Do not directly include psdk directory when building host tools
by hpoussin＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: hpoussin Date: Tue Oct 30 13:48:53 2007 New Revision: 29976 URL: http://svn.reactos.org/svn/reactos?rev=29976&view=rev Log: Do not directly include psdk directory when building host tools Modified: trunk/reactos/tools/tools.mak trunk/reactos/tools/widl/widl.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29976&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Tue Oct 30 13:48:53 2007 @@ -5,8 +5,8 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS) -TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS) +TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing -D__REACTOS__ $(HOST_CFLAGS) +TOOLS_CPPFLAGS = -Wall -Wpointer-arith -D__REACTOS__ $(HOST_CPPFLAGS) TOOLS_LFLAGS = $(HOST_LFLAGS) # HACK: Remove those lines once host tools don't use target headers anymore Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=29… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Tue Oct 30 13:48:53 2007 @@ -57,9 +57,9 @@ $(addprefix $(INTERMEDIATE_), $(WIDL_SOURCES:.c=.o)) WIDL_HOST_CFLAGS = \ - -DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 -D__REACTOS__=1 \ + -DINT16=SHORT -DYYDEBUG=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -Iinclude/reactos/wine -Iinclude/reactos \ -I$(INTERMEDIATE_)include $(TOOLS_CFLAGS) WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[hpoussin] 29975: Add missing constants in winnt.h Fix svn properties
by hpoussin＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: hpoussin Date: Tue Oct 30 13:47:24 2007 New Revision: 29975 URL: http://svn.reactos.org/svn/reactos?rev=29975&view=rev Log: Add missing constants in winnt.h Fix svn properties Added: trunk/reactos/include/reactos/wine/guiddef.h (with props) Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h (props changed) trunk/reactos/include/reactos/wine/config.h (props changed) trunk/reactos/include/reactos/wine/dlgs.h (props changed) trunk/reactos/include/reactos/wine/exception.h (props changed) trunk/reactos/include/reactos/wine/itss.idl (contents, props changed) trunk/reactos/include/reactos/wine/library.h (contents, props changed) trunk/reactos/include/reactos/wine/lmbrowsr.h (props changed) trunk/reactos/include/reactos/wine/mmddk.h (props changed) trunk/reactos/include/reactos/wine/mmreg.h (props changed) trunk/reactos/include/reactos/wine/mmsystem.h (props changed) trunk/reactos/include/reactos/wine/msacm.h (props changed) trunk/reactos/include/reactos/wine/msacmdlg.h (props changed) trunk/reactos/include/reactos/wine/msacmdrv.h (props changed) trunk/reactos/include/reactos/wine/msvcrt/fcntl.h (props changed) trunk/reactos/include/reactos/wine/port.h (props changed) trunk/reactos/include/reactos/wine/prsht.h (props changed) trunk/reactos/include/reactos/wine/rpcfc.h (props changed) trunk/reactos/include/reactos/wine/rpcss_shared.h (props changed) trunk/reactos/include/reactos/wine/unicode.h (props changed) trunk/reactos/include/reactos/wine/winbase16.h (props changed) trunk/reactos/include/reactos/wine/windef.h (contents, props changed) trunk/reactos/include/reactos/wine/windef16.h (props changed) trunk/reactos/include/reactos/wine/wine_common_ver.rc (props changed) trunk/reactos/include/reactos/wine/wingdi16.h (props changed) trunk/reactos/include/reactos/wine/winnetwk.h (contents, props changed) trunk/reactos/include/reactos/wine/winnt.h (contents, props changed) trunk/reactos/include/reactos/wine/winsock16.h (contents, props changed) trunk/reactos/include/reactos/wine/winuser.h (props changed) trunk/reactos/include/reactos/wine/winuser16.h (props changed) trunk/reactos/include/reactos/wine/wownt32.h (props changed) trunk/reactos/include/reactos/wine/wpp.h (props changed) Propchange: trunk/reactos/include/reactos/wine/cfgmgr32.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Propchange: trunk/reactos/include/reactos/wine/config.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/dlgs.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/exception.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Added: trunk/reactos/include/reactos/wine/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/guidd… ============================================================================== --- trunk/reactos/include/reactos/wine/guiddef.h (added) +++ trunk/reactos/include/reactos/wine/guiddef.h Tue Oct 30 13:47:24 2007 @@ -1,0 +1,1 @@ +#include "../../psdk/guiddef.h" Propchange: trunk/reactos/include/reactos/wine/guiddef.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/wine/itss.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/itss.… ============================================================================== --- trunk/reactos/include/reactos/wine/itss.idl (original) +++ trunk/reactos/include/reactos/wine/itss.idl Tue Oct 30 13:47:24 2007 @@ -1,95 +1,95 @@ -/* - * Copyright (C) 2004 Mike McCormack - * - * 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 - */ - -import "oaidl.idl"; - -typedef struct _ITS_Control_Data -{ - UINT cdwControlData; - UINT adwControlData[1]; - -} ITS_Control_Data, *PITS_Control_Data; - -typedef enum ECompactionLev { - COMPACT_DATA = 0, - COMPACT_DATA_AND_PATH -} ECompactionLev; - -[ - object, - uuid(88cc31de-27ab-11d0-9df9-00a0c922e6ec), - pointer_default(unique) -] -interface IITStorage : IUnknown -{ - HRESULT StgCreateDocfile( - [in] const WCHAR * pwcsName, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgCreateDocfileOnILockBytes( - [in] ILockBytes * plkbyt, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - - HRESULT StgIsStorageFile( - [in] const WCHAR * pwcsName); - - HRESULT StgIsStorageILockBytes( - [in] ILockBytes * plkbyt); - - HRESULT StgOpenStorage( - [in] const WCHAR * pwcsName, - [in] IStorage * pstgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgOpenStorageOnILockBytes( - [in] ILockBytes * plkbyt, - [in] IStorage * pStgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgSetTimes( - [in] WCHAR const * lpszName, - [in] FILETIME const * pctime, - [in] FILETIME const * patime, - [in] FILETIME const * pmtime); - - HRESULT SetControlData( - [in] PITS_Control_Data pControlData); - - HRESULT DefaultControlData( - [out] PITS_Control_Data * ppControlData); - - HRESULT Compact( - [in] const WCHAR * pwcsName, - [in] ECompactionLev iLev); -} - -cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") -cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") +/* + * Copyright (C) 2004 Mike McCormack + * + * 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 + */ + +import "oaidl.idl"; + +typedef struct _ITS_Control_Data +{ + UINT cdwControlData; + UINT adwControlData[1]; + +} ITS_Control_Data, *PITS_Control_Data; + +typedef enum ECompactionLev { + COMPACT_DATA = 0, + COMPACT_DATA_AND_PATH +} ECompactionLev; + +[ + object, + uuid(88cc31de-27ab-11d0-9df9-00a0c922e6ec), + pointer_default(unique) +] +interface IITStorage : IUnknown +{ + HRESULT StgCreateDocfile( + [in] const WCHAR * pwcsName, + [in] DWORD grfMode, + [in] DWORD reserved, + [out] IStorage ** ppstgOpen); + + HRESULT StgCreateDocfileOnILockBytes( + [in] ILockBytes * plkbyt, + [in] DWORD grfMode, + [in] DWORD reserved, + [out] IStorage ** ppstgOpen); + + + HRESULT StgIsStorageFile( + [in] const WCHAR * pwcsName); + + HRESULT StgIsStorageILockBytes( + [in] ILockBytes * plkbyt); + + HRESULT StgOpenStorage( + [in] const WCHAR * pwcsName, + [in] IStorage * pstgPriority, + [in] DWORD grfMode, + [in] SNB snbExclude, + [in] DWORD reserved, + [out] IStorage ** ppstgOpen); + + HRESULT StgOpenStorageOnILockBytes( + [in] ILockBytes * plkbyt, + [in] IStorage * pStgPriority, + [in] DWORD grfMode, + [in] SNB snbExclude, + [in] DWORD reserved, + [out] IStorage ** ppstgOpen); + + HRESULT StgSetTimes( + [in] WCHAR const * lpszName, + [in] FILETIME const * pctime, + [in] FILETIME const * patime, + [in] FILETIME const * pmtime); + + HRESULT SetControlData( + [in] PITS_Control_Data pControlData); + + HRESULT DefaultControlData( + [out] PITS_Control_Data * ppControlData); + + HRESULT Compact( + [in] const WCHAR * pwcsName, + [in] ECompactionLev iLev); +} + +cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec);") +cpp_quote("DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec);") +cpp_quote("DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") +cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") Propchange: trunk/reactos/include/reactos/wine/itss.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/wine/library.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/libra… ============================================================================== --- trunk/reactos/include/reactos/wine/library.h (original) +++ trunk/reactos/include/reactos/wine/library.h Tue Oct 30 13:47:24 2007 @@ -1,210 +1,210 @@ -/* - * Definitions for the Wine library - * - * Copyright 2000 Alexandre Julliard - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_WINE_LIBRARY_H -#define __WINE_WINE_LIBRARY_H - -#include <stdarg.h> -#include <sys/types.h> - -#include <windef.h> -#include <winbase.h> - -/* configuration */ - -extern const char *wine_get_config_dir(void); -extern const char *wine_get_server_dir(void); -extern const char *wine_get_user_name(void); -extern void wine_init_argv0_path( const char *argv0 ); -extern void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_preloader ); - -/* dll loading */ - -typedef void (*load_dll_callback_t)( void *, const char * ); - -extern void *wine_dlopen( const char *filename, int flag, char *error, int errorsize ); -extern void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize ); -extern int wine_dlclose( void *handle, char *error, int errorsize ); -extern void wine_dll_set_callback( load_dll_callback_t load ); -extern void *wine_dll_load( const char *filename, char *error, int errorsize, int *file_exists ); -extern void *wine_dll_load_main_exe( const char *name, char *error, int errorsize, - int test_only, int *file_exists ); -extern void wine_dll_unload( void *handle ); -extern int wine_dll_get_owner( const char *name, char *buffer, int size, int *file_exists ); - -extern int __wine_main_argc; -extern char **__wine_main_argv; -extern WCHAR **__wine_main_wargv; -extern char **__wine_main_environ; -extern void wine_init( int argc, char *argv[], char *error, int error_size ); - -/* debugging */ - -extern const char * (*__wine_dbgstr_an)( const char * s, int n ); -extern const char * (*__wine_dbgstr_wn)( const WCHAR *s, int n ); -extern const char * (*__wine_dbg_vsprintf)( const char *format, va_list args ); -extern int (*__wine_dbg_vprintf)( const char *format, va_list args ); -extern int (*__wine_dbg_vlog)( unsigned int cls, const char *channel, - const char *function, const char *format, va_list args ); - -extern void wine_dbg_add_option( const char *name, unsigned char set, unsigned char clear ); -extern int wine_dbg_parse_options( const char *str ); - -/* portability */ - -extern void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ); -extern void wine_set_pe_load_area( void *base, size_t size ); -extern void wine_free_pe_load_area(void); - -/* memory mappings */ - -extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags ); -extern void wine_mmap_add_reserved_area( void *addr, size_t size ); -extern void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap ); -extern int wine_mmap_is_in_reserved_area( void *addr, size_t size ); - -/* LDT management */ - -extern void wine_ldt_init_locking( void (*lock_func)(void), void (*unlock_func)(void) ); -extern void wine_ldt_get_entry( unsigned short sel, LDT_ENTRY *entry ); -extern int wine_ldt_set_entry( unsigned short sel, const LDT_ENTRY *entry ); -extern int wine_ldt_is_system( unsigned short sel ); -extern void *wine_ldt_get_ptr( unsigned short sel, unsigned int offset ); -extern unsigned short wine_ldt_alloc_entries( int count ); -extern unsigned short wine_ldt_realloc_entries( unsigned short sel, int oldcount, int newcount ); -extern void wine_ldt_free_entries( unsigned short sel, int count ); -#ifdef __i386__ -extern unsigned short wine_ldt_alloc_fs(void); -extern void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ); -extern void wine_ldt_free_fs( unsigned short sel ); -#else /* __i386__ */ -static inline unsigned short wine_ldt_alloc_fs(void) { return 0x0b; /* pseudo GDT selector */ } -static inline void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ) { } -static inline void wine_ldt_free_fs( unsigned short sel ) { } -#endif /* __i386__ */ - - -/* the local copy of the LDT */ -#ifdef __CYGWIN__ -# ifdef WINE_EXPORT_LDT_COPY -# define WINE_LDT_EXTERN __declspec(dllexport) -# else -# define WINE_LDT_EXTERN __declspec(dllimport) -# endif -#else -# define WINE_LDT_EXTERN extern -#endif - -WINE_LDT_EXTERN struct __wine_ldt_copy -{ - void *base[8192]; /* base address or 0 if entry is free */ - unsigned long limit[8192]; /* limit in bytes or 0 if entry is free */ - unsigned char flags[8192]; /* flags (defined below) */ -} wine_ldt_copy; - -#define WINE_LDT_FLAGS_DATA 0x13 /* Data segment */ -#define WINE_LDT_FLAGS_STACK 0x17 /* Stack segment */ -#define WINE_LDT_FLAGS_CODE 0x1b /* Code segment */ -#define WINE_LDT_FLAGS_TYPE_MASK 0x1f /* Mask for segment type */ -#define WINE_LDT_FLAGS_32BIT 0x40 /* Segment is 32-bit (code or stack) */ -#define WINE_LDT_FLAGS_ALLOCATED 0x80 /* Segment is allocated (no longer free) */ - -/* helper functions to manipulate the LDT_ENTRY structure */ -inline static void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) -{ - ent->BaseLow = (WORD)(unsigned long)base; - ent->HighWord.Bits.BaseMid = (BYTE)((unsigned long)base >> 16); - ent->HighWord.Bits.BaseHi = (BYTE)((unsigned long)base >> 24); -} -inline static void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) -{ - if ((ent->HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; - ent->LimitLow = (WORD)limit; - ent->HighWord.Bits.LimitHi = (limit >> 16); -} -inline static void *wine_ldt_get_base( const LDT_ENTRY *ent ) -{ - return (void *)(ent->BaseLow | - (unsigned long)ent->HighWord.Bits.BaseMid << 16 | - (unsigned long)ent->HighWord.Bits.BaseHi << 24); -} -inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) -{ - unsigned int limit = ent->LimitLow | (ent->HighWord.Bits.LimitHi << 16); - if (ent->HighWord.Bits.Granularity) limit = (limit << 12) | 0xfff; - return limit; -} -inline static void wine_ldt_set_flags( LDT_ENTRY *ent, unsigned char flags ) -{ - ent->HighWord.Bits.Dpl = 3; - ent->HighWord.Bits.Pres = 1; - ent->HighWord.Bits.Type = flags; - ent->HighWord.Bits.Sys = 0; - ent->HighWord.Bits.Reserved_0 = 0; - ent->HighWord.Bits.Default_Big = (flags & WINE_LDT_FLAGS_32BIT) != 0; -} -inline static unsigned char wine_ldt_get_flags( const LDT_ENTRY *ent ) -{ - unsigned char ret = ent->HighWord.Bits.Type; - if (ent->HighWord.Bits.Default_Big) ret |= WINE_LDT_FLAGS_32BIT; - return ret; -} -inline static int wine_ldt_is_empty( const LDT_ENTRY *ent ) -{ - const DWORD *dw = (const DWORD *)ent; - return (dw[0] | dw[1]) == 0; -} - -/* segment register access */ - -#ifdef __i386__ -# ifdef __GNUC__ -# define __DEFINE_GET_SEG(seg) \ - extern inline unsigned short wine_get_##seg(void) \ - { unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; } -# define __DEFINE_SET_SEG(seg) \ - extern inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } -# elif defined(_MSC_VER) -# define __DEFINE_GET_SEG(seg) \ - extern inline unsigned short wine_get_##seg(void) \ - { unsigned short res; __asm { mov res, seg } return res; } -# define __DEFINE_SET_SEG(seg) \ - extern inline void wine_set_##seg(unsigned short val) { __asm { mov seg, val } } -# else /* __GNUC__ || _MSC_VER */ -# define __DEFINE_GET_SEG(seg) extern unsigned short wine_get_##seg(void); -# define __DEFINE_SET_SEG(seg) extern void wine_set_##seg(unsigned int); -# endif /* __GNUC__ || _MSC_VER */ -#else /* __i386__ */ -# define __DEFINE_GET_SEG(seg) inline static unsigned short wine_get_##seg(void) { return 0; } -# define __DEFINE_SET_SEG(seg) inline static void wine_set_##seg(int val) { /* nothing */ } -#endif /* __i386__ */ - -__DEFINE_GET_SEG(cs) -__DEFINE_GET_SEG(ds) -__DEFINE_GET_SEG(es) -__DEFINE_GET_SEG(fs) -__DEFINE_GET_SEG(gs) -__DEFINE_GET_SEG(ss) -__DEFINE_SET_SEG(fs) -__DEFINE_SET_SEG(gs) -#undef __DEFINE_GET_SEG -#undef __DEFINE_SET_SEG - -#endif /* __WINE_WINE_LIBRARY_H */ +/* + * Definitions for the Wine library + * + * Copyright 2000 Alexandre Julliard + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_WINE_LIBRARY_H +#define __WINE_WINE_LIBRARY_H + +#include <stdarg.h> +#include <sys/types.h> + +#include <windef.h> +#include <winbase.h> + +/* configuration */ + +extern const char *wine_get_config_dir(void); +extern const char *wine_get_server_dir(void); +extern const char *wine_get_user_name(void); +extern void wine_init_argv0_path( const char *argv0 ); +extern void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_preloader ); + +/* dll loading */ + +typedef void (*load_dll_callback_t)( void *, const char * ); + +extern void *wine_dlopen( const char *filename, int flag, char *error, int errorsize ); +extern void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize ); +extern int wine_dlclose( void *handle, char *error, int errorsize ); +extern void wine_dll_set_callback( load_dll_callback_t load ); +extern void *wine_dll_load( const char *filename, char *error, int errorsize, int *file_exists ); +extern void *wine_dll_load_main_exe( const char *name, char *error, int errorsize, + int test_only, int *file_exists ); +extern void wine_dll_unload( void *handle ); +extern int wine_dll_get_owner( const char *name, char *buffer, int size, int *file_exists ); + +extern int __wine_main_argc; +extern char **__wine_main_argv; +extern WCHAR **__wine_main_wargv; +extern char **__wine_main_environ; +extern void wine_init( int argc, char *argv[], char *error, int error_size ); + +/* debugging */ + +extern const char * (*__wine_dbgstr_an)( const char * s, int n ); +extern const char * (*__wine_dbgstr_wn)( const WCHAR *s, int n ); +extern const char * (*__wine_dbg_vsprintf)( const char *format, va_list args ); +extern int (*__wine_dbg_vprintf)( const char *format, va_list args ); +extern int (*__wine_dbg_vlog)( unsigned int cls, const char *channel, + const char *function, const char *format, va_list args ); + +extern void wine_dbg_add_option( const char *name, unsigned char set, unsigned char clear ); +extern int wine_dbg_parse_options( const char *str ); + +/* portability */ + +extern void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, void *stack ); +extern void wine_set_pe_load_area( void *base, size_t size ); +extern void wine_free_pe_load_area(void); + +/* memory mappings */ + +extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags ); +extern void wine_mmap_add_reserved_area( void *addr, size_t size ); +extern void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap ); +extern int wine_mmap_is_in_reserved_area( void *addr, size_t size ); + +/* LDT management */ + +extern void wine_ldt_init_locking( void (*lock_func)(void), void (*unlock_func)(void) ); +extern void wine_ldt_get_entry( unsigned short sel, LDT_ENTRY *entry ); +extern int wine_ldt_set_entry( unsigned short sel, const LDT_ENTRY *entry ); +extern int wine_ldt_is_system( unsigned short sel ); +extern void *wine_ldt_get_ptr( unsigned short sel, unsigned int offset ); +extern unsigned short wine_ldt_alloc_entries( int count ); +extern unsigned short wine_ldt_realloc_entries( unsigned short sel, int oldcount, int newcount ); +extern void wine_ldt_free_entries( unsigned short sel, int count ); +#ifdef __i386__ +extern unsigned short wine_ldt_alloc_fs(void); +extern void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ); +extern void wine_ldt_free_fs( unsigned short sel ); +#else /* __i386__ */ +static inline unsigned short wine_ldt_alloc_fs(void) { return 0x0b; /* pseudo GDT selector */ } +static inline void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ) { } +static inline void wine_ldt_free_fs( unsigned short sel ) { } +#endif /* __i386__ */ + + +/* the local copy of the LDT */ +#ifdef __CYGWIN__ +# ifdef WINE_EXPORT_LDT_COPY +# define WINE_LDT_EXTERN __declspec(dllexport) +# else +# define WINE_LDT_EXTERN __declspec(dllimport) +# endif +#else +# define WINE_LDT_EXTERN extern +#endif + +WINE_LDT_EXTERN struct __wine_ldt_copy +{ + void *base[8192]; /* base address or 0 if entry is free */ + unsigned long limit[8192]; /* limit in bytes or 0 if entry is free */ + unsigned char flags[8192]; /* flags (defined below) */ +} wine_ldt_copy; + +#define WINE_LDT_FLAGS_DATA 0x13 /* Data segment */ +#define WINE_LDT_FLAGS_STACK 0x17 /* Stack segment */ +#define WINE_LDT_FLAGS_CODE 0x1b /* Code segment */ +#define WINE_LDT_FLAGS_TYPE_MASK 0x1f /* Mask for segment type */ +#define WINE_LDT_FLAGS_32BIT 0x40 /* Segment is 32-bit (code or stack) */ +#define WINE_LDT_FLAGS_ALLOCATED 0x80 /* Segment is allocated (no longer free) */ + +/* helper functions to manipulate the LDT_ENTRY structure */ +inline static void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) +{ + ent->BaseLow = (WORD)(unsigned long)base; + ent->HighWord.Bits.BaseMid = (BYTE)((unsigned long)base >> 16); + ent->HighWord.Bits.BaseHi = (BYTE)((unsigned long)base >> 24); +} +inline static void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) +{ + if ((ent->HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; + ent->LimitLow = (WORD)limit; + ent->HighWord.Bits.LimitHi = (limit >> 16); +} +inline static void *wine_ldt_get_base( const LDT_ENTRY *ent ) +{ + return (void *)(ent->BaseLow | + (unsigned long)ent->HighWord.Bits.BaseMid << 16 | + (unsigned long)ent->HighWord.Bits.BaseHi << 24); +} +inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) +{ + unsigned int limit = ent->LimitLow | (ent->HighWord.Bits.LimitHi << 16); + if (ent->HighWord.Bits.Granularity) limit = (limit << 12) | 0xfff; + return limit; +} +inline static void wine_ldt_set_flags( LDT_ENTRY *ent, unsigned char flags ) +{ + ent->HighWord.Bits.Dpl = 3; + ent->HighWord.Bits.Pres = 1; + ent->HighWord.Bits.Type = flags; + ent->HighWord.Bits.Sys = 0; + ent->HighWord.Bits.Reserved_0 = 0; + ent->HighWord.Bits.Default_Big = (flags & WINE_LDT_FLAGS_32BIT) != 0; +} +inline static unsigned char wine_ldt_get_flags( const LDT_ENTRY *ent ) +{ + unsigned char ret = ent->HighWord.Bits.Type; + if (ent->HighWord.Bits.Default_Big) ret |= WINE_LDT_FLAGS_32BIT; + return ret; +} +inline static int wine_ldt_is_empty( const LDT_ENTRY *ent ) +{ + const DWORD *dw = (const DWORD *)ent; + return (dw[0] | dw[1]) == 0; +} + +/* segment register access */ + +#ifdef __i386__ +# ifdef __GNUC__ +# define __DEFINE_GET_SEG(seg) \ + extern inline unsigned short wine_get_##seg(void) \ + { unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; } +# define __DEFINE_SET_SEG(seg) \ + extern inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } +# elif defined(_MSC_VER) +# define __DEFINE_GET_SEG(seg) \ + extern inline unsigned short wine_get_##seg(void) \ + { unsigned short res; __asm { mov res, seg } return res; } +# define __DEFINE_SET_SEG(seg) \ + extern inline void wine_set_##seg(unsigned short val) { __asm { mov seg, val } } +# else /* __GNUC__ || _MSC_VER */ +# define __DEFINE_GET_SEG(seg) extern unsigned short wine_get_##seg(void); +# define __DEFINE_SET_SEG(seg) extern void wine_set_##seg(unsigned int); +# endif /* __GNUC__ || _MSC_VER */ +#else /* __i386__ */ +# define __DEFINE_GET_SEG(seg) inline static unsigned short wine_get_##seg(void) { return 0; } +# define __DEFINE_SET_SEG(seg) inline static void wine_set_##seg(int val) { /* nothing */ } +#endif /* __i386__ */ + +__DEFINE_GET_SEG(cs) +__DEFINE_GET_SEG(ds) +__DEFINE_GET_SEG(es) +__DEFINE_GET_SEG(fs) +__DEFINE_GET_SEG(gs) +__DEFINE_GET_SEG(ss) +__DEFINE_SET_SEG(fs) +__DEFINE_SET_SEG(gs) +#undef __DEFINE_GET_SEG +#undef __DEFINE_SET_SEG + +#endif /* __WINE_WINE_LIBRARY_H */ Propchange: trunk/reactos/include/reactos/wine/library.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/wine/lmbrowsr.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Propchange: trunk/reactos/include/reactos/wine/mmddk.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/mmreg.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/mmsystem.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/msacm.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/msacmdlg.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/msacmdrv.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/msvcrt/fcntl.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Propchange: trunk/reactos/include/reactos/wine/port.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/prsht.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/rpcfc.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/rpcss_shared.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/unicode.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/winbase16.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/include/reactos/wine/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde… ============================================================================== --- trunk/reactos/include/reactos/wine/windef.h (original) +++ trunk/reactos/include/reactos/wine/windef.h Tue Oct 30 13:47:24 2007 @@ -1,3 +1,1 @@ -#include "../../psdk/windef.h" - - +#include "../../psdk/windef.h" Propchange: trunk/reactos/include/reactos/wine/windef.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/wine/windef16.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/wine_common_ver.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/wingdi16.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/include/reactos/wine/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winne… ============================================================================== --- trunk/reactos/include/reactos/wine/winnetwk.h (original) +++ trunk/reactos/include/reactos/wine/winnetwk.h Tue Oct 30 13:47:24 2007 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: winnetwk.h 20909 2006-01-15 22:25:16Z gvg $ * * Compatibility header * Propchange: trunk/reactos/include/reactos/wine/winnetwk.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnt… ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h (original) +++ trunk/reactos/include/reactos/wine/winnt.h Tue Oct 30 13:47:24 2007 @@ -22,12 +22,10 @@ #define __WINE_WINNT_H #include_next <winnt.h> -#include <w32api.h> -#include <stddef.h> /* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ESPERANTO 0x8f -#define LANG_WALON 0x90 +#define LANG_ESPERANTO 0x8f +#define LANG_WALON 0x90 #define LANG_CORNISH 0x91 #define LANG_WELSH 0x92 #define LANG_BRETON 0x93 @@ -35,12 +33,12 @@ /* FIXME: these are not in the Windows header */ #define LANG_GAELIC 0x94 #define LANG_MALTESE 0x3a -#define LANG_RHAETO_ROMANCE 0x17 +#define LANG_ROMANSH 0x17 #define LANG_SAAMI 0x3b -#define LANG_SORBIAN 0x2e #define LANG_LOWER_SORBIAN 0x2e #define LANG_UPPER_SORBIAN 0x2e #define LANG_SUTU 0x30 +#define LANG_TAJIK 0x28 #define LANG_TSONGA 0x31 #define LANG_TSWANA 0x32 #define LANG_VENDA 0x33 Propchange: trunk/reactos/include/reactos/wine/winnt.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/include/reactos/wine/winsock16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winso… ============================================================================== --- trunk/reactos/include/reactos/wine/winsock16.h (original) +++ trunk/reactos/include/reactos/wine/winsock16.h Tue Oct 30 13:47:24 2007 @@ -1,110 +1,110 @@ -/* - * Copyright (C) the Wine project - * - * 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_WINE_WINSOCK16_H -#define __WINE_WINE_WINSOCK16_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <pshpack1.h> - -typedef UINT16 SOCKET16; - -typedef struct -{ - UINT16 fd_count; /* how many are SET? */ - SOCKET16 fd_array[WS_FD_SETSIZE]; /* an array of SOCKETs */ -} ws_fd_set16; - -/* ws_hostent16, ws_protoent16, ws_servent16, ws_netent16 - * are 1-byte aligned here ! */ -typedef struct ws_hostent16 -{ - SEGPTR h_name; /* official name of host */ - SEGPTR h_aliases; /* alias list */ - INT16 h_addrtype; /* host address type */ - INT16 h_length; /* length of address */ - SEGPTR h_addr_list; /* list of addresses from name server */ -} _ws_hostent16; - -typedef struct ws_protoent16 -{ - SEGPTR p_name; /* official protocol name */ - SEGPTR p_aliases; /* alias list */ - INT16 p_proto; /* protocol # */ -} _ws_protoent16; - -typedef struct ws_servent16 -{ - SEGPTR s_name; /* official service name */ - SEGPTR s_aliases; /* alias list */ - INT16 s_port; /* port # */ - SEGPTR s_proto; /* protocol to use */ -} _ws_servent16; - -typedef struct ws_netent16 -{ - SEGPTR n_name; /* official name of net */ - SEGPTR n_aliases; /* alias list */ - INT16 n_addrtype; /* net address type */ - INT n_net; /* network # */ -} _ws_netent16; - -typedef struct WSAData16 -{ - WORD wVersion; - WORD wHighVersion; - char szDescription[WSADESCRIPTION_LEN+1]; - char szSystemStatus[WSASYS_STATUS_LEN+1]; - WORD iMaxSockets; - WORD iMaxUdpDg; - SEGPTR lpVendorInfo; -} WSADATA16, *LPWSADATA16; - -#include <poppack.h> - -#define WS_FD_CLR16(fd, set) __WS_FD_CLR((fd),(set), ws_fd_set16) -#define WS_FD_SET16(fd, set) __WS_FD_SET1((fd),(set), ws_fd_set16) -#define WS_FD_ZERO16(set) (((ws_fd_set16*)(set))->fd_count=0) -#define WS_FD_ISSET16(fd, set) __WSAFDIsSet16((SOCKET16)(fd), (ws_fd_set16*)(set)) - -#define INVALID_SOCKET16 ((SOCKET16)(~0)) - -INT16 WINAPI __WSAFDIsSet16( SOCKET16, ws_fd_set16 * ); -INT16 WINAPI WSAStartup16(UINT16 wVersionRequired, LPWSADATA16 lpWSAData); -void WINAPI WSASetLastError16(INT16 iError); -INT16 WINAPI WSAUnhookBlockingHook16(void); -FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc); -HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 wMsg, LPCSTR name, LPCSTR proto, - SEGPTR buf, INT16 buflen); -HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 wMsg, INT16 port, - LPCSTR proto, SEGPTR buf, INT16 buflen); -HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 wMsg, - LPCSTR name, SEGPTR buf, INT16 buflen); -HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd, UINT16 wMsg, - INT16 number, SEGPTR buf, INT16 buflen); -HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 wMsg, - LPCSTR name, SEGPTR buf, INT16 buflen); -HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 wMsg, LPCSTR addr, - INT16 len, INT16 type, SEGPTR buf, INT16 buflen); -INT16 WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle); -INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, LONG lEvent); -INT16 WINAPI WSARecvEx16(SOCKET16 s, char *buf, INT16 len, INT16 *flags); - -#endif /* __WINE_WINE_WINSOCK16_H */ +/* + * Copyright (C) the Wine project + * + * 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_WINE_WINSOCK16_H +#define __WINE_WINE_WINSOCK16_H + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <pshpack1.h> + +typedef UINT16 SOCKET16; + +typedef struct +{ + UINT16 fd_count; /* how many are SET? */ + SOCKET16 fd_array[WS_FD_SETSIZE]; /* an array of SOCKETs */ +} ws_fd_set16; + +/* ws_hostent16, ws_protoent16, ws_servent16, ws_netent16 + * are 1-byte aligned here ! */ +typedef struct ws_hostent16 +{ + SEGPTR h_name; /* official name of host */ + SEGPTR h_aliases; /* alias list */ + INT16 h_addrtype; /* host address type */ + INT16 h_length; /* length of address */ + SEGPTR h_addr_list; /* list of addresses from name server */ +} _ws_hostent16; + +typedef struct ws_protoent16 +{ + SEGPTR p_name; /* official protocol name */ + SEGPTR p_aliases; /* alias list */ + INT16 p_proto; /* protocol # */ +} _ws_protoent16; + +typedef struct ws_servent16 +{ + SEGPTR s_name; /* official service name */ + SEGPTR s_aliases; /* alias list */ + INT16 s_port; /* port # */ + SEGPTR s_proto; /* protocol to use */ +} _ws_servent16; + +typedef struct ws_netent16 +{ + SEGPTR n_name; /* official name of net */ + SEGPTR n_aliases; /* alias list */ + INT16 n_addrtype; /* net address type */ + INT n_net; /* network # */ +} _ws_netent16; + +typedef struct WSAData16 +{ + WORD wVersion; + WORD wHighVersion; + char szDescription[WSADESCRIPTION_LEN+1]; + char szSystemStatus[WSASYS_STATUS_LEN+1]; + WORD iMaxSockets; + WORD iMaxUdpDg; + SEGPTR lpVendorInfo; +} WSADATA16, *LPWSADATA16; + +#include <poppack.h> + +#define WS_FD_CLR16(fd, set) __WS_FD_CLR((fd),(set), ws_fd_set16) +#define WS_FD_SET16(fd, set) __WS_FD_SET1((fd),(set), ws_fd_set16) +#define WS_FD_ZERO16(set) (((ws_fd_set16*)(set))->fd_count=0) +#define WS_FD_ISSET16(fd, set) __WSAFDIsSet16((SOCKET16)(fd), (ws_fd_set16*)(set)) + +#define INVALID_SOCKET16 ((SOCKET16)(~0)) + +INT16 WINAPI __WSAFDIsSet16( SOCKET16, ws_fd_set16 * ); +INT16 WINAPI WSAStartup16(UINT16 wVersionRequired, LPWSADATA16 lpWSAData); +void WINAPI WSASetLastError16(INT16 iError); +INT16 WINAPI WSAUnhookBlockingHook16(void); +FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc); +HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 wMsg, LPCSTR name, LPCSTR proto, + SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 wMsg, INT16 port, + LPCSTR proto, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 wMsg, + LPCSTR name, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd, UINT16 wMsg, + INT16 number, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 wMsg, + LPCSTR name, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 wMsg, LPCSTR addr, + INT16 len, INT16 type, SEGPTR buf, INT16 buflen); +INT16 WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle); +INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, LONG lEvent); +INT16 WINAPI WSARecvEx16(SOCKET16 s, char *buf, INT16 len, INT16 *flags); + +#endif /* __WINE_WINE_WINSOCK16_H */ Propchange: trunk/reactos/include/reactos/wine/winsock16.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/wine/winuser.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/winuser16.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/wownt32.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/include/reactos/wine/wpp.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

1 0

[fireball] 29974: - Yes, this is the last fix, really!!
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 11:53:06 2007 New Revision: 29974 URL: http://svn.reactos.org/svn/reactos?rev=29974&view=rev Log: - Yes, this is the last fix, really!! Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Tue Oct 30 11:53:06 2007 @@ -394,7 +394,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc); } -int CALLBACK tWinMain (HINSTANCE hInst, +int CALLBACK _tWinMain (HINSTANCE hInst, HINSTANCE hPrev, LPTSTR lpCmdLine, int iCmdShow)

1 0

[fireball] 29973: - Forgot to add 't'.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 11:50:40 2007 New Revision: 29973 URL: http://svn.reactos.org/svn/reactos?rev=29973&view=rev Log: - Forgot to add 't'. Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Tue Oct 30 11:50:40 2007 @@ -394,7 +394,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc); } -int CALLBACK WinMain (HINSTANCE hInst, +int CALLBACK tWinMain (HINSTANCE hInst, HINSTANCE hPrev, LPTSTR lpCmdLine, int iCmdShow)

1 0

[fireball] 29972: - More fixes, leaving what's unfixed yet to Marc. 3dtext now compiles fine.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 11:37:54 2007 New Revision: 29972 URL: http://svn.reactos.org/svn/reactos?rev=29972&view=rev Log: - More fixes, leaving what's unfixed yet to Marc. 3dtext now compiles fine. Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Tue Oct 30 11:37:54 2007 @@ -84,7 +84,15 @@ glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits glListBase(base); // Sets The Base Character to 32 - glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text + + glCallLists(_tcslen(text), +#ifdef UNICODE + GL_UNSIGNED_SHORT +#else + GL_UNSIGNED_BYTE +#endif + , text); // Draws The Display List Text + glPopAttrib(); // Pops The Display List Bits } @@ -320,28 +328,28 @@ // -p <hwnd> (preview) // -c <hwnd> (configure) // -VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) -{ - UCHAR ch = *szCmdLine++; - - if(ch == '-' || ch == '/') +VOID ParseCommandLine(LPTSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) +{ + TCHAR ch = *szCmdLine++; + + if(ch == _T('-') || ch == _T('/')) ch = *szCmdLine++; - if(ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; //convert to lower case + if(ch >= _T('A') && ch <= _T('Z')) + ch += _T('a') - _T('A'); //convert to lower case *chOption = ch; ch = *szCmdLine++; - if(ch == ':') + if(ch == _T(':')) ch = *szCmdLine++; - while(ch == ' ' || ch == '\t') + while(ch == _T(' ') || ch == _T('\t')) ch = *szCmdLine++; if(isdigit(ch)) { - unsigned int i = _wtoi(szCmdLine - 1); + unsigned int i = _ttoi(szCmdLine - 1); *hwndParent = (HWND)i; } else @@ -386,10 +394,10 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc); } -int CALLBACK wWinMain (HINSTANCE hInst, - HINSTANCE hPrev, - LPWSTR lpCmdLine, - int iCmdShow) +int CALLBACK WinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPTSTR lpCmdLine, + int iCmdShow) { HWND hwndParent = 0; UCHAR chOption;

1 0

[fireball] 29971: - Proper fix for unicode/ansi compilation ability of 3dtext (at least to fix compiler warning preventing trunk to compile), however one problem remains: glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text GL_UNSIGNED_SHORT should be substituted by GL_UNSIGNED_BYTE if compiling as ANSI.
by fireball＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: fireball Date: Tue Oct 30 11:29:31 2007 New Revision: 29971 URL: http://svn.reactos.org/svn/reactos?rev=29971&view=rev Log: - Proper fix for unicode/ansi compilation ability of 3dtext (at least to fix compiler warning preventing trunk to compile), however one problem remains: glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text GL_UNSIGNED_SHORT should be substituted by GL_UNSIGNED_BYTE if compiling as ANSI. Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Tue Oct 30 11:29:31 2007 @@ -77,14 +77,14 @@ glDeleteLists(base, 256); // Delete All 256 Characters } -GLvoid glPrint(LPWSTR text) // Custom GL "Print" Routine +GLvoid glPrint(LPTSTR text) // Custom GL "Print" Routine { if (text == NULL) // If There's No Text return; // Do Nothing glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits glListBase(base); // Sets The Base Character to 32 - glCallLists(wcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text + glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text glPopAttrib(); // Pops The Display List Bits } @@ -140,7 +140,7 @@ (1.0f*(cos(rot/20.0f))), (1.0f*(sin(rot/25.0f))), (1.0f-0.5f*(cos(rot/17.0f)))); - glPrint(m_Text); // Print GL Text To The Screen + glPrint(m_Text); // Print GL Text To The Screen glColor3f(0.0f,0.0f,1.0f); // Make The Text Blue rot+=0.1f; // Increase The Rotation Variable }

1 0

[jimtabor] 29970: Add Gdi batch flush command types.
by jimtabor＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: jimtabor Date: Tue Oct 30 07:39:34 2007 New Revision: 29970 URL: http://svn.reactos.org/svn/reactos?rev=29970&view=rev Log: Add Gdi batch flush command types. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Tue Oct 30 07:39:34 2007 @@ -76,6 +76,19 @@ GdiGetAspectRatioFilter, GdiGetDCOrg = 6, } GETDCPOINT, *PGETDCPOINT; + +typedef enum _GDIBATCHCMD +{ + GdiBCPatBlt, + GdiBCPolyPatBlt, + GdiBCTextOut, + GdiBCExtTextOut, + GdiBCSetBrushOrg, + GdiBCExtSelClipRgn, + GdiBCSelObj, + GdiBCDelObj, + GdiBCDelRgn, +} GDIBATCHCMD, *PGDIBATCHCMD; typedef enum _TRANSFORMTYPE {

1 0

[weiden] 29969: stock objects don't need to be deleted
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Tue Oct 30 04:51:23 2007 New Revision: 29969 URL: http://svn.reactos.org/svn/reactos?rev=29969&view=rev Log: stock objects don't need to be deleted Modified: trunk/reactos/base/applications/taskmgr/graph.c Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Tue Oct 30 04:51:23 2007 @@ -308,7 +308,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; - HFONT hFont, hOldFont; + HFONT hOldFont; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; int nBars; @@ -344,8 +344,7 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); - hFont = GetStockObject(DEFAULT_GUI_FONT); - hOldFont = SelectObject(hDC, hFont); + hOldFont = SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); @@ -406,7 +405,6 @@ } SelectObject(hDC, hOldFont); - DeleteObject(hFont); } void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd)

1 0

[weiden] 29968: Patch by Heis Spiter <heis_spiter@hotmail.com>: - Fix a handle leak See issue #2772 for more details.
by weiden＠svn.reactos.org 30 Oct '07

30 Oct '07

Author: weiden Date: Tue Oct 30 04:46:00 2007 New Revision: 29968 URL: http://svn.reactos.org/svn/reactos?rev=29968&view=rev Log: Patch by Heis Spiter <heis_spiter(a)hotmail.com>: - Fix a handle leak See issue #2772 for more details. Modified: trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Tue Oct 30 04:46:00 2007 @@ -137,7 +137,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; - HFONT hFont, hOldFont; + HFONT hOldFont; ULONG CpuUsage; ULONG CpuKernelUsage; int nBars; @@ -174,8 +174,7 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); - hFont = GetStockObject(DEFAULT_GUI_FONT); - hOldFont = SelectObject(hDC, hFont); + hOldFont = SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); @@ -297,6 +296,8 @@ rcBarRight.bottom -=3; } + + SelectObject(hDC, hOldFont); } void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) @@ -403,6 +404,9 @@ rcBarRight.top += 3; rcBarRight.bottom += 3; } + + SelectObject(hDC, hOldFont); + DeleteObject(hFont); } void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Tue Oct 30 04:46:00 2007 @@ -74,6 +74,7 @@ /* Get the debug privilege for this process. */ AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0); + CloseHandle(hToken); } /* Load our settings from the registry */

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