Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49838: [CRT] Implement thiscall wrapper for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 10:14:51 2010 New Revision: 49838 URL: http://svn.reactos.org/svn/reactos?rev=49838&view=rev Log: [CRT] Implement thiscall wrapper for MSVC Added: branches/cmake-bringup/lib/sdk/crt/include/internal/wine_msc.h (with props) Modified: branches/cmake-bringup/lib/sdk/crt/except/cpp.c Modified: branches/cmake-bringup/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/cpp.c [iso-8859-1] Sun Nov 28 10:14:51 2010 @@ -65,14 +65,7 @@ #define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) #ifdef _MSC_VER -#pragma message ("DEFINE_THISCALL_WRAPPER broken") -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); -// __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ -// pop eax \ -// push ecx \ -// push eax \ -// jmp __ASM_NAME(#func) __ASM_STDCALL(args) ) +#include <internal/wine_msc.h> #else #define DEFINE_THISCALL_WRAPPER(func,args) \ extern void THISCALL(func)(void); \ @@ -671,6 +664,7 @@ /* vtables */ +#ifdef __GNUC__ #ifdef _WIN64 #define __ASM_VTABLE(name,funcs) \ @@ -713,6 +707,16 @@ #ifndef __GNUC__ } +#endif +#endif + +#ifdef _MSC_VER +#pragma message ("HAXX!") +const vtable_ptr MSVCRT_exception_vtable; +const vtable_ptr MSVCRT_bad_typeid_vtable; +const vtable_ptr MSVCRT_bad_cast_vtable; +const vtable_ptr MSVCRT___non_rtti_object_vtable; +const vtable_ptr MSVCRT_type_info_vtable; #endif /* Static RTTI for exported objects */ Added: branches/cmake-bringup/lib/sdk/crt/include/internal/wine_msc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/inclu… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/include/internal/wine_msc.h (added) +++ branches/cmake-bringup/lib/sdk/crt/include/internal/wine_msc.h [iso-8859-1] Sun Nov 28 10:14:51 2010 @@ -1,0 +1,50 @@ + +#define DEFINE_THISCALL_WRAPPER(func, args) \ + void __declspec(naked) __thiscall_ ## func (void) \ + { \ + __asm { pop eax } \ + __asm { push ecx } \ + __asm { push eax } \ + __asm { jmp func } \ + } + +exception * __stdcall MSVCRT_exception_ctor(exception * _this, const char ** name); +exception * __stdcall MSVCRT_exception_ctor_noalloc(exception * _this, char ** name, int noalloc); +exception * __stdcall MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs); +exception * __stdcall MSVCRT_exception_default_ctor(exception * _this); +void __stdcall MSVCRT_exception_dtor(exception * _this); +exception * __stdcall MSVCRT_exception_opequals(exception * _this, const exception * rhs); +void * __stdcall MSVCRT_exception_vector_dtor(exception * _this, unsigned int flags); +void * __stdcall MSVCRT_exception_scalar_dtor(exception * _this, unsigned int flags); +const char * __stdcall MSVCRT_what_exception(exception * _this); +bad_typeid * __stdcall MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs); +bad_typeid * __stdcall MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name); +bad_typeid * __stdcall MSVCRT_bad_typeid_default_ctor(bad_typeid * _this); +void __stdcall MSVCRT_bad_typeid_dtor(bad_typeid * _this); +bad_typeid * __stdcall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs); +void * __stdcall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags); +void * __stdcall MSVCRT_bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags); +__non_rtti_object * __stdcall MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this, const __non_rtti_object * rhs); +__non_rtti_object * __stdcall MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this, const char * name); +void __stdcall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this); +__non_rtti_object * __stdcall MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this, const __non_rtti_object *rhs); +void * __stdcall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags); +void * __stdcall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags); +bad_cast * __stdcall MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name); +bad_cast * __stdcall MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs); +bad_cast * __stdcall MSVCRT_bad_cast_ctor_charptr(bad_cast * _this, const char * name); +bad_cast * __stdcall MSVCRT_bad_cast_default_ctor(bad_cast * _this); +void __stdcall MSVCRT_bad_cast_dtor(bad_cast * _this); +bad_cast * __stdcall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs); +void * __stdcall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int flags); +void * __stdcall MSVCRT_bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags); +int __stdcall MSVCRT_type_info_opequals_equals(type_info * _this, const type_info * rhs); +int __stdcall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info * rhs); +int __stdcall MSVCRT_type_info_before(type_info * _this, const type_info * rhs); +void __stdcall MSVCRT_type_info_dtor(type_info * _this); +const char * __stdcall MSVCRT_type_info_name(type_info * _this); +const char * __stdcall MSVCRT_type_info_raw_name(type_info * _this); +void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int flags); + +#define __ASM_VTABLE(name,funcs) +//void *MSVCRT_ ## name ##_vtable[] = Propchange: branches/cmake-bringup/lib/sdk/crt/include/internal/wine_msc.h ------------------------------------------------------------------------------ svn:eol-style = native

