Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 50222: - Fix copy paste error, which means this code is not used, should have pop up during testing.
by jimtabor＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: jimtabor Date: Thu Dec 30 05:56:50 2010 New Revision: 50222 URL: http://svn.reactos.org/svn/reactos?rev=50222&view=rev Log: - Fix copy paste error, which means this code is not used, should have pop up during testing. 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] Thu Dec 30 05:56:50 2010 @@ -353,7 +353,7 @@ DPRINT1("Not enough memory to pack lParam\n"); return STATUS_NO_MEMORY; } - RtlCopyMemory(PackedmCs, UnpackedmCs, sizeof(CREATESTRUCTW)); + RtlCopyMemory(PackedmCs, UnpackedmCs, sizeof(MDICREATESTRUCTW)); CsData = (PCHAR) (PackedmCs + 1); PackedmCs->szTitle = (LPCWSTR) (CsData - (PCHAR) PackedmCs); RtlCopyMemory(CsData, WindowName->Buffer, WindowName->Length);

1 0

[jimtabor] 50221: [Win32k|User32] - Fix most of the user32 wine win test_mdi tests. Leaving 6 failures dealing with rect size. Start A2U and U2A support.
by jimtabor＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: jimtabor Date: Thu Dec 30 05:52:06 2010 New Revision: 50221 URL: http://svn.reactos.org/svn/reactos?rev=50221&view=rev Log: [Win32k|User32] - Fix most of the user32 wine win test_mdi tests. Leaving 6 failures dealing with rect size. Start A2U and U2A support. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Thu Dec 30 05:52:06 2010 @@ -296,6 +296,26 @@ } break; + case WM_MDICREATE: + { + MDICREATESTRUCTW *mCs = (MDICREATESTRUCTW *) KMMsg->lParam; + PCHAR Class; + mCs->szTitle = (LPCWSTR) ((PCHAR) mCs + (DWORD_PTR) mCs->szTitle); + Class = (PCHAR) mCs + (DWORD_PTR) mCs->szClass; + if (L'A' == *((WCHAR *) Class)) + { + Class += sizeof(WCHAR); + mCs->szClass = (LPCWSTR)(DWORD_PTR) (*((ATOM *) Class)); + } + else + { + ASSERT(L'S' == *((WCHAR *) Class)); + Class += sizeof(WCHAR); + mCs->szClass = (LPCWSTR) Class; + } + } + break; + case WM_DDE_ACK: { PKMDDELPARAM DdeLparam = (PKMDDELPARAM) KMMsg->lParam; @@ -383,7 +403,7 @@ } static BOOL FASTCALL -MsgiAnsiToUnicodeMessage(LPMSG UnicodeMsg, LPMSG AnsiMsg) +MsgiAnsiToUnicodeMessage(HWND hwnd, LPMSG UnicodeMsg, LPMSG AnsiMsg) { UNICODE_STRING UnicodeString; @@ -457,6 +477,7 @@ case WM_NCCREATE: case WM_CREATE: { + MDICREATESTRUCTW mdi_cs; struct s { CREATESTRUCTW cs; /* new structure */ @@ -480,6 +501,15 @@ RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)xs->cs.lpszClass); xs->lpszClass = xs->cs.lpszClass = UnicodeString.Buffer; } + + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) + { + mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; + mdi_cs.szTitle = xs->cs.lpszName; + mdi_cs.szClass = xs->cs.lpszClass; + xs->cs.lpCreateParams = &mdi_cs; + } + UnicodeMsg->lParam = (LPARAM)xs; break; } @@ -648,7 +678,7 @@ static BOOL FASTCALL -MsgiUnicodeToAnsiMessage(LPMSG AnsiMsg, LPMSG UnicodeMsg) +MsgiUnicodeToAnsiMessage(HWND hwnd, LPMSG AnsiMsg, LPMSG UnicodeMsg) { ANSI_STRING AnsiString; UNICODE_STRING UnicodeString; @@ -660,6 +690,7 @@ case WM_CREATE: case WM_NCCREATE: { + MDICREATESTRUCTA mdi_cs; CREATESTRUCTA* CsA; CREATESTRUCTW* CsW; NTSTATUS Status; @@ -693,6 +724,15 @@ } CsA->lpszClass = AnsiString.Buffer; } + + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) + { + mdi_cs = *(MDICREATESTRUCTA *)CsW->lpCreateParams; + mdi_cs.szTitle = CsA->lpszName; + mdi_cs.szClass = CsA->lpszClass; + CsA->lpCreateParams = &mdi_cs; + } + AnsiMsg->lParam = (LPARAM)CsA; break; } @@ -1064,7 +1104,7 @@ UnicodeMsg.message = Msg; UnicodeMsg.wParam = wParam; UnicodeMsg.lParam = lParam; - if (! MsgiUnicodeToAnsiMessage(&AnsiMsg, &UnicodeMsg)) + if (! MsgiUnicodeToAnsiMessage(hWnd, &AnsiMsg, &UnicodeMsg)) { goto Exit; } @@ -1248,7 +1288,7 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; - if (! MsgiAnsiToUnicodeMessage(&UnicodeMsg, &AnsiMsg)) + if (! MsgiAnsiToUnicodeMessage(hWnd, &UnicodeMsg, &AnsiMsg)) { goto Exit; } @@ -1512,7 +1552,7 @@ } else { - if (!MsgiAnsiToUnicodeMessage(&UnicodeMsg, (LPMSG)lpmsg)) + if (!MsgiAnsiToUnicodeMessage(lpmsg->hwnd, &UnicodeMsg, (LPMSG)lpmsg)) { return FALSE; } @@ -1970,7 +2010,7 @@ AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; - if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + if (!MsgiAnsiToUnicodeMessage(Wnd, &UcMsg, &AnsiMsg)) { return FALSE; } @@ -2020,7 +2060,7 @@ AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; - if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + if (!MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { return FALSE; } @@ -2118,7 +2158,7 @@ AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; - if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { return FALSE; } @@ -2221,7 +2261,7 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; - if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { return FALSE; } 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] Thu Dec 30 05:52:06 2010 @@ -31,6 +31,81 @@ IntCleanupMessageImpl(VOID) { return STATUS_SUCCESS; +} + +/* From wine: */ +/* flag for messages that contain pointers */ +/* 32 messages per entry, messages 0..31 map to bits 0..31 */ + +#define SET(msg) (1 << ((msg) & 31)) + +static const unsigned int message_pointer_flags[] = +{ + /* 0x00 - 0x1f */ + SET(WM_CREATE) | SET(WM_SETTEXT) | SET(WM_GETTEXT) | + SET(WM_WININICHANGE) | SET(WM_DEVMODECHANGE), + /* 0x20 - 0x3f */ + SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | + SET(WM_COMPAREITEM), + /* 0x40 - 0x5f */ + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | + SET(WM_COPYGLOBALDATA) | SET(WM_NOTIFY) | SET(WM_HELP), + /* 0x60 - 0x7f */ + SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), + /* 0x80 - 0x9f */ + SET(WM_NCCREATE) | SET(WM_NCCALCSIZE) | SET(WM_GETDLGCODE), + /* 0xa0 - 0xbf */ + SET(EM_GETSEL) | SET(EM_GETRECT) | SET(EM_SETRECT) | SET(EM_SETRECTNP), + /* 0xc0 - 0xdf */ + SET(EM_REPLACESEL) | SET(EM_GETLINE) | SET(EM_SETTABSTOPS), + /* 0xe0 - 0xff */ + SET(SBM_GETRANGE) | SET(SBM_SETSCROLLINFO) | SET(SBM_GETSCROLLINFO) | SET(SBM_GETSCROLLBARINFO), + /* 0x100 - 0x11f */ + 0, + /* 0x120 - 0x13f */ + 0, + /* 0x140 - 0x15f */ + SET(CB_GETEDITSEL) | SET(CB_ADDSTRING) | SET(CB_DIR) | SET(CB_GETLBTEXT) | + SET(CB_INSERTSTRING) | SET(CB_FINDSTRING) | SET(CB_SELECTSTRING) | + SET(CB_GETDROPPEDCONTROLRECT) | SET(CB_FINDSTRINGEXACT), + /* 0x160 - 0x17f */ + 0, + /* 0x180 - 0x19f */ + SET(LB_ADDSTRING) | SET(LB_INSERTSTRING) | SET(LB_GETTEXT) | SET(LB_SELECTSTRING) | + SET(LB_DIR) | SET(LB_FINDSTRING) | + SET(LB_GETSELITEMS) | SET(LB_SETTABSTOPS) | SET(LB_ADDFILE) | SET(LB_GETITEMRECT), + /* 0x1a0 - 0x1bf */ + SET(LB_FINDSTRINGEXACT), + /* 0x1c0 - 0x1df */ + 0, + /* 0x1e0 - 0x1ff */ + 0, + /* 0x200 - 0x21f */ + SET(WM_NEXTMENU) | SET(WM_SIZING) | SET(WM_MOVING) | SET(WM_DEVICECHANGE), + /* 0x220 - 0x23f */ + SET(WM_MDICREATE) | SET(WM_MDIGETACTIVE) | SET(WM_DROPOBJECT) | + SET(WM_QUERYDROPOBJECT) | SET(WM_DRAGLOOP) | SET(WM_DRAGSELECT) | SET(WM_DRAGMOVE), + /* 0x240 - 0x25f */ + 0, + /* 0x260 - 0x27f */ + 0, + /* 0x280 - 0x29f */ + 0, + /* 0x2a0 - 0x2bf */ + 0, + /* 0x2c0 - 0x2df */ + 0, + /* 0x2e0 - 0x2ff */ + 0, + /* 0x300 - 0x31f */ + SET(WM_ASKCBFORMATNAME) +}; + +/* check whether a given message type includes pointers */ +static inline int is_pointer_message( UINT message ) +{ + if (message >= 8*sizeof(message_pointer_flags)) return FALSE; + return (message_pointer_flags[message / 32] & SET(message)) != 0; } #define MMS_SIZE_WPARAM -1 @@ -64,6 +139,7 @@ { WM_COPYGLOBALDATA, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_WINDOWPOSCHANGED, sizeof(WINDOWPOS), MMS_FLAG_READ }, { WM_WINDOWPOSCHANGING, sizeof(WINDOWPOS), MMS_FLAG_READWRITE }, + { WM_MDICREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, }; static PMSGMEMORY FASTCALL @@ -89,6 +165,7 @@ MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam) { CREATESTRUCTW *Cs; + MDICREATESTRUCTW *mCs; PUNICODE_STRING WindowName; PUNICODE_STRING ClassName; UINT Size = 0; @@ -127,6 +204,21 @@ } break; + case WM_MDICREATE: + mCs = (MDICREATESTRUCTW *)lParam; + WindowName = (PUNICODE_STRING) mCs->szTitle; + ClassName = (PUNICODE_STRING) mCs->szClass; + Size = sizeof(MDICREATESTRUCTW) + WindowName->Length + sizeof(WCHAR); + if (IS_ATOM(ClassName->Buffer)) + { + Size += sizeof(WCHAR) + sizeof(ATOM); + } + else + { + Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR); + } + break; + case WM_NCCALCSIZE: Size = wParam ? sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) : sizeof(RECT); break; @@ -162,6 +254,7 @@ NCCALCSIZE_PARAMS *PackedNcCalcsize; CREATESTRUCTW *UnpackedCs; CREATESTRUCTW *PackedCs; + MDICREATESTRUCTW *UnpackedmCs, *PackedmCs; PLARGE_STRING WindowName; PUNICODE_STRING ClassName; POOL_TYPE PoolType; @@ -240,6 +333,53 @@ ASSERT(CsData == (PCHAR) PackedCs + Size); *lParamPacked = (LPARAM) PackedCs; } + else if (WM_MDICREATE == Msg) + { + UnpackedmCs = (MDICREATESTRUCTW *) lParam; + WindowName = (PLARGE_STRING) UnpackedmCs->szTitle; + ClassName = (PUNICODE_STRING) UnpackedmCs->szClass; + Size = sizeof(MDICREATESTRUCTW) + WindowName->Length + sizeof(WCHAR); + if (IS_ATOM(ClassName->Buffer)) + { + Size += sizeof(WCHAR) + sizeof(ATOM); + } + else + { + Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR); + } + PackedmCs = ExAllocatePoolWithTag(PoolType, Size, TAG_MSG); + if (NULL == PackedmCs) + { + DPRINT1("Not enough memory to pack lParam\n"); + return STATUS_NO_MEMORY; + } + RtlCopyMemory(PackedmCs, UnpackedmCs, sizeof(CREATESTRUCTW)); + CsData = (PCHAR) (PackedmCs + 1); + PackedmCs->szTitle = (LPCWSTR) (CsData - (PCHAR) PackedmCs); + RtlCopyMemory(CsData, WindowName->Buffer, WindowName->Length); + CsData += WindowName->Length; + *((WCHAR *) CsData) = L'\0'; + CsData += sizeof(WCHAR); + PackedmCs->szClass = (LPCWSTR) (CsData - (PCHAR) PackedmCs); + if (IS_ATOM(ClassName->Buffer)) + { + *((WCHAR *) CsData) = L'A'; + CsData += sizeof(WCHAR); + *((ATOM *) CsData) = (ATOM)(DWORD_PTR) ClassName->Buffer; + CsData += sizeof(ATOM); + } + else + { + *((WCHAR *) CsData) = L'S'; + CsData += sizeof(WCHAR); + RtlCopyMemory(CsData, ClassName->Buffer, ClassName->Length); + CsData += ClassName->Length; + *((WCHAR *) CsData) = L'\0'; + CsData += sizeof(WCHAR); + } + ASSERT(CsData == (PCHAR) PackedmCs + Size); + *lParamPacked = (LPARAM) PackedmCs; + } else if (PoolType == NonPagedPool) { PMSGMEMORY MsgMemoryEntry; @@ -288,6 +428,11 @@ { ExFreePool((PVOID) lParamPacked); + return STATUS_SUCCESS; + } + else if (WM_MDICREATE == Msg) + { + ExFreePool((PVOID) lParamPacked); return STATUS_SUCCESS; } else if (NonPagedPoolUsed) @@ -910,7 +1055,7 @@ LARGE_INTEGER LargeTickCount; NTSTATUS Status; - if (FindMsgMemory(Msg) != 0) + if (is_pointer_message(Msg)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -990,7 +1135,7 @@ return TRUE; } - if (MsgMemoryEntry) + if (is_pointer_message(Message.message)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -1486,7 +1631,7 @@ { BOOL Ret = TRUE; - if (FindMsgMemory(Msg) != 0) + if (is_pointer_message(Msg)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); return FALSE;

1 0

[jimtabor] 50220: [Win32k] - NtUserSetWindowFNID, sets user client side window function Ids, expands to ghost.
by jimtabor＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: jimtabor Date: Thu Dec 30 03:03:45 2010 New Revision: 50220 URL: http://svn.reactos.org/svn/reactos?rev=50220&view=rev Log: [Win32k] - NtUserSetWindowFNID, sets user client side window function Ids, expands to ghost. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Dec 30 03:03:45 2010 @@ -3887,9 +3887,10 @@ // From user land we only set these. if (fnID != FNID_DESTROY) { - if ( ((fnID < FNID_BUTTON) && (fnID > FNID_IME)) || + if ( ((fnID < FNID_BUTTON) && (fnID > FNID_GHOST)) || Wnd->fnid != 0 ) { + EngSetLastError(ERROR_INVALID_PARAMETER); RETURN( FALSE); } }

1 0

[jimtabor] 50219: [User32] - Controls: Set fnids for the user client controls.
by jimtabor＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: jimtabor Date: Thu Dec 30 02:32:50 2010 New Revision: 50219 URL: http://svn.reactos.org/svn/reactos?rev=50219&view=rev Log: [User32] - Controls: Set fnids for the user client controls. Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/static.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Thu Dec 30 02:32:50 2010 @@ -256,6 +256,18 @@ UINT btn_type = get_button_type( style ); LONG state; HANDLE oldHbitmap; +#ifdef __REACTOS__ + PWND pWnd; + + pWnd = ValidateHwnd(hWnd); + if (pWnd) + { + if (!pWnd->fnid) + { + NtUserSetWindowFNID(hWnd, FNID_BUTTON); + } + } +#endif pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); @@ -299,6 +311,13 @@ set_button_state( hWnd, BUTTON_UNCHECKED ); button_update_uistate( hWnd, unicode ); return 0; + +#ifdef __REACTOS__ + case WM_DESTROY: + case WM_NCDESTROY: + NtUserSetWindowFNID(hWnd, FNID_DESTROY); + break; +#endif case WM_ERASEBKGND: if (btn_type == BS_OWNERDRAW) Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Thu Dec 30 02:32:50 2010 @@ -1837,6 +1837,18 @@ WPARAM wParam, LPARAM lParam, BOOL unicode ) { LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); +#ifdef __REACTOS__ + PWND pWnd; + + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) + { + NtUserSetWindowFNID(hwnd, FNID_COMBOBOX); + } + } +#endif TRACE("[%p]: msg %s wp %08lx lp %08lx\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); @@ -1855,6 +1867,9 @@ } case WM_NCDESTROY: COMBO_NCDestroy(lphc); +#ifdef __REACTOS__ + NtUserSetWindowFNID(hwnd, FNID_DESTROY); +#endif break;/* -> DefWindowProc */ case WM_CREATE: Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Thu Dec 30 02:32:50 2010 @@ -4476,6 +4476,18 @@ { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; +#ifdef __REACTOS__ + PWND pWnd; + + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) + { + NtUserSetWindowFNID(hwnd, FNID_EDIT); + } + } +#endif TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); @@ -4723,6 +4735,9 @@ case WM_DESTROY: result = EDIT_WM_Destroy(es); es = NULL; +#ifdef __REACTOS__ + NtUserSetWindowFNID(hwnd, FNID_DESTROY); +#endif break; case WM_GETDLGCODE: Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Thu Dec 30 02:32:50 2010 @@ -2585,6 +2585,18 @@ LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); LPHEADCOMBO lphc = 0; LRESULT ret; +#ifdef __REACTOS__ + PWND pWnd; + + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) + { + NtUserSetWindowFNID(hwnd, FNID_LISTBOX); // Could be FNID_COMBOLBOX by class. + } + } +#endif if (!descr) { @@ -2999,6 +3011,9 @@ return 0; case WM_DESTROY: +#ifdef __REACTOS__ + NtUserSetWindowFNID(hwnd, FNID_DESTROY); +#endif return LISTBOX_Destroy( descr ); case WM_ENABLE: Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Thu Dec 30 02:32:50 2010 @@ -423,6 +423,18 @@ LRESULT lResult = 0; LONG full_style = GetWindowLongPtrW( hwnd, GWL_STYLE ); LONG style = full_style & SS_TYPEMASK; +#ifdef __REACTOS__ + PWND pWnd; + + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) + { + NtUserSetWindowFNID(hwnd, FNID_STATIC); + } + } +#endif switch (uMsg) { @@ -437,6 +449,9 @@ break; case WM_NCDESTROY: +#ifdef __REACTOS__ + NtUserSetWindowFNID(hwnd, FNID_DESTROY); +#endif if (style == SS_ICON) { /* * FIXME

1 0

[jimtabor] 50218: [Win32k|User32] - Fix mdi class window function Id, now msi message tests do not assert.
by jimtabor＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: jimtabor Date: Thu Dec 30 00:59:10 2010 New Revision: 50218 URL: http://svn.reactos.org/svn/reactos?rev=50218&view=rev Log: [Win32k|User32] - Fix mdi class window function Id, now msi message tests do not assert. Modified: trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Thu Dec 30 00:59:10 2010 @@ -1111,6 +1111,7 @@ return FALSE; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)ci ); ci->hBmpClose = 0; + NtUserSetWindowFNID( hwnd, FNID_MDICLIENT); // wine uses WIN_ISMDICLIENT #else WND *wndPtr = WIN_GetPtr( hwnd ); wndPtr->flags |= WIN_ISMDICLIENT; @@ -1160,6 +1161,7 @@ #ifdef __REACTOS__ HeapFree( GetProcessHeap(), 0, ci ); SetWindowLongPtrW( hwnd, 0, 0 ); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); #endif return 0; } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Dec 30 00:59:10 2010 @@ -343,15 +343,12 @@ UINT id = 0; HWND top_child; PWND pWndParent; - PCLS pCls; pWndParent = ValidateHwnd(hWndParent); if (!pWndParent) return NULL; - pCls = DesktopPtrToUser(pWndParent->pcls); - - if (pCls->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT + if (pWndParent->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); return NULL; @@ -469,15 +466,12 @@ UINT id = 0; HWND top_child; PWND pWndParent; - PCLS pCls; pWndParent = ValidateHwnd(hWndParent); if (!pWndParent) return NULL; - pCls = DesktopPtrToUser(pWndParent->pcls); - - if (pCls->fnid != FNID_MDICLIENT) + if (pWndParent->fnid != FNID_MDICLIENT) { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); return NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Dec 30 00:59:10 2010 @@ -3878,15 +3878,23 @@ RETURN( FALSE); } - if (Wnd->pcls) - { // From user land we only set these. - if ((fnID != FNID_DESTROY) || ((fnID < FNID_BUTTON) && (fnID > FNID_IME)) ) + if (Wnd->head.pti->ppi != PsGetCurrentProcessWin32Process()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + RETURN( FALSE); + } + + // From user land we only set these. + if (fnID != FNID_DESTROY) + { + if ( ((fnID < FNID_BUTTON) && (fnID > FNID_IME)) || + Wnd->fnid != 0 ) { RETURN( FALSE); } - else - Wnd->pcls->fnid |= fnID; - } + } + + Wnd->fnid |= fnID; RETURN( TRUE); CLEANUP:

1 0

[tkreuzer] 50217: [CMAKE] LD is stupid and doesn't handle stdcall decoration as proper as dlltool does (after we provided a patch). Passing --kill-at, also kills C++ mangled names and exports with ...
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 23:58:17 2010 New Revision: 50217 URL: http://svn.reactos.org/svn/reactos?rev=50217&view=rev Log: [CMAKE] LD is stupid and doesn't handle stdcall decoration as proper as dlltool does (after we provided a patch). Passing --kill-at, also kills C++ mangled names and exports with stdcall decoration are imposible. In trunk we use dlltool to generate an exp file that we link with LD, but in the cmake branch we pass the def file to LD directly. Luckily we have a tool called spec2def that can handle these things. We now generate 2 different .def files, one for LD, containing the undecorated export name forwarded to the decorated symbol name (FooFunc=FooFunc@12), while the 2nd def file which is passed to dlltool for exportlib generation has full stdcall decorations. --kill-at is now passed to dlltool only. This commit might break msvc, but should be pretty easy to fix. Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/toolchain-mingw32.cmake branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=502… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Dec 29 23:58:17 2010 @@ -9,7 +9,7 @@ link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") @@ -242,8 +242,8 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def ${DLLNAME_OPTION} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + COMMAND native-spec2def ${DLLNAME_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) elseif(${_extension} STREQUAL ".def") @@ -265,7 +265,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def -n=${_dllname} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Dec 29 23:58:17 2010 @@ -49,14 +49,14 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") if(ARCH MATCHES i386) - set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) - set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") endif() # adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search +# search headers and libraries in the target environment, search # programs in the host environment set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Wed Dec 29 23:58:17 2010 @@ -2,10 +2,6 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> - -#ifndef _WIN32 -#define _stricmp strcasecmp -#endif typedef struct { @@ -22,7 +18,8 @@ } EXPORT; typedef int (*PFNOUTLINE)(FILE *, EXPORT *); -int no_decoration = 0; +int gbKillAt = 0; +int gbUseDeco = 0; int no_redirections = 0; char *pszArchString = "i386"; char *pszArchString2; @@ -182,8 +179,8 @@ case ARG_PTR: fprintf(file, "0x%%p"); break; case ARG_STR: fprintf(file, "'%%s'"); break; case ARG_WSTR: fprintf(file, "'%%ws'"); break; - case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; - case ARG_INT64: fprintf(file, "0x%%ll"); break; + case ARG_DBL: fprintf(file, "%%f"); break; + case ARG_INT64: fprintf(file, "%%\"PRix64\""); break; } } fprintf(file, ")\\n\""); @@ -197,7 +194,7 @@ case ARG_PTR: fprintf(file, "(void*)a%d", i); break; case ARG_STR: fprintf(file, "(char*)a%d", i); break; case ARG_WSTR: fprintf(file, "(wchar_t*)a%d", i); break; - case ARG_DBL: fprintf(file, "(__int64)a%d", i); break; + case ARG_DBL: fprintf(file, "(double)a%d", i); break; case ARG_INT64: fprintf(file, "(__int64)a%d", i); break; } } @@ -268,6 +265,22 @@ libname); } +void +PrintName(FILE *fileDest, EXPORT *pexp, int fRedir, int fDeco) +{ + char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; + int nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; + + if (fDeco && pexp->nCallingConvention == CC_FASTCALL) + fprintf(fileDest, "@"); + fprintf(fileDest, "%.*s", nNameLength, pcName); + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && fDeco) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } +} + int OutputLine_def(FILE *fileDest, EXPORT *pexp) { @@ -280,42 +293,22 @@ } else { - if (pexp->nCallingConvention == CC_FASTCALL && !no_decoration) - { - fprintf(fileDest, "@"); - } - - fprintf(fileDest, "%.*s", pexp->nNameLength, pexp->pcName); - - if ((pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL) && !no_decoration) - { - fprintf(fileDest, "@%d", pexp->nStackBytes); - } + PrintName(fileDest, pexp, 0, gbUseDeco && !gbKillAt); } if (pexp->pcRedirection && !no_redirections) { - int bAddDecorations = 1; + int fDeco = (gbUseDeco && !ScanToken(pexp->pcRedirection, '.')); fprintf(fileDest, "="); - - /* No decorations, if switch was passed or this is an external */ - if (no_decoration || ScanToken(pexp->pcRedirection, '.')) - { - bAddDecorations = 0; - } - - if (pexp->nCallingConvention == CC_FASTCALL && bAddDecorations) - { - fprintf(fileDest, "@"); - } - fprintf(fileDest, "%.*s", pexp->nRedirectionLength, pexp->pcRedirection); - if ((pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL) && bAddDecorations) - { - fprintf(fileDest, "@%d", pexp->nStackBytes); - } + PrintName(fileDest, pexp, 1, fDeco); + } + else if (gbUseDeco && gbKillAt && + (pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL)) + { + fprintf(fileDest, "="); + PrintName(fileDest, pexp, 0, 1); } if (pexp->nOrdinal != -1) @@ -452,7 +445,7 @@ } else if (CompareToken(pc, "-i386")) { - if (_stricmp(pszArchString, "i386") != 0) included = 0; + if (strcasecmp(pszArchString, "i386") != 0) included = 0; } else if (CompareToken(pc, "-private")) { @@ -628,7 +621,7 @@ " -d=<file> generates a def file\n" " -s=<file> generates a stub file\n" " -n=<name> name of the dll\n" - " -@ removes @xx decorations from def file\n" + " --kill-at removes @xx decorations from exports\n" " -r removes redirections from def file\n" " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); } @@ -650,8 +643,8 @@ /* Read options */ for (i = 1; i < argc && *argv[i] == '-'; i++) { - if ((_stricmp(argv[i], "--help") == 0) || - (_stricmp(argv[i], "-h") == 0)) + if ((strcasecmp(argv[i], "--help") == 0) || + (strcasecmp(argv[i], "-h") == 0)) { usage(); return 0; @@ -672,11 +665,11 @@ { pszDllName = argv[i] + 3; } - else if ((_stricmp(argv[i], "-@") == 0)) - { - no_decoration = 1; - } - else if ((_stricmp(argv[i], "-r") == 0)) + else if ((strcasecmp(argv[i], "--kill-at") == 0)) + { + gbKillAt = 1; + } + else if ((strcasecmp(argv[i], "-r") == 0)) { no_redirections = 1; } @@ -691,13 +684,18 @@ } } - if ((_stricmp(pszArchString, "x86_64") == 0) || - (_stricmp(pszArchString, "ia64") == 0)) + if ((strcasecmp(pszArchString, "x86_64") == 0) || + (strcasecmp(pszArchString, "ia64") == 0)) { pszArchString2 = "win64"; } else pszArchString2 = "win32"; + + if (strcasecmp(pszArchString, "i386") == 0) + { + gbUseDeco = 1; + } /* Set a default dll name */ if (!pszDllName)

1 0

[akhaldi] 50216: [CMAKE] - Remove an unintended change.
by akhaldi＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: akhaldi Date: Wed Dec 29 19:11:17 2010 New Revision: 50216 URL: http://svn.reactos.org/svn/reactos?rev=50216&view=rev Log: [CMAKE] - Remove an unintended change. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Dec 29 19:11:17 2010 @@ -42,8 +42,6 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") -set(CMAKE_C_CREATE_STATIC_LIBRARY "${MINGW_PREFIX}ar crs <TARGET> <LINK_FLAGS> <OBJECTS>") - # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")

1 0

[jgardou] 50215: [CMAKE] Improve rpcproxy macro split boot/CMakeLists.txt into smaller and clearer CMakeLists.txt
by jgardou＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: jgardou Date: Wed Dec 29 18:28:34 2010 New Revision: 50215 URL: http://svn.reactos.org/svn/reactos?rev=50215&view=rev Log: [CMAKE] Improve rpcproxy macro split boot/CMakeLists.txt into smaller and clearer CMakeLists.txt Added: branches/cmake-bringup/boot/freeldr/CMakeLists.txt (with props) branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt (with props) branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -181,10 +181,6 @@ PROPERTIES GENERATED TRUE) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) - list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p) - add_custom_target(${TARGET}_${FILE}_p - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) - #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) endforeach() add_custom_command( @@ -194,9 +190,6 @@ set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c PROPERTIES GENERATED TRUE) - - add_library(${TARGET}_proxy ${SOURCE}) - add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) endmacro() macro(idl_files) Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,249 +1,6 @@ -CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/dosmbr.bin) -CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/ext2.bin) -CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat32.bin) -CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin) -CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin) -CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) +add_subdirectory(freeldr) -include_directories(BEFORE freeldr/freeldr/include) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -if(ARCH MATCHES arm) - if(SARCH MATCHES omap-zoom2) - add_definitions(-D_ZOOM2_) - endif() -endif() - -if(ARCH MATCHES i386) -if(MSVC) -list(APPEND FREELDR_BASE64K_SOURCE - freeldr/freeldr/arch/i386/realmode.S) -else() -list(APPEND FREELDR_STARTUP_SOURCE - freeldr/freeldr/arch/i386/fathelp.S - freeldr/freeldr/arch/i386/arch.S) -endif() -elseif(ARCH MATCHES amd64) -list(APPEND FREELDR_STARTUP_SOURCE - freeldr/freeldr/arch/i386/fathelp.S - freeldr/freeldr/arch/amd64/arch.S) -endif(ARCH MATCHES i386) - -if(ARCH MATCHES i386) -if(NOT MSVC) -list(APPEND FREELDR_BASE64K_SOURCE - freeldr/freeldr/arch/i386/boot.S - freeldr/freeldr/arch/i386/drvmap.S - freeldr/freeldr/arch/i386/i386cpu.S - freeldr/freeldr/arch/i386/i386idt.S - freeldr/freeldr/arch/i386/i386pnp.S - freeldr/freeldr/arch/i386/i386trap.S - freeldr/freeldr/arch/i386/int386.S - freeldr/freeldr/arch/i386/linux.S - freeldr/freeldr/arch/i386/mb.S - freeldr/freeldr/arch/i386/i386bug.c) -endif() -elseif(ARCH MATCHES amd64) -list(APPEND FREELDR_BASE64K_SOURCE - freeldr/freeldr/arch/i386/drvmap.S - freeldr/freeldr/arch/i386/i386cpu.S - freeldr/freeldr/arch/i386/i386idt.S - freeldr/freeldr/arch/i386/i386trap.S - freeldr/freeldr/arch/amd64/mb.S) -endif(ARCH MATCHES i386) - -set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_") - -include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib) - -list(APPEND FREELDR_BASE_SOURCE - freeldr/freeldr/arcemul/mm.c - freeldr/freeldr/arcemul/time.c - freeldr/freeldr/cache/blocklist.c - freeldr/freeldr/cache/cache.c - freeldr/freeldr/comm/rs232.c - freeldr/freeldr/disk/disk.c - freeldr/freeldr/disk/partition.c - freeldr/freeldr/disk/ramdisk.c - freeldr/freeldr/disk/scsiport.c - freeldr/freeldr/fs/ext2.c - freeldr/freeldr/fs/fat.c - freeldr/freeldr/fs/fs.c - freeldr/freeldr/fs/iso.c - freeldr/freeldr/fs/ntfs.c - freeldr/freeldr/inifile/ini_init.c - freeldr/freeldr/inifile/inifile.c - freeldr/freeldr/inifile/parse.c - freeldr/freeldr/mm/meminit.c - freeldr/freeldr/mm/mm.c - freeldr/freeldr/reactos/registry.c - freeldr/freeldr/reactos/arcname.c - freeldr/freeldr/reactos/archwsup.c - freeldr/freeldr/reactos/binhive.c - freeldr/freeldr/reactos/reactos.c - freeldr/freeldr/reactos/imageldr.c - freeldr/freeldr/rtl/bget.c - freeldr/freeldr/rtl/libsupp.c - freeldr/freeldr/ui/directui.c - freeldr/freeldr/ui/gui.c - freeldr/freeldr/ui/minitui.c - freeldr/freeldr/ui/noui.c - freeldr/freeldr/ui/tui.c - freeldr/freeldr/ui/tuimenu.c - freeldr/freeldr/ui/ui.c - freeldr/freeldr/video/fade.c - freeldr/freeldr/video/palette.c - freeldr/freeldr/video/video.c - freeldr/freeldr/windows/conversion.c - freeldr/freeldr/windows/peloader.c - freeldr/freeldr/windows/winldr.c - freeldr/freeldr/windows/wlmemory.c - freeldr/freeldr/windows/wlregistry.c - freeldr/freeldr/freeldr.c - freeldr/freeldr/debug.c - freeldr/freeldr/version.c - freeldr/freeldr/cmdline.c - freeldr/freeldr/machine.c - freeldr/freeldr/options.c - freeldr/freeldr/linuxboot.c - freeldr/freeldr/oslist.c) - -if(ARCH MATCHES i386) -list(APPEND FREELDR_BASE_SOURCE - freeldr/freeldr/windows/headless.c - freeldr/freeldr/disk/scsiport.c) -endif(ARCH MATCHES i386) - -set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf) - -if(ARCH MATCHES i386) -list(APPEND FREELDR_ARCH_SOURCE - freeldr/freeldr/arch/i386/archmach.c - freeldr/freeldr/arch/i386/custom.c - freeldr/freeldr/arch/i386/drivemap.c - freeldr/freeldr/arch/i386/halstub.c - freeldr/freeldr/arch/i386/hardware.c - freeldr/freeldr/arch/i386/hwacpi.c - freeldr/freeldr/arch/i386/hwapm.c - freeldr/freeldr/arch/i386/hwpci.c - freeldr/freeldr/arch/i386/i386disk.c - freeldr/freeldr/arch/i386/i386rtl.c - freeldr/freeldr/arch/i386/i386vid.c - freeldr/freeldr/arch/i386/loader.c - freeldr/freeldr/arch/i386/machpc.c - freeldr/freeldr/arch/i386/miscboot.c - freeldr/freeldr/arch/i386/ntoskrnl.c - freeldr/freeldr/arch/i386/pccons.c - freeldr/freeldr/arch/i386/pcdisk.c - freeldr/freeldr/arch/i386/pcmem.c - freeldr/freeldr/arch/i386/pcrtc.c - freeldr/freeldr/arch/i386/pcvideo.c - freeldr/freeldr/arch/i386/machxbox.c - freeldr/freeldr/arch/i386/xboxcons.c - freeldr/freeldr/arch/i386/xboxdisk.c - freeldr/freeldr/arch/i386/xboxfont.c - freeldr/freeldr/arch/i386/xboxhw.c - freeldr/freeldr/arch/i386/xboxi2c.c - freeldr/freeldr/arch/i386/xboxmem.c - freeldr/freeldr/arch/i386/xboxrtc.c - freeldr/freeldr/arch/i386/xboxvideo.c - freeldr/freeldr/windows/i386/ntsetup.c - freeldr/freeldr/windows/i386/wlmemory.c) -else() -#TBD -endif(ARCH MATCHES i386) - -set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") - -list(APPEND SETUPLDR_MAIN_SOURCE - freeldr/freeldr/bootmgr.c - freeldr/freeldr/inffile/inffile.c - freeldr/freeldr/reactos/setupldr.c) - -if(ARCH MATCHES i386) -list(APPEND SETUPLDR_MAIN_SOURCE freeldr/freeldr/windows/setupldr2.c) -elseif(ARCH MATCHES amd64) -list(APPEND SETUPLDR_MAIN_SOURCE freeldr/freeldr/windows/setupldr2.c) -endif(ARCH MATCHES i386) - -set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") - - - -list(APPEND FREELDR_SOURCE - freeldr/freeldr/bootmgr.c - ${FREELDR_STARTUP_SOURCE} - ${FREELDR_BASE64K_SOURCE} - ${FREELDR_BASE_SOURCE} - ${FREELDR_ARCH_SOURCE}) - -add_library(freeldr SHARED - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch - ${FREELDR_SOURCE}) - -if(NOT MSVC) -set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys") -set_image_base(freeldr 0x8000) -else() -set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") -set_image_base(freeldr 0x10000) -endif() - -set_subsystem(freeldr native) -set_entrypoint(freeldr mainCRTStartup) - -if(ARCH MATCHES i386) -target_link_libraries(freeldr mini_hal) -endif(ARCH MATCHES i386) - -target_link_libraries(freeldr - cportlib - rossym - cmlib - rtl - libcntpr) -add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${FREELDR_SOURCE}) -add_dependencies(freeldr asm) - -list(APPEND SETUPLDR_SOURCE - ${FREELDR_STARTUP_SOURCE} - ${FREELDR_BASE64K_SOURCE} - ${FREELDR_BASE_SOURCE} - ${FREELDR_ARCH_SOURCE} - ${SETUPLDR_MAIN_SOURCE}) - -add_library(setupldr SHARED ${SETUPLDR_SOURCE}) - -if(NOT MSVC) -set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") -set_image_base(setupldr 0x8000) -else() -set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") -endif() - -set_subsystem(setupldr native) -set_entrypoint(setupldr mainCRTStartup) - -if(ARCH MATCHES i386) -target_link_libraries(setupldr mini_hal) -endif(ARCH MATCHES i386) - -target_link_libraries(setupldr - cportlib - rossym - cmlib - rtl - libcntpr) - -add_dependencies(setupldr asm) - -# Bootcd files -add_minicd_target(setupldr loader setupldr.sys) -add_minicd_target(freeldr loader freeldr.sys) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/txtsetup.sif reactos txtsetup.sif) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/bootcd.ini "" freeldr.ini) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivecls_${ARCH}.inf reactos hivecls.inf) @@ -265,7 +22,6 @@ add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam) -add_livecd_target(setupldr loader) add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) #regtest Added: branches/cmake-bringup/boot/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/CMak… ============================================================================== --- branches/cmake-bringup/boot/freeldr/CMakeLists.txt (added) +++ branches/cmake-bringup/boot/freeldr/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,0 +1,3 @@ + +add_subdirectory(bootsect) +add_subdirectory(freeldr) Propchange: branches/cmake-bringup/boot/freeldr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/boot… ============================================================================== --- branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt (added) +++ branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,0 +1,7 @@ + +CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin) +CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin) +CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin) +CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin) +CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin) +CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin) Propchange: branches/cmake-bringup/boot/freeldr/bootsect/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt (added) +++ branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -1,0 +1,242 @@ + +include_directories(BEFORE include) +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +if(ARCH MATCHES arm) + if(SARCH MATCHES omap-zoom2) + add_definitions(-D_ZOOM2_) + endif() +endif() + +if(ARCH MATCHES i386) +if(MSVC) +list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/realmode.S) +else() +list(APPEND FREELDR_STARTUP_SOURCE + arch/i386/fathelp.S + arch/i386/arch.S) +endif() +elseif(ARCH MATCHES amd64) +list(APPEND FREELDR_STARTUP_SOURCE + arch/i386/fathelp.S + arch/amd64/arch.S) +endif(ARCH MATCHES i386) + +if(ARCH MATCHES i386) +if(NOT MSVC) +list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/boot.S + arch/i386/drvmap.S + arch/i386/i386cpu.S + arch/i386/i386idt.S + arch/i386/i386pnp.S + arch/i386/i386trap.S + arch/i386/int386.S + arch/i386/linux.S + arch/i386/mb.S + arch/i386/i386bug.c) +endif() +elseif(ARCH MATCHES amd64) +list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/drvmap.S + arch/i386/i386cpu.S + arch/i386/i386idt.S + arch/i386/i386trap.S + arch/amd64/mb.S) +endif(ARCH MATCHES i386) + + + +set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_") + +include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib) + +list(APPEND FREELDR_BASE_SOURCE + arcemul/mm.c + arcemul/time.c + cache/blocklist.c + cache/cache.c + comm/rs232.c + disk/disk.c + disk/partition.c + disk/ramdisk.c + disk/scsiport.c + fs/ext2.c + fs/fat.c + fs/fs.c + fs/iso.c + fs/ntfs.c + inifile/ini_init.c + inifile/inifile.c + inifile/parse.c + mm/meminit.c + mm/mm.c + reactos/registry.c + reactos/arcname.c + reactos/archwsup.c + reactos/binhive.c + reactos/reactos.c + reactos/imageldr.c + rtl/bget.c + rtl/libsupp.c + ui/directui.c + ui/gui.c + ui/minitui.c + ui/noui.c + ui/tui.c + ui/tuimenu.c + ui/ui.c + video/fade.c + video/palette.c + video/video.c + windows/conversion.c + windows/peloader.c + windows/winldr.c + windows/wlmemory.c + windows/wlregistry.c + freeldr.c + debug.c + version.c + cmdline.c + machine.c + options.c + linuxboot.c + oslist.c) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_BASE_SOURCE + windows/headless.c + disk/scsiport.c) +endif(ARCH MATCHES i386) + +set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_ARCH_SOURCE + arch/i386/archmach.c + arch/i386/custom.c + arch/i386/drivemap.c + arch/i386/halstub.c + arch/i386/hardware.c + arch/i386/hwacpi.c + arch/i386/hwapm.c + arch/i386/hwpci.c + arch/i386/i386disk.c + arch/i386/i386rtl.c + arch/i386/i386vid.c + arch/i386/loader.c + arch/i386/machpc.c + arch/i386/miscboot.c + arch/i386/ntoskrnl.c + arch/i386/pccons.c + arch/i386/pcdisk.c + arch/i386/pcmem.c + arch/i386/pcrtc.c + arch/i386/pcvideo.c + arch/i386/machxbox.c + arch/i386/xboxcons.c + arch/i386/xboxdisk.c + arch/i386/xboxfont.c + arch/i386/xboxhw.c + arch/i386/xboxi2c.c + arch/i386/xboxmem.c + arch/i386/xboxrtc.c + arch/i386/xboxvideo.c + windows/i386/ntsetup.c + windows/i386/wlmemory.c) +else() +#TBD +endif(ARCH MATCHES i386) + +set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") + +list(APPEND SETUPLDR_MAIN_SOURCE + bootmgr.c + inffile/inffile.c + reactos/setupldr.c) + +if(ARCH MATCHES i386) +list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) +elseif(ARCH MATCHES amd64) +list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) +endif(ARCH MATCHES i386) + +set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") + + + +list(APPEND FREELDR_SOURCE + bootmgr.c + ${FREELDR_STARTUP_SOURCE} + ${FREELDR_BASE64K_SOURCE} + ${FREELDR_BASE_SOURCE} + ${FREELDR_ARCH_SOURCE}) + +add_library(freeldr SHARED + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch + ${FREELDR_SOURCE}) + +if(NOT MSVC) +set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys") +set_image_base(freeldr 0x8000) +else() +set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") +set_image_base(freeldr 0x10000) +endif() + +set_subsystem(freeldr native) +set_entrypoint(freeldr mainCRTStartup) + +if(ARCH MATCHES i386) +target_link_libraries(freeldr mini_hal) +endif(ARCH MATCHES i386) + +target_link_libraries(freeldr + cportlib + rossym + cmlib + rtl + libcntpr) +add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/include/freeldr.h ${FREELDR_SOURCE}) +add_dependencies(freeldr asm) + +list(APPEND SETUPLDR_SOURCE + ${FREELDR_STARTUP_SOURCE} + ${FREELDR_BASE64K_SOURCE} + ${FREELDR_BASE_SOURCE} + ${FREELDR_ARCH_SOURCE} + ${SETUPLDR_MAIN_SOURCE}) + +add_library(setupldr SHARED ${SETUPLDR_SOURCE}) + +if(NOT MSVC) +set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +set_image_base(setupldr 0x8000) +else() +set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +endif() + +set_subsystem(setupldr native) +set_entrypoint(setupldr mainCRTStartup) + +if(ARCH MATCHES i386) +target_link_libraries(setupldr mini_hal) +endif(ARCH MATCHES i386) + +target_link_libraries(setupldr + cportlib + rossym + cmlib + rtl + libcntpr) + +add_dependencies(setupldr asm) + +# Bootcd files +add_minicd_target(setupldr loader setupldr.sys) +add_minicd_target(freeldr loader freeldr.sys) +add_livecd_target(setupldr loader) Propchange: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native 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] Wed Dec 29 18:28:34 2010 @@ -14,7 +14,9 @@ spec2def(quartz.dll quartz.spec) -add_library(quartz SHARED +rpcproxy(quartz quartz_strmif.idl) + +list(APPEND SOURCE avidec.c acmwrapper.c waveparser.c @@ -42,10 +44,11 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) +add_library(quartz SHARED ${SOURCE}) + set_module_type(quartz win32dll) target_link_libraries(quartz - quartz_proxy strmiids uuid wine @@ -67,6 +70,4 @@ kernel32 ntdll) - -rpcproxy(quartz quartz_strmif.idl) add_cab_target(quartz 1) Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -3,6 +3,18 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(actxprxy.dll actxprxy.spec) + +rpcproxy(actxprxy + actxprxy_activscp.idl + actxprxy_comcat.idl + actxprxy_docobj.idl + actxprxy_hlink.idl + actxprxy_htiframe.idl + actxprxy_objsafe.idl + actxprxy_ocmm.idl + actxprxy_servprov.idl + actxprxy_shobjidl.idl + actxprxy_urlhist.idl) list(APPEND SOURCE usrmarshal.c @@ -13,7 +25,6 @@ set_entrypoint(actxprxy 0) target_link_libraries(actxprxy - actxprxy_proxy uuid wine ${PSEH_LIB}) @@ -27,16 +38,4 @@ add_definitions(-DREGISTER_PROXY_DLL -DPROXY_DELEGATION) -rpcproxy(actxprxy - actxprxy_activscp.idl - actxprxy_comcat.idl - actxprxy_docobj.idl - actxprxy_hlink.idl - actxprxy_htiframe.idl - actxprxy_objsafe.idl - actxprxy_ocmm.idl - actxprxy_servprov.idl - actxprxy_shobjidl.idl - actxprxy_urlhist.idl) - add_cab_target(actxprxy 1) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -71,7 +71,6 @@ target_link_libraries(ole32 wine irot_client - ole32_proxy uuid ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -48,12 +48,13 @@ spec2def(oleaut32.dll oleaut32.spec) +rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) + add_library(oleaut32 SHARED ${SOURCE}) set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 - oleaut32_proxy wine wineldr uuid @@ -61,7 +62,5 @@ add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) -rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) - add_cab_target(oleaut32 1) add_importlib_target(oleaut32.spec) Modified: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgrprx… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -14,11 +14,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) +rpcproxy(qmgrprxy qmgrprxy.idl) + add_library(qmgrprxy SHARED ${SOURCE}) -rpcproxy(qmgrprxy qmgrprxy.idl) - set_module_type(qmgrprxy win32dll) -target_link_libraries(qmgrprxy qmgrprxy_proxy ${PSEH_LIB} wine) +target_link_libraries(qmgrprxy ${PSEH_LIB} wine) add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) add_cab_target(qmgrprxy 1) Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -18,12 +18,13 @@ sti_main.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) +rpcproxy(sti sti_wia.idl) + add_library(sti SHARED ${SOURCE}) set_entrypoint(sti 0) target_link_libraries(sti - sti_proxy wine uuid ${PSEH_LIB}) @@ -36,5 +37,4 @@ kernel32 ntdll) -rpcproxy(sti sti_wia.idl) add_cab_target(sti 1) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Wed Dec 29 18:28:34 2010 @@ -8,7 +8,9 @@ spec2def(urlmon.dll urlmon.spec) -add_library(urlmon SHARED +rpcproxy(urlmon urlmon_urlmon.idl) + +list(APPEND SOURCE bindctx.c binding.c bindprot.c @@ -34,10 +36,12 @@ rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) +add_library(urlmon SHARED ${SOURCE}) + + set_module_type(urlmon win32dll) target_link_libraries(urlmon - urlmon_proxy uuid wine ${PSEH_LIB}) @@ -66,6 +70,5 @@ add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) #add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") -rpcproxy(urlmon urlmon_urlmon.idl) add_cab_target(urlmon 1) add_importlib_target(urlmon.spec)

1 0

[spetreolle] 50214: [CMAKE] Fix rpcrt4_winetest build.
by spetreolle＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: spetreolle Date: Wed Dec 29 16:12:56 2010 New Revision: 50214 URL: http://svn.reactos.org/svn/reactos?rev=50214&view=rev Log: [CMAKE] Fix rpcrt4_winetest build. Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Wed Dec 29 16:12:56 2010 @@ -6,7 +6,7 @@ -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) -MACRO_IDL_FILES(server.idl) +idl_files(server.idl) list(APPEND SOURCE cstub.c

1 0

[tkreuzer] 50213: [STLPORT] - Only use #pragma intrinsics on MSVC - Don't add function prototypes for _InterlockedXxx
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 13:35:40 2010 New Revision: 50213 URL: http://svn.reactos.org/svn/reactos?rev=50213&view=rev Log: [STLPORT] - Only use #pragma intrinsics on MSVC - Don't add function prototypes for _InterlockedXxx Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Wed Dec 29 13:35:40 2010 @@ -96,10 +96,12 @@ # if defined (_STLP_NEW_PLATFORM_SDK) && !defined(_WDMDDK_) # include <windef.h> +#ifndef InterlockedIncrement _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedIncrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedDecrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedExchange(IN OUT LONG volatile *, LONG); _STLP_IMPORT_DECLSPEC void _STLP_STDCALL Sleep(DWORD); +#endif # if defined (_WIN64) _STLP_IMPORT_DECLSPEC void* _STLP_STDCALL _InterlockedExchangePointer(void* volatile *, void*); # endif @@ -180,7 +182,7 @@ _STLP_IMPORT_DECLSPEC void _STLP_STDCALL OutputDebugStringA(const char* lpOutputString); # endif -# if defined (InterlockedIncrement) +# if defined (InterlockedIncrement) && defined(_MSC_VER) # pragma intrinsic(_InterlockedIncrement) # pragma intrinsic(_InterlockedDecrement) # pragma intrinsic(_InterlockedExchange)

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