Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 51804: [uxtheme] - Implement drawing windows caption and borders with themes
by gadamopoulos＠svn.reactos.org 17 May '11

17 May '11

Author: gadamopoulos Date: Tue May 17 07:57:17 2011 New Revision: 51804 URL: http://svn.reactos.org/svn/reactos?rev=51804&view=rev Log: [uxtheme] - Implement drawing windows caption and borders with themes Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue May 17 07:57:17 2011 @@ -10,6 +10,7 @@ #include "undocuser.h" #include "vfwmsgs.h" #include "uxtheme.h" +#include <tmschema.h> #include "wine/debug.h" @@ -21,8 +22,136 @@ HDC hDC; HTHEME theme; WINDOWINFO wi; + BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ HRGN hRgn; + int CaptionHeight; } DRAW_CONTEXT, *PDRAW_CONTEXT; + +typedef enum +{ + CLOSEBUTTON, + MAXBUTTON, + MINBUTTON, + HELPBUTTON +} CAPTIONBUTTON; + +/* +The following values specify all possible vutton states +Note that not all of them are documented but it is easy to +find them by opening a theme file +*/ +typedef enum { + BUTTON_NORMAL = 1 , + BUTTON_HOT , + BUTTON_PRESSED , + BUTTON_DISABLED , + BUTTON_INACTIVE +} THEME_BUTTON_STATES; + +#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) + +#define BUTTON_GAP_SIZE 2 + +static BOOL +IsWindowActive(HWND hWnd, DWORD ExStyle) +{ + BOOL ret; + + if (ExStyle & WS_EX_MDICHILD) + { + ret = IsChild(GetForegroundWindow(), hWnd); + if (ret) + ret = (hWnd == (HWND)SendMessageW(GetParent(hWnd), WM_MDIGETACTIVE, 0, 0)); + } + else + { + ret = (GetForegroundWindow() == hWnd); + } + + return ret; +} + +HICON +UserGetWindowIcon(HWND hwnd) +{ + HICON hIcon = 0; + + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); + + if (!hIcon) + hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); + + if(!hIcon) + hIcon = LoadIcon(NULL, IDI_WINLOGO); + + return hIcon; +} + +WCHAR *UserGetWindowCaption(HWND hwnd) +{ + INT len = 512; + WCHAR *text; + text = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (text) InternalGetWindowText(hwnd, text, len); + return text; +} + +static void +ThemeDrawTitle(PDRAW_CONTEXT context, RECT* prcCurrent) +{ + +} + +HRESULT WINAPI ThemeDrawCaptionText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + LPCWSTR pszText, int iCharCount, DWORD dwTextFlags, + DWORD dwTextFlags2, const RECT *pRect, BOOL Active) +{ + HRESULT hr; + HFONT hFont = NULL; + HGDIOBJ oldFont = NULL; + LOGFONTW logfont; + COLORREF textColor; + COLORREF oldTextColor; + int oldBkMode; + RECT rt; + + hr = GetThemeSysFont(0,TMT_CAPTIONFONT,&logfont); + + if(SUCCEEDED(hr)) { + hFont = CreateFontIndirectW(&logfont); + } + CopyRect(&rt, pRect); + if(hFont) + oldFont = SelectObject(hdc, hFont); + + if(dwTextFlags2 & DTT_GRAYED) + textColor = GetSysColor(COLOR_GRAYTEXT); + else if (!Active) + textColor = GetSysColor(COLOR_INACTIVECAPTIONTEXT); + else + textColor = GetSysColor(COLOR_CAPTIONTEXT); + + oldTextColor = SetTextColor(hdc, textColor); + oldBkMode = SetBkMode(hdc, TRANSPARENT); + DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + SetBkMode(hdc, oldBkMode); + SetTextColor(hdc, oldTextColor); + + if(hFont) { + SelectObject(hdc, oldFont); + DeleteObject(hFont); + } + return S_OK; +} static void ThemeInitDrawContext(PDRAW_CONTEXT pcontext, @@ -31,7 +160,11 @@ { GetWindowInfo(hWnd, &pcontext->wi); pcontext->hWnd = hWnd; + pcontext->Active = IsWindowActive(hWnd, pcontext->wi.dwExStyle); pcontext->theme = OpenThemeData(pcontext->hWnd, L"WINDOW"); + + pcontext->CaptionHeight = pcontext->wi.cyWindowBorders; + pcontext->CaptionHeight += GetSystemMetrics(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); if(hRgn <= 0) { @@ -57,17 +190,200 @@ { DeleteObject(pcontext->hRgn); } +} + +static void +ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, + RECT* prcCurrent, + CAPTIONBUTTON buttonId, + INT iStateId) +{ + RECT rcPart; + INT ButtonWidth, ButtonHeight, iPartId; + + ButtonHeight = GetThemeSysSize(pcontext->theme, pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + ButtonWidth = GetThemeSysSize(pcontext->theme, pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CXSMSIZE : SM_CXSIZE); + + switch(buttonId) + { + case CLOSEBUTTON: + iPartId = pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; + break; + + case MAXBUTTON: + if (!(pcontext->wi.dwStyle & WS_MAXIMIZEBOX)) + { + if (!(pcontext->wi.dwStyle & WS_MINIMIZEBOX)) + return; + else + iStateId = BUTTON_DISABLED; + } + + iPartId = pcontext->wi.dwStyle & WS_MAXIMIZE ? WP_RESTOREBUTTON : WP_MAXBUTTON; + break; + + case MINBUTTON: + if (!(pcontext->wi.dwStyle & WS_MINIMIZEBOX)) + { + if (!(pcontext->wi.dwStyle & WS_MAXIMIZEBOX)) + return; + else + iStateId = BUTTON_DISABLED; + } + + iPartId = WP_MINBUTTON; + break; + + default: + //FIXME: Implement Help Button + return; + } + + ButtonHeight -= 4; + ButtonWidth -= 4; + + /* Calculate the position */ + rcPart.top = prcCurrent->top; + rcPart.right = prcCurrent->right; + rcPart.bottom = rcPart.top + ButtonHeight ; + rcPart.left = rcPart.right - ButtonWidth ; + prcCurrent->right -= ButtonWidth + BUTTON_GAP_SIZE; + + DrawThemeBackground(pcontext->theme, pcontext->hDC, iPartId, iStateId, &rcPart, NULL); +} + +static void +ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) +{ + RECT rcPart; + int iPart, iState; + HICON hIcon; + WCHAR *CaptionText; + + hIcon = UserGetWindowIcon(pcontext->hWnd); + CaptionText = UserGetWindowCaption(pcontext->hWnd); + + /* Get the caption part and state id */ + if (pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW) + iPart = WP_SMALLCAPTION; + else if (pcontext->wi.dwStyle & WS_MAXIMIZE) + iPart = WP_MAXCAPTION; + else + iPart = WP_CAPTION; + + iState = pcontext->Active ? FS_ACTIVE : FS_INACTIVE; + + /* Draw the caption background*/ + rcPart = *prcCurrent; + rcPart.bottom = pcontext->CaptionHeight; + prcCurrent->top = rcPart.bottom; + DrawThemeBackground(pcontext->theme, pcontext->hDC,iPart,iState,&rcPart,NULL); + + /* Add a padding around the objects of the caption */ + InflateRect(&rcPart, -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE, + -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE); + + /* Draw the caption buttons */ + if (pcontext->wi.dwStyle & WS_SYSMENU) + { + iState = pcontext->Active ? BUTTON_NORMAL : BUTTON_INACTIVE; + + ThemeDrawCaptionButton(pcontext, &rcPart, CLOSEBUTTON, iState); + ThemeDrawCaptionButton(pcontext, &rcPart, MAXBUTTON, iState); + ThemeDrawCaptionButton(pcontext, &rcPart, MINBUTTON, iState); + ThemeDrawCaptionButton(pcontext, &rcPart, HELPBUTTON, iState); + } + + rcPart.top += 3 ; + + /* Draw the icon */ + if(hIcon && !(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW)) + { + int IconHeight = GetSystemMetrics(SM_CYSMICON); + int IconWidth = GetSystemMetrics(SM_CXSMICON); + DrawIconEx(pcontext->hDC, rcPart.left, rcPart.top , hIcon, IconWidth, IconHeight, 0, NULL, DI_NORMAL); + rcPart.left += IconWidth + 4; + } + + rcPart.right -= 4; + + /* Draw the caption */ + if(CaptionText) + { + /*FIXME: Use DrawThemeTextEx*/ + ThemeDrawCaptionText(pcontext->theme, + pcontext->hDC, + iPart, + iState, + CaptionText, + lstrlenW(CaptionText), + DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS, + 0, + &rcPart , + pcontext->Active); + HeapFree(GetProcessHeap(), 0, CaptionText); + } +} + +static void +ThemeDrawBorders(PDRAW_CONTEXT pcontext, RECT* prcCurrent) +{ + +} + +static void +DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) +{ + +} + +static void +ThemeDrawMenuBar(PDRAW_CONTEXT pcontext, PRECT prcCurrent) +{ + +} + +static void +ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar) +{ + +} + +static void +ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent) +{ + if(!(pcontext->wi.dwStyle & WS_VISIBLE)) + return; + + if(pcontext->wi.dwStyle & WS_MINIMIZE) + { + ThemeDrawTitle(pcontext, prcCurrent); + return; + } + + if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) + { + ThemeDrawCaption(pcontext, prcCurrent); + ThemeDrawBorders(pcontext, prcCurrent); + } + else + { + DrawClassicFrame(pcontext, prcCurrent); + } + + if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle)) + ThemeDrawMenuBar(pcontext, prcCurrent); + + if(pcontext->wi.dwStyle & WS_HSCROLL) + ThemeDrawScrollBar(pcontext, OBJID_VSCROLL); + + if(pcontext->wi.dwStyle & WS_VSCROLL) + ThemeDrawScrollBar(pcontext, OBJID_HSCROLL); } /* Message handlers */ - -static void -ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent) -{ - UNIMPLEMENTED; -} static LRESULT ThemeHandleNCPaint(HWND hWnd, HRGN hRgn)

