Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 49029: [WIN32K] - Roel Messiant: Return correct address in the user heap commit routine. Should fix boot with the new heap manager.
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 07:56:26 2010 New Revision: 49029 URL: http://svn.reactos.org/svn/reactos?rev=49029&view=rev Log: [WIN32K] - Roel Messiant: Return correct address in the user heap commit routine. Should fix boot with the new heap manager. Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] Thu Oct 7 07:56:26 2010 @@ -32,7 +32,8 @@ PW32HEAP_USER_MAPPING Mapping; PVOID UserBase = NULL; NTSTATUS Status; - SIZE_T Delta = (SIZE_T)((ULONG_PTR)(*CommitAddress) - (ULONG_PTR)Base); + SIZE_T Delta; + PVOID UserCommitAddress; W32Process = PsGetCurrentProcessWin32Process(); @@ -79,18 +80,23 @@ return Status; } - /* commit! */ - UserBase = (PVOID)((ULONG_PTR)UserBase + Delta); - + /* Apply the commit address offset to the user base address */ + Delta = (SIZE_T) ((ULONG_PTR) (*CommitAddress) - (ULONG_PTR) (Base)); + UserCommitAddress = (PVOID) ((ULONG_PTR) (UserBase) + Delta); + + /* Perform the actual commit */ Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &UserBase, + &UserCommitAddress, 0, CommitSize, MEM_COMMIT, PAGE_EXECUTE_READ); + if (NT_SUCCESS(Status)) { - *CommitAddress = (PVOID)((ULONG_PTR)UserBase + Delta); + /* Determine the address to return */ + Delta = (SIZE_T) ((ULONG_PTR) (UserCommitAddress) - (ULONG_PTR) (UserBase)); + *CommitAddress = (PVOID) ((ULONG_PTR) (Base) + Delta); } if (W32Process == NULL)

1 0

[fireball] 49028: [ADVAPI32] - Roel Messiant: Properly handle STATUS_BUFFER_TOO_SMALL in RegEnumValueW implementation. See issue #2492 for more details.
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 07:21:08 2010 New Revision: 49028 URL: http://svn.reactos.org/svn/reactos?rev=49028&view=rev Log: [ADVAPI32] - Roel Messiant: Properly handle STATUS_BUFFER_TOO_SMALL in RegEnumValueW implementation. See issue #2492 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Oct 7 07:21:08 2010 @@ -2928,12 +2928,12 @@ status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + if (status && (status != STATUS_BUFFER_OVERFLOW) && (status != STATUS_BUFFER_TOO_SMALL)) goto done; if (value || data) { /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) + while ((status == STATUS_BUFFER_OVERFLOW) || (status == STATUS_BUFFER_TOO_SMALL)) { if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size )))

1 0

