Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 53980: [WINLOGON] Do not call HandleShutdown() with NULL Session.
by dgorbachev＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: dgorbachev Date: Mon Oct 3 22:33:14 2011 New Revision: 53980 URL: http://svn.reactos.org/svn/reactos?rev=53980&view=rev Log: [WINLOGON] Do not call HandleShutdown() with NULL Session. Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Mon Oct 3 22:33:14 2011 @@ -368,7 +368,6 @@ if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) { ERR("WL: Could not register logon process\n"); - HandleShutdown(NULL, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); NtShutdownSystem(ShutdownNoReboot); ExitProcess(0); }

1 0

[dgorbachev] 53979: [INTRIN] Use "unsigned int" for x86 __writecr*(), as it is (reportedly) used in VS10 headers.
by dgorbachev＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: dgorbachev Date: Mon Oct 3 20:57:43 2011 New Revision: 53979 URL: http://svn.reactos.org/svn/reactos?rev=53979&view=rev Log: [INTRIN] Use "unsigned int" for x86 __writecr*(), as it is (reportedly) used in VS10 headers. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Mon Oct 3 20:57:43 2011 @@ -1235,6 +1235,7 @@ /*** Protected memory management ***/ +#ifdef _M_AMD64 __INTRIN_INLINE void __writecr0(const unsigned __int64 Data) { __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); @@ -1250,7 +1251,6 @@ __asm__("mov %[Data], %%cr4" : : [Data] "r" (Data) : "memory"); } -#ifdef _M_AMD64 __INTRIN_INLINE void __writecr8(const unsigned __int64 Data) { __asm__("mov %[Data], %%cr8" : : [Data] "r" (Data) : "memory"); @@ -1291,6 +1291,21 @@ return value; } #else +__INTRIN_INLINE void __writecr0(const unsigned int Data) +{ + __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); +} + +__INTRIN_INLINE void __writecr3(const unsigned int Data) +{ + __asm__("mov %[Data], %%cr3" : : [Data] "r" (Data) : "memory"); +} + +__INTRIN_INLINE void __writecr4(const unsigned int Data) +{ + __asm__("mov %[Data], %%cr4" : : [Data] "r" (Data) : "memory"); +} + __INTRIN_INLINE unsigned long __readcr0(void) { unsigned long value;

1 0

[dgorbachev] 53978: [NTOSKRNL] - Do not access an object after destruction. - Remove the remaining mentions of a function which Sir Richard defeated a year ago.
by dgorbachev＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: dgorbachev Date: Mon Oct 3 20:57:38 2011 New Revision: 53978 URL: http://svn.reactos.org/svn/reactos?rev=53978&view=rev Log: [NTOSKRNL] - Do not access an object after destruction. - Remove the remaining mentions of a function which Sir Richard defeated a year ago. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Oct 3 20:57:38 2011 @@ -13,8 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -VOID MmPrintMemoryStatistic(VOID); FAST_MUTEX ExpEnvironmentLock; ERESOURCE ExpFirmwareTableResource; @@ -1297,10 +1295,6 @@ TheIdleProcess->Pcb.KernelTime, MiFreeSwapPages, MiUsedSwapPages); - -#ifndef NDEBUG - MmPrintMemoryStatistic(); -#endif *Spi = MiMemoryConsumers[MC_USER].PagesUsed; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Mon Oct 3 20:57:38 2011 @@ -753,12 +753,10 @@ /* Return to caller */ OBTRACE(OB_HANDLE_DEBUG, - "%s - Closed handle: %lx for %p. HC PC %lx %lx\n", + "%s - Closed handle: %lx for %p.\n", __FUNCTION__, Handle, - Body, - ObjectHeader->HandleCount, - ObjectHeader->PointerCount); + Body); return STATUS_SUCCESS; }

1 0

[pschweitzer] 53977: [USER32] Fix memory leak
by pschweitzer＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: pschweitzer Date: Mon Oct 3 20:42:38 2011 New Revision: 53977 URL: http://svn.reactos.org/svn/reactos?rev=53977&view=rev Log: [USER32] Fix memory leak Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Mon Oct 3 20:42:38 2011 @@ -885,6 +885,7 @@ &UnicodeString, TRUE))) { + HeapFree(GetProcessHeap(), 0, cs); return FALSE; } cs->szClass = AnsiString.Buffer; @@ -900,6 +901,8 @@ RtlInitAnsiString(&AnsiString, cs->szClass); RtlFreeAnsiString(&AnsiString); } + + HeapFree(GetProcessHeap(), 0, cs); return FALSE; } cs->szTitle = AnsiString.Buffer;

1 0