1 0

[ekohl] 51803: [CFGMGR32] - Add forwarders for functions that have been implemented in setupapi.dll. - Remove forwarders which are not exported by cfgmgr32.dll.
by ekohl＠svn.reactos.org 16 May '11

16 May '11

Author: ekohl Date: Mon May 16 23:37:19 2011 New Revision: 51803 URL: http://svn.reactos.org/svn/reactos?rev=51803&view=rev Log: [CFGMGR32] - Add forwarders for functions that have been implemented in setupapi.dll. - Remove forwarders which are not exported by cfgmgr32.dll. Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] Mon May 16 23:37:19 2011 @@ -59,8 +59,8 @@ @ stdcall CM_Get_Class_NameW(ptr wstr ptr long) setupapi.CM_Get_Class_NameW @ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) setupapi.CM_Get_Class_Name_ExA @ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) setupapi.CM_Get_Class_Name_ExW -@ stub CM_Get_Class_Registry_PropertyA # setupapi.CM_Get_Class_Registry_PropertyA -@ stub CM_Get_Class_Registry_PropertyW # setupapi.CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr ptr long ptr) setupapi.CM_Get_Class_Registry_PropertyA +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr ptr long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stdcall CM_Get_Depth(ptr long long) setupapi.CM_Get_Depth @ stdcall CM_Get_Depth_Ex(ptr long long long) setupapi.CM_Get_Depth_Ex @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @@ -83,18 +83,18 @@ @ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long long) setupapi.CM_Get_Device_ID_List_Size_ExA @ stdcall CM_Get_Device_ID_Size(ptr long long) setupapi.CM_Get_Device_ID_Size @ stdcall CM_Get_Device_ID_Size_Ex(ptr long long long) setupapi.CM_Get_Device_ID_Size_Ex -@ stub CM_Get_Device_Interface_AliasA # setupapi.CM_Get_Device_Interface_AliasA -@ stub CM_Get_Device_Interface_AliasW # setupapi.CM_Get_Device_Interface_AliasW -@ stub CM_Get_Device_Interface_Alias_ExA # setupapi.CM_Get_Device_Interface_Alias_ExA -@ stub CM_Get_Device_Interface_Alias_ExW # setupapi.CM_Get_Device_Interface_Alias_ExW -@ stub CM_Get_Device_Interface_ListA # setupapi.CM_Get_Device_Interface_ListA -@ stub CM_Get_Device_Interface_ListW # setupapi.CM_Get_Device_Interface_ListW -@ stub CM_Get_Device_Interface_List_ExA # setupapi.CM_Get_Device_Interface_List_ExA -@ stub CM_Get_Device_Interface_List_ExW # setupapi.CM_Get_Device_Interface_List_ExW -@ stub CM_Get_Device_Interface_List_SizeA # setupapi.CM_Get_Device_Interface_List_SizeA -@ stub CM_Get_Device_Interface_List_SizeW # setupapi.CM_Get_Device_Interface_List_SizeW -@ stub CM_Get_Device_Interface_List_Size_ExA # setupapi.CM_Get_Device_Interface_List_Size_ExA -@ stub CM_Get_Device_Interface_List_Size_ExW # setupapi.CM_Get_Device_Interface_List_Size_ExW +@ stdcall CM_Get_Device_Interface_AliasA(str ptr str ptr long) setupapi.CM_Get_Device_Interface_AliasA +@ stdcall CM_Get_Device_Interface_AliasW(wstr ptr wstr ptr long) setupapi.CM_Get_Device_Interface_AliasW +@ stdcall CM_Get_Device_Interface_Alias_ExA(str ptr str ptr long long) setupapi.CM_Get_Device_Interface_Alias_ExA +@ stdcall CM_Get_Device_Interface_Alias_ExW(wstr ptr wstr ptr long long) setupapi.CM_Get_Device_Interface_Alias_ExW +@ stdcall CM_Get_Device_Interface_ListA(ptr str str long long) setupapi.CM_Get_Device_Interface_ListA +@ stdcall CM_Get_Device_Interface_ListW(ptr wstr wstr long long) setupapi.CM_Get_Device_Interface_ListW +@ stdcall CM_Get_Device_Interface_List_ExA(ptr str str long long ptr) setupapi.CM_Get_Device_Interface_List_ExA +@ stdcall CM_Get_Device_Interface_List_ExW(ptr wstr wstr long long ptr) setupapi.CM_Get_Device_Interface_List_ExW +@ stdcall CM_Get_Device_Interface_List_SizeA(ptr ptr str long) setupapi.CM_Get_Device_Interface_List_SizeA +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA +@ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW @ stdcall CM_Get_First_Log_Conf(ptr long long) setupapi.CM_Get_First_Log_Conf @ stdcall CM_Get_First_Log_Conf_Ex(ptr long long long) setupapi.CM_Get_First_Log_Conf_Ex @ stdcall CM_Get_Global_State(ptr long) setupapi.CM_Get_Global_State @@ -103,10 +103,10 @@ @ stdcall CM_Get_HW_Prof_FlagsW(wstr long ptr long) setupapi.CM_Get_HW_Prof_FlagsW @ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long long) setupapi.CM_Get_HW_Prof_Flags_ExA @ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long long) setupapi.CM_Get_HW_Prof_Flags_ExW -@ stub CM_Get_Hardware_Profile_InfoA # setupapi.CM_Get_Hardware_Profile_InfoA -@ stub CM_Get_Hardware_Profile_InfoW # setupapi.CM_Get_Hardware_Profile_InfoW -@ stub CM_Get_Hardware_Profile_Info_ExA # setupapi.CM_Get_Hardware_Profile_Info_ExA -@ stub CM_Get_Hardware_Profile_Info_ExW # setupapi.CM_Get_Hardware_Profile_Info_ExW +@ stdcall CM_Get_Hardware_Profile_InfoA(long ptr long) setupapi.CM_Get_Hardware_Profile_InfoA +@ stdcall CM_Get_Hardware_Profile_InfoW(long ptr long) setupapi.CM_Get_Hardware_Profile_InfoW +@ stdcall CM_Get_Hardware_Profile_Info_ExA(long ptr long long) setupapi.CM_Get_Hardware_Profile_Info_ExA +@ stdcall CM_Get_Hardware_Profile_Info_ExW(long ptr long long) setupapi.CM_Get_Hardware_Profile_Info_ExW @ stdcall CM_Get_Log_Conf_Priority(ptr ptr long) setupapi.CM_Get_Log_Conf_Priority @ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long) setupapi.CM_Get_Log_Conf_Priority_Ex @ stdcall CM_Get_Next_Log_Conf(ptr ptr long) setupapi.CM_Get_Next_Log_Conf @@ -146,29 +146,27 @@ @ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) setupapi.CM_Open_Class_Key_ExW @ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) setupapi.CM_Open_DevNode_Key @ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) setupapi.CM_Open_DevNode_Key_Ex -@ stub CM_Query_And_Remove_SubTreeA # setupapi.CM_Query_And_Remove_SubTreeA -@ stub CM_Query_And_Remove_SubTreeW # setupapi.CM_Query_And_Remove_SubTreeW -@ stub CM_Query_And_Remove_SubTree_ExA # setupapi.CM_Query_And_Remove_SubTree_ExA -@ stub CM_Query_And_Remove_SubTree_ExW # setupapi.CM_Query_And_Remove_SubTree_ExW -@ stub CM_Query_Arbitrator_Free_Data # setupapi.CM_Query_Arbitrator_Free_Data -@ stub CM_Query_Arbitrator_Free_Data_Ex # setupapi.CM_Query_Arbitrator_Free_Data_Ex -@ stub CM_Query_Arbitrator_Free_Size # setupapi.CM_Query_Arbitrator_Free_Size -@ stub CM_Query_Arbitrator_Free_Size_Ex # setupapi.CM_Query_Arbitrator_Free_Size_Ex -@ stub CM_Query_Remove_SubTree # setupapi.CM_Query_Remove_SubTree -@ stub CM_Query_Remove_SubTree_Ex # setupapi.CM_Query_Remove_SubTree_Ex +@ stdcall CM_Query_And_Remove_SubTreeA(long ptr str long long) setupapi.CM_Query_And_Remove_SubTreeA +@ stdcall CM_Query_And_Remove_SubTreeW(long ptr wstr long long) setupapi.CM_Query_And_Remove_SubTreeW +@ stdcall CM_Query_And_Remove_SubTree_ExA(long ptr str long long long) setupapi.CM_Query_And_Remove_SubTree_ExA +@ stdcall CM_Query_And_Remove_SubTree_ExW(long ptr wstr long long long) setupapi.CM_Query_And_Remove_SubTree_ExW +@ stdcall CM_Query_Arbitrator_Free_Data(ptr long long long long) setupapi.CM_Query_Arbitrator_Free_Data +@ stdcall CM_Query_Arbitrator_Free_Data_Ex(ptr long long long long ptr) setupapi.CM_Query_Arbitrator_Free_Data_Ex +@ stdcall CM_Query_Arbitrator_Free_Size(ptr long long long) setupapi.CM_Query_Arbitrator_Free_Size +@ stdcall CM_Query_Arbitrator_Free_Size_Ex(ptr long long long ptr) setupapi.CM_Query_Arbitrator_Free_Size_Ex +@ stdcall CM_Query_Remove_SubTree(long long) setupapi.CM_Query_Remove_SubTree +@ stdcall CM_Query_Remove_SubTree_Ex(long long long) setupapi.CM_Query_Remove_SubTree_Ex @ stub CM_Query_Resource_Conflict_List # setupapi.CM_Query_Resource_Conflict_List @ stdcall CM_Reenumerate_DevNode(long long) setupapi.CM_Reenumerate_DevNode @ stdcall CM_Reenumerate_DevNode_Ex(long long long) setuapi.CM_Reenumerate_DevNode_Ex -@ stub CM_Register_Device_Driver # setupapi.CM_Register_Device_Driver -@ stub CM_Register_Device_Driver_Ex # setupapi.CM_Register_Device_Driver_Ex -@ stub CM_Register_Device_InterfaceA # setupapi.CM_Register_Device_InterfaceA -@ stub CM_Register_Device_InterfaceW # setupapi.CM_Register_Device_InterfaceW -@ stub CM_Register_Device_Interface_ExA # setupapi.CM_Register_Device_Interface_ExA -@ stub CM_Register_Device_Interface_ExW # setupapi.CM_Register_Device_Interface_ExW -@ stub CM_Remove_SubTree # setupapi.CM_Remove_SubTree -@ stub CM_Remove_SubTree_Ex # setupapi.CM_Remove_SubTree_Ex -@ stub CM_Request_Device_EjectA # setupapi.CM_Request_Device_EjectA -@ stub CM_Request_Device_EjectW # setupapi.CM_Request_Device_EjectW +@ stdcall CM_Register_Device_Driver(long long) setupapi.CM_Register_Device_Driver +@ stdcall CM_Register_Device_Driver_Ex(long long ptr) setupapi.CM_Register_Device_Driver_Ex +@ stdcall CM_Register_Device_InterfaceA(long ptr str str ptr long) setupapi.CM_Register_Device_InterfaceA +@ stdcall CM_Register_Device_InterfaceW(long ptr wstr wstr ptr long) setupapi.CM_Register_Device_InterfaceW +@ stdcall CM_Register_Device_Interface_ExA(long ptr str str ptr long long) setupapi.CM_Register_Device_Interface_ExA +@ stdcall CM_Register_Device_Interface_ExW(long ptr wstr wstr ptr long long) setupapi.CM_Register_Device_Interface_ExW +@ stdcall CM_Remove_SubTree(long long) setupapi.CM_Remove_SubTree +@ stdcall CM_Remove_SubTree_Ex(long long long) setupapi.CM_Remove_SubTree_Ex @ stdcall CM_Request_Eject_PC() setupapi.CM_Request_Eject_PC @ stdcall CM_Request_Eject_PC_Ex(long) setupapi.CM_Request_Eject_PC_Ex @ stdcall CM_Run_Detection(long) setupapi.CM_Run_Detection @@ -181,8 +179,8 @@ @ stdcall CM_Set_DevNode_Registry_PropertyW(long long ptr long long) setupapi.CM_Set_DevNode_Registry_PropertyW @ stdcall CM_Set_DevNode_Registry_Property_ExA(long long ptr long long long) setupapi.CM_Set_DevNode_Registry_Property_ExA @ stdcall CM_Set_DevNode_Registry_Property_ExW(long long ptr long long long) setupapi.CM_Set_DevNode_Registry_Property_ExW -@ stub CM_Set_HW_Prof # setupapi.CM_Set_HW_Prof -@ stub CM_Set_HW_Prof_Ex # setupapi.CM_Set_HW_Prof_Ex +@ stdcall CM_Set_HW_Prof(long long) setupapi.CM_Set_HW_Prof +@ stdcall CM_Set_HW_Prof_Ex(long long long) setupapi.CM_Set_HW_Prof_Ex @ stdcall CM_Set_HW_Prof_FlagsA(str long long long) setupapi.CM_Set_HW_Prof_FlagsA @ stdcall CM_Set_HW_Prof_FlagsW(wstr long long long) setupapi.CM_Set_HW_Prof_FlagsW @ stdcall CM_Set_HW_Prof_Flags_ExA(str long long long long) setupapi.CM_Set_HW_Prof_Flags_ExA @@ -192,10 +190,10 @@ @ stub CM_Test_Range_Available # setupapi.CM_Test_Range_Available @ stdcall CM_Uninstall_DevNode(long long) setupapi.CM_Uninstall_DevNode @ stdcall CM_Uninstall_DevNode_Ex(long long long) setupapi.CM_Uninstall_DevNode_Ex -@ stub CM_Unregister_Device_InterfaceA # setupapi.CM_Unregister_Device_InterfaceA -@ stub CM_Unregister_Device_InterfaceW # setupapi.CM_Unregister_Device_InterfaceW -@ stub CM_Unregister_Device_Interface_ExA # setupapi.CM_Unregister_Device_Interface_ExA -@ stub CM_Unregister_Device_Interface_ExW # setupapi.CM_Unregister_Device_Interface_ExW +@ stdcall CM_Unregister_Device_InterfaceA(str long) setupapi.CM_Unregister_Device_InterfaceA +@ stdcall CM_Unregister_Device_InterfaceW(wstr long) setupapi.CM_Unregister_Device_InterfaceW +@ stdcall CM_Unregister_Device_Interface_ExA(str long long) setupapi.CM_Unregister_Device_Interface_ExA +@ stdcall CM_Unregister_Device_Interface_ExW(wstr long long) setupapi.CM_Unregister_Device_Interface_ExW # Deprecated functions, they are not present in Win2003 SP1 @ stub CM_Remove_Unmarked_Children # setupapi.CM_Remove_Unmarked_Children