[mkupfer] 49027: Carlo Bramini <carlo DOT bramix AT libero DOT it> - Fix for render status bar after changing line wrap and flicker issue. - See issue #5635 for details.
by mkupfer＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: mkupfer Date: Wed Oct 6 22:11:12 2010 New Revision: 49027 URL: http://svn.reactos.org/svn/reactos?rev=49027&view=rev Log: Carlo Bramini <carlo DOT bramix AT libero DOT it> - Fix for render status bar after changing line wrap and flicker issue. - See issue #5635 for details. Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/dialog.h trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -687,53 +687,177 @@ SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); } -VOID DIALOG_EditWrap(VOID) -{ - static const TCHAR edit[] = _T("edit"); - DWORD dwStyle; - RECT rc, rcstatus; - DWORD size; +VOID DoCreateStatusBar(VOID) +{ + RECT rc; + RECT rcstatus; + BOOL bStatusBarVisible; + + // Check if status bar object already exists. + if (Globals.hStatusBar == NULL) + { + // Try to create the status bar + Globals.hStatusBar = CreateStatusWindow( + WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, + NULL, + Globals.hMainWnd, + CMD_STATUSBAR_WND_ID); + + if (Globals.hStatusBar == NULL) + { + ShowLastError(); + return; + } + + // Load the string for formatting column/row text output + LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1); + + // Set the status bar for single-text output + SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); + } + + // Set status bar visible or not accordind the the settings. + if (Globals.bWrapLongLines == TRUE || + Globals.bShowStatusBar == FALSE) + { + bStatusBarVisible = FALSE; + ShowWindow(Globals.hStatusBar, SW_HIDE); + } + else + { + bStatusBarVisible = TRUE; + ShowWindow(Globals.hStatusBar, SW_SHOW); + SendMessage(Globals.hStatusBar, WM_SIZE, 0, 0); + } + + // Set check state in show status bar item. + if (Globals.bShowStatusBar == TRUE) + { + CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_CHECKED); + } + else + { + CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_UNCHECKED); + } + + // Update menu mar with the previous changes + DrawMenuBar(Globals.hMainWnd); + + // Sefety test is edit control exists + if (Globals.hEdit != NULL) + { + // Retrieve the sizes of the controls + GetClientRect(Globals.hMainWnd, &rc); + GetClientRect(Globals.hStatusBar, &rcstatus); + + // If status bar is currently visible, update dimensions of edir control + if (bStatusBarVisible) + rc.bottom -= (rcstatus.bottom - rcstatus.top); + + // Resize edit control to right size. + MoveWindow(Globals.hEdit, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE); + } + + // Update content with current row/column text + DIALOG_StatusBarUpdateCaretPos(); +} + +VOID DoCreateEditWindow(VOID) +{ + DWORD dwStyle; + int iSize; LPTSTR pTemp; - TCHAR buff[MAX_PATH]; - - Globals.bWrapLongLines = !Globals.bWrapLongLines; - - size = GetWindowTextLength(Globals.hEdit) + 1; - pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!pTemp) + + iSize = 0; + + // If the edit control already exists, try to save its content + if (Globals.hEdit != NULL) + { + // number of chars currently written into the editor. + iSize = GetWindowTextLength(Globals.hEdit); + + if (iSize) + { + // Allocates temporary buffer. + pTemp = HeapAlloc(GetProcessHeap(), 0, (iSize + 1) * sizeof(TCHAR)); + + if (!pTemp) + { + ShowLastError(); + return; + } + + // Recover the text into the control. + GetWindowText(Globals.hEdit, pTemp, iSize + 1); + } + + // Restore original window procedure + SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)Globals.EditProc); + + // Destroy the edit control + DestroyWindow(Globals.hEdit); + } + + // Update wrap status into the main menu and recover style flags + if (Globals.bWrapLongLines) + { + dwStyle = EDIT_STYLE_WRAP; + EnableMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + } else { + dwStyle = EDIT_STYLE; + EnableMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_ENABLED); + } + + // Update previous changes + DrawMenuBar(Globals.hMainWnd); + + // Create the new edit control + Globals.hEdit = CreateWindowEx( + WS_EX_CLIENTEDGE, + EDIT_CLASS, + NULL, + dwStyle, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + Globals.hMainWnd, + NULL, + Globals.hInstance, + NULL); + + if (Globals.hEdit == NULL) { ShowLastError(); return; } - GetWindowText(Globals.hEdit, pTemp, size); - DestroyWindow(Globals.hEdit); - GetClientRect(Globals.hMainWnd, &rc); - dwStyle = Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE; - EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, - MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); - if ( Globals.hStatusBar ) - { - if ( Globals.bWrapLongLines ) - ShowWindow(Globals.hStatusBar, SW_HIDE); - else if ( Globals.bShowStatusBar ) - { - GetClientRect(Globals.hStatusBar, &rcstatus); - rc.bottom -= (rcstatus.bottom - rcstatus.top); - ShowWindow(Globals.hStatusBar, SW_SHOW); - } - } - Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, edit, NULL, dwStyle, - 0, 0, rc.right, rc.bottom, Globals.hMainWnd, - NULL, Globals.hInstance, NULL); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); - SetWindowText(Globals.hEdit, pTemp); + + // If some text was previously saved, restore it. + if (iSize != 0) + { + SetWindowText(Globals.hEdit, pTemp); + HeapFree(GetProcessHeap(), 0, pTemp); + } + + // Sub-class a new window callback for row/column detection. + Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); + + // Create/update status bar + DoCreateStatusBar(); + + // Finally shows new edit control and set focus into it. + ShowWindow(Globals.hEdit, SW_SHOW); SetFocus(Globals.hEdit); - Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); - _stprintf(buff, Globals.szStatusBarLineCol, 1, 1); - SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff); - HeapFree(GetProcessHeap(), 0, pTemp); - DrawMenuBar(Globals.hMainWnd); +} + +VOID DIALOG_EditWrap(VOID) +{ + Globals.bWrapLongLines = !Globals.bWrapLongLines; + + DoCreateEditWindow(); } VOID DIALOG_SelectFont(VOID) @@ -887,27 +1011,9 @@ VOID DIALOG_ViewStatusBar(VOID) { - RECT rc; - RECT rcstatus; - - Globals.bShowStatusBar = !Globals.bShowStatusBar; - if ( !Globals.hStatusBar ) - { - Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, TEXT("test"), Globals.hMainWnd, CMD_STATUSBAR_WND_ID ); - LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1); - SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); - } - CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, - MF_BYCOMMAND | (Globals.bShowStatusBar ? MF_CHECKED : MF_UNCHECKED)); - DrawMenuBar(Globals.hMainWnd); - GetClientRect(Globals.hMainWnd, &rc); - GetClientRect(Globals.hStatusBar, &rcstatus); - if ( Globals.bShowStatusBar ) - rc.bottom -= (rcstatus.bottom - rcstatus.top); - - MoveWindow(Globals.hEdit, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE); - ShowWindow(Globals.hStatusBar, Globals.bShowStatusBar); - DIALOG_StatusBarUpdateCaretPos(); + Globals.bShowStatusBar = !Globals.bShowStatusBar; + + DoCreateStatusBar(); } VOID DIALOG_HelpContents(VOID) Modified: trunk/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -63,3 +63,5 @@ BOOL HasFileExtension(LPCTSTR szFilename); BOOL DoCloseFile(void); void DoOpenFile(LPCTSTR szFileName); +VOID DoCreateStatusBar(VOID); +VOID DoCreateEditWindow(VOID); Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -29,9 +29,9 @@ VOID NOTEPAD_EnableSearchMenu() { - EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH, + EnableMenuItem(Globals.hMenu, CMD_SEARCH, MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); - EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH_NEXT, + EnableMenuItem(Globals.hMenu, CMD_SEARCH_NEXT, MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); } @@ -334,23 +334,8 @@ switch (msg) { case WM_CREATE: - { - static const TCHAR edit[] = _T("edit"); - RECT rc; - GetClientRect(hWnd, &rc); - Globals.hEdit = CreateWindowEx(EDIT_EXSTYLE, edit, NULL, Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE, - 0, 0, rc.right, rc.bottom, hWnd, - NULL, Globals.hInstance, NULL); - if (!Globals.hEdit) - return -1; - SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); - if (Globals.hFont) - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE); - - Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); - - break; - } + Globals.hMenu = GetMenu(hWnd); + break; case WM_COMMAND: if (HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == EN_HSCROLL || HIWORD(wParam) == EN_VSCROLL) @@ -386,7 +371,8 @@ case WM_SIZE: { - if (Globals.bShowStatusBar) + if (Globals.bShowStatusBar == TRUE && + Globals.bWrapLongLines == FALSE) { RECT rcStatusBar; HDWP hdwp; @@ -412,6 +398,12 @@ break; } + + // The entire client area is covered by edit control and by + // the status bar. So there is no need to erase main background. + // This resolves the horrible fliker effect during windows resizes. + case WM_ERASEBKGND: + return 1; case WM_SETFOCUS: SetFocus(Globals.hEdit); @@ -613,6 +605,8 @@ ExitProcess(1); } + DoCreateEditWindow(); + NOTEPAD_InitData(); DIALOG_FileNew(); Modified: trunk/reactos/base/applications/notepad/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.h [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -23,10 +23,11 @@ #include "notepad_res.h" -#define EDIT_STYLE_WRAP (WS_CHILD | WS_VISIBLE | WS_VSCROLL \ +#define EDIT_STYLE_WRAP (WS_CHILD | WS_VSCROLL \ | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL) #define EDIT_STYLE (EDIT_STYLE_WRAP | WS_HSCROLL | ES_AUTOHSCROLL) -#define EDIT_EXSTYLE (WS_EX_CLIENTEDGE) + +#define EDIT_CLASS _T("EDIT") #define MAX_STRING_LEN 255 @@ -47,6 +48,7 @@ HWND hEdit; HWND hStatusBar; HFONT hFont; /* Font used by the edit control */ + HMENU hMenu; LOGFONT lfFont; BOOL bWrapLongLines; BOOL bShowStatusBar;

1 0

[ekohl] 49026: [RTL] Change RtlLockBootStatusData prototype according to http://cookp.com/%2F/thread/1111206/how%20can%20i%20detect%20last%20boot%20success
by ekohl＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: ekohl Date: Wed Oct 6 20:43:51 2010 New Revision: 49026 URL: http://svn.reactos.org/svn/reactos?rev=49026&view=rev Log: [RTL] Change RtlLockBootStatusData prototype according to http://cookp.com/%2F/thread/1111206/how%20can%20i%20detect%20last%20boot%20… Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Oct 6 20:43:51 2010 @@ -3496,14 +3496,14 @@ NTSTATUS NTAPI RtlLockBootStatusData( - HANDLE FileHandle + OUT PHANDLE FileHandle ); NTSYSAPI NTSTATUS NTAPI RtlUnlockBootStatusData( - HANDLE FileHandle + IN HANDLE FileHandle ); #endif Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=490… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Wed Oct 6 20:43:51 2010 @@ -707,7 +707,7 @@ NTSTATUS NTAPI RtlLockBootStatusData( - HANDLE Filehandle + OUT PHANDLE Filehandle ) { UNIMPLEMENTED; @@ -720,7 +720,7 @@ NTSTATUS NTAPI RtlUnlockBootStatusData( - HANDLE Filehandle + IN HANDLE Filehandle ) { UNIMPLEMENTED;

1 0