[akhaldi] 53976: [USER32_WINETEST] * Sync with Wine 1.3.29.
by akhaldi＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: akhaldi Date: Mon Oct 3 19:49:16 2011 New Revision: 53976 URL: http://svn.reactos.org/svn/reactos?rev=53976&view=rev Log: [USER32_WINETEST] * Sync with Wine 1.3.29. Modified: trunk/rostests/winetests/user32/combo.c trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/resource.rc trunk/rostests/winetests/user32/static.c trunk/rostests/winetests/user32/win.c trunk/rostests/winetests/user32/winstation.c Modified: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?… ============================================================================== --- trunk/rostests/winetests/user32/combo.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/combo.c [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -404,6 +404,37 @@ ok( rc.bottom - rc.top == clheight + 2, "drop-down rect height is %d vs %d\n", rc.bottom - rc.top, clheight + 2); } + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, -1, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, clwidth - 1, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, clwidth << 1, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 1, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + DestroyWindow(hCombo); } Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -1405,6 +1405,7 @@ BITMAPINFO *info; ICONINFO iinfo; DWORD ret; + int i; ret = GetIconInfo( hCursor, &iinfo ); ok(ret, "GetIconInfo() failed\n"); @@ -1430,10 +1431,11 @@ if (!image) goto cleanup; ret = GetDIBits( hdc, iinfo.hbmColor, 0, 32, image, info, DIB_RGB_COLORS ); ok(ret, "GetDIBits() failed\n"); - if (!ret) goto cleanup; - ret = (memcmp(image, data, length) == 0); - ok(ret, "Expected 0x%x, actually 0x%x (first 4 bytes only)\n", *(DWORD *)data, *(DWORD *)image); - + for (i = 0; ret && i < length / sizeof(COLORREF); i++) + { + ret = color_match( ((COLORREF *)data)[i], ((COLORREF *)image)[i] ); + ok(ret, "%04x: Expected 0x%x, actually 0x%x\n", i, ((COLORREF *)data)[i], ((COLORREF *)image)[i] ); + } cleanup: HeapFree( GetProcessHeap(), 0, image ); HeapFree( GetProcessHeap(), 0, info ); Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -736,9 +736,10 @@ */ static void test_edit_control_2(void) { - HWND hwndMain; + HWND hwndMain, phwnd; char szLocalString[MAXLEN]; - LONG r; + LONG r, w = 150, h = 50; + POINT cpos; /* Create main and edit windows. */ hwndMain = CreateWindow(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, @@ -749,7 +750,7 @@ hwndET2 = CreateWindow("EDIT", NULL, WS_CHILD|WS_BORDER|ES_LEFT|ES_AUTOHSCROLL, - 0, 0, 150, 50, /* important this not be 0 size. */ + 0, 0, w, h, /* important this not be 0 size. */ hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); assert(hwndET2); if (winetest_interactive) @@ -767,6 +768,37 @@ GetWindowText(hwndET2, szLocalString, MAXLEN); ok(lstrcmp(szLocalString, "bar")==0, "Wrong contents of edit: %s\n", szLocalString); + + /* try setting the caret before it's visible */ + r = SetCaretPos(0, 0); + todo_wine ok(0 == r, "SetCaretPos succeeded unexpectedly, expected: 0, got: %d\n", r); + phwnd = SetFocus(hwndET2); + ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL\n"); + r = SetCaretPos(0, 0); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == 0 && cpos.y == 0, "Wrong caret position, expected: (0,0), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(-1, -1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == -1 && cpos.y == -1, "Wrong caret position, expected: (-1,-1), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(w << 1, h << 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w << 1) && cpos.y == (h << 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w << 1, h << 1, cpos.x, cpos.y); + r = SetCaretPos(w, h); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == w && cpos.y == h, "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w, h, cpos.x, cpos.y); + r = SetCaretPos(w - 1, h - 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w - 1) && cpos.y == (h - 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w - 1, h - 1, cpos.x, cpos.y); /* OK, done! */ DestroyWindow (hwndET2); Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -7608,6 +7608,21 @@ return ret; } +static INT_PTR CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + if (message == WM_CREATE) + PostMessage(hwnd, WM_CLOSE, 0, 0); + else if (message == WM_CLOSE) + { + /* Only the first WM_QUIT will survive the window destruction */ + PostMessage(hwnd, WM_USER, 0x1234, 0x5678); + PostMessage(hwnd, WM_QUIT, 0x1234, 0x5678); + PostMessage(hwnd, WM_QUIT, 0x4321, 0x8765); + } + + return DefWindowProcA(hwnd, message, wp, lp); +} + static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -7788,6 +7803,10 @@ cls.lpfnWndProc = ParentMsgCheckProcA; cls.lpszClassName = "TestParentClass"; + if(!RegisterClassA(&cls)) return FALSE; + + cls.lpfnWndProc = StopQuitMsgCheckProcA; + cls.lpszClassName = "StopQuitClass"; if(!RegisterClassA(&cls)) return FALSE; cls.lpfnWndProc = DefWindowProcA; @@ -10131,6 +10150,13 @@ { 0 } }; +static const struct message WmStopQuitSeq[] = { + { WM_DWMNCRENDERINGCHANGED, posted|optional }, + { WM_CLOSE, posted }, + { WM_QUIT, posted|wparam|lparam, 0x1234, 0 }, + { 0 } +}; + static void test_quit_message(void) { MSG msg; @@ -10193,6 +10219,29 @@ ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message); ok(msg.wParam == 0x1234, "wParam was 0x%lx instead of 0x1234\n", msg.wParam); ok(msg.lParam == 0, "lParam was 0x%lx instead of 0\n", msg.lParam); + + /* Check what happens to a WM_QUIT message posted to a window that gets + * destroyed. + */ + CreateWindowExA(0, "StopQuitClass", "Stop Quit Test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, NULL, NULL, NULL, NULL); + flush_sequence(); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + struct recvd_message rmsg; + rmsg.hwnd = msg.hwnd; + rmsg.message = msg.message; + rmsg.flags = posted|wparam|lparam; + rmsg.wParam = msg.wParam; + rmsg.lParam = msg.lParam; + rmsg.descr = "stop/quit"; + if (msg.message == WM_QUIT) + /* The hwnd can only be checked here */ + ok(!msg.hwnd, "The WM_QUIT hwnd was %p instead of NULL\n", msg.hwnd); + add_message(&rmsg); + DispatchMessage(&msg); + } + ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); } static const struct message WmMouseHoverSeq[] = { Modified: trunk/rostests/winetests/user32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/resource… ============================================================================== --- trunk/rostests/winetests/user32/resource.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/resource.rc [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -45,7 +45,7 @@ 65534 "Test high id" } -TEST_DIALOG DIALOG DISCARDABLE 0, 0, 60, 30 +TEST_DIALOG DIALOG 0, 0, 60, 30 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Test dialog" FONT 8, "MS Shell Dlg" @@ -65,7 +65,7 @@ PUSHBUTTON "Cancel", IDCANCEL,109,20,50,14, WS_TABSTOP | WS_GROUP } -CLASS_TEST_DIALOG DIALOG DISCARDABLE 0, 0, 91, 28 +CLASS_TEST_DIALOG DIALOG 0, 0, 91, 28 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test" CLASS "TestDialog" @@ -73,7 +73,7 @@ { } -CLASS_TEST_DIALOG_2 DIALOG DISCARDABLE 0, 0, 100, 100 +CLASS_TEST_DIALOG_2 DIALOG 0, 0, 100, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test" CLASS "MyDialogClass" @@ -81,7 +81,7 @@ { } -FOCUS_TEST_DIALOG DIALOG DISCARDABLE 0, 0, 60, 30 +FOCUS_TEST_DIALOG DIALOG 0, 0, 60, 30 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CONTROL CAPTION "Test dialog" FONT 8, "MS Shell Dlg" @@ -89,7 +89,7 @@ EDITTEXT 200,4,4,50,14 } -IDD_DIALOG DIALOG DISCARDABLE 0, 0, 186, 95 +IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog" FONT 8, "MS Sans Serif" @@ -98,14 +98,14 @@ PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 END -TEST_EMPTY_DIALOG DIALOG DISCARDABLE 0, 0, 186, 95 +TEST_EMPTY_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog" FONT 8, "MS Sans Serif" BEGIN END -MULTI_EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 75 +MULTI_EDIT_DIALOG DIALOG 0, 0, 160, 75 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Multiple Edit Test" FONT 8, "MS Shell Dlg" @@ -115,52 +115,52 @@ EDITTEXT 1002, 5, 45, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP } -EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +EDIT_DIALOG DIALOG 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test" FONT 8, "MS Shell Dlg" { - PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL } -EDIT_SINGLELINE_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +EDIT_SINGLELINE_DIALOG DIALOG 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test" FONT 8, "MS Shell Dlg" { - PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL } -EDIT_SINGLELINE_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +EDIT_SINGLELINE_WANTRETURN_DIALOG DIALOG 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test" FONT 8, "MS Shell Dlg" { - PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN } -EDIT_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +EDIT_WANTRETURN_DIALOG DIALOG 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test" FONT 8, "MS Shell Dlg" { - PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN } -EDIT_READONLY_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +EDIT_READONLY_DIALOG DIALOG 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Readonly Test" FONT 8, "MS Shell Dlg" { - PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_READONLY } @@ -190,4 +190,5 @@ MENUITEM "&Paste", 203 MENUITEM "&Delete", 204 } + MENUITEM "&Quit", 300 } Modified: trunk/rostests/winetests/user32/static.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/static.c… ============================================================================== --- trunk/rostests/winetests/user32/static.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/static.c [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -40,6 +40,22 @@ static int g_nReceivedColorStatic = 0; +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static HWND build_static(DWORD style) { return CreateWindow("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); @@ -70,6 +86,7 @@ HWND hStatic = build_static(style); int exp; + flush_events(); trace("Testing style 0x%x\n", style); g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ @@ -122,7 +139,6 @@ hMainWnd = CreateWindow(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - UpdateWindow(hMainWnd); test_updates(0, 0); test_updates(SS_SIMPLE, 0); Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -6701,7 +6701,7 @@ if(!winetest_interactive) skip("bug 5957: skipping test_shell_window, it crashes ros/win7 explorer\n"); else - test_shell_window(); + test_shell_window(); test_handles( hwndMain ); test_winregion(); Modified: trunk/rostests/winetests/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/winstati… ============================================================================== --- trunk/rostests/winetests/user32/winstation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/winstation.c [iso-8859-1] Mon Oct 3 19:49:16 2011 @@ -108,7 +108,7 @@ HWINSTA w1, w2, w3; HDESK d1, d2, d3; HANDLE hthread; - DWORD id, flags; + DWORD id, flags, le; ATOM atom; char buffer[20]; @@ -137,16 +137,22 @@ ok( CloseHandle(w2), "closing dup win station handle failed\n" ); w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "CreateWindowStation failed\n" ); - ok( w2 != w1, "CreateWindowStation returned default handle\n" ); - SetLastError( 0xdeadbeef ); - ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - - w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); - ok( CloseHandle( w2 ), "CloseHandle failed\n" ); + le = GetLastError(); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", le ); + if (w2 != 0) + { + ok( w2 != w1, "CreateWindowStation returned default handle\n" ); + SetLastError( 0xdeadbeef ); + ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ + "bad last error %d\n", GetLastError() ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + + w2 = CreateWindowStation("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); + ok( CloseHandle( w2 ), "CloseHandle failed\n" ); + } + else if (le == ERROR_ACCESS_DENIED) + win_skip( "Not enough privileges for CreateWindowStation\n" ); w2 = OpenWindowStation("winsta0", TRUE, WINSTA_ALL_ACCESS ); ok( w2 != 0, "OpenWindowStation failed\n" ); @@ -158,38 +164,43 @@ CreateMutexA( NULL, 0, "foobar" ); w2 = CreateWindowStation("foobar", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create foobar station failed\n" ); - - w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); - ok( w3 != 0, "open foobar station failed\n" ); - ok( w3 != w2, "open foobar station returned same handle\n" ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - ok( CloseWindowStation( w3 ), "CloseWindowStation failed\n" ); - - w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); - ok( !w3, "open foobar station succeeded\n" ); - - w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create foobar station failed\n" ); - w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w3 != 0, "create foobar station failed\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w2 ); - register_class(); - atom = GlobalAddAtomA("foo"); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); - - ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w3 ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + le = GetLastError(); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "create foobar station failed (%u)\n", le ); + + if (w2 != 0) + { + w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); + ok( w3 != 0, "open foobar station failed\n" ); + ok( w3 != w2, "open foobar station returned same handle\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( CloseWindowStation( w3 ), "CloseWindowStation failed\n" ); + + w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); + ok( !w3, "open foobar station succeeded\n" ); + + w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create foobar station failed\n" ); + w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w3 != 0, "create foobar station failed\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w2 ); + atom = GlobalAddAtomA("foo"); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + + ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w3 ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + } + else if (le == ERROR_ACCESS_DENIED) + win_skip( "Not enough privileges for CreateWindowStation\n" ); /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId()); @@ -251,6 +262,7 @@ d2 = GetThreadDesktop(GetCurrentThreadId()); ok( d1 == d2, "got different handles after close\n" ); + register_class(); trace( "thread 1 desktop: %p\n", d1 ); print_object( d1 ); hthread = CreateThread( NULL, 0, thread, (LPVOID)2, 0, &id );