1 0

[ekohl] 51802: [SETUPAPI] - Add stubs CM_Get_Class_Registry_PropertyA/W. - Move CMP_RegisterNotification, CMP_UnregisterNotification and CMP_WaitNoPendingInstallEvents. - Remove stubs TPWriteProfil...
by ekohl＠svn.reactos.org 16 May '11

16 May '11

Author: ekohl Date: Mon May 16 23:12:12 2011 New Revision: 51802 URL: http://svn.reactos.org/svn/reactos?rev=51802&view=rev Log: [SETUPAPI] - Add stubs CM_Get_Class_Registry_PropertyA/W. - Move CMP_RegisterNotification, CMP_UnregisterNotification and CMP_WaitNoPendingInstallEvents. - Remove stubs TPWriteProfileString and suErrorToIds because they are part of setupx.dll (16 bit DLL). Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Mon May 16 23:12:12 2011 @@ -84,25 +84,6 @@ /*********************************************************************** - * CMP_WaitNoPendingInstallEvents [SETUPAPI.@] - */ -DWORD WINAPI CMP_WaitNoPendingInstallEvents( - DWORD dwTimeout) -{ - HANDLE hEvent; - DWORD ret; - - hEvent = OpenEventW(SYNCHRONIZE, FALSE, L"Global\\PnP_No_Pending_Install_Events"); - if (hEvent == NULL) - return WAIT_FAILED; - - ret = WaitForSingleObject(hEvent, dwTimeout); - CloseHandle(hEvent); - return ret; -} - - -/*********************************************************************** * CMP_Init_Detection [SETUPAPI.@] */ CONFIGRET WINAPI CMP_Init_Detection( @@ -130,6 +111,22 @@ RpcEndExcept; return ret; +} + + +/*********************************************************************** + * CMP_RegisterNotification [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CMP_RegisterNotification(IN HANDLE hRecipient, + IN LPVOID lpvNotificationFilter, + IN DWORD dwFlags, + OUT PULONG pluhDevNotify) +{ + FIXME("Stub %p %p %lu %p\n", hRecipient, lpvNotificationFilter, dwFlags, pluhDevNotify); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return CR_FAILURE; } @@ -180,6 +177,37 @@ /*********************************************************************** + * CMP_UnregisterNotification [SETUPAPI.@] + */ +CONFIGRET +WINAPI +CMP_UnregisterNotification(IN HDEVNOTIFY handle) +{ + FIXME("Stub %p\n", handle); + return CR_SUCCESS; +} + + +/*********************************************************************** + * CMP_WaitNoPendingInstallEvents [SETUPAPI.@] + */ +DWORD WINAPI CMP_WaitNoPendingInstallEvents( + DWORD dwTimeout) +{ + HANDLE hEvent; + DWORD ret; + + hEvent = OpenEventW(SYNCHRONIZE, FALSE, L"Global\\PnP_No_Pending_Install_Events"); + if (hEvent == NULL) + return WAIT_FAILED; + + ret = WaitForSingleObject(hEvent, dwTimeout); + CloseHandle(hEvent); + return ret; +} + + +/*********************************************************************** * CMP_WaitServicesAvailable [SETUPAPI.@] */ CONFIGRET @@ -1546,6 +1574,44 @@ RpcEndExcept; return ret; +} + + +/*********************************************************************** + * CM_Get_Class_Registry_PropertyA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA( + LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType, + PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("\n"); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * CM_Get_Class_Registry_PropertyW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW( + LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType, + PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("\n"); + +#if 0 + if (ClassGuid == NULL || + pulLength == NULL) + return 3; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (pSetupStringFromGuid(ClassGuid, ebp_6c, 0x27) != 0) + return 1F; +#endif + + + return CR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Mon May 16 23:12:12 2011 @@ -62,8 +62,8 @@ @ stdcall CM_Get_Class_NameW(ptr wstr ptr long) @ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) @ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) -@ stub CM_Get_Class_Registry_PropertyA -@ stub CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr ptr long ptr) +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr ptr long ptr) @ stdcall CM_Get_Depth(ptr long long) @ stdcall CM_Get_Depth_Ex(ptr long long long) @ stub CM_Get_DevNode_Custom_PropertyA Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Mon May 16 23:12:12 2011 @@ -21,25 +21,6 @@ #include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); - -/*********************************************************************** - * TPWriteProfileString (SETUPX.62) - */ -BOOL WINAPI TPWriteProfileString16( LPCSTR section, LPCSTR entry, LPCSTR string ) -{ - FIXME( "%s %s %s: stub\n", debugstr_a(section), debugstr_a(entry), debugstr_a(string) ); - return TRUE; -} - - -/*********************************************************************** - * suErrorToIds (SETUPX.61) - */ -DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) -{ - FIXME( "%x %x: stub\n", w1, w2 ); - return 0; -} /*********************************************************************** * pSetupRegistryDelnode(SETUPAPI.@) @@ -159,35 +140,6 @@ } -/*********************************************************************** - * CMP_RegisterNotification(SETUPAPI.@) - */ -CONFIGRET -WINAPI -CMP_RegisterNotification( - IN HANDLE hRecipient, - IN LPVOID lpvNotificationFilter, - IN DWORD dwFlags, - OUT PULONG pluhDevNotify) -{ - FIXME ("Stub %p %p %lu %p\n", hRecipient, lpvNotificationFilter, dwFlags, pluhDevNotify); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return CR_FAILURE; -} - - -/*********************************************************************** - * CMP_UnregisterNotification(SETUPAPI.@) - */ -CONFIGRET -WINAPI -CMP_UnregisterNotification(IN HDEVNOTIFY handle) -{ - FIXME ("Stub %p\n", handle); - return CR_SUCCESS; -} - - WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceAlias(IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN CONST GUID *AliasInterfaceClassGuid, OUT PSP_DEVICE_INTERFACE_DATA AliasDeviceInterfaceData) { FIXME("%p %p %p %p %p stub\n", DeviceInfoSet, DeviceInterfaceData, AliasInterfaceClassGuid, AliasDeviceInterfaceData);