[fireball] 49025: [NTDLL] - LoadImageFileExecutionOptions() improvements: * Apply certain heap flags if the process is being debugged (only if NtGlobalFlags is not overridden). * Implement enabling...
by fireball＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: fireball Date: Wed Oct 6 20:34:30 2010 New Revision: 49025 URL: http://svn.reactos.org/svn/reactos?rev=49025&view=rev Log: [NTDLL] - LoadImageFileExecutionOptions() improvements: * Apply certain heap flags if the process is being debugged (only if NtGlobalFlags is not overridden). * Implement enabling page heap and reading image-specific configuration values. - Add page heap configuration values to the Heap Manager. Modified: trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/lib/rtl/heap_rewrite.c trunk/reactos/lib/rtl/heapdbg.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Oct 6 20:34:30 2010 @@ -74,6 +74,10 @@ UNICODE_STRING ImageName; UNICODE_STRING ImagePathName; ULONG ValueSize; + extern ULONG RtlpPageHeapGlobalFlags, RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; + extern ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; + extern WCHAR RtlpPageHeapTargetDlls[512]; + extern BOOLEAN RtlpPageHeapEnabled; if (Peb->ProcessParameters && Peb->ProcessParameters->ImagePathName.Length > 0) @@ -113,10 +117,75 @@ Peb->NtGlobalFlag = Value; DPRINT("GlobalFlag: Value=0x%lx\n", Value); } - /* - * FIXME: - * read more options - */ + else + { + /* Add debugging flags if there is no GlobalFlags override */ + if (Peb->BeingDebugged) + { + Peb->NtGlobalFlag |= FLG_HEAP_VALIDATE_PARAMETERS | + FLG_HEAP_ENABLE_FREE_CHECK | + FLG_HEAP_ENABLE_TAIL_CHECK; + } + } + + /* Handle the case when page heap is enabled */ + if (Peb->NtGlobalFlag & FLG_HEAP_PAGE_ALLOCS) + { + /* Disable all heap debugging flags so that no heap call goes via page heap branch */ + Peb->NtGlobalFlag &= ~(FLG_HEAP_VALIDATE_PARAMETERS | + FLG_HEAP_VALIDATE_ALL | + FLG_HEAP_ENABLE_FREE_CHECK | + FLG_HEAP_ENABLE_TAIL_CHECK | + FLG_USER_STACK_TRACE_DB | + FLG_HEAP_ENABLE_TAGGING | + FLG_HEAP_ENABLE_TAG_BY_DLL); + } + + /* Get page heap flags without checking return value */ + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapFlags", + REG_DWORD, + (PVOID)&RtlpPageHeapGlobalFlags, + sizeof(RtlpPageHeapGlobalFlags), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapSizeRangeStart", + REG_DWORD, + (PVOID)&RtlpPageHeapSizeRangeStart, + sizeof(RtlpPageHeapSizeRangeStart), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapSizeRangeEnd", + REG_DWORD, + (PVOID)&RtlpPageHeapSizeRangeEnd, + sizeof(RtlpPageHeapSizeRangeEnd), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapDllRangeStart", + REG_DWORD, + (PVOID)&RtlpPageHeapDllRangeStart, + sizeof(RtlpPageHeapDllRangeStart), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapDllRangeEnd", + REG_DWORD, + (PVOID)&RtlpPageHeapDllRangeEnd, + sizeof(RtlpPageHeapDllRangeEnd), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapTargetDlls", + REG_SZ, + (PVOID)RtlpPageHeapTargetDlls, + sizeof(RtlpPageHeapTargetDlls), + &ValueSize); + + /* Now when all parameters are read, enable page heap */ + RtlpPageHeapEnabled = TRUE; } } Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Wed Oct 6 20:34:30 2010 @@ -269,7 +269,6 @@ PVOID Lock, PRTL_HEAP_PARAMETERS Parameters) { return NULL; }; -BOOLEAN RtlpSpecialHeapEnabled = FALSE; HEAP_LOCK RtlpProcessHeapsListLock; PHEAP RtlpProcessHeaps[HEAP_MAX_PROCESS_HEAPS]; /* Usermode only */ @@ -1542,7 +1541,7 @@ BOOLEAN AllocateLock = FALSE; /* Check for a special heap */ - if (RtlpSpecialHeapEnabled && !Addr && !Lock) + if (RtlpPageHeapEnabled && !Addr && !Lock) { Heap = RtlpSpecialHeapCreate(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); if (Heap) return Heap; Modified: trunk/reactos/lib/rtl/heapdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=4902… ============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Wed Oct 6 20:34:30 2010 @@ -8,6 +8,17 @@ /* INCLUDES ******************************************************************/ +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +BOOLEAN RtlpPageHeapEnabled = FALSE; +ULONG RtlpPageHeapGlobalFlags; +ULONG RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; +ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; +WCHAR RtlpPageHeapTargetDlls[512]; + /* FUNCTIONS ******************************************************************/ /* EOF */

1 0

[tkreuzer] 49024: remove svn:mergeinfo
by tkreuzer＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: tkreuzer Date: Wed Oct 6 19:36:42 2010 New Revision: 49024 URL: http://svn.reactos.org/svn/reactos?rev=49024&view=rev Log: remove svn:mergeinfo Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/ (props changed) Propchange: trunk/reactos/dll/win32/msacm32/msacm32.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Oct 6 19:36:42 2010 @@ -1,0 +1,4 @@ +/branches/header-work/dll/win32/msacm32/msacm32.drv:45691-47721 +/branches/reactos-yarotows/dll/win32/msacm32/msacm32.drv:46372,46848,46966,47800,48026,48064 +/branches/ros-amd64-bringup/dll/win32/msacm32/msacm32.drv:36852 +/branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.drv:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882

1 0

[akhaldi] 49023: [CMAKE] - Rename netevent.mc to neteventmsg.mc - Add some missing win32 dlls. By Alexey Komarov.
by akhaldi＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: akhaldi Date: Wed Oct 6 18:57:42 2010 New Revision: 49023 URL: http://svn.reactos.org/svn/reactos?rev=49023&view=rev Log: [CMAKE] - Rename netevent.mc to neteventmsg.mc - Add some missing win32 dlls. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/netid/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/security/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/sti/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libgdiplus.a (with props) branches/cmake-bringup/importlibs/libimm32.a (with props) branches/cmake-bringup/importlibs/libnetapi32.a (with props) branches/cmake-bringup/importlibs/libriched20.a (with props) branches/cmake-bringup/importlibs/librsaenh.a (with props) branches/cmake-bringup/importlibs/libsamlib.a (with props) branches/cmake-bringup/importlibs/libuserenv.a (with props) branches/cmake-bringup/importlibs/libwintrust.a (with props) branches/cmake-bringup/include/reactos/mc/neteventmsg.mc - copied unchanged from r49021, branches/cmake-bringup/include/reactos/mc/netevent.mc Removed: branches/cmake-bringup/include/reactos/mc/netevent.mc Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/netevent/netevt.rc Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -81,11 +81,11 @@ #add_subdirectory(msacm32) add_subdirectory(msadp32.acm) add_subdirectory(msafd) -#add_subdirectory(mscat32) +add_subdirectory(mscat32) add_subdirectory(mscms) add_subdirectory(mscoree) #add_subdirectory(msctf) -#add_subdirectory(msftedit) +add_subdirectory(msftedit) add_subdirectory(msg711.acm) add_subdirectory(msgina) add_subdirectory(msgsm32.acm) @@ -93,11 +93,11 @@ #add_subdirectory(mshtml.tlb) #add_subdirectory(msi) add_subdirectory(msimg32) -#add_subdirectory(msimtf) -#add_subdirectory(msisip) -#add_subdirectory(msisys.ocx) +add_subdirectory(msimtf) +add_subdirectory(msisip) +add_subdirectory(msisys.ocx) add_subdirectory(msnet32) -#add_subdirectory(msrle32) +add_subdirectory(msrle32) add_subdirectory(mssign32) add_subdirectory(mssip32) #add_subdirectory(mstask) @@ -110,84 +110,84 @@ #add_subdirectory(msxml3) add_subdirectory(nddeapi) add_subdirectory(netapi32) -#add_subdirectory(netcfgx) -#add_subdirectory(netevent) -#add_subdirectory(netid) -#add_subdirectory(netshell) +add_subdirectory(netcfgx) +add_subdirectory(netevent) +add_subdirectory(netid) +add_subdirectory(netshell) add_subdirectory(newdev) add_subdirectory(ntdsapi) add_subdirectory(ntlanman) -#add_subdirectory(ntmarta) +add_subdirectory(ntmarta) add_subdirectory(ntprint) -#add_subdirectory(objsel) -#add_subdirectory(odbc32) -#add_subdirectory(odbccp32) +add_subdirectory(objsel) +add_subdirectory(odbc32) +add_subdirectory(odbccp32) #add_subdirectory(ole32) -#add_subdirectory(oleacc) +add_subdirectory(oleacc) #add_subdirectory(oleaut32) add_subdirectory(olecli32) add_subdirectory(oledlg) -#add_subdirectory(olepro32) +add_subdirectory(olepro32) add_subdirectory(olesvr32) add_subdirectory(olethk32) -#add_subdirectory(opengl32) -#add_subdirectory(pdh) +add_subdirectory(opengl32) +add_subdirectory(pdh) add_subdirectory(pidgen) add_subdirectory(powrprof) add_subdirectory(printui) -#add_subdirectory(psapi) +add_subdirectory(psapi) #add_subdirectory(pstorec) #add_subdirectory(qmgr) #add_subdirectory(qmgrprxy) add_subdirectory(query) -#add_subdirectory(rasadhlp) +add_subdirectory(rasadhlp) add_subdirectory(rasapi32) add_subdirectory(rasdlg) add_subdirectory(rasman) add_subdirectory(resutils) -#add_subdirectory(riched20) -#add_subdirectory(riched32) +add_subdirectory(riched20) +add_subdirectory(riched32) #add_subdirectory(rpcrt4) -#add_subdirectory(rsabase) -#add_subdirectory(rsaenh) +add_subdirectory(rsabase) +add_subdirectory(rsaenh) add_subdirectory(samlib) add_subdirectory(samsrv) add_subdirectory(sccbase) add_subdirectory(schannel) -#add_subdirectory(secur32) -#add_subdirectory(security) +add_subdirectory(secur32) +add_subdirectory(security) add_subdirectory(sensapi) add_subdirectory(serialui) -#add_subdirectory(setupapi) -#add_subdirectory(sfc) -#add_subdirectory(sfc_os) +add_subdirectory(setupapi) +add_subdirectory(sfc) +add_subdirectory(sfc_os) add_subdirectory(shdoclc) #add_subdirectory(shdocvw) #add_subdirectory(shell32) add_subdirectory(shfolder) -#add_subdirectory(shimgvw) +add_subdirectory(shimgvw) add_subdirectory(shlwapi) add_subdirectory(slbcsp) add_subdirectory(smdll) add_subdirectory(sndblst) add_subdirectory(snmpapi) -#add_subdirectory(softpub) +add_subdirectory(softpub) add_subdirectory(spoolss) add_subdirectory(srclient) #add_subdirectory(stdole2.tlb) #add_subdirectory(stdole32.tlb) #add_subdirectory(sti) add_subdirectory(sxs) -#add_subdirectory(syssetup) +add_subdirectory(syssetup) add_subdirectory(t2embed) add_subdirectory(tapi32) add_subdirectory(tapiui) add_subdirectory(traffic) -#add_subdirectory(twain_32) -#add_subdirectory(uext2) -#add_subdirectory(ufat) -#add_subdirectory(ufatx) -#add_subdirectory(untfs) +add_subdirectory(twain_32) +add_subdirectory(uext2) +add_subdirectory(ufat) +add_subdirectory(ufatx) +add_subdirectory(untfs) add_subdirectory(updspapi) add_subdirectory(url) #add_subdirectory(urlmon) Added: branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscat32… ============================================================================== --- branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,21 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mscat32 ${CMAKE_CURRENT_SOURCE_DIR}/mscat32.spec ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def) + +add_library(mscat32 SHARED main.c) + +set_module_type(mscat32 win32dll) + +target_link_libraries(mscat32 + ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def + wine) + +add_importlibs(mscat32 + wintrust + kernel32 + ntdll) + +add_dependencies(mscat32 mscat32_def) Propchange: branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msftedi… ============================================================================== --- branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msftedit ${CMAKE_CURRENT_SOURCE_DIR}/msftedit.spec ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def) + +add_library(msftedit SHARED + msftedit_main.c + version.rc) + +set_module_type(msftedit win32dll) + +target_link_libraries(msftedit + ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def + uuid + wine) + +add_importlibs(msftedit + riched20 + kernel32 + ntdll) + +add_dependencies(msftedit msftedit_def) Propchange: branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimtf/… ============================================================================== --- branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,26 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msimtf ${CMAKE_CURRENT_SOURCE_DIR}/msimtf.spec ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def) + +add_library(msimtf SHARED + activeimmapp.c + main.c + rsrc.rc) + +set_module_type(msimtf win32dll) + +target_link_libraries(msimtf + ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def + uuid + wine) + +add_importlibs(msimtf + msvcrt + imm32 + kernel32 + ntdll) + +add_dependencies(msimtf msimtf_def) Propchange: branches/cmake-bringup/dll/win32/msimtf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisip/… ============================================================================== --- branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,22 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msisip ${CMAKE_CURRENT_SOURCE_DIR}/msisip.spec ${CMAKE_CURRENT_BINARY_DIR}/msisip.def) + +add_library(msisip SHARED main.c) + +set_module_type(msisip win32dll) + +target_link_libraries(msisip + ${CMAKE_CURRENT_BINARY_DIR}/msisip.def + wine) + +add_importlibs(msisip + crypt32 + ole32 + kernel32 + ntdll) + +add_dependencies(msisip msisip_def) Propchange: branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,19 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msisys ${CMAKE_CURRENT_SOURCE_DIR}/msisys.ocx.spec ${CMAKE_CURRENT_BINARY_DIR}/msisys.def) + +add_library(msisys SHARED msisys.c) + +set_module_type(msisys win32ocx) + +target_link_libraries(msisys + ${CMAKE_CURRENT_BINARY_DIR}/msisys.def + uuid + wine) + +add_importlibs(msisys kernel32 ntdll) + +add_dependencies(msisys msisys_def) Propchange: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… ============================================================================== --- branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msrle32 ${CMAKE_CURRENT_SOURCE_DIR}/msrle32.spec ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def) + +add_library(msrle32 SHARED msrle32.c rsrc.rc) + +set_module_type(msrle32 win32dll) + +target_link_libraries(msrle32 + ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def + wine) + +add_importlibs(msrle32 + msvcrt + winmm + user32 + kernel32 + ntdll) + +add_dependencies(msrle32 msrle32_def) Propchange: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/… ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,32 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-DWINVER=0x502) +add_definitions(-DWINVER=0x600) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mstask ${CMAKE_CURRENT_SOURCE_DIR}/mstask.spec ${CMAKE_CURRENT_BINARY_DIR}/mstask.def) + +add_library(mstask SHARED + factory.c + mstask_main.c + task.c + task_scheduler.c + task_trigger.c + rsrc.rc) + +set_module_type(mstask win32dll) + +target_link_libraries(mstask + ${CMAKE_CURRENT_BINARY_DIR}/mstask.def + mstask_local_interface + uuid + wine) + +add_importlibs(mstask + ole32 + ntdll) + +add_dependencies(mstask mstask_def) Propchange: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,35 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions(-D_DLL -D__USE_CRTIMP) + +spec2def(netcfgx ${CMAKE_CURRENT_SOURCE_DIR}/netcfgx.spec ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) + +add_library(netcfgx SHARED + netcfgx.c + classfactory.c + netcfg_iface.c + inetcfgcomp_iface.c + tcpipconf_notify.c + netcfgx.rc) + +set_module_type(netcfgx win32dll) + +target_link_libraries(netcfgx + ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def + uuid + wine) + +add_importlibs(netcfgx + rpcrt4 + setupapi + advapi32 + iphlpapi + ole32 + user32 + comctl32 + ws2_32 + ntdll) + +add_dependencies(netcfgx netcfgx_def) Propchange: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netcfgx… ============================================================================== --- branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,34 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(netcfgx ${CMAKE_CURRENT_SOURCE_DIR}/netcfgx.spec ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) + +add_library(netcfgx SHARED + netcfgx.c + classfactory.c + netcfg_iface.c + inetcfgcomp_iface.c + tcpipconf_notify.c + netcfgx.rc) + +set_module_type(netcfgx win32dll) + +target_link_libraries(netcfgx + ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def + uuid + wine) + +add_importlibs(netcfgx + rpcrt4 + setupapi + advapi32 + iphlpapi + ole32 + user32 + comctl32 + ws2_32 + kernel32 + ntdll) + +add_dependencies(netcfgx netcfgx_def) Propchange: branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/neteven… ============================================================================== --- branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,17 @@ + +set_unicode() + +include_directories(${REACTOS_BINARY_DIR}/include/reactos) + +spec2def(netevent ${CMAKE_CURRENT_SOURCE_DIR}/netevent.spec ${CMAKE_CURRENT_BINARY_DIR}/netevent.def) + +add_library(netevent SHARED netevent.c netevt.rc) + +set_module_type(netevent win32dll) + +target_link_libraries(netevent + ${CMAKE_CURRENT_BINARY_DIR}/netevent.def) + +add_importlibs(netevent kernel32) + +add_dependencies(netevent netevent_def neteventmsg) Propchange: branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/netevent/netevt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/neteven… ============================================================================== --- branches/cmake-bringup/dll/win32/netevent/netevt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netevent/netevt.rc [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -6,4 +6,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netevent.dll\0" #include <reactos/version.rc> -#include "netevent.rc" +#include "neteventmsg.rc" Added: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/C… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,20 @@ + +spec2def(netid ${CMAKE_CURRENT_SOURCE_DIR}/netid.spec ${CMAKE_CURRENT_BINARY_DIR}/netid.def) + +add_library(netid SHARED netid.c netid.rc) + +set_module_type(netid win32dll) + +target_link_libraries(netid + ${CMAKE_CURRENT_BINARY_DIR}/netid.def) + +add_importlibs(netid + user32 + gdi32 + comctl32 + advapi32 + netapi32 + kernel32 + ntdll) + +add_dependencies(netid netid_def) Propchange: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netshel… ============================================================================== --- branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,44 @@ + +add_definitions(-D_NETSHELL_) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(netshell ${CMAKE_CURRENT_SOURCE_DIR}/netshell.spec ${CMAKE_CURRENT_BINARY_DIR}/netshell.def) + +list(APPEND SOURCE + netshell.c + shfldr_netconnect.c + enumlist.c + netshell.rc + classfactory.c + connectmanager.c + lanconnectui.c + lanstatusui.c) + +add_library(netshell SHARED + ${CMAKE_CURRENT_BINARY_DIR}/netshell_precomp.h.gch + ${SOURCE}) + +set_module_type(netshell win32dll) + +target_link_libraries(netshell + ${CMAKE_CURRENT_BINARY_DIR}/netshell.def + uuid + wine) + +add_importlibs(netshell + msvcrt + shlwapi + shell32 + version + iphlpapi + ole32 + user32 + advapi32 + setupapi + ws2_32 + comctl32 + kernel32) + +add_pch(netshell ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(netshell netshell_def) Propchange: branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… ============================================================================== --- branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,23 @@ + +set_unicode() + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(ntmarta ${CMAKE_CURRENT_SOURCE_DIR}/ntmarta.spec ${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def) + +add_library(ntmarta SHARED ntmarta.c ntmarta.rc) + +set_module_type(ntmarta win32dll) + +target_link_libraries(ntmarta + ${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def) + +add_importlibs(ntmarta + user32 + advapi32 + kernel32 + ntdll) + +add_dependencies(ntmarta ntmarta_def) Propchange: branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… ============================================================================== --- branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,30 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(objsel ${CMAKE_CURRENT_SOURCE_DIR}/objsel.spec ${CMAKE_CURRENT_BINARY_DIR}/objsel.def) + +add_library(objsel SHARED + factory.c + objsel.c + regsvr.c + objsel.rc) + +set_module_type(objsel win32dll) + +target_link_libraries(objsel + ${CMAKE_CURRENT_BINARY_DIR}/objsel.def + uuid + wine) + +add_importlibs(objsel + ole32 + user32 + advapi32 + kernel32 + ntdll) + +add_dependencies(objsel objsel_def) Propchange: branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/odbc32/… ============================================================================== --- branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(odbc32 ${CMAKE_CURRENT_SOURCE_DIR}/odbc32.spec ${CMAKE_CURRENT_BINARY_DIR}/odbc32.def) + +add_library(odbc32 SHARED proxyodbc.c) + +set_module_type(odbc32 win32dll) + +target_link_libraries(odbc32 + ${CMAKE_CURRENT_BINARY_DIR}/odbc32.def + wine) + +add_importlibs(odbc32 + msvcrt + advapi32 + kernel32 + ntdll) + +add_dependencies(odbc32 odbc32_def) Propchange: branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/odbccp3… ============================================================================== --- branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(odbccp32 ${CMAKE_CURRENT_SOURCE_DIR}/odbccp32.spec ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def) + +add_library(odbccp32 SHARED odbccp32.c) + +set_entrypoint(odbccp32 0) + +target_link_libraries(odbccp32 + ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def + uuid + wine) + +add_importlibs(odbccp32 + msvcrt + advapi32 + kernel32 + ntdll) + +add_dependencies(odbccp32 odbccp32_def) Propchange: branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleacc/… ============================================================================== --- branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,21 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(oleacc ${CMAKE_CURRENT_SOURCE_DIR}/oleacc.spec ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def) + +add_library(oleacc SHARED main.c oleacc.rc) + +set_entrypoint(oleacc 0) + +target_link_libraries(oleacc + ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def + wine) + +add_importlibs(oleacc + user32 + kernel32 + ntdll) + +add_dependencies(oleacc oleacc_def) Propchange: branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro3… ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,21 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(olepro32 ${CMAKE_CURRENT_SOURCE_DIR}/olepro32.spec ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def) + +add_library(olepro32 SHARED olepro32stubs.c version.rc) + +set_entrypoint(olepro32 0) + +target_link_libraries(olepro32 + ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def + wine) + +add_importlibs(olepro32 + oleaut32 + kernel32 + ntdll) + +add_dependencies(olepro32 olepro32_def) Propchange: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/opengl3… ============================================================================== --- branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,33 @@ + +set_unicode() + +add_definitions(-D_DLL -D__USE_CRTIMP) + +spec2def(opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.spec ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def) + +list(APPEND SOURCE + font.c + gl.c + opengl32.c + wgl.c) + +add_library(opengl32 SHARED + ${CMAKE_CURRENT_BINARY_DIR}/opengl32_opengl32.h.gch + ${SOURCE}) + +set_module_type(opengl32 win32dll) + +target_link_libraries(opengl32 + ${CMAKE_CURRENT_BINARY_DIR}/opengl32.def) + +add_importlibs(opengl32 + msvcrt + gdi32 + user32 + advapi32 + glu32 + kernel32 + ntdll) + +add_pch(opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.h ${SOURCE}) +add_dependencies(opengl32 opengl32_def) Propchange: branches/cmake-bringup/dll/win32/opengl32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pdh/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,19 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(pdh ${CMAKE_CURRENT_SOURCE_DIR}/pdh.spec ${CMAKE_CURRENT_BINARY_DIR}/pdh.def) + +add_library(pdh SHARED pdh_main.c) + +set_entrypoint(pdh 0) + +target_link_libraries(pdh + ${CMAKE_CURRENT_BINARY_DIR}/pdh.def + wine) + +add_importlibs(pdh kernel32 ntdll) +add_dependencies(pdh pdh_def) Propchange: branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,22 @@ + +spec2def(psapi ${CMAKE_CURRENT_SOURCE_DIR}/psapi.spec ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) + +list(APPEND SOURCE + malloc.c + psapi.c + psapi.rc) + +add_library(psapi SHARED + ${CMAKE_CURRENT_BINARY_DIR}/psapi_precomp.h.gch + ${SOURCE}) + +set_module_type(psapi win32dll) + +target_link_libraries(psapi + ${CMAKE_CURRENT_BINARY_DIR}/psapi.def + epsapi + pseh) + +add_importlibs(psapi kernel32 ntdll) +add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(psapi psapi_def) Propchange: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasadhl… ============================================================================== --- branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,21 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) + +spec2def(rasadhlp ${CMAKE_CURRENT_SOURCE_DIR}/rasadhlp.spec ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def) + +add_library(rasadhlp SHARED + autodial.c + init.c + winsock.c) + +set_module_type(rasadhlp win32dll) + +target_link_libraries(rasadhlp + ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def) + +add_importlibs(rasadhlp + ws2_32 + kernel32 + ntdll) + +add_dependencies(rasadhlp rasadhlp_def) Propchange: branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,52 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(riched20 ${CMAKE_CURRENT_SOURCE_DIR}/riched20.spec ${CMAKE_CURRENT_BINARY_DIR}/riched20.def) + +add_library(riched20 SHARED + caret.c + clipboard.c + context.c + editor.c + list.c + paint.c + para.c + reader.c + richole.c + row.c + run.c + string.c + style.c + table.c + txthost.c + txtsrv.c + undo.c + wrap.c + writer.c + version.rc) + +set_module_type(riched20 win32dll) + +target_link_libraries(riched20 + ${CMAKE_CURRENT_BINARY_DIR}/riched20.def + wine + uuid) + +if(MSVC) + set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") +endif(MSVC) + +add_importlibs(riched20 + msvcrt + ole32 + oleaut32 + imm32 + user32 + gdi32 + kernel32 + ntdll) + +add_dependencies(riched20 riched20_def) Propchange: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,17 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(riched32 ${CMAKE_CURRENT_SOURCE_DIR}/riched32.spec ${CMAKE_CURRENT_BINARY_DIR}/riched32.def) + +add_library(riched32 SHARED richedit.c version.rc) + +set_module_type(riched32 win32dll) + +target_link_libraries(riched32 + ${CMAKE_CURRENT_BINARY_DIR}/riched32.def + wine) + +add_importlibs(riched32 riched20 user32 kernel32 ntdll) +add_dependencies(riched32 riched32_def) Propchange: branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase… ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,17 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(rsabase ${CMAKE_CURRENT_SOURCE_DIR}/rsabase.spec ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def) + +add_library(rsabase SHARED version.rc) + +set_entrypoint(rsabase 0) + +target_link_libraries(rsabase + ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def + wine) + +add_importlibs(rsabase rsaenh ntdll) +add_dependencies(rsabase rsabase_def) Propchange: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,31 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(rsaenh ${CMAKE_CURRENT_SOURCE_DIR}/rsaenh.spec ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) + +add_library(rsaenh SHARED + aes.c + des.c + handle.c + implglue.c + md2.c + mpi.c + rc2.c + rc4.c + rsa.c + rsaenh.c + sha2.c + version.rc) + +set_module_type(rsaenh win32dll) + +target_link_libraries(rsaenh + ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def + wine) + +add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) + +add_dependencies(rsaenh rsaenh_def) Propchange: branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32… ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,26 @@ + +add_definitions(-D__SECUR32__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + +spec2def(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/secur32.spec ${CMAKE_CURRENT_BINARY_DIR}/secur32.def) + +list(APPEND SOURCE + dllmain.c + secext.c + sspi.c + secur32.rc) + +add_library(secur32 SHARED + ${CMAKE_CURRENT_BINARY_DIR}/secur32_precomp.h.gch + ${SOURCE}) + +set_module_type(secur32 win32dll) + +target_link_libraries(secur32 + ${CMAKE_CURRENT_BINARY_DIR}/secur32.def + lsalib) + +add_importlibs(secur32 advapi32 kernel32 ntdll) +add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(secur32 secur32_def) Propchange: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/security/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/securit… ============================================================================== --- branches/cmake-bringup/dll/win32/security/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/security/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,15 @@ + +set_unicode() + +add_definitions(-D__SECURITY__) + +spec2def(security ${CMAKE_CURRENT_SOURCE_DIR}/security.spec ${CMAKE_CURRENT_BINARY_DIR}/security.def) + +add_library(security SHARED security.rc) + +set_entrypoint(security 0) + +target_link_libraries(security ${CMAKE_CURRENT_BINARY_DIR}/security.def) + +add_importlibs(security advapi32 ntdll) +add_dependencies(security security_def) Propchange: branches/cmake-bringup/dll/win32/security/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,57 @@ + +set_unicode() + +add_definitions( + -D_DLL + -D__USE_CRTIMP + -D_SETUPAPI_ + -D_CFGMGR32_ + -Dwcsnicmp=_wcsnicmp) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_BINARY_DIR}/include/reactos/idl) + +spec2def(setupapi ${CMAKE_CURRENT_SOURCE_DIR}/setupapi.spec ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def) + +add_library(setupapi SHARED + cfgmgr.c + devclass.c + devinst.c + dirid.c + diskspace.c + driver.c + install.c + interface.c + misc.c + parser.c + query.c + queue.c + setupcab.c + stringtable.c + stubs.c + rpc.c + setupapi.rc) + +set_module_type(setupapi win32dll) + +target_link_libraries(setupapi + ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def + pnp_client + uuid + wine + pseh) + +add_importlibs(setupapi + msvcrt + gdi32 + comctl32 + advapi32 + user32 + rpcrt4 + version + shell32 + kernel32 + ntdll) + +add_dependencies(setupapi setupapi_def) Propchange: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sfc/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,16 @@ + +spec2def(sfc ${CMAKE_CURRENT_SOURCE_DIR}/sfc.spec ${CMAKE_CURRENT_BINARY_DIR}/sfc.def) + +list(APPEND SOURCE sfc.c) + +add_library(sfc SHARED + ${CMAKE_CURRENT_BINARY_DIR}/sfc_precomp.h.gch + ${SOURCE}) + +set_module_type(sfc win32dll) + +target_link_libraries(sfc ${CMAKE_CURRENT_BINARY_DIR}/sfc.def) + +add_importlibs(sfc kernel32) +add_pch(sfc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(sfc sfc_def) Propchange: branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sfc_os/… ============================================================================== --- branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,16 @@ + +spec2def(sfc_os ${CMAKE_CURRENT_SOURCE_DIR}/sfc_os.spec ${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def) + +list(APPEND SOURCE sfc_os.c) + +add_library(sfc_os SHARED + ${CMAKE_CURRENT_BINARY_DIR}/sfc_os_precomp.h.gch + ${SOURCE}) + +set_module_type(sfc_os win32dll) + +target_link_libraries(sfc_os ${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def) + +add_importlibs(sfc_os kernel32 ntdll) +add_pch(sfc_os ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(sfc_os sfc_os_def) Propchange: branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shimgvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,21 @@ + +spec2def(shimgvw ${CMAKE_CURRENT_SOURCE_DIR}/shimgvw.spec ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) + +add_library(shimgvw SHARED shimgvw.c shimgvw.rc) + +set_module_type(shimgvw win32dll) + +target_link_libraries(shimgvw + ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def + wine) + +add_importlibs(shimgvw + advapi32 + comctl32 + user32 + gdi32 + gdiplus + kernel32 + ntdll) + +add_dependencies(shimgvw shimgvw_def) Propchange: branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/softpub… ============================================================================== --- branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,17 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(softpub ${CMAKE_CURRENT_SOURCE_DIR}/softpub.spec ${CMAKE_CURRENT_BINARY_DIR}/softpub.def) + +add_library(softpub SHARED softpub.rc) + +set_entrypoint(softpub 0) + +target_link_libraries(softpub + ${CMAKE_CURRENT_BINARY_DIR}/softpub.def + wine) + +add_importlibs(softpub wintrust) + +add_dependencies(softpub softpub_def) Propchange: branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,36 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) +add_definitions(-DENTRY_PREFIX=STI_) +add_definitions(-DPROXY_DELEGATION) +add_definitions(-DREGISTER_PROXY_DLL) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(sti ${CMAKE_CURRENT_SOURCE_DIR}/sti.spec ${CMAKE_CURRENT_BINARY_DIR}/sti.def) + +add_library(sti SHARED + regsvr.c + sti.c + sti_main.c + sti_wia.idl)# not sure + +set_entrypoint(sti 0) + +target_link_libraries(sti + ${CMAKE_CURRENT_BINARY_DIR}/sti.def + sti_proxy + wine + uuid + pseh) + +add_importlibs(sti + ole32 + oleaut32 + rpcrt4 + advapi32 + kernel32 + ntdll) + +add_dependencies(sti sti_def) Propchange: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu… ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,38 @@ + +set_unicode() + +add_definitions(-D_DLL -D__USE_CRTIMP) + +spec2def(syssetup ${CMAKE_CURRENT_SOURCE_DIR}/syssetup.spec ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def) + +add_library(syssetup SHARED + classinst.c + dllmain.c + install.c + logfile.c + wizard.c + syssetup.rc) + +set_module_type(syssetup win32dll) + +target_link_libraries(syssetup + ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def + uuid + pseh) + +add_importlibs(syssetup + msvcrt + advapi32 + gdi32 + user32 + samlib + userenv + comctl32 + setupapi + ole32 + shell32 + shlwapi + kernel32 + ntdll) + +add_dependencies(syssetup syssetup_def) Propchange: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_3… ============================================================================== --- branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,22 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +spec2def(twain_32 ${CMAKE_CURRENT_SOURCE_DIR}/twain_32.spec ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def) + +add_library(twain_32 SHARED + capability.c + ds_audio.c + ds_ctrl.c + ds_image.c + dsm_ctrl.c + twain32_main.c + twain_32.rc) + +set_module_type(twain_32 win32dll) + +target_link_libraries(twain_32 + ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def + wine) + +add_importlibs(twain_32 msvcrt kernel32 ntdll) +add_dependencies(twain_32 twain_32_def) Propchange: branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/C… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,13 @@ + +spec2def(uext2 ${CMAKE_CURRENT_SOURCE_DIR}/uext2.spec ${CMAKE_CURRENT_BINARY_DIR}/uext2.def) + +add_library(uext2 SHARED uext2.c uext2.rc) + +set_module_type(uext2 win32dll) + +target_link_libraries(uext2 + ${CMAKE_CURRENT_BINARY_DIR}/uext2.def + ext2lib) + +add_importlibs(uext2 kernel32 ntdll) +add_dependencies(uext2 uext2_def) Propchange: branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,13 @@ + +spec2def(ufat ${CMAKE_CURRENT_SOURCE_DIR}/ufat.spec ${CMAKE_CURRENT_BINARY_DIR}/ufat.def) + +add_library(ufat SHARED ufat.c ufat.rc) + +set_module_type(ufat win32dll) + +target_link_libraries(ufat + ${CMAKE_CURRENT_BINARY_DIR}/ufat.def + vfatlib) + +add_importlibs(ufat kernel32 ntdll) +add_dependencies(ufat ufat_def) Propchange: branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,13 @@ + +spec2def(ufatx ${CMAKE_CURRENT_SOURCE_DIR}/ufatx.spec ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) + +add_library(ufatx SHARED ufatx.rc) + +set_entrypoint(ufatx 0) + +target_link_libraries(ufatx + ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def + vfatxlib) + +add_importlibs(ufatx gcc kernel32 ntdll) +add_dependencies(ufatx ufatx_def) Propchange: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,13 @@ + +spec2def(untfs ${CMAKE_CURRENT_SOURCE_DIR}/untfs.spec ${CMAKE_CURRENT_BINARY_DIR}/untfs.def) + +add_library(untfs SHARED untfs.c untfs.rc) + +set_module_type(untfs win32dll) + +target_link_libraries(untfs + ${CMAKE_CURRENT_BINARY_DIR}/untfs.def + ntfslib) + +add_importlibs(untfs kernel32 ntdll) +add_dependencies(untfs untfs_def) Propchange: branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Wed Oct 6 18:57:42 2010 @@ -1,0 +1,56 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(urlmon ${CMAKE_CURRENT_SOURCE_DIR}/urlmon.spec ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) + +add_library(urlmon SHARED + bindctx.c + binding.c + bindprot.c + download.c + file.c + format.c + ftp.c + gopher.c + http.c + internet.c + mimefilter.c + mk.c + protocol.c + protproxy.c + regsvr.c + sec_mgr.c + session.c + umon.c + umstream.c + uri.c + urlmon_main.c + usrmarshal.c + rsrc.rc) + +set_module_type(urlmon win32dll) + +target_link_libraries(urlmon + ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def + urlmon_proxy + uuid + wine + pseh) + +add_importlibs(urlmon + rpcrt4 + ole32 + oleaut32 + shlwapi + shell32 + wininet + user32 + advapi32 + kernel32 + ntdll) + +add_dependencies(urlmon urlmon_def) Propchange: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libgdiplus.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libgdi… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libgdiplus.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libimm32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libimm… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libimm32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libnetapi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnet… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libnetapi32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libriched20.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libric… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libriched20.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/librsaenh.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librsa… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/librsaenh.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libsamlib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsam… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libsamlib.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libuserenv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libuse… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libuserenv.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libwintrust.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libwintrust.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: branches/cmake-bringup/include/reactos/mc/netevent.mc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mc/netevent.mc [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mc/netevent.mc (removed) @@ -1,53 +1,0 @@ -MessageIdTypedef=DWORD - -SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS - Informational=0x1:STATUS_SEVERITY_INFORMATIONAL - Warning=0x2:STATUS_SEVERITY_WARNING - Error=0x3:STATUS_SEVERITY_ERROR - ) - -FacilityNames=(System=0x0:FACILITY_SYSTEM - ) - -LanguageNames=(English=0x409:MSG00409) - -MessageId=6005 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogStarted -Language=English -The Event log service was started. -. - -MessageId=6006 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogStopped -Language=English -The Event log service was stopped. -. - -MessageId=6009 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogProductInfo -Language=English -ReactOS %1 %2 %3 %4. -. - - -MessageId=9004 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSPORT_REGISTER_FAILED -Language=English -%2 failed to register itself with the NDIS wrapper. -. - -MessageId=9006 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSPORT_ADAPTER_NOT_FOUND -Language=English -%2 could not find adapter %3. -.

1 0

[fireball] 49022: - Respectively fix incorrect data type for GlobalFlags in ReactOS registry.
by fireball＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: fireball Date: Wed Oct 6 17:25:15 2010 New Revision: 49022 URL: http://svn.reactos.org/svn/reactos?rev=49022&view=rev Log: - Respectively fix incorrect data type for GlobalFlags in ReactOS registry. Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Wed Oct 6 17:25:15 2010 @@ -124,10 +124,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ports","LPT3:",2,"" ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe) -HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\soffice.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00000000,"0x00000002" +HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\soffice.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00010001,0x00000002 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midimapper",0x00000000,"midimap.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"msacm32.drv" Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Wed Oct 6 17:25:15 2010 @@ -50,10 +50,10 @@ ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe) -HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\soffice.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00000000,"0x00000002" +HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\soffice.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00010001,0x00000002 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midimapper",0x00000000,"midimap.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"msacm32.drv" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Wed Oct 6 17:25:15 2010 @@ -124,10 +124,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ports","LPT3:",2,"" ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe) -HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\soffice.exe","GlobalFlag",0x00000000,"0x00000002" -;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00000000,"0x00000002" +HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loadlib.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\soffice.exe","GlobalFlag",0x00010001,0x00000002 +;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00010001,0x00000002 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midimapper",0x00000000,"midimap.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"msacm32.drv"

1 0

[fireball] 49021: [NTDLL] - Fix loading of GlobalFlags in Image File Execution Options. I really wonder who had that brilliant idea that bitwise flags would be stored as a string in the registry. -...
by fireball＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: fireball Date: Wed Oct 6 17:18:22 2010 New Revision: 49021 URL: http://svn.reactos.org/svn/reactos?rev=49021&view=rev Log: [NTDLL] - Fix loading of GlobalFlags in Image File Execution Options. I really wonder who had that brilliant idea that bitwise flags would be stored as a string in the registry. - If there is a GlobalFlags value specified in the registr for that specific image, it means that value should overwrite NtGlobalFlags. Fix that too (previously it was ORing which made no sense). Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Oct 6 17:18:22 2010 @@ -71,10 +71,8 @@ { NTSTATUS Status = STATUS_SUCCESS; ULONG Value = 0; - UNICODE_STRING ValueString; UNICODE_STRING ImageName; UNICODE_STRING ImagePathName; - WCHAR ValueBuffer[64]; ULONG ValueSize; if (Peb->ProcessParameters && @@ -106,21 +104,14 @@ /* global flag */ Status = LdrQueryImageFileExecutionOptions(&ImageName, L"GlobalFlag", - REG_SZ, - (PVOID)ValueBuffer, - sizeof(ValueBuffer), + REG_DWORD, + (PVOID)&Value, + sizeof(Value), &ValueSize); if (NT_SUCCESS(Status)) { - ValueString.Buffer = ValueBuffer; - ValueString.Length = ValueSize - sizeof(WCHAR); - ValueString.MaximumLength = sizeof(ValueBuffer); - Status = RtlUnicodeStringToInteger(&ValueString, 16, &Value); - if (NT_SUCCESS(Status)) - { - Peb->NtGlobalFlag |= Value; - DPRINT("GlobalFlag: Key='%S', Value=0x%lx\n", ValueBuffer, Value); - } + Peb->NtGlobalFlag = Value; + DPRINT("GlobalFlag: Value=0x%lx\n", Value); } /* * FIXME:

1 0

[khornicek] 49020: [CMD] Use the full name we get from SearchForExecutable when building the command line for CreateProcess so we get proper name in argv[0] later.
by khornicek＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: khornicek Date: Wed Oct 6 16:44:09 2010 New Revision: 49020 URL: http://svn.reactos.org/svn/reactos?rev=49020&view=rev Log: [CMD] Use the full name we get from SearchForExecutable when building the command line for CreateProcess so we get proper name in argv[0] later. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Wed Oct 6 16:44:09 2010 @@ -316,6 +316,7 @@ TCHAR szWindowTitle[MAX_PATH]; DWORD dwExitCode = 0; TCHAR *FirstEnd; + TCHAR szFullCmdLine [CMDLINE_LENGTH]; TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(First), debugstr_aw(Rest)); @@ -392,11 +393,16 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; - /* build command line for CreateProcess(): first + " " + rest */ + /* build command line for CreateProcess(): FullName + " " + rest */ + _tcscpy(szFullCmdLine, szFullName); + if (*rest) - rest[-1] = _T(' '); - - TRACE ("[EXEC: %s]\n", debugstr_aw(Full)); + { + _tcsncat(szFullCmdLine, _T(" "), CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + _tcsncat(szFullCmdLine, rest, CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + } + + TRACE ("[EXEC: %s]\n", debugstr_aw(szFullCmdLine)); /* fill startup info */ memset (&stui, 0, sizeof (STARTUPINFO)); @@ -409,7 +415,7 @@ ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); if (CreateProcess (szFullName, - Full, + szFullCmdLine, NULL, NULL, TRUE, Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Wed Oct 6 16:44:09 2010 @@ -246,14 +246,14 @@ else { TRACE ("[EXEC: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(Rest)); - _tcscpy(szFullCmdLine, Rest); + _tcscpy(szFullCmdLine, szFullName); } /* build command line for CreateProcess() */ if (param != NULL) { - _tcscat(szFullCmdLine, _T(" ")); - _tcscat(szFullCmdLine, param); + _tcsncat(szFullCmdLine, _T(" "), CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + _tcsncat(szFullCmdLine, param, CMDLINE_LENGTH - _tcslen(szFullCmdLine)); } /* fill startup info */

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