1 0

[akhaldi] 53975: [NTDLL_WINETEST] * Sync with Wine 1.3.29.
by akhaldi＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: akhaldi Date: Mon Oct 3 19:29:29 2011 New Revision: 53975 URL: http://svn.reactos.org/svn/reactos?rev=53975&view=rev Log: [NTDLL_WINETEST] * Sync with Wine 1.3.29. Added: trunk/rostests/winetests/ntdll/pipe.c (with props) Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/ntdll/atom.c trunk/rostests/winetests/ntdll/change.c trunk/rostests/winetests/ntdll/directory.c trunk/rostests/winetests/ntdll/env.c trunk/rostests/winetests/ntdll/error.c trunk/rostests/winetests/ntdll/exception.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/large_int.c trunk/rostests/winetests/ntdll/ntdll.rbuild trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/port.c trunk/rostests/winetests/ntdll/reg.c trunk/rostests/winetests/ntdll/rtl.c trunk/rostests/winetests/ntdll/rtlbitmap.c trunk/rostests/winetests/ntdll/rtlstr.c trunk/rostests/winetests/ntdll/string.c trunk/rostests/winetests/ntdll/testlist.c trunk/rostests/winetests/ntdll/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… Modified: trunk/rostests/winetests/ntdll/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/atom.c?re… Modified: trunk/rostests/winetests/ntdll/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/change.c?… Modified: trunk/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… Modified: trunk/rostests/winetests/ntdll/env.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/env.c?rev… Modified: trunk/rostests/winetests/ntdll/error.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/error.c?r… Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… Modified: trunk/rostests/winetests/ntdll/large_int.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/large_int… Modified: trunk/rostests/winetests/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/ntdll.rbu… Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… Added: trunk/rostests/winetests/ntdll/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/pipe.c?re… Modified: trunk/rostests/winetests/ntdll/port.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/port.c?re… Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… Modified: trunk/rostests/winetests/ntdll/rtlbitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtlbitmap… Modified: trunk/rostests/winetests/ntdll/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtlstr.c?… Modified: trunk/rostests/winetests/ntdll/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/string.c?… Modified: trunk/rostests/winetests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/testlist.… Modified: trunk/rostests/winetests/ntdll/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/time.c?re…

1 0

[akhaldi] 53974: [PSDK] * Missed this one.
by akhaldi＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: akhaldi Date: Mon Oct 3 19:27:59 2011 New Revision: 53974 URL: http://svn.reactos.org/svn/reactos?rev=53974&view=rev Log: [PSDK] * Missed this one. Modified: trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Mon Oct 3 19:27:59 2011 @@ -595,8 +595,20 @@ LARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; -typedef struct _FILE_ALL_INFORMATION -{ +typedef struct _FILE_PIPE_LOCAL_INFORMATION { + ULONG NamedPipeType; + ULONG NamedPipeConfiguration; + ULONG MaximumInstances; + ULONG CurrentInstances; + ULONG InboundQuota; + ULONG ReadDataAvailable; + ULONG OutboundQuota; + ULONG WriteQuotaAvailable; + ULONG NamedPipeState; + ULONG NamedPipeEnd; +} FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION; + +typedef struct _FILE_ALL_INFORMATION { FILE_BASIC_INFORMATION BasicInformation; FILE_STANDARD_INFORMATION StandardInformation; FILE_INTERNAL_INFORMATION InternalInformation; @@ -2483,6 +2495,7 @@ BOOLEAN SupportsObjects; WCHAR VolumeLabel[1]; } FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; +#define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #ifdef __cplusplus } /* extern "C" */

1 0

[tfaber] 53973: [CMAKE] - Fix build
by tfaber＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: tfaber Date: Mon Oct 3 19:16:59 2011 New Revision: 53973 URL: http://svn.reactos.org/svn/reactos?rev=53973&view=rev Log: [CMAKE] - Fix build Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Mon Oct 3 19:16:59 2011 @@ -31,5 +31,5 @@ add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) -add_message_headers(rappsmsg.mc) +add_message_headers(ANSI rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 53972: [PSDK] * Add some missing definitions.
by akhaldi＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: akhaldi Date: Mon Oct 3 19:11:33 2011 New Revision: 53972 URL: http://svn.reactos.org/svn/reactos?rev=53972&view=rev Log: [PSDK] * Add some missing definitions. Modified: trunk/reactos/include/psdk/ntstatus.h trunk/reactos/include/psdk/winerror.h trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntstatus.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] Mon Oct 3 19:11:33 2011 @@ -1166,6 +1166,24 @@ #define STATUS_SXS_PROCESS_TERMINATION_REQUESTED ((NTSTATUS)0xC0150013) #define STATUS_SXS_CORRUPT_ACTIVATION_STACK ((NTSTATUS)0xC0150014) #define STATUS_SXS_CORRUPTION ((NTSTATUS)0xC0150015) +#define STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE ((NTSTATUS) 0xC0150016) +#define STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME ((NTSTATUS) 0xC0150017) +#define STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE ((NTSTATUS) 0xC0150018) +#define STATUS_SXS_IDENTITY_PARSE_ERROR ((NTSTATUS) 0xC0150019) +#define STATUS_SXS_COMPONENT_STORE_CORRUPT ((NTSTATUS) 0xC015001A) +#define STATUS_SXS_FILE_HASH_MISMATCH ((NTSTATUS) 0xC015001B) +#define STATUS_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT ((NTSTATUS) 0xC015001C) +#define STATUS_SXS_IDENTITIES_DIFFERENT ((NTSTATUS) 0xC015001D) +#define STATUS_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT ((NTSTATUS) 0xC015001E) +#define STATUS_SXS_FILE_NOT_PART_OF_ASSEMBLY ((NTSTATUS) 0xC015001F) +#define STATUS_ADVANCED_INSTALLER_FAILED ((NTSTATUS) 0xC0150020) +#define STATUS_XML_ENCODING_MISMATCH ((NTSTATUS) 0xC0150021) +#define STATUS_SXS_MANIFEST_TOO_BIG ((NTSTATUS) 0xC0150022) +#define STATUS_SXS_SETTING_NOT_REGISTERED ((NTSTATUS) 0xC0150023) +#define STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE ((NTSTATUS) 0xC0150024) +#define STATUS_SXS_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) +#define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) +#define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027) #endif /* WIN32_NO_STATUS */ Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/winerror.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winerror.h [iso-8859-1] Mon Oct 3 19:11:33 2011 @@ -1,5 +1,23 @@ -#ifndef _WINERROR_H -#define _WINERROR_H +/* + * Copyright (C) the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINERROR_H +#define __WINE_WINERROR_H #define FACILITY_NULL 0 #define FACILITY_RPC 1 @@ -116,6 +134,7 @@ #define ERROR_SHARING_VIOLATION 32 #define ERROR_LOCK_VIOLATION 33 #define ERROR_WRONG_DISK 34 +#define ERROR_FCB_UNAVAILABLE 35 #define ERROR_SHARING_BUFFER_EXCEEDED 36 #define ERROR_HANDLE_EOF 38 #define ERROR_HANDLE_DISK_FULL 39 @@ -295,7 +314,161 @@ #define ERROR_ARITHMETIC_OVERFLOW 534 #define ERROR_PIPE_CONNECTED 535 #define ERROR_PIPE_LISTENING 536 +#define ERROR_INVALID_LDT_SIZE 561 +#define ERROR_INVALID_LDT_OFFSET 563 +#define ERROR_INVALID_LDT_DESCRIPTOR 564 +#define ERROR_TOO_MANY_THREADS 565 +#define ERROR_THREAD_NOT_IN_PROCESS 566 +#define ERROR_PAGEFILE_QUOTA_EXCEEDED 567 +#define ERROR_LOGON_SERVER_CONFLICT 568 +#define ERROR_SYNCHRONIZATION_REQUIRED 569 +#define ERROR_NET_OPEN_FAILED 570 +#define ERROR_IO_PRIVILEGE_FAILED 571 +#define ERROR_CONTROL_C_EXIT 572 +#define ERROR_MISSING_SYSTEMFILE 573 +#define ERROR_UNHANDLED_EXCEPTION 574 +#define ERROR_APP_INIT_FAILURE 575 +#define ERROR_PAGEFILE_CREATE_FAILED 576 +#define ERROR_INVALID_IMAGE_HASH 577 +#define ERROR_NO_PAGEFILE 578 +#define ERROR_ILLEGAL_FLOAT_CONTEXT 579 +#define ERROR_NO_EVENT_PAIR 580 +#define ERROR_DOMAIN_CTRLR_CONFIG_ERROR 581 +#define ERROR_ILLEGAL_CHARACTER 582 +#define ERROR_UNDEFINED_CHARACTER 583 +#define ERROR_FLOPPY_VOLUME 584 +#define ERROR_BIOS_FAILED_TO_CONNECT_INTERRUPT 585 +#define ERROR_BACKUP_CONTROLLER 586 +#define ERROR_MUTANT_LIMIT_EXCEEDED 587 +#define ERROR_FS_DRIVER_REQUIRED 588 +#define ERROR_CANNOT_LOAD_REGISTRY_FILE 589 +#define ERROR_DEBUG_ATTACH_FAILED 590 +#define ERROR_SYSTEM_PROCESS_TERMINATED 591 +#define ERROR_DATA_NOT_ACCEPTED 592 +#define ERROR_VDM_HARD_ERROR 593 +#define ERROR_DRIVER_CANCEL_TIMEOUT 594 +#define ERROR_REPLY_MESSAGE_MISMATCH 595 +#define ERROR_LOST_WRITEBEHIND_DATA 596 +#define ERROR_CLIENT_SERVER_PARAMETERS_INVALID 597 +#define ERROR_NOT_TINY_STREAM 598 +#define ERROR_STACK_OVERFLOW_READ 599 +#define ERROR_CONVERT_TO_LARGE 600 +#define ERROR_FOUND_OUT_OF_SCOPE 601 +#define ERROR_ALLOCATE_BUCKET 602 +#define ERROR_MARSHALL_OVERFLOW 603 +#define ERROR_INVALID_VARIANT 604 +#define ERROR_BAD_COMPRESSION_BUFFER 605 +#define ERROR_AUDIT_FAILED 606 +#define ERROR_TIMER_RESOLUTION_NOT_SET 607 +#define ERROR_INSUFFICIENT_LOGON_INFO 608 +#define ERROR_BAD_DLL_ENTRYPOINT 609 +#define ERROR_BAD_SERVICE_ENTRYPOINT 610 +#define ERROR_IP_ADDRESS_CONFLICT1 611 +#define ERROR_IP_ADDRESS_CONFLICT2 612 +#define ERROR_REGISTRY_QUOTA_LIMIT 613 +#define ERROR_NO_CALLBACK_ACTIVE 614 +#define ERROR_PWD_TOO_SHORT 615 +#define ERROR_PWD_TOO_RECENT 616 +#define ERROR_PWD_HISTORY_CONFLICT 617 +#define ERROR_UNSUPPORTED_COMPRESSION 618 +#define ERROR_INVALID_HW_PROFILE 619 +#define ERROR_INVALID_PLUGPLAY_DEVICE_PATH 620 +#define ERROR_QUOTA_LIST_INCONSISTENT 621 +#define ERROR_EVALUATION_EXPIRATION 622 +#define ERROR_ILLEGAL_DLL_RELOCATION 623 +#define ERROR_DLL_INIT_FAILED_LOGOFF 624 +#define ERROR_VALIDATE_CONTINUE 625 +#define ERROR_NO_MORE_MATCHES 626 +#define ERROR_RANGE_LIST_CONFLICT 627 +#define ERROR_SERVER_SID_MISMATCH 628 +#define ERROR_CANT_ENABLE_DENY_ONLY 629 +#define ERROR_FLOAT_MULTIPLE_FAULTS 630 +#define ERROR_FLOAT_MULTIPLE_TRAPS 631 +#define ERROR_NOINTERFACE 632 +#define ERROR_DRIVER_FAILED_SLEEP 633 +#define ERROR_CORRUPT_SYSTEM_FILE 634 +#define ERROR_COMMITMENT_MINIMUM 635 +#define ERROR_PNP_RESTART_ENUMERATION 636 +#define ERROR_SYSTEM_IMAGE_BAD_SIGNATURE 637 +#define ERROR_PNP_REBOOT_REQUIRED 638 +#define ERROR_INSUFFICIENT_POWER 639 +#define ERROR_MULTIPLE_FAULT_VIOLATION 640 +#define ERROR_SYSTEM_SHUTDOWN 641 +#define ERROR_PORT_NOT_SET 642 +#define ERROR_DS_VERSION_CHECK_FAILURE 643 +#define ERROR_RANGE_NOT_FOUND 644 +#define ERROR_NOT_SAFE_MODE_DRIVER 646 +#define ERROR_FAILED_DRIVER_ENTRY 647 +#define ERROR_DEVICE_ENUMERATION_ERROR 648 +#define ERROR_MOUNT_POINT_NOT_RESOLVED 649 +#define ERROR_INVALID_DEVICE_OBJECT_PARAMETER 650 +#define ERROR_MCA_OCCURED 651 +#define ERROR_DRIVER_DATABASE_ERROR 652 +#define ERROR_SYSTEM_HIVE_TOO_LARGE 653 +#define ERROR_DRIVER_FAILED_PRIOR_UNLOAD 654 +#define ERROR_VOLSNAP_PREPARE_HIBERNATE 655 +#define ERROR_HIBERNATION_FAILURE 656 +#define ERROR_FILE_SYSTEM_LIMITATION 665 +#define ERROR_ASSERTION_FAILURE 668 +#define ERROR_ACPI_ERROR 669 +#define ERROR_WOW_ASSERTION 670 +#define ERROR_PNP_BAD_MPS_TABLE 671 +#define ERROR_PNP_TRANSLATION_FAILED 672 +#define ERROR_PNP_IRQ_TRANSLATION_FAILED 673 +#define ERROR_PNP_INVALID_ID 674 +#define ERROR_WAKE_SYSTEM_DEBUGGER 675 #define ERROR_HANDLES_CLOSED 676 +#define ERROR_EXTRANEOUS_INFORMATION 677 +#define ERROR_RXACT_COMMIT_NECESSARY 678 +#define ERROR_MEDIA_CHECK 679 +#define ERROR_GUID_SUBSTITUTION_MADE 680 +#define ERROR_STOPPED_ON_SYMLINK 681 +#define ERROR_LONGJUMP 682 +#define ERROR_PLUGPLAY_QUERY_VETOED 683 +#define ERROR_UNWIND_CONSOLIDATE 684 +#define ERROR_REGISTRY_HIVE_RECOVERED 685 +#define ERROR_DLL_MIGHT_BE_INSECURE 686 +#define ERROR_DLL_MIGHT_BE_INCOMPATIBLE 687 +#define ERROR_DBG_EXCEPTION_NOT_HANDLED 688 +#define ERROR_DBG_REPLY_LATER 689 +#define ERROR_DBG_UNABLE_TO_PROVIDE_HANDLE 690 +#define ERROR_DBG_TERMINATE_THREAD 691 +#define ERROR_DBG_TERMINATE_PROCESS 692 +#define ERROR_DBG_CONTROL_C 693 +#define ERROR_DBG_PRINTEXCEPTION_C 694 +#define ERROR_DBG_RIPEXCEPTION 695 +#define ERROR_DBG_CONTROL_BREAK 696 +#define ERROR_DBG_COMMAND_EXCEPTION 697 +#define ERROR_OBJECT_NAME_EXISTS 698 +#define ERROR_THREAD_WAS_SUSPENDED 699 +#define ERROR_IMAGE_NOT_AT_BASE 700 +#define ERROR_RXACT_STATE_CREATED 701 +#define ERROR_SEGMENT_NOTIFICATION 702 +#define ERROR_BAD_CURRENT_DIRECTORY 703 +#define ERROR_FT_READ_RECOVERY_FROM_BACKUP 704 +#define ERROR_FT_WRITE_RECOVERY 705 +#define ERROR_IMAGE_MACHINE_TYPE_MISMATCH 706 +#define ERROR_RECEIVE_PARTIAL 707 +#define ERROR_RECEIVE_EXPEDITED 708 +#define ERROR_RECEIVE_PARTIAL_EXPEDITED 709 +#define ERROR_EVENT_DONE 710 +#define ERROR_EVENT_PENDING 711 +#define ERROR_CHECKING_FILE_SYSTEM 712 +#define ERROR_FATAL_APP_EXIT 713 +#define ERROR_PREDEFINED_HANDLE 714 +#define ERROR_WAS_UNLOCKED 715 +#define ERROR_SERVICE_NOTIFICATION 716 +#define ERROR_WAS_LOCKED 717 +#define ERROR_LOG_HARD_ERROR 718 +#define ERROR_ALREADY_WIN32 719 +#define ERROR_IMAGE_MACHINE_TYPE_MISMATCH_EXE 720 +#define ERROR_NO_YIELD_PERFORMED 721 +#define ERROR_TIMER_RESUME_IGNORED 722 +#define ERROR_ARBITRATION_UNHANDLED 723 +#define ERROR_CARDBUS_NOT_SUPPORTED 724 +#define ERROR_MP_PROCESSOR_MISMATCH 725 +#define ERROR_HIBERNATED 726 +#define ERROR_RESUME_HIBERNATION 727 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996 @@ -669,6 +842,9 @@ #define ERROR_EVENTLOG_CANT_START 1501 #define ERROR_LOG_FILE_FULL 1502 #define ERROR_EVENTLOG_FILE_CHANGED 1503 +#define ERROR_INVALID_TASK_NAME 1550 +#define ERROR_INVALID_TASK_INDEX 1551 +#define ERROR_THREAD_ALREADY_IN_TASK 1552 #define ERROR_INSTALL_SERVICE_FAILURE 1601 #define ERROR_INSTALL_USEREXIT 1602 #define ERROR_INSTALL_FAILURE 1603 @@ -714,7 +890,13 @@ #define ERROR_PATCH_PACKAGE_REJECTED 1643 #define ERROR_INSTALL_TRANSFORM_REJECTED 1644 #define ERROR_INSTALL_REMOTE_PROHIBITED 1645 +#define ERROR_PATCH_REMOVAL_UNSUPPORTED 1646 #define ERROR_UNKNOWN_PATCH 1647 +#define ERROR_PATCH_NO_SEQUENCE 1648 +#define ERROR_PATCH_REMOVAL_DISALLOWED 1649 +#define ERROR_INVALID_PATCH_XML 1650 +#define ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT 1651 +#define ERROR_INSTALL_SERVICE_SAFEBOOT 1652 #define RPC_S_INVALID_STRING_BINDING 1700 #define RPC_S_WRONG_KIND_OF_BINDING 1701 #define RPC_S_INVALID_BINDING 1702 @@ -1861,18 +2043,18 @@ #define ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED 14015 #define ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED 14016 #define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE 14017 -#define ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE 14018 -#define ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE 14019 -#define ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT 14020 +#define ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE 14018 +#define ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE 14019 +#define ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT 14020 #define ERROR_SXS_DUPLICATE_DLL_NAME 14021 -#define ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME 14022L -#define ERROR_SXS_DUPLICATE_CLSID 14023L -#define ERROR_SXS_DUPLICATE_IID 14024L -#define ERROR_SXS_DUPLICATE_TLBID 14025L -#define ERROR_SXS_DUPLICATE_PROGID 14026L -#define ERROR_SXS_DUPLICATE_ASSEMBLY_NAME 14027L -#define ERROR_SXS_FILE_HASH_MISMATCH 14028L -#define ERROR_SXS_POLICY_PARSE_ERROR 14029L +#define ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME 14022 +#define ERROR_SXS_DUPLICATE_CLSID 14023 +#define ERROR_SXS_DUPLICATE_IID 14024 +#define ERROR_SXS_DUPLICATE_TLBID 14025 +#define ERROR_SXS_DUPLICATE_PROGID 14026 +#define ERROR_SXS_DUPLICATE_ASSEMBLY_NAME 14027 +#define ERROR_SXS_FILE_HASH_MISMATCH 14028 +#define ERROR_SXS_POLICY_PARSE_ERROR 14029 #define ERROR_SXS_XML_E_MISSINGQUOTE 14030L #define ERROR_SXS_XML_E_COMMENTSYNTAX 14031L #define ERROR_SXS_XML_E_BADSTARTNAMECHAR 14032L @@ -1923,7 +2105,38 @@ #define ERROR_SXS_UNTRANSLATABLE_HRESULT 14077L #define ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING 14078L #define ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE 14079L -#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME 14080 +#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME 14080 +#define ERROR_SXS_ASSEMBLY_MISSING 14081 +#define ERROR_SXS_CORRUPT_ACTIVATION_STACK 14082 +#define ERROR_SXS_CORRUPTION 14083 +#define ERROR_SXS_EARLY_DEACTIVATION 14084 +#define ERROR_SXS_INVALID_DEACTIVATION 14085 +#define ERROR_SXS_MULTIPLE_DEACTIVATION 14086 +#define ERROR_SXS_PROCESS_TERMINATION_REQUESTED 14087 +#define ERROR_SXS_RELEASE_ACTIVATION_CONTEXT 14088 +#define ERROR_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY 14089 +#define ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE 14090 +#define ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME 14091 +#define ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE 14092 +#define ERROR_SXS_IDENTITY_PARSE_ERROR 14093 +#define ERROR_SXS_IDENTITY_PARSE_ERROR 14093 +#define ERROR_MALFORMED_SUBSTITUTION_STRING 14094 +#define ERROR_SXS_INCORRECT_PUBLIC_KEY_TOKEN 14095 +#define ERROR_UNMAPPED_SUBSTITUTION_STRING 14096 +#define ERROR_SXS_ASSEMBLY_NOT_LOCKED 14097 +#define ERROR_SXS_COMPONENT_STORE_CORRUPT 14098 +#define ERROR_ADVANCED_INSTALLER_FAILED 14099 +#define ERROR_XML_ENCODING_MISMATCH 14100 +#define ERROR_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT 14101 +#define ERROR_SXS_IDENTITIES_DIFFERENT 14102 +#define ERROR_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT 14103 +#define ERROR_SXS_FILE_NOT_PART_OF_ASSEMBLY 14104 +#define ERROR_SXS_MANIFEST_TOO_BIG 14105 +#define ERROR_SXS_SETTING_NOT_REGISTERED 14106 +#define ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE 14107 +#define ERROR_SMI_PRIMITIVE_INSTALLER_FAILED 14108 +#define ERROR_GENERIC_COMMAND_FAILED 14109 +#define ERROR_SXS_FILE_HASH_MISSING 14110 #define ERROR_MUI_FILE_NOT_FOUND 15100 #define ERROR_MUI_INVALID_FILE 15101 @@ -2863,6 +3076,4 @@ #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001L) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002L) - - -#endif +#endif /* __WINE_WINERROR_H */ Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Mon Oct 3 19:11:33 2011 @@ -676,8 +676,13 @@ ProcessDebugObjectHandle = 30, ProcessDebugFlags = 31, ProcessHandleTracing = 32, + ProcessExecuteFlags = 34, MaxProcessInfoClass } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; + +#define MEM_EXECUTE_OPTION_DISABLE 0x01 +#define MEM_EXECUTE_OPTION_ENABLE 0x02 +#define MEM_EXECUTE_OPTION_PERMANENT 0x08 typedef enum _SECTION_INHERIT { ViewShare = 1, @@ -975,6 +980,29 @@ BOOLEAN InheritHandle; BOOLEAN ProtectFromClose; } OBJECT_DATA_INFORMATION, *POBJECT_DATA_INFORMATION; + +typedef struct _OBJECT_BASIC_INFORMATION { + ULONG Attributes; + ACCESS_MASK GrantedAccess; + ULONG HandleCount; + ULONG PointerCount; + ULONG PagedPoolUsage; + ULONG NonPagedPoolUsage; + ULONG Reserved[3]; + ULONG NameInformationLength; + ULONG TypeInformationLength; + ULONG SecurityDescriptorLength; + LARGE_INTEGER CreateTime; +} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; + +typedef struct _OBJECT_NAME_INFORMATION { + UNICODE_STRING Name; +} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; + +typedef struct __OBJECT_TYPE_INFORMATION { + UNICODE_STRING TypeName; + ULONG Reserved [22]; +} OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION; typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ @@ -2447,6 +2475,15 @@ return e; } +typedef struct _FILE_FS_VOLUME_INFORMATION +{ + LARGE_INTEGER VolumeCreationTime; + ULONG VolumeSerialNumber; + ULONG VolumeLabelLength; + BOOLEAN SupportsObjects; + WCHAR VolumeLabel[1]; +} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

[tfaber] 53971: [CMAKE] - Add a flag to distinguish Ansi and Unicode message tables. Keep them Ansi for now pending further testing - Apply this to MSVC build as well. Fixes ntoskrnl messages incor...
by tfaber＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: tfaber Date: Mon Oct 3 19:09:26 2011 New Revision: 53971 URL: http://svn.reactos.org/svn/reactos?rev=53971&view=rev Log: [CMAKE] - Add a flag to distinguish Ansi and Unicode message tables. Keep them Ansi for now pending further testing - Apply this to MSVC build as well. Fixes ntoskrnl messages incorrectly being Unicode Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/include/reactos/mc/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Oct 3 19:09:26 2011 @@ -34,13 +34,18 @@ file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " </graph>\n</graphml>\n") endfunction() -function(add_message_headers) +function(add_message_headers _type) + if(${_type} STREQUAL UNICODE) + set(_flag "-U") + else() + set(_flag "-A") + endif() foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) - macro_mc(${FILE}) + macro_mc(${_flag} ${FILE}) add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h - COMMAND ${COMMAND_MC} + COMMAND ${COMMAND_MC} ${MC_FLAGS} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) set_source_files_properties( ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53971&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Oct 3 19:09:26 2011 @@ -249,8 +249,8 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) endfunction() -macro(macro_mc FILE) - set(COMMAND_MC ${CMAKE_MC_COMPILER} -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) +macro(macro_mc FLAG FILE) + set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) endmacro() #pseh lib, needed with mingw Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53971… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Oct 3 19:09:26 2011 @@ -174,8 +174,8 @@ PROPERTIES GENERATED TRUE) endfunction() -macro(macro_mc FILE) - set(COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) +macro(macro_mc FLAG FILE) + set(COMMAND_MC mc ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) endmacro() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) Modified: trunk/reactos/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/CMakeLi… ============================================================================== --- trunk/reactos/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/CMakeLists.txt [iso-8859-1] Mon Oct 3 19:09:26 2011 @@ -1,9 +1,13 @@ -list(APPEND SOURCE - bugcodes.mc +list(APPEND ANSI_SOURCE + bugcodes.mc) + +list(APPEND UNICODE_SOURCE errcodes.mc neteventmsg.mc ntstatus.mc pciclass.mc) -add_message_headers(${SOURCE}) +add_message_headers(ANSI ${ANSI_SOURCE}) +# FIXME: this needs testing before switching to unicode +add_message_headers(ANSI ${UNICODE_SOURCE})

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