1 0

[spetreolle] 51801: Add cmake configure script for unix.
by spetreolle＠svn.reactos.org 16 May '11

16 May '11

Author: spetreolle Date: Mon May 16 21:26:08 2011 New Revision: 51801 URL: http://svn.reactos.org/svn/reactos?rev=51801&view=rev Log: Add cmake configure script for unix. Added: trunk/reactos/configure.sh (with props) Modified: trunk/reactos/configure.cmd (props changed) Propchange: trunk/reactos/configure.cmd ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=51801&vie… ============================================================================== --- trunk/reactos/configure.sh (added) +++ trunk/reactos/configure.sh [iso-8859-1] Mon May 16 21:26:08 2011 @@ -1,0 +1,38 @@ +#!/bin/bash +if [ "x$ROS_ARCH" == "x" ] +then + echo Could not detect RosBE. + exit 1 +fi + +BUILD_ENVIRONMENT=MinGW +ARCH=$ROS_ARCH +REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) +REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH + +echo ARCH $ARCH ROS $ROS_ARCH +if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] +then + echo Creating directories in $REACTOS_OUTPUT_PATH + mkdir -p $REACTOS_OUTPUT_PATH + cd "$REACTOS_OUTPUT_PATH" +fi + +mkdir -p host-tools +mkdir -p reactos + +echo Preparing host tools... +cd host-tools +if [ -f CMakeCache.txt ] +then + rm -f CMakeCache.txt +fi + +REACTOS_BUILD_TOOLS_DIR="$PWD" +cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" + +cd ../reactos +cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" + +echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, makex, etc...). + Propchange: trunk/reactos/configure.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/configure.sh ------------------------------------------------------------------------------ svn:executable = *

1 0

[mkupfer] 51800: restart German translation - please don't delete existing work in future
by mkupfer＠svn.reactos.org 16 May '11

16 May '11

Author: mkupfer Date: Mon May 16 19:13:15 2011 New Revision: 51800 URL: http://svn.reactos.org/svn/reactos?rev=51800&view=rev Log: restart German translation - please don't delete existing work in future Modified: trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5180… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 51799: [CMAKE] * Add the missing temporary import libs.
by akhaldi＠svn.reactos.org 16 May '11

16 May '11

Author: akhaldi Date: Mon May 16 18:53:45 2011 New Revision: 51799 URL: http://svn.reactos.org/svn/reactos?rev=51799&view=rev Log: [CMAKE] * Add the missing temporary import libs. Added: trunk/reactos/importlibs/libcoldname.a (with props) trunk/reactos/importlibs/libgcc.a (with props) trunk/reactos/importlibs/libmingw32.a (with props) trunk/reactos/importlibs/libmingwex.a (with props) trunk/reactos/importlibs/libsupc++.a (with props) Added: trunk/reactos/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libcoldname.a?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libcoldname.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libgcc.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libgcc.a?rev=51… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libgcc.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libmingw32.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libmingw32.a?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libmingw32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libmingwex.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libmingwex.a?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libmingwex.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/importlibs/libsupc++.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libsupc%2B%2B.a… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libsupc++.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 51798: [GDI FONT DRIVER] - Implement copying 1bpp bitmaps - The driver now "works" as a replacement for the original true type driver in Windows, several glitches need to be fixed
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 18:13:29 2011 New Revision: 51798 URL: http://svn.reactos.org/svn/reactos?rev=51798&view=rev Log: [GDI FONT DRIVER] - Implement copying 1bpp bitmaps - The driver now "works" as a replacement for the original true type driver in Windows, several glitches need to be fixed Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Mon May 16 18:13:29 2011 @@ -434,7 +434,25 @@ BYTE *pjDest, FT_Bitmap *ftbitmap) { - __debugbreak(); + ULONG ulRows, ulDstDelta, ulSrcDelta; + PBYTE pjDstLine, pjSrcLine; + + pjDstLine = pjDest; + ulDstDelta = (ftbitmap->width + 7) / 8; + + pjSrcLine = ftbitmap->buffer; + ulSrcDelta = abs(ftbitmap->pitch); + + ulRows = ftbitmap->rows; + while (ulRows--) + { + /* Copy one line */ + memcpy(pjDstLine, pjSrcLine, ulDstDelta); + + /* Next ros */ + pjDstLine += ulDstDelta; + pjSrcLine += ulSrcDelta; + } } static

1 0

[pschweitzer] 51797: [NTOSKRNL] - Fix the fix for IopStoreSystemPartitionInformation(). The sizeof wasn't on an unicode string... I blame the guy who first wrote that function! Thanks to "rs" on IR...
by pschweitzer＠svn.reactos.org 16 May '11

16 May '11

Author: pschweitzer Date: Mon May 16 18:06:14 2011 New Revision: 51797 URL: http://svn.reactos.org/svn/reactos?rev=51797&view=rev Log: [NTOSKRNL] - Fix the fix for IopStoreSystemPartitionInformation(). The sizeof wasn't on an unicode string... I blame the guy who first wrote that function! Thanks to "rs" on IRC for having spotted the error. Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Mon May 16 18:06:14 2011 @@ -701,7 +701,7 @@ UNICODE_STRING LinkTarget, KeyName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE LinkHandle, RegistryHandle, KeyHandle; - WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof("SystemPartition") / sizeof(WCHAR)]; + WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof(L"SystemPartition") / sizeof(WCHAR)]; UNICODE_STRING CmRegistryMachineSystemName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM"); ASSERT(NtSystemPartitionDeviceName->MaximumLength >= NtSystemPartitionDeviceName->Length + sizeof(WCHAR));

1 0

[pschweitzer] 51796: [NTOSKRNL] - Implemented IoSetSystemPartition(). This is required by MountMgr. - Fixed buffer size in IopStoreSystemPartitionInformation(). No need to have a buffer twice bigge...
by pschweitzer＠svn.reactos.org 16 May '11

16 May '11

Author: pschweitzer Date: Mon May 16 17:52:03 2011 New Revision: 51796 URL: http://svn.reactos.org/svn/reactos?rev=51796&view=rev Log: [NTOSKRNL] - Implemented IoSetSystemPartition(). This is required by MountMgr. - Fixed buffer size in IopStoreSystemPartitionInformation(). No need to have a buffer twice bigger than maximum use. Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Mon May 16 17:52:03 2011 @@ -701,7 +701,7 @@ UNICODE_STRING LinkTarget, KeyName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE LinkHandle, RegistryHandle, KeyHandle; - WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof("SystemPartition")]; + WCHAR LinkTargetBuffer[256], KeyNameBuffer[sizeof("SystemPartition") / sizeof(WCHAR)]; UNICODE_STRING CmRegistryMachineSystemName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM"); ASSERT(NtSystemPartitionDeviceName->MaximumLength >= NtSystemPartitionDeviceName->Length + sizeof(WCHAR)); Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Mon May 16 17:52:03 2011 @@ -937,14 +937,56 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI IoSetSystemPartition(IN PUNICODE_STRING VolumeNameString) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + HANDLE RootHandle, KeyHandle; + UNICODE_STRING HKLMSystem, KeyString; + WCHAR Buffer[sizeof(L"SystemPartition") / sizeof(WCHAR)]; + + RtlInitUnicodeString(&HKLMSystem, L"\\REGISTRY\\MACHINE\\SYSTEM"); + + /* Open registry to save data (HKLM\SYSTEM) */ + Status = IopOpenRegistryKeyEx(&RootHandle, 0, &HKLMSystem, KEY_ALL_ACCESS); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Create or open Setup subkey */ + KeyString.Buffer = Buffer; + KeyString.Length = sizeof(L"Setup") - sizeof(UNICODE_NULL); + KeyString.MaximumLength = sizeof(L"Setup"); + RtlCopyMemory(Buffer, L"Setup", sizeof(L"Setup")); + Status = IopCreateRegistryKeyEx(&KeyHandle, + RootHandle, + &KeyString, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + NULL); + ZwClose(RootHandle); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Store caller value */ + KeyString.Length = sizeof(L"SystemPartition") - sizeof(UNICODE_NULL); + KeyString.MaximumLength = sizeof(L"SystemPartition"); + RtlCopyMemory(Buffer, L"SystemPartition", sizeof(L"SystemPartition")); + Status = ZwSetValueKey(KeyHandle, + &KeyString, + 0, + REG_SZ, + VolumeNameString->Buffer, + VolumeNameString->Length + sizeof(UNICODE_NULL)); + ZwClose(KeyHandle); + + return Status; } /*

1 0

[gschneider] 51795: [charmap] Carlo Bramini (carlo dot bramix at libero dot it): - Fix font zoom when scrolling and changing fonts - Optimize font zoom drawing See issue #3500 for more details.
by gschneider＠svn.reactos.org 16 May '11

16 May '11

Author: gschneider Date: Mon May 16 17:46:49 2011 New Revision: 51795 URL: http://svn.reactos.org/svn/reactos?rev=51795&view=rev Log: [charmap] Carlo Bramini (carlo dot bramix at libero dot it): - Fix font zoom when scrolling and changing fonts - Optimize font zoom drawing See issue #3500 for more details. Modified: trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Mon May 16 17:46:49 2011 @@ -61,53 +61,76 @@ static VOID DrawGrid(PMAP infoPtr, - HDC hdc) + PAINTSTRUCT *ps) { INT x, y; + RECT rc; + PCELL Cell; for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { - Rectangle(hdc, - infoPtr->Cells[y][x].CellExt.left, - infoPtr->Cells[y][x].CellExt.top, - infoPtr->Cells[y][x].CellExt.right, - infoPtr->Cells[y][x].CellExt.bottom); - } - - if (infoPtr->pActiveCell) - DrawActiveCell(infoPtr, - hdc); + Cell = &infoPtr->Cells[y][x]; + + if (!IntersectRect(&rc, + &ps->rcPaint, + &Cell->CellExt)) + { + continue; + } + + Rectangle(ps->hdc, + Cell->CellExt.left, + Cell->CellExt.top, + Cell->CellExt.right, + Cell->CellExt.bottom); + + if (infoPtr->pActiveCell == Cell) + { + DrawActiveCell(infoPtr, ps->hdc); + } + } } static VOID FillGrid(PMAP infoPtr, - HDC hdc) + PAINTSTRUCT *ps) { HFONT hOldFont; WCHAR ch; INT x, y; - - hOldFont = SelectObject(hdc, + RECT rc; + PCELL Cell; + + hOldFont = SelectObject(ps->hdc, infoPtr->hFont); for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { + Cell = &infoPtr->Cells[y][x]; + + if (!IntersectRect(&rc, + &ps->rcPaint, + &Cell->CellExt)) + { + continue; + } + ch = (WCHAR)((XCELLS * (y + infoPtr->iYStart)) + x); - TagFontToCell(&infoPtr->Cells[y][x], ch); - - DrawTextW(hdc, + TagFontToCell(Cell, ch); + + DrawTextW(ps->hdc, &ch, 1, - &infoPtr->Cells[y][x].CellInt, + &Cell->CellInt, DT_CENTER | DT_VCENTER | DT_SINGLELINE); } - SelectObject(hdc, + SelectObject(ps->hdc, hOldFont); } @@ -187,6 +210,10 @@ { HDC hdc; + /* Destroy Zoom window, since it was created with older font */ + DestroyWindow(infoPtr->hLrgWnd); + infoPtr->hLrgWnd = NULL; + if (infoPtr->hFont) DeleteObject(infoPtr->hFont); @@ -207,6 +234,13 @@ InvalidateRect(infoPtr->hMapWnd, NULL, TRUE); + + /* Test if zoom window must be reopened */ + if (infoPtr->pActiveCell != NULL && + infoPtr->pActiveCell->bLarge) + { + CreateLargeCell(infoPtr); + } } @@ -391,6 +425,11 @@ iYDiff = iOldYStart - infoPtr->iYStart; if (iYDiff) { + if (infoPtr->hLrgWnd != NULL) + { + ShowWindow(infoPtr->hLrgWnd, SW_HIDE); + } + SetScrollPos(infoPtr->hMapWnd, SB_VERT, infoPtr->iYStart, @@ -417,6 +456,11 @@ NULL, TRUE); } + + if (infoPtr->hLrgWnd != NULL) + { + ShowWindow(infoPtr->hLrgWnd, SW_SHOW); + } } } @@ -450,11 +494,9 @@ } } - DrawGrid(infoPtr, - hdc); - - FillGrid(infoPtr, - hdc); + DrawGrid(infoPtr, &ps); + + FillGrid(infoPtr, &ps); if (wParam == 0) {

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