Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[jimtabor] 73876: [NtUser] - If an appication hangs other than suspended use Hung test to prevent locking the whole system. Quick fix for CORE-10078.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 22 00:25:13 2017 New Revision: 73876 URL: http://svn.reactos.org/svn/reactos?rev=73876&view=rev Log: [NtUser] - If an appication hangs other than suspended use Hung test to prevent locking the whole system. Quick fix for CORE-10078. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Feb 22 00:25:13 2017 @@ -1111,7 +1111,7 @@ } else { - if (IsThreadSuspended(pwndTemp->head.pti)) + if (IsThreadSuspended(pwndTemp->head.pti) || MsqIsHung(pwndTemp->head.pti)) { UpdateTheadChildren(pwndTemp, hRgn); }

7 years, 10 months

[jimtabor] 73875: [NtUser] - Fix : Allow controls to receive non-client messages. See CORE-12771. - See also https://bugs.winehq.org/show_bug.cgi?id=42503 .

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 22 00:01:13 2017 New Revision: 73875 URL: http://svn.reactos.org/svn/reactos?rev=73875&view=rev Log: [NtUser] - Fix : Allow controls to receive non-client messages. See CORE-12771. - See also https://bugs.winehq.org/show_bug.cgi?id=42503 . Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/window.h Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Wed Feb 22 00:01:13 2017 @@ -1950,6 +1950,8 @@ RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXDLGFRAME), -UserGetSystemMetrics(SM_CYDLGFRAME)); else if (HAS_THINFRAME( Style, ExStyle )) RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); + else if (HAS_CLIENTFRAME( Style, ExStyle )) + RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXEDGE), -UserGetSystemMetrics(SM_CYEDGE)); if (!RECTL_bPointInRect( &rcWindow, pt.x, pt.y )) return HTBORDER; } Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Wed Feb 22 00:01:13 2017 @@ -15,6 +15,9 @@ #define HAS_THINFRAME(Style, ExStyle) \ (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) + +#define HAS_CLIENTFRAME(Style, ExStyle) \ + (((ExStyle) & WS_EX_CLIENTEDGE) || (!((Style) & (WS_CHILD | WS_POPUP)))) #define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && (pWnd->IDMenu) && IntIsMenu(UlongToHandle(pWnd->IDMenu)))

7 years, 10 months

[gadamopoulos] 73874: Fix build.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 21 21:53:34 2017 New Revision: 73874 URL: http://svn.reactos.org/svn/reactos?rev=73874&view=rev Log: Fix build. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Tue Feb 21 21:53:34 2017 @@ -244,7 +244,7 @@ btnPaintFunc[style]( hwnd, hdc, action ); } ReleaseDC( hwnd, hdc ); -#elif +#else if (btnPaintFunc[style] && IsWindowVisible(hwnd)) { HDC hdc = GetDC( hwnd );

7 years, 10 months

[gadamopoulos] 73873: [COMCTL32] -Rename BUTTON_Paint to BUTTON_PaintWithTheme and use it in the newly added code for the v6 button.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 21 21:47:41 2017 New Revision: 73873 URL: http://svn.reactos.org/svn/reactos?rev=73873&view=rev Log: [COMCTL32] -Rename BUTTON_Paint to BUTTON_PaintWithTheme and use it in the newly added code for the v6 button. Modified: trunk/reactos/dll/win32/comctl32/button.c trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Tue Feb 21 21:47:41 2017 @@ -205,7 +205,7 @@ return hrgn; } -BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC, UINT action); +BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC); #endif @@ -227,12 +227,31 @@ /* paint a button of any type */ static inline void paint_button( HWND hwnd, LONG style, UINT action ) { +#ifndef _USER32_ + HTHEME theme = GetWindowTheme(hwnd); + RECT rc; + HDC hdc = GetDC( hwnd ); + /* GetDC appears to give a dc with a clip rect that includes the whoe parent, not sure if it is correct or not. */ + GetClientRect(hwnd, &rc); + IntersectClipRect (hdc, rc.left, rc. top, rc.right, rc.bottom); + if (theme && BUTTON_PaintWithTheme(theme, hwnd, hdc)) + { + ReleaseDC( hwnd, hdc ); + return; + } + if (btnPaintFunc[style] && IsWindowVisible(hwnd)) + { + btnPaintFunc[style]( hwnd, hdc, action ); + } + ReleaseDC( hwnd, hdc ); +#elif if (btnPaintFunc[style] && IsWindowVisible(hwnd)) { HDC hdc = GetDC( hwnd ); btnPaintFunc[style]( hwnd, hdc, action ); ReleaseDC( hwnd, hdc ); } +#endif } /* retrieve the button text; returned buffer must be freed by caller */ @@ -343,6 +362,9 @@ #ifdef __REACTOS__ button_update_uistate( hWnd, unicode ); #endif +#ifndef _USER32_ + OpenThemeData(hWnd, WC_BUTTONW); +#endif return 0; #if defined(__REACTOS__) && defined(_USER32_) @@ -351,7 +373,31 @@ case WM_DESTROY: break; #endif - +#ifndef _USER32_ + case WM_DESTROY: + CloseThemeData (GetWindowTheme(hWnd)); + break; + case WM_THEMECHANGED: + CloseThemeData (GetWindowTheme(hWnd)); + OpenThemeData(hWnd, WC_BUTTONW); + break; + + case WM_MOUSEHOVER: + { + int state = (int)SendMessageW(hWnd, BM_GETSTATE, 0, 0); + SetWindowLongW(hWnd, 0, state|BST_HOT); + InvalidateRect(hWnd, NULL, FALSE); + break; + } + + case WM_MOUSELEAVE: + { + int state = (int)SendMessageW(hWnd, BM_GETSTATE, 0, 0); + SetWindowLongW(hWnd, 0, state&(~BST_HOT)); + InvalidateRect(hWnd, NULL, FALSE); + break; + } +#endif case WM_ERASEBKGND: if (btn_type == BS_OWNERDRAW) { @@ -378,6 +424,14 @@ { PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); +#ifndef _USER32_ + HTHEME theme = GetWindowTheme(hWnd); + if (theme && BUTTON_PaintWithTheme(theme, hWnd, hdc)) + { + if ( !wParam ) EndPaint( hWnd, &ps ); + return 0; + } +#endif if (btnPaintFunc[btn_type]) { int nOldMode = SetBkMode( hdc, OPAQUE ); @@ -480,6 +534,21 @@ break; case WM_MOUSEMOVE: +#ifndef _USER32_ + { + TRACKMOUSEEVENT mouse_event; + mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); + mouse_event.dwFlags = TME_QUERY; + if(!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags&(TME_HOVER|TME_LEAVE))) + { + mouse_event.dwFlags = TME_HOVER|TME_LEAVE; + mouse_event.hwndTrack = hWnd; + mouse_event.dwHoverTime = 1; + TrackMouseEvent(&mouse_event); + } + } +#endif + if ((wParam & MK_LBUTTON) && GetCapture() == hWnd) { GetClientRect( hWnd, &rect ); Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Tue Feb 21 21:47:41 2017 @@ -294,16 +294,16 @@ NULL, /* Not defined */ }; -static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) -{ - PAINTSTRUCT ps; - HDC hDC; +BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC) +{ DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; + if (!paint) + return FALSE; if(IsWindowEnabled(hwnd)) { @@ -314,105 +314,6 @@ } else drawState = STATE_DISABLED; - hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - if (paint) paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); - if (!hParamDC) EndPaint(hwnd, &ps); + paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS); return TRUE; } - -/********************************************************************** - * The button control subclass window proc. - */ -LRESULT CALLBACK THEMING_ButtonSubclassProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - const WCHAR* themeClass = WC_BUTTONW; - HTHEME theme; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); - OpenThemeData(hwnd, themeClass); - return result; - - case WM_DESTROY: - theme = GetWindowTheme(hwnd); - CloseThemeData (theme); - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); - - case WM_THEMECHANGED: - theme = GetWindowTheme(hwnd); - CloseThemeData (theme); - OpenThemeData(hwnd, themeClass); - break; - - case WM_SYSCOLORCHANGE: - theme = GetWindowTheme(hwnd); - if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - - case WM_PAINT: - theme = GetWindowTheme(hwnd); - if (theme && BUTTON_Paint(theme, hwnd, (HDC)wParam)) - return 0; - else - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); - - case WM_ENABLE: - theme = GetWindowTheme(hwnd); - if (theme) { - RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); - return 0; - } else - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); - - case WM_MOUSEMOVE: - { - TRACKMOUSEEVENT mouse_event; - mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); - mouse_event.dwFlags = TME_QUERY; - if(!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags&(TME_HOVER|TME_LEAVE))) - { - mouse_event.dwFlags = TME_HOVER|TME_LEAVE; - mouse_event.hwndTrack = hwnd; - mouse_event.dwHoverTime = 1; - TrackMouseEvent(&mouse_event); - } - break; - } - - case WM_MOUSEHOVER: - { - int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); - SetWindowLongW(hwnd, 0, state|BST_HOT); - InvalidateRect(hwnd, NULL, FALSE); - break; - } - - case WM_MOUSELEAVE: - { - int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); - SetWindowLongW(hwnd, 0, state&(~BST_HOT)); - InvalidateRect(hwnd, NULL, FALSE); - break; - } - - case BM_SETCHECK: - case BM_SETSTATE: - theme = GetWindowTheme(hwnd); - if (theme) { - InvalidateRect(hwnd, NULL, FALSE); - } - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); - - default: - /* Call old proc */ - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); - } - return 0; -}

7 years, 10 months

[gadamopoulos] 73872: [COMCTL32] -Add a comment to clarify that there is no need to backport the #ifdef _USER32_ defines back to user32 (although they will work fine in user32).

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 21 21:07:06 2017 New Revision: 73872 URL: http://svn.reactos.org/svn/reactos?rev=73872&view=rev Log: [COMCTL32] -Add a comment to clarify that there is no need to backport the #ifdef _USER32_ defines back to user32 (although they will work fine in user32). Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Tue Feb 21 21:07:06 2017 @@ -135,6 +135,7 @@ OB_Paint /* BS_OWNERDRAW */ }; +/* The original code from user32 was kept in order to make it easier to bring changes from user32 */ #ifdef _USER32_ /********************************************************************* * button class descriptor

7 years, 10 months

[gadamopoulos] 73871: [COMCTL32]: Copy button.c from user32, make the needed changes to make it compile and register it. This is the beginning of the v6 button. Remove the subclassing of the builti...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Feb 21 21:03:04 2017 New Revision: 73871 URL: http://svn.reactos.org/svn/reactos?rev=73871&view=rev Log: [COMCTL32]: Copy button.c from user32, make the needed changes to make it compile and register it. This is the beginning of the v6 button. Remove the subclassing of the builtin button. Added: trunk/reactos/dll/win32/comctl32/button.c - copied, changed from r73835, trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/theming.c Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Tue Feb 21 21:03:04 2017 @@ -12,6 +12,7 @@ list(APPEND SOURCE animate.c + button.c comboex.c comctl32undoc.c commctrl.c Copied: trunk/reactos/dll/win32/comctl32/button.c (from r73835, trunk/reactos/win32ss/user/user32/controls/button.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Tue Feb 21 21:03:04 2017 @@ -62,7 +62,7 @@ * - Button_SetImageList * - Button_SetTextMargin */ -#include <user32.h> +#include "comctl32.h" #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(button); @@ -135,6 +135,7 @@ OB_Paint /* BS_OWNERDRAW */ }; +#ifdef _USER32_ /********************************************************************* * button class descriptor */ @@ -153,6 +154,7 @@ IDC_ARROW, /* cursor */ 0 /* brush */ }; +#endif static inline LONG get_button_state( HWND hwnd ) @@ -178,6 +180,33 @@ } #endif /* __REACTOS__ */ + +#ifndef _USER32_ +#define NtUserAlterWindowStyle SetWindowLongPtrW + +HRGN set_control_clipping( HDC hdc, const RECT *rect ) +{ + RECT rc = *rect; + HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 ); + + if (GetClipRgn( hdc, hrgn ) != 1) + { + DeleteObject( hrgn ); + hrgn = 0; + } + DPtoLP( hdc, (POINT *)&rc, 2 ); + if (GetLayout( hdc ) & LAYOUT_RTL) /* compensate for the shifting done by IntersectClipRect */ + { + rc.left++; + rc.right++; + } + IntersectClipRect( hdc, rc.left, rc.top, rc.right, rc.bottom ); + return hrgn; +} + +BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC, UINT action); + +#endif static inline HFONT get_button_font( HWND hwnd ) { @@ -249,7 +278,7 @@ UINT btn_type = get_button_type( style ); LONG state; HANDLE oldHbitmap; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) PWND pWnd; pWnd = ValidateHwnd(hWnd); @@ -315,7 +344,7 @@ #endif return 0; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) case WM_NCDESTROY: NtUserSetWindowFNID(hWnd, FNID_DESTROY); case WM_DESTROY: @@ -330,7 +359,7 @@ HBRUSH hBrush; HWND parent = GetParent(hWnd); if (!parent) parent = hWnd; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) hBrush = GetControlColor( parent, hWnd, hdc, WM_CTLCOLORBTN); #else hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hdc, (LPARAM)hWnd); @@ -484,7 +513,7 @@ WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; if (!parent) parent = hWnd; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) hbrush = GetControlColor(parent, hWnd, hdc, message); #else hbrush = (HBRUSH)SendMessageW(parent, message, @@ -945,7 +974,7 @@ if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) GetControlColor( parent, hwnd, hDC, WM_CTLCOLORBTN); #else SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); @@ -1061,7 +1090,7 @@ parent = GetParent(hwnd); if (!parent) parent = hwnd; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) hBrush = GetControlColor(parent, hwnd, hDC, WM_CTLCOLORSTATIC); #else hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, @@ -1215,7 +1244,7 @@ /* GroupBox acts like static control, so it sends CTLCOLORSTATIC */ parent = GetParent(hwnd); if (!parent) parent = hwnd; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) hbr = GetControlColor(parent, hwnd, hDC, WM_CTLCOLORSTATIC); #else hbr = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd); @@ -1271,7 +1300,7 @@ parent = GetParent(hwnd); if (!parent) parent = hwnd; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) hBrush = GetControlColor( parent, hwnd, hDC, WM_CTLCOLORBTN); #else hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd); @@ -1336,7 +1365,7 @@ if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(_USER32_) GetControlColor( parent, hwnd, hDC, WM_CTLCOLORBTN); #else SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); @@ -1349,3 +1378,26 @@ SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); } + +#ifndef _USER32_ +void BUTTON_Register() +{ + WNDCLASSW wndClass; + + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC; + wndClass.lpfnWndProc = ButtonWndProcW; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = NB_EXTRA_BYTES; + wndClass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); + wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wndClass.lpszClassName = WC_BUTTONW; + + RegisterClassW(&wndClass); +} + +void BUTTON_Unregister() +{ + UnregisterClassW(WC_BUTTONW, NULL); +} +#endif Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Tue Feb 21 21:03:04 2017 @@ -159,7 +159,8 @@ extern void TREEVIEW_Unregister(void) DECLSPEC_HIDDEN; extern void UPDOWN_Register(void) DECLSPEC_HIDDEN; extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; - +extern void BUTTON_Register(); +extern void BUTTON_Unregister(); int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Tue Feb 21 21:03:04 2017 @@ -274,6 +274,7 @@ { activated = ActivateActCtx(hActCtx6, &ulCookie); RegisterControls(); /* Register the classes pretending to be v6 */ + BUTTON_Register(); if (activated) DeactivateActCtx(0, ulCookie); /* Initialize the themed controls only when the v6 manifest is present */ @@ -298,6 +299,7 @@ activated = ActivateActCtx(hActCtx6, &ulCookie); THEMING_Uninitialize(); UnregisterControls(); + BUTTON_Unregister(); if (activated) DeactivateActCtx(0, ulCookie); } } Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] Tue Feb 21 21:03:04 2017 @@ -26,8 +26,6 @@ typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, ULONG_PTR); -extern LRESULT CALLBACK THEMING_ButtonSubclassProc (HWND, UINT, WPARAM, LPARAM, - ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ComboSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_EditSubclassProc (HWND, UINT, WPARAM, LPARAM, @@ -46,7 +44,6 @@ THEMING_SUBCLASSPROC subclassProc; } subclasses[] = { /* Note: list must be sorted by class name */ - {WC_BUTTONW, THEMING_ButtonSubclassProc}, {WC_COMBOBOXW, THEMING_ComboSubclassProc}, {comboLboxClass, THEMING_ListBoxSubclassProc}, {WC_EDITW, THEMING_EditSubclassProc}, @@ -86,15 +83,13 @@ MAKE_SUBCLASS_PROC(2) MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) -MAKE_SUBCLASS_PROC(5) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, subclass_proc1, subclass_proc2, subclass_proc3, - subclass_proc4, - subclass_proc5 + subclass_proc4 }; /***********************************************************************

7 years, 10 months

[akhaldi] 73870: * Revert r73869 because wmi was mentioned nowhere in CORE-9111, nor in our tree restructure wiki, nor any developers discussions. This is the ReactOS trunk, not a branch.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 21 09:04:05 2017 New Revision: 73870 URL: http://svn.reactos.org/svn/reactos?rev=73870&view=rev Log: * Revert r73869 because wmi was mentioned nowhere in CORE-9111, nor in our tree restructure wiki, nor any developers discussions. This is the ReactOS trunk, not a branch. Added: trunk/reactos/base/applications/cmdutils/mofcomp/ - copied from r73868, trunk/reactos/base/applications/cmdutils/mofcomp/ trunk/reactos/base/applications/cmdutils/wmic/ - copied from r73868, trunk/reactos/base/applications/cmdutils/wmic/ trunk/reactos/base/services/wmisvc/ - copied from r73868, trunk/reactos/base/services/wmisvc/ trunk/reactos/dll/win32/framedyn/ - copied from r73868, trunk/reactos/dll/win32/framedyn/ trunk/reactos/dll/win32/wbemdisp/ - copied from r73868, trunk/reactos/dll/win32/wbemdisp/ trunk/reactos/dll/win32/wbemprox/ - copied from r73868, trunk/reactos/dll/win32/wbemprox/ trunk/reactos/dll/win32/wmi/ - copied from r73868, trunk/reactos/dll/win32/wmi/ trunk/reactos/dll/win32/wmiutils/ - copied from r73868, trunk/reactos/dll/win32/wmiutils/ Modified: trunk/reactos/base/CMakeLists.txt trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/base/services/CMakeLists.txt trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/CMakeLists.txt?rev=73… ============================================================================== --- trunk/reactos/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/CMakeLists.txt [iso-8859-1] Tue Feb 21 09:04:05 2017 @@ -4,4 +4,3 @@ add_subdirectory(setup) add_subdirectory(shell) add_subdirectory(system) -add_subdirectory(wmi) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Feb 21 09:04:05 2017 @@ -9,6 +9,7 @@ add_subdirectory(hostname) add_subdirectory(lodctr) add_subdirectory(mode) +add_subdirectory(mofcomp) add_subdirectory(more) add_subdirectory(reg) add_subdirectory(schtasks) @@ -16,5 +17,6 @@ add_subdirectory(taskkill) add_subdirectory(tree) add_subdirectory(whoami) +add_subdirectory(wmic) add_subdirectory(wscript) add_subdirectory(xcopy) Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Tue Feb 21 09:04:05 2017 @@ -13,3 +13,4 @@ add_subdirectory(umpnpmgr) add_subdirectory(wkssvc) add_subdirectory(wlansvc) +add_subdirectory(wmisvc) Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Tue Feb 21 09:04:05 2017 @@ -91,6 +91,13 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll" HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012 + +; WBem +HKLM,"SOFTWARE\Microsoft\wbem\ess",,0x00000012 +HKLM,"SOFTWARE\Microsoft\wbem\Transports",,0x00000012 +HKLM,"SOFTWARE\Microsoft\wbem\Scripting",,0x00000012 +HKLM,"SOFTWARE\Microsoft\wbem","Installation Directory",0x00020000,"%SystemRoot%\system32\wbem" +HKLM,"SOFTWARE\Microsoft\wbem","MOF Self-Install Directory",0x00020000,"%SystemRoot%\system32\wbem\mof" ; HTML Help HKLM,"SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9}",,2,"HTML Help" Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Tue Feb 21 09:04:05 2017 @@ -1997,6 +1997,18 @@ HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020 +; WMI Service +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DependOnService",0x00010000,"RPCSS" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DisplayName",0x00000000,"ReactOS Management Infrastructure" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Description",0x00000000,"Provides interface to system management information" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Group",0x00000000,"WMI" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wbem\wmisvc.dll" + ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue Feb 21 09:04:05 2017 @@ -42,6 +42,7 @@ add_subdirectory(fltlib) add_subdirectory(fmifs) add_subdirectory(fontsub) +add_subdirectory(framedyn) add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) @@ -219,6 +220,8 @@ add_subdirectory(vbscript) add_subdirectory(version) add_subdirectory(vssapi) +add_subdirectory(wbemdisp) +add_subdirectory(wbemprox) if(ARCH STREQUAL "i386") add_subdirectory(wdmaud.drv) endif() @@ -235,6 +238,8 @@ add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32) +add_subdirectory(wmi) +add_subdirectory(wmiutils) add_subdirectory(wmvcore) add_subdirectory(ws2_32) add_subdirectory(ws2help) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Feb 21 09:04:05 2017 @@ -20,11 +20,6 @@ reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 The following libraries are shared with Wine. - -reactos/base/wmi/wbemdisp # Synced to WineStaging-1.9.16 -reactos/base/wmi/wbemprox # Synced to WineStaging-1.9.23 -reactos/base/wmi/wmi # Synced to WineStaging-1.9.11 -reactos/base/wmi/wmiutils # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 @@ -199,6 +194,8 @@ reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16 +reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.23 @@ -211,6 +208,8 @@ reactos/dll/win32/winscard # Synced to WineStaging-1.9.11 reactos/dll/win32/wintrust # Synced to WineStaging-1.9.23 reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 +reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.11 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.9.11 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11 @@ -231,6 +230,7 @@ reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.16 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.11 reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources. @@ -244,10 +244,6 @@ reactos/base/services/rpcss # Synced to WineStaging-1.9.16 reactos/base/system/expand # Synced to WineStaging-1.9.11 reactos/base/system/msiexec # Synced to WineStaging-1.9.11 - -reactos/base/wmi/mofcomp # Synced to Wine-2.2 -reactos/base/wmi/wmic # Synced to WineStaging-1.9.11 - reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

7 years, 10 months

[hbelusca] 73869: [WMI]: Gather all the user-mode components of WMI inside base/wmi/, as part of the ReactOS source code tree restructure. This gives an idea how this can be done for other ReactOS ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 20 23:28:09 2017 New Revision: 73869 URL: http://svn.reactos.org/svn/reactos?rev=73869&view=rev Log: [WMI]: Gather all the user-mode components of WMI inside base/wmi/, as part of the ReactOS source code tree restructure. This gives an idea how this can be done for other ReactOS components. CORE-9111 Added: trunk/reactos/base/wmi/ trunk/reactos/base/wmi/CMakeLists.txt (with props) trunk/reactos/base/wmi/framedyn/ - copied from r73868, trunk/reactos/dll/win32/framedyn/ trunk/reactos/base/wmi/mofcomp/ - copied from r73868, trunk/reactos/base/applications/cmdutils/mofcomp/ trunk/reactos/base/wmi/wbem_reg.inf (with props) trunk/reactos/base/wmi/wbemdisp/ - copied from r73868, trunk/reactos/dll/win32/wbemdisp/ trunk/reactos/base/wmi/wbemprox/ - copied from r73868, trunk/reactos/dll/win32/wbemprox/ trunk/reactos/base/wmi/wmi/ - copied from r73868, trunk/reactos/dll/win32/wmi/ trunk/reactos/base/wmi/wmic/ - copied from r73868, trunk/reactos/base/applications/cmdutils/wmic/ trunk/reactos/base/wmi/wmisvc/ - copied from r73868, trunk/reactos/base/services/wmisvc/ trunk/reactos/base/wmi/wmisvc/wmisvc_reg.inf (with props) trunk/reactos/base/wmi/wmiutils/ - copied from r73868, trunk/reactos/dll/win32/wmiutils/ Removed: trunk/reactos/base/applications/cmdutils/mofcomp/ trunk/reactos/base/applications/cmdutils/wmic/ trunk/reactos/base/services/wmisvc/ trunk/reactos/dll/win32/framedyn/ trunk/reactos/dll/win32/wbemdisp/ trunk/reactos/dll/win32/wbemprox/ trunk/reactos/dll/win32/wmi/ trunk/reactos/dll/win32/wmiutils/ Modified: trunk/reactos/base/CMakeLists.txt trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/base/services/CMakeLists.txt trunk/reactos/base/wmi/wmisvc/CMakeLists.txt trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/CMakeLists.txt?rev=73… ============================================================================== --- trunk/reactos/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/CMakeLists.txt [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -4,3 +4,4 @@ add_subdirectory(setup) add_subdirectory(shell) add_subdirectory(system) +add_subdirectory(wmi) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -9,7 +9,6 @@ add_subdirectory(hostname) add_subdirectory(lodctr) add_subdirectory(mode) -add_subdirectory(mofcomp) add_subdirectory(more) add_subdirectory(reg) add_subdirectory(schtasks) @@ -17,6 +16,5 @@ add_subdirectory(taskkill) add_subdirectory(tree) add_subdirectory(whoami) -add_subdirectory(wmic) add_subdirectory(wscript) add_subdirectory(xcopy) Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -13,4 +13,3 @@ add_subdirectory(umpnpmgr) add_subdirectory(wkssvc) add_subdirectory(wlansvc) -add_subdirectory(wmisvc) Added: trunk/reactos/base/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/wmi/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/base/wmi/CMakeLists.txt (added) +++ trunk/reactos/base/wmi/CMakeLists.txt [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -0,0 +1,11 @@ + +add_subdirectory(framedyn) +add_subdirectory(mofcomp) +add_subdirectory(wbemdisp) +add_subdirectory(wbemprox) +add_subdirectory(wmi) +add_subdirectory(wmic) +add_subdirectory(wmisvc) +add_subdirectory(wmiutils) + +add_registry_inf(wbem_reg.inf) Propchange: trunk/reactos/base/wmi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/wmi/wbem_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/wmi/wbem_reg.inf?rev=… ============================================================================== --- trunk/reactos/base/wmi/wbem_reg.inf (added) +++ trunk/reactos/base/wmi/wbem_reg.inf [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -0,0 +1,7 @@ +; WBem +[AddReg] +HKLM,"SOFTWARE\Microsoft\wbem\ess",,0x00000012 +HKLM,"SOFTWARE\Microsoft\wbem\Transports",,0x00000012 +HKLM,"SOFTWARE\Microsoft\wbem\Scripting",,0x00000012 +HKLM,"SOFTWARE\Microsoft\wbem","Installation Directory",0x00020000,"%SystemRoot%\system32\wbem" +HKLM,"SOFTWARE\Microsoft\wbem","MOF Self-Install Directory",0x00020000,"%SystemRoot%\system32\wbem\mof" Propchange: trunk/reactos/base/wmi/wbem_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/wmi/wmisvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/wmi/wmisvc/CMakeLists… ============================================================================== --- trunk/reactos/base/wmi/wmisvc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/wmi/wmisvc/CMakeLists.txt [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -8,3 +8,4 @@ set_module_type(wmisvc win32dll UNICODE) add_importlibs(wmisvc advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET wmisvc DESTINATION reactos/system32/wbem FOR all) +add_registry_inf(wmisvc_reg.inf) Added: trunk/reactos/base/wmi/wmisvc/wmisvc_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/wmi/wmisvc/wmisvc_reg… ============================================================================== --- trunk/reactos/base/wmi/wmisvc/wmisvc_reg.inf (added) +++ trunk/reactos/base/wmi/wmisvc/wmisvc_reg.inf [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -0,0 +1,12 @@ +; WMI Service +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DependOnService",0x00010000,"RPCSS" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DisplayName",0x00000000,"ReactOS Management Infrastructure" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Description",0x00000000,"Provides interface to system management information" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Group",0x00000000,"WMI" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wbem\wmisvc.dll" Propchange: trunk/reactos/base/wmi/wmisvc/wmisvc_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -91,13 +91,6 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll" HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012 - -; WBem -HKLM,"SOFTWARE\Microsoft\wbem\ess",,0x00000012 -HKLM,"SOFTWARE\Microsoft\wbem\Transports",,0x00000012 -HKLM,"SOFTWARE\Microsoft\wbem\Scripting",,0x00000012 -HKLM,"SOFTWARE\Microsoft\wbem","Installation Directory",0x00020000,"%SystemRoot%\system32\wbem" -HKLM,"SOFTWARE\Microsoft\wbem","MOF Self-Install Directory",0x00020000,"%SystemRoot%\system32\wbem\mof" ; HTML Help HKLM,"SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9}",,2,"HTML Help" Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -1997,18 +1997,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020 -; WMI Service -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DependOnService",0x00010000,"RPCSS" -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DisplayName",0x00000000,"ReactOS Management Infrastructure" -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Description",0x00000000,"Provides interface to system management information" -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Group",0x00000000,"WMI" -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Start",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Type",0x00010001,0x00000020 -HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wbem\wmisvc.dll" - ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -42,7 +42,6 @@ add_subdirectory(fltlib) add_subdirectory(fmifs) add_subdirectory(fontsub) -add_subdirectory(framedyn) add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) @@ -220,8 +219,6 @@ add_subdirectory(vbscript) add_subdirectory(version) add_subdirectory(vssapi) -add_subdirectory(wbemdisp) -add_subdirectory(wbemprox) if(ARCH STREQUAL "i386") add_subdirectory(wdmaud.drv) endif() @@ -238,8 +235,6 @@ add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32) -add_subdirectory(wmi) -add_subdirectory(wmiutils) add_subdirectory(wmvcore) add_subdirectory(ws2_32) add_subdirectory(ws2help) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Feb 20 23:28:09 2017 @@ -20,6 +20,11 @@ reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 The following libraries are shared with Wine. + +reactos/base/wmi/wbemdisp # Synced to WineStaging-1.9.16 +reactos/base/wmi/wbemprox # Synced to WineStaging-1.9.23 +reactos/base/wmi/wmi # Synced to WineStaging-1.9.11 +reactos/base/wmi/wmiutils # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 @@ -194,8 +199,6 @@ reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16 -reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.23 @@ -208,8 +211,6 @@ reactos/dll/win32/winscard # Synced to WineStaging-1.9.11 reactos/dll/win32/wintrust # Synced to WineStaging-1.9.23 reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 -reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.11 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.9.11 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11 @@ -230,7 +231,6 @@ reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.16 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.11 reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources. @@ -244,6 +244,10 @@ reactos/base/services/rpcss # Synced to WineStaging-1.9.16 reactos/base/system/expand # Synced to WineStaging-1.9.11 reactos/base/system/msiexec # Synced to WineStaging-1.9.11 + +reactos/base/wmi/mofcomp # Synced to Wine-2.2 +reactos/base/wmi/wmic # Synced to WineStaging-1.9.11 + reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

7 years, 10 months

[hbelusca] 73868: [SECUR32]: As an interim step towards a proper NTLM implementation that is done by Samuel Serapion, I temporarily commit Wine's NTLM code layer around Samba's "ntlm_auth" utility....

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 20 22:28:07 2017 New Revision: 73868 URL: http://svn.reactos.org/svn/reactos?rev=73868&view=rev Log: [SECUR32]: As an interim step towards a proper NTLM implementation that is done by Samuel Serapion, I temporarily commit Wine's NTLM code layer around Samba's "ntlm_auth" utility. In addition I add the kerberos & negotiate stubs too. This is not a problem on Wine, because they run on Linux distributions, most of which have Samba available. But this is not the case on Windows / ReactOS, so few adaptations were needed: in the dispatcher.c code, the fork_helper function was partially rewritten around CreateProcess to start the ntlm_auth utility (I try to use maximally the CRT to not have to rewrite other functions). This works great. But then, to make this NTLM layer working on ReactOS, one has to find a Windows build of Samba. Here is one: http://smithii.com/samba . This is a Samba 3.0.23c build. You need to follow *exactly* the manual installation steps to make it work (actually, everything up to "Step 6" included, i.e. running smbsetup.cmd). This means in particular to copy Samba into C:\Program Files\samba, as this path is also hardcoded into the executables. As the Wine's NTLM layer expects Samba 3.0.25+, I manually downgraded the expected version, which appears to still work nice for the needs of Office 2010 installation. You can now play with it and try to install Office 2010. CORE-12601 #comment Wine's NTLM layer committed in r73868 as an interim step towards a proper implementation. CORE-12279 Added: trunk/reactos/dll/win32/secur32/wine/ trunk/reactos/dll/win32/secur32/wine/base64_codec.c (with props) trunk/reactos/dll/win32/secur32/wine/base64_codec.h (with props) trunk/reactos/dll/win32/secur32/wine/dispatcher.c (with props) trunk/reactos/dll/win32/secur32/wine/dispatcher.h (with props) trunk/reactos/dll/win32/secur32/wine/hmac_md5.c (with props) trunk/reactos/dll/win32/secur32/wine/hmac_md5.h (with props) trunk/reactos/dll/win32/secur32/wine/kerberos.c (with props) trunk/reactos/dll/win32/secur32/wine/kerberos.h (with props) trunk/reactos/dll/win32/secur32/wine/negotiate.c (with props) trunk/reactos/dll/win32/secur32/wine/negotiate.h (with props) trunk/reactos/dll/win32/secur32/wine/ntlm.c (with props) trunk/reactos/dll/win32/secur32/wine/ntlm.h (with props) trunk/reactos/dll/win32/secur32/wine/util.c (with props) trunk/reactos/dll/win32/secur32/wine/util.h (with props) trunk/reactos/dll/win32/secur32/wine/wine_supp.h (with props) Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/dll/win32/secur32/dllmain.c trunk/reactos/dll/win32/secur32/secur32_priv.h trunk/reactos/dll/win32/secur32/sspi.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… Modified: trunk/reactos/dll/win32/secur32/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/dllmain.… Modified: trunk/reactos/dll/win32/secur32/secur32_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32_… Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… Added: trunk/reactos/dll/win32/secur32/wine/base64_codec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/bas… Added: trunk/reactos/dll/win32/secur32/wine/base64_codec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/bas… Added: trunk/reactos/dll/win32/secur32/wine/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/dis… Added: trunk/reactos/dll/win32/secur32/wine/dispatcher.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/dis… Added: trunk/reactos/dll/win32/secur32/wine/hmac_md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/hma… Added: trunk/reactos/dll/win32/secur32/wine/hmac_md5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/hma… Added: trunk/reactos/dll/win32/secur32/wine/kerberos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/ker… Added: trunk/reactos/dll/win32/secur32/wine/kerberos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/ker… Added: trunk/reactos/dll/win32/secur32/wine/negotiate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/neg… Added: trunk/reactos/dll/win32/secur32/wine/negotiate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/neg… Added: trunk/reactos/dll/win32/secur32/wine/ntlm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/ntl… Added: trunk/reactos/dll/win32/secur32/wine/ntlm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/ntl… Added: trunk/reactos/dll/win32/secur32/wine/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/uti… Added: trunk/reactos/dll/win32/secur32/wine/util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/uti… Added: trunk/reactos/dll/win32/secur32/wine/wine_supp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/wine/win…

7 years, 10 months

[hbelusca] 73867: [MOFCOMP]: Add the MOF compiler stub from Wine, which allows fixing the very last step in the installation of Office 2010. CORE-12811 #resolve CORE-12279

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 20 20:47:42 2017 New Revision: 73867 URL: http://svn.reactos.org/svn/reactos?rev=73867&view=rev Log: [MOFCOMP]: Add the MOF compiler stub from Wine, which allows fixing the very last step in the installation of Office 2010. CORE-12811 #resolve CORE-12279 Added: trunk/reactos/base/applications/cmdutils/mofcomp/ trunk/reactos/base/applications/cmdutils/mofcomp/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/mofcomp/mofcomp.c (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Mon Feb 20 20:47:42 2017 @@ -9,6 +9,7 @@ add_subdirectory(hostname) add_subdirectory(lodctr) add_subdirectory(mode) +add_subdirectory(mofcomp) add_subdirectory(more) add_subdirectory(reg) add_subdirectory(schtasks) Added: trunk/reactos/base/applications/cmdutils/mofcomp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mofcomp/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/mofcomp/CMakeLists.txt [iso-8859-1] Mon Feb 20 20:47:42 2017 @@ -0,0 +1,6 @@ + +add_executable(mofcomp mofcomp.c) +target_link_libraries(mofcomp wine) +set_module_type(mofcomp win32cui UNICODE) +add_importlibs(mofcomp msvcrt kernel32 ntdll) +add_cd_file(TARGET mofcomp DESTINATION reactos/system32/wbem FOR all) Propchange: trunk/reactos/base/applications/cmdutils/mofcomp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/mofcomp/mofcomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mofcomp/mofcomp.c (added) +++ trunk/reactos/base/applications/cmdutils/mofcomp/mofcomp.c [iso-8859-1] Mon Feb 20 20:47:42 2017 @@ -0,0 +1,29 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mofcomp); + +int wmain( int argc, const WCHAR *argv[] ) +{ + WINE_FIXME("stub\n"); + return 0; +} Propchange: trunk/reactos/base/applications/cmdutils/mofcomp/mofcomp.c ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017