14 years

[tkreuzer] 49837: [UUID] Add a number of GUIDs. They are duplicated from idl generated headers, because of a small difference between widl and midl. widl generates "DEFINE_GUID" entries for each in...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 10:12:35 2010 New Revision: 49837 URL: http://svn.reactos.org/svn/reactos?rev=49837&view=rev Log: [UUID] Add a number of GUIDs. They are duplicated from idl generated headers, because of a small difference between widl and midl. widl generates "DEFINE_GUID" entries for each interface, while midl generates "extern GUID" only. The latter matching MS SDK headers. If someone can think of a more elegant way of solving this, let me know. Modified: branches/cmake-bringup/lib/sdk/uuid/uuid.c Modified: branches/cmake-bringup/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/uuid/uuid… ============================================================================== --- branches/cmake-bringup/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/uuid/uuid.c [iso-8859-1] Sun Nov 28 10:12:35 2010 @@ -174,3 +174,27 @@ DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xae,0x5d,0x91,0xa0,0x1a,0x1f,0x75,0x92); DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9); + +#ifdef _MSC_VER +DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IMoniker, 0x0000000f, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IEnumMoniker, 0x00000102, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IPersistStream, 0x00000109, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IPersistFile, 0x0000010b, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IPersist, 0x0000010c, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IDataObject, 0x0000010e, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IOleWindow, 0x00000114, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IParseDisplayName, 0x0000011a, 0x0000, 0x0000, 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IDropTarget, 0x00000122, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(IID_IDropTargetHelper, 0x4657278b, 0x411b, 0x11d2, 0x83,0x9a,0x00,0xc0,0x4f,0xd9,0x18,0xd0); +DEFINE_GUID(IID_IOleCommandTarget, 0xb722bccb, 0x4e68, 0x101b, 0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70); +DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34,0x00,0xaa,0x00,0x60,0x09,0xfa); +DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B,0x3F,0x00,0xA0,0xC9,0x11,0xE8,0xE5); +DEFINE_GUID(IID_IObjectWithSite, 0xFC4801A3, 0x2BA9, 0x11CF, 0xA2,0x29,0x00,0xAA,0x00,0x3D,0x73,0x52); +DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89,0xB3,0x00,0xA0,0xC9,0x0A,0x90,0xAC); +DEFINE_GUID(IID_IShellService, 0x5836FB00, 0x8187, 0x11CF, 0xA1,0x2B,0x00,0xAA,0x00,0x4A,0xE8,0x37); +DEFINE_GUID(IID_IPropertyBag, 0x55272A00, 0x42CB, 0x11CE, 0x81,0x35,0x00,0xAA,0x00,0x4B,0xB8,0x51); +DEFINE_GUID(IID_IPersistPropertyBag, 0x37D84F60, 0x42CB, 0x11CE, 0x81,0x35,0x00,0xAA,0x00,0x4B,0xB8,0x51); +#endif +

14 years

[tkreuzer] 49836: [CRT] Fix another typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 09:53:22 2010 New Revision: 49836 URL: http://svn.reactos.org/svn/reactos?rev=49836&view=rev Log: [CRT] Fix another typo Modified: trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s Modified: trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/i386/se… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] Sun Nov 28 09:53:22 2010 @@ -109,6 +109,6 @@ mov esi, [ecx + JB_SI*4] mov esp, [ecx + JB_SP*4] /* Jump to saved PC. */ - jmp dword ptr [edx] + jmp edx END

14 years

[tkreuzer] 49835: [PSDK] Add some GUIDs for MSVC.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 09:28:28 2010 New Revision: 49835 URL: http://svn.reactos.org/svn/reactos?rev=49835&view=rev Log: [PSDK] Add some GUIDs for MSVC. Modified: branches/cmake-bringup/include/psdk/hlguids.h branches/cmake-bringup/include/psdk/richole.idl branches/cmake-bringup/include/psdk/shlguid.h Modified: branches/cmake-bringup/include/psdk/hlguids.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/hlgu… ============================================================================== --- branches/cmake-bringup/include/psdk/hlguids.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/hlguids.h [iso-8859-1] Sun Nov 28 09:28:28 2010 @@ -27,5 +27,9 @@ 0x79eac9d1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); DEFINE_GUID(CLSID_IID_IExtensionServices, 0x79eac9cb, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); +#ifndef __GNUC__ +DEFINE_GUID(IID_IBindStatusCallback, + 0x79eac9c1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); +#endif #endif Modified: branches/cmake-bringup/include/psdk/richole.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rich… ============================================================================== --- branches/cmake-bringup/include/psdk/richole.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/richole.idl [iso-8859-1] Sun Nov 28 09:28:28 2010 @@ -131,3 +131,8 @@ HRESULT GetDragDropEffect(BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect); HRESULT GetContextMenu(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE *lpchrg, HMENU *lphmenu); } + +#ifndef __WIDL__ +cpp_quote("DEFINE_GUID(IID_IRichEditOle, 0x00020D00, 0, 0, 0xC0,0,0,0,0,0,0,0x46);") +cpp_quote("DEFINE_GUID(IID_IRichEditOleCallback, 0x00020D03, 0, 0, 0xC0,0,0,0,0,0,0,0x46);") +#endif Modified: branches/cmake-bringup/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/shlg… ============================================================================== --- branches/cmake-bringup/include/psdk/shlguid.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/shlguid.h [iso-8859-1] Sun Nov 28 09:28:28 2010 @@ -57,26 +57,27 @@ DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); -/* avoid duplicate definitions with shobjidl.h (FIXME) */ -/* DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); */ -/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ -/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ -/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ -/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ +#ifndef __GNUC__ /* avoid duplicate definitions with shobjidl.h (FIXME) */ +DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); +DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); +DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); +DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); +DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); +DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); +DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); +DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); +DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); +DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); +DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); +DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); +DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); +DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); +DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); +DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); +DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); +DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); +#endif DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory

14 years

[jimtabor] 49834: [User32] - Sync up with wine 1.2 rc6 menu so it will pass the tests from rev 47939.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Nov 28 01:37:16 2010 New Revision: 49834 URL: http://svn.reactos.org/svn/reactos?rev=49834&view=rev Log: [User32] - Sync up with wine 1.2 rc6 menu so it will pass the tests from rev 47939. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Nov 28 01:37:16 2010 @@ -3487,13 +3487,22 @@ HideCaret(0); + MenuGetRosMenuInfo(&MenuInfo, hMenu); + /* This makes the menus of applications built with Delphi work. + * It also enables menus to be displayed in more than one window, + * but there are some bugs left that need to be fixed in this case. + */ + if(MenuInfo.Self == hMenu) + { + MenuInfo.Wnd = hWnd; + MenuSetRosMenuInfo(&MenuInfo); + } + /* Send WM_ENTERMENULOOP and WM_INITMENU message only if TPM_NONOTIFY flag is not specified */ if (!(wFlags & TPM_NONOTIFY)) SendMessageW( hWnd, WM_ENTERMENULOOP, bPopup, 0 ); SendMessageW( hWnd, WM_SETCURSOR, (WPARAM)hWnd, HTCAPTION ); - - MenuGetRosMenuInfo(&MenuInfo, hMenu); if (!(wFlags & TPM_NONOTIFY)) { @@ -3512,16 +3521,6 @@ } } - /* This makes the menus of applications built with Delphi work. - * It also enables menus to be displayed in more than one window, - * but there are some bugs left that need to be fixed in this case. - */ - if(MenuInfo.Self == hMenu) - { - MenuInfo.Wnd = hWnd; - MenuSetRosMenuInfo(&MenuInfo); - } - IntNotifyWinEvent( EVENT_SYSTEM_MENUSTART, hWnd, MenuInfo.Flags & MF_SYSMENU ? OBJID_SYSMENU : OBJID_MENU, @@ -3652,11 +3651,19 @@ HWND Wnd, LPTPMPARAMS Tpm) { BOOL ret = FALSE; + ROSMENUINFO MenuInfo; if (!IsMenu(Menu)) { SetLastError( ERROR_INVALID_MENU_HANDLE ); return FALSE; + } + + MenuGetRosMenuInfo(&MenuInfo, Menu); + if (IsWindow(MenuInfo.Wnd)) + { + SetLastError( ERROR_POPUP_ALREADY_ACTIVE ); + return FALSE; } MenuInitTracking(Wnd, Menu, TRUE, Flags);

14 years

[tkreuzer] 49833: [CMAKE] - Link libxslt to ntdll for MSVC - Don't compile some directx stuff with MSVC atm - Add importlib target for dinput - add importlib target for wined3d and use autogenerate...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 01:24:36 2010 New Revision: 49833 URL: http://svn.reactos.org/svn/reactos?rev=49833&view=rev Log: [CMAKE] - Link libxslt to ntdll for MSVC - Don't compile some directx stuff with MSVC atm - Add importlib target for dinput - add importlib target for wined3d and use autogenerated def - Improve quartz Modified: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt branches/cmake-bringup/dll/directx/CMakeLists.txt branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt Modified: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libx… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010 @@ -37,6 +37,9 @@ target_link_libraries(libxslt libxml2) add_importlibs(libxslt msvcrt ws2_32 kernel32) +if(MSVC) +add_importlibs(libxslt ntdll) +endif() add_dependencies(libxslt psdk buildno_header) Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake… ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010 @@ -1,8 +1,10 @@ +if (NOT MSVC) add_subdirectory(amstream) +add_subdirectory(d3d8thk) +endif() #add_subdirectory(bdaplgin) #disabled in trunk #add_subdirectory(d3d8) #disabled in trunk -add_subdirectory(d3d8thk) #add_subdirectory(d3d9) #disabled in trunk #add_subdirectory(ddraw) #disabled in trunk add_subdirectory(devenum) Modified: branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinpu… ============================================================================== --- branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010 @@ -38,3 +38,4 @@ add_cab_target(dinput 1) +add_importlib_target(dinput.spec) Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010 @@ -46,7 +46,6 @@ set_module_type(quartz win32dll) target_link_libraries(quartz - ${CMAKE_CURRENT_BINARY_DIR}/quartz.def quartz_proxy strmiids uuid Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Sun Nov 28 01:24:36 2010 @@ -38,7 +38,7 @@ volumetexture.c wined3d_main.c version.rc - wined3d.def) + ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) if(ARCH MATCHES amd64) list(APPEND SOURCE @@ -55,10 +55,7 @@ add_library(wined3d SHARED ${SOURCE}) set_module_type(wined3d win32dll) -target_link_libraries(wined3d - ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def - wine - uuid) +target_link_libraries(wined3d wine uuid) add_importlibs(wined3d user32 @@ -68,7 +65,7 @@ msvcrt kernel32 ntdll) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) add_dependencies(wined3d wineheaders) -add_cab_target(wined3d 1) +add_cab_target(wined3d 1) +add_importlib_target(wined3d.spec)

14 years

[tkreuzer] 49832: [REACTOS] Fix Italian resource file syntax

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 01:01:36 2010 New Revision: 49832 URL: http://svn.reactos.org/svn/reactos?rev=49832&view=rev Log: [REACTOS] Fix Italian resource file syntax Modified: branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc Modified: branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Sun Nov 28 01:01:36 2010 @@ -6,9 +6,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Benvenuto al wizard di installazione di ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Non è ancora possibile installare ReactOS direttamente da questo CD! "\ - "E' necessario riavviare il computer da questo CD per procedere "\ - "alla installazione di ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Non è ancora possibile installare ReactOS direttamente da questo CD! E' necessario riavviare il computer da questo CD per procedere alla installazione di ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Cliccare Fine per uscire.", IDC_STATIC, 115, 169, 195, 17 END @@ -128,8 +126,7 @@ LTEXT "Quando verrà premuto fine il computer si riavvierà.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Se presente rimuovere il CD dal lettore e cliccare Fine "\ - "per riavviare il computer.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Se presente rimuovere il CD dal lettore e cliccare Fine per riavviare il computer.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE

14 years

[tkreuzer] 49831: [CMAKE] Make rapps a win32gui app and link to msvcrt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 00:47:58 2010 New Revision: 49831 URL: http://svn.reactos.org/svn/reactos?rev=49831&view=rev Log: [CMAKE] Make rapps a win32gui app and link to msvcrt Modified: branches/cmake-bringup/base/applications/rapps/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sun Nov 28 00:47:58 2010 @@ -24,9 +24,10 @@ set_rc_compiler() add_executable(rapps ${SOURCE}) +set_module_type(rapps win32gui) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi kernel32 msvcrt ntdll) add_dependencies(rapps rappsmsg) #FIXME : move this to cmakemacros + gcc/msvc.cmake

14 years

[tkreuzer] 49830: [CRT] Fix typos

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 28 00:10:02 2010 New Revision: 49830 URL: http://svn.reactos.org/svn/reactos?rev=49830&view=rev Log: [CRT] Fix typos Modified: trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s Modified: trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/i386/se… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] Sun Nov 28 00:10:02 2010 @@ -101,13 +101,13 @@ mov eax, [esp + 8] /* Second argument is return value. */ /* Save the return address now. */ - mov edx, [edx + JB_IP*4] + mov edx, [ecx + JB_IP*4] /* Restore registers. */ - mov ebp, [edx + JB_BP*4] - mov ebx, [edx + JB_BX*4] - mov edi, [edx + JB_DI*4] - mov esi, [edx + JB_SI*4] - mov esp, [edx + JB_SP*4] + mov ebp, [ecx + JB_BP*4] + mov ebx, [ecx + JB_BX*4] + mov edi, [ecx + JB_DI*4] + mov esi, [ecx + JB_SI*4] + mov esp, [ecx + JB_SP*4] /* Jump to saved PC. */ jmp dword ptr [edx]

14 years

[tkreuzer] 49829: [CMAKE] Fix build of msvcsup (add missing file)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 23:47:10 2010 New Revision: 49829 URL: http://svn.reactos.org/svn/reactos?rev=49829&view=rev Log: [CMAKE] Fix build of msvcsup (add missing file) Added: branches/cmake-bringup/lib/sdk/crt/misc/fltused.c (with props) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sat Nov 27 23:47:10 2010 @@ -571,11 +571,13 @@ set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) add_dependencies(libcntpr psdk buildno_header asm) +if(MSVC) # This is a temporary solution until we have proper crt libs list(APPEND MSVCSUP_SOURCE -# misc/fltused.c FIXME: missing file ? + misc/fltused.c except/i386/chkstk_asm.s math/i386/ftol2_asm.S) add_library(msvcsup ${MSVCSUP_SOURCE}) add_dependencies(msvcsup psdk buildno_header asm) +endif() Added: branches/cmake-bringup/lib/sdk/crt/misc/fltused.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/misc/fltused.c (added) +++ branches/cmake-bringup/lib/sdk/crt/misc/fltused.c [iso-8859-1] Sat Nov 27 23:47:10 2010 @@ -1,0 +1,2 @@ + +int _fltused; Propchange: branches/cmake-bringup/lib/sdk/crt/misc/fltused.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years

← Newer
1
2
3
4
5
6
7
8
...
50
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 November 2010