Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 23171: Alexey Minnekhanov (minlexx@rambler.ru): - Implement setting of desktop background color. This feature is tested to work in Windows XP, however in ReactOS the setting currently does no effect. - Improve russian translation, also check and fix layout/placement (so that russian words actually fit)
by fireball＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: fireball Date: Wed Jul 19 12:45:21 2006 New Revision: 23171 URL: http://svn.reactos.org/svn/reactos?rev=23171&view=rev Log: Alexey Minnekhanov (minlexx(a)rambler.ru): - Implement setting of desktop background color. This feature is tested to work in Windows XP, however in ReactOS the setting currently does no effect. - Improve russian translation, also check and fix layout/placement (so that russian words actually fit) Modified: trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=231… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Wed Jul 19 12:45:21 2006 @@ -1,120 +1,142 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_BACKGROUND DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ôîí" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW, 80, 10, - 83, 57, WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32", LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP, 8, 114, 174, 68 - LTEXT "Âûáåðèòå èçîáðàæåíèå äëÿ ðàáî÷åãî ñòîëà:", - IDC_STATIC, 8, 103, 180, 9 - PUSHBUTTON "&Îáçîð...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 - PUSHBUTTON "&Öâåò...", IDC_COLOR_BUTTON, 188, 167, 50, 15 - LTEXT "Ðàñïîëîæåíèå:", IDC_STATIC, 188, 138, 50, 9 - COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,80,10,83, + 57,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | + WS_BORDER | WS_TABSTOP,8,114,174,68 + LTEXT "Âûáåðèòå èçîáðàæåíèå äëÿ ðàáî÷åãî ñòîëà:",IDC_STATIC,8, + 103,180,9 + PUSHBUTTON "&Îáçîð...",IDC_BROWSE_BUTTON,188,114,55,15 + PUSHBUTTON "&Öâåò...",IDC_COLOR_BUTTON,188,167,55,15 + LTEXT "Ðàñïîëîæåíèå:",IDC_STATIC,188,138,55,9 + COMBOBOX IDC_PLACEMENT_COMBO,188,149,55,54,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Çàñòàâêà" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY, 5, 7, 238, 137 - - LTEXT "Ñïèñîê çàñòàâîê:",IDC_STATIC,13, 24, 150, 9 + GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY,5,7,238,137 + LTEXT "Ñïèñîê çàñòàâîê:",IDC_STATIC,13,24,150,9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - - PUSHBUTTON "&Íàñòðîéêà...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP - PUSHBUTTON "Ïðî&ñìîòð",IDC_SCREENS_TESTSC,188, 52, 50, 15 - - CONTROL "&Çàùèòà ïàðîëåì.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 13, 121, 119, 18 - - LTEXT "&Èíòåðâàë:",IDC_STATIC, 13, 110, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 33, 109, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 52, 109, 12, 12 - LTEXT "ìèíóò äî îòîáðàæåíèÿ çàñòàâêè.",IDC_STATIC, 70, 111, 147, 9 - - GROUPBOX "&Ýíåðãîñáåðåãàþùèå ôóíêöèè ìîíèòîðà",IDC_SCREENS_DUMMY2, 5, 146, 238, 50 + LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | + WS_BORDER | WS_TABSTOP,13,34,170,69 + PUSHBUTTON "&Íàñòðîéêà...",IDC_SCREENS_SETTINGS,188,34,50,15, + WS_GROUP + PUSHBUTTON "Ïðî&ñìîòð",IDC_SCREENS_TESTSC,188,52,50,15 + CONTROL "&Çàùèòà ïàðîëåì.",IDC_SCREENS_USEPASSCHK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,121,119,18 + LTEXT "&Èíòåðâàë:",IDC_STATIC,13,110,35,9 + EDITTEXT IDC_SCREENS_TIMEDELAY,53,109,31,12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME,"msctls_updown32",UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,87,108,13,12 + LTEXT "ìèíóò äî îòîáðàæåíèÿ çàñòàâêè.",IDC_STATIC,109,110,118, + 9 + GROUPBOX "&Ýíåðãîñáåðåãàþùèå ôóíêöèè ìîíèòîðà",IDC_SCREENS_DUMMY2, + 5,146,238,50 LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó Ïàðàìåòðû Ïèòàíèÿ.", - IDC_STATIC, 16, 159, 145, 35 - PUSHBUTTON "Ïàðàìåòðû &Ïèòàíèÿ",IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 + IDC_STATIC,16,159,145,35 + PUSHBUTTON "Ïàðàìåòðû &ïèòàíèÿ",IDC_SCREENS_POWER_BUTTON,157,162,81, + 15 END -IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_APPEARANCE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Îôîðìëåíèå" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,66, - 90,112,8 + LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,65,87,114,8 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_SETTINGS DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Íàñòðîéêè" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "&Äèñïëåé:",1820,3,100,30,8 LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Îáëàñòü ýêðàíà",1818,3,120,119,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 33,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP,33,130,58,17 LTEXT "Ìåíüøå",1815,7,130,27,8,NOT WS_GROUP LTEXT "Áîëüøå",1816,91,130,27,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + CTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT + WS_GROUP GROUPBOX "&Öâåòà",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,133,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SETTINGS_BPP,133,130,103,80,CBS_DROPDOWNLIST | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 PUSHBUTTON "Äî&ïîëíèòåëüíî...",IDC_SETTINGS_ADVANCED,306,165,56,14 END -IDR_POPUP_MENU MENU DISCARDABLE + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_POPUP_MENU MENU BEGIN - POPUP "" - BEGIN - MENUITEM "&Configure", ID_MENU_CONFIG - MENUITEM "&Preview", ID_MENU_PREVIEW - MENUITEM SEPARATOR - MENUITEM "&Add", ID_MENU_ADD - MENUITEM "&Delete\tDel", ID_MENU_DELETE - END + POPUP "" + BEGIN + MENUITEM "&Íàñòðîèòü", ID_MENU_CONFIG + MENUITEM "&Ïðåäïðîñìîòð", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Äîáàâèòü", ID_MENU_ADD + MENUITEM "&Óäàëèòü\tDel", ID_MENU_DELETE + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_CPLNAME "Äèñïëåé" + IDS_CPLDESCRIPTION "Âûáåðèòå äèñïëåé ðàáî÷åãî ñòîëà è çàñòàâêó." + IDS_NONE "(íåò)" + IDS_CENTER "Ïî öåíòðó" + IDS_STRETCH "Ðàñòÿíóòü" + IDS_TILE "Ïîâòîðÿòü" END STRINGTABLE BEGIN - IDS_CPLNAME "Äèñïëåé" - IDS_CPLDESCRIPTION "Âûáåðèòå äèñïëåé ðàáî÷åãî ñòîëà è çàñòàâêó." - - IDS_NONE "(íåò)" - IDS_CENTER "Ïî öåíòðó" - IDS_STRETCH "Ðàñòÿíóòü" - IDS_TILE "Ïîâòîðÿòü" + IDS_COLOR_4BIT "16 öâåòîâ" + IDS_COLOR_8BIT "256 öâåòîâ" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN - IDS_COLOR_4BIT "16 öâåòîâ" - IDS_COLOR_8BIT "256 öâåòîâ" - IDS_COLOR_16BIT "High Color (16 áèò)" - IDS_COLOR_24BIT "True Color (24 áèòà)" - IDS_COLOR_32BIT "True Color (32 áèòà)" - IDS_PIXEL "%lux%lu òî÷åê" + IDS_COLOR_16BIT "High Color (16 áèò)" + IDS_COLOR_24BIT "True Color (24 áèòà)" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_COLOR_32BIT "True Color (32 áèòà)" END + +STRINGTABLE +BEGIN + IDS_PIXEL "%lux%lu òî÷åê" +END + +STRINGTABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\000*.bmp;*.dib" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Wed Jul 19 12:45:21 2006 @@ -6,6 +6,7 @@ * PURPOSE: Background property page * * PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com) + * Alexey Minnekhanov (minlexx(a)rambler.ru) */ #include "desk.h" @@ -31,6 +32,7 @@ int g_placementSelection = 0; int g_backgroundSelection = 0; +COLORREF g_backgroundDesktopColor = 0; int g_listViewItemCount = 0; @@ -52,7 +54,7 @@ WIN32_FIND_DATA fd; HANDLE hFind; TCHAR szSearchPath[MAX_PATH]; - TCHAR szFileTypes[MAX_PATH]; + TCHAR szFileTypes[MAX_PATH]; LV_ITEM listItem; LV_COLUMN dummy; RECT clientRect; @@ -65,8 +67,8 @@ LONG result; UINT i = 0; BackgroundItem *backgroundItem = NULL; - TCHAR separators[] = TEXT(";"); - TCHAR *token; + TCHAR separators[] = TEXT(";"); + TCHAR *token; GetClientRect(g_hBackgroundList, &clientRect); @@ -76,13 +78,10 @@ dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); (void)ListView_InsertColumn(g_hBackgroundList, 0, &dummy); - + /* Add the "None" item */ - - backgroundItem = &g_backgroundItems[g_listViewItemCount]; - + backgroundItem = &g_backgroundItems[g_listViewItemCount]; backgroundItem->bWallpaper = FALSE; - LoadString(hApplet, IDS_NONE, backgroundItem->szDisplayName, @@ -102,9 +101,7 @@ g_listViewItemCount++; /* Add current wallpaper if any */ - RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); if((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) @@ -231,7 +228,9 @@ LONG result; BITMAP bitmap; - g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); + g_backgroundDesktopColor = GetSysColor( COLOR_BACKGROUND ); + + g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); g_hBackgroundPreview = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW); g_hPlacementCombo = GetDlgItem(g_hBackgroundPage, IDC_PLACEMENT_COMBO); g_hColorButton = GetDlgItem(g_hBackgroundPage, IDC_COLOR_BUTTON); @@ -297,7 +296,30 @@ void OnColorButton() { - MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK); + CHOOSECOLOR cc; + COLORREF custom_colors[16]; + + cc.lStructSize = sizeof(CHOOSECOLOR); + cc.hwndOwner = g_hBackgroundPage; + cc.hInstance = NULL; + cc.rgbResult = g_backgroundDesktopColor; + + memset(custom_colors, RGB(255,255,255), sizeof(custom_colors)); + + cc.lpCustColors = custom_colors; + cc.Flags = CC_ANYCOLOR | /* Causes the dialog box to display all available colors in the set of basic colors. */ + CC_FULLOPEN | /* opens dialog in full size */ + CC_RGBINIT ; /* init chosen color by rgbResult value */ + cc.lCustData = 0; + cc.lpfnHook = NULL; + cc.lpTemplateName = NULL; + + if( ChooseColor( &cc ) ) + { + g_backgroundDesktopColor = cc.rgbResult; /* save selected color to var */ + PropSheet_Changed( GetParent( g_hBackgroundPage ), g_hBackgroundPage ); /* Apply button will be activated */ + InvalidateRect(g_hBackgroundPreview, NULL, TRUE); /* window will be updated :) */ + } } BOOL CheckListBoxFilename(HWND list, TCHAR *filename) @@ -314,9 +336,9 @@ TCHAR fileTitle[256]; TCHAR filter[MAX_PATH]; BackgroundItem *backgroundItem = NULL; - SHFILEINFO sfi; - LV_ITEM listItem; - + SHFILEINFO sfi; + LV_ITEM listItem; + ZeroMemory(&ofn, sizeof(OPENFILENAME)); ofn.lStructSize = sizeof(OPENFILENAME); @@ -324,7 +346,7 @@ ofn.lpstrFile = filename; LoadString(hApplet, IDS_BACKGROUND_COMDLG_FILTER, filter, sizeof(filter) / sizeof(TCHAR)); - + /* Set lpstrFile[0] to '\0' so that GetOpenFileName does not * use the contents of szFile to initialize itself */ ofn.lpstrFile[0] = TEXT('\0'); @@ -337,7 +359,7 @@ ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; if(GetOpenFileName(&ofn) == TRUE) - { + { /* Check if there is already a entry that holds this filename */ if(CheckListBoxFilename(g_hBackgroundList, filename) == TRUE) return; @@ -414,7 +436,11 @@ if(g_backgroundItems[g_backgroundSelection].bWallpaper == FALSE) { - FillRect(draw->hDC, &draw->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); + HBRUSH hBrush = CreateSolidBrush( g_backgroundDesktopColor ); + //HBRUSH hBrushOld = SelectObject( draw->hDC, hBrush ); + FillRect(draw->hDC, &draw->rcItem, hBrush ); + //SelectObject( draw->hDC, hBrushOld ); + DeleteObject( hBrush ); return; } @@ -531,6 +557,30 @@ else { SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); + } +} + +void SetDesktopBackColor() +{ + /* change system color */ + INT iElement = COLOR_BACKGROUND; + if(!SetSysColors(1, &iElement, &g_backgroundDesktopColor)) + { + MessageBox(g_hBackgroundPage, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ + TEXT("Error!"), MB_ICONSTOP ); + } + + /* write color to registry key: HKEY_CURRENT_USER\Control Panel\Colors\Background */ + HKEY hKey = NULL; + if( RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS ) + { + TCHAR clText[16] = {0}; // COLORREF(DWORD) holds colors as := 0x00BBGGRR + DWORD red = (g_backgroundDesktopColor & 0x000000FF); + DWORD green = (g_backgroundDesktopColor & 0x0000FF00) >> 8; + DWORD blue = (g_backgroundDesktopColor & 0x00FF0000) >> 16; + wsprintf( clText, TEXT("%d %d %d"), red, green, blue ); /* format string to be set to registry */ + RegSetValueEx( hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR) ); + RegCloseKey( hKey ); } } @@ -622,7 +672,7 @@ case PSN_APPLY: { SetWallpaper(); - + SetDesktopBackColor(); return TRUE; } break;

1 0

[fireball] 23170: Add HKCU\Control Panel\Colors\Background key for storing desktop background color (Windows XP stores it in this key)
by fireball＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: fireball Date: Wed Jul 19 12:40:38 2006 New Revision: 23170 URL: http://svn.reactos.org/svn/reactos?rev=23170&view=rev Log: Add HKCU\Control Panel\Colors\Background key for storing desktop background color (Windows XP stores it in this key) Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Wed Jul 19 12:40:38 2006 @@ -5,6 +5,8 @@ HKCU,"Control Panel",,0x00000012 HKCU,"Control Panel\Appearance",,0x00000012 +HKCU,"Control Panel\Colors",,0x00000012 +HKCU,"Control Panel\Colors","Background",0x00000012, "0 128 128" HKCU,"Control Panel\Mouse","MouseTrails",0x00010001,0x00000000 HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00010001,0x00000000 HKCU,"Control Panel\Mouse","MouseSpeed",0x00010001,0x00000001

1 0

[jimtabor] 23169: User32 Implement MenuTrackKbdMenuBar, it does work but, alt f works but hit alt again goes into a message loop. So hit alt f than esc esc. If hit alt f than alt v or something else the popup menu stays displayed until the program has terminated.
by jimtabor＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: jimtabor Date: Wed Jul 19 11:10:56 2006 New Revision: 23169 URL: http://svn.reactos.org/svn/reactos?rev=23169&view=rev Log: User32 Implement MenuTrackKbdMenuBar, it does work but, alt f works but hit alt again goes into a message loop. So hit alt f than esc esc. If hit alt f than alt v or something else the popup menu stays displayed until the program has terminated. Modified: trunk/reactos/dll/win32/user32/include/menu.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/menu.h (original) +++ trunk/reactos/dll/win32/user32/include/menu.h Wed Jul 19 11:10:56 2006 @@ -17,6 +17,6 @@ VOID MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt); VOID -MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key); +MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar); #endif /* __LIB_USER32_INCLUDE_MENU_H */ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Wed Jul 19 11:10:56 2006 @@ -766,9 +766,10 @@ LRESULT -DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt) +DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { WINDOWPLACEMENT wp; + POINT Pt; switch (wParam & 0xfff0) { @@ -804,16 +805,24 @@ SendMessageA(hWnd, WM_CLOSE, 0, 0); break; case SC_MOUSEMENU: - MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt); + { + Pt.x = (short)LOWORD(lParam); + Pt.y = (short)HIWORD(lParam); + MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt); + } break; case SC_KEYMENU: - MenuTrackKbdMenuBar(hWnd, wParam, Pt.x); + MenuTrackKbdMenuBar(hWnd, wParam, (WCHAR)lParam); break; case SC_VSCROLL: case SC_HSCROLL: - DefWndTrackScrollBar(hWnd, wParam, Pt); + { + Pt.x = (short)LOWORD(lParam); + Pt.y = (short)HIWORD(lParam); + DefWndTrackScrollBar(hWnd, wParam, Pt); + } break; - + default: /* FIXME: Implement */ UNIMPLEMENTED; @@ -1305,13 +1314,7 @@ } case WM_SYSCOMMAND: - { - POINT Pt; - Pt.x = GET_X_LPARAM(lParam); - Pt.y = GET_Y_LPARAM(lParam); - return (DefWndHandleSysCommand(hWnd, wParam, Pt)); - } - + return (DefWndHandleSysCommand(hWnd, wParam, lParam)); case WM_KEYDOWN: if(wParam == VK_F10) iF10Key = VK_F10; Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Wed Jul 19 11:10:56 2006 @@ -3320,9 +3320,13 @@ fRemove = TRUE; /* Keyboard messages are always removed */ switch(Msg.message) { + case WM_SYSKEYDOWN: case WM_KEYDOWN: switch(Msg.wParam) { + case VK_MENU: + fEndMenu = TRUE; + break; case VK_HOME: case VK_END: if (MenuGetRosMenuInfo(&MenuInfo, Mt.CurrentMenu)) @@ -3408,20 +3412,6 @@ break; } break; /* WM_KEYDOWN */ - - case WM_SYSKEYDOWN: - switch (Msg.wParam) - { - DbgPrint("Menu.c WM_SYSKEYDOWN wPram %d\n",Msg.wParam); - case VK_MENU: - fEndMenu = TRUE; - break; - case VK_LMENU: - fEndMenu = TRUE; - break; - } - break; /* WM_SYSKEYDOWN */ - case WM_CHAR: case WM_SYSCHAR: { @@ -3566,8 +3556,73 @@ VOID -MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key) -{ +MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar) +{ + UINT uItem = NO_SELECTED_ITEM; + HMENU hTrackMenu; + ROSMENUINFO MenuInfo; + UINT wFlags = TPM_ENTERIDLEEX | TPM_LEFTALIGN | TPM_LEFTBUTTON; + + DPRINT("hwnd %p wParam 0x%04x wChar 0x%04x\n", hWnd, wParam, wChar); + + /* find window that has a menu */ + + while (!((GetWindowLongW( hWnd, GWL_STYLE ) & + (WS_CHILD | WS_POPUP)) != WS_CHILD)) + if (!(hWnd = GetAncestor( hWnd, GA_PARENT ))) return; + + /* check if we have to track a system menu */ + + hTrackMenu = GetMenu( hWnd ); + if (!hTrackMenu || IsIconic(hWnd) || wChar == ' ' ) + { + if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_SYSMENU)) return; + hTrackMenu = NtUserGetSystemMenu(hWnd, FALSE); + uItem = 0; + wParam |= HTSYSMENU; /* prevent item lookup */ + } + + if (!IsMenu( hTrackMenu )) return; + + MenuInitTracking( hWnd, hTrackMenu, FALSE, wFlags ); + + if (! MenuGetRosMenuInfo(&MenuInfo, hTrackMenu)) + { + goto track_menu; + } + + if( wChar && wChar != ' ' ) + { + uItem = MenuFindItemByKey( hWnd, &MenuInfo, wChar, (wParam & HTSYSMENU) ); + if ( uItem >= (UINT)(-2) ) + { + if( uItem == (UINT)(-1) ) MessageBeep(0); + /* schedule end of menu tracking */ + wFlags |= TF_ENDMENU; + goto track_menu; + } + } + + MenuSelectItem( hWnd, &MenuInfo, uItem, TRUE, 0 ); + + if (wParam & HTSYSMENU) + { + /* prevent sysmenu activation for managed windows on Alt down/up */ +// if (GetPropA( hwnd, "__wine_x11_managed" )) + wFlags |= TF_ENDMENU; /* schedule end of menu tracking */ + } + else + { + if( uItem == NO_SELECTED_ITEM ) + MenuMoveSelection( hWnd, &MenuInfo, ITEM_NEXT ); + else + PostMessageW( hWnd, WM_KEYDOWN, VK_DOWN, 0L ); + } + +track_menu: + MenuTrackMenu( hTrackMenu, wFlags, 0, 0, hWnd, NULL ); + MenuExitTracking( hWnd ); + }

1 0

[greatlrd] 23168: hacking NtGdiDdResetVisrgn so it lest say clip have not change. for now
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 06:14:26 2006 New Revision: 23168 URL: http://svn.reactos.org/svn/reactos?rev=23168&view=rev Log: hacking NtGdiDdResetVisrgn so it lest say clip have not change. for now Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Wed Jul 19 06:14:26 2006 @@ -338,9 +338,18 @@ HWND hwnd ) { - UNIMPLEMENTED - - return 0; + DPRINT1("UNIMPLEMENTED NtGdiDdResetVisrgn \n"); + /* see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu… + for more info, I pasted some part of it here + Clipping can change asynchronously from the point of view of user-mode threads. + The kernel-mode parts of DirectDraw and Microsoft Windows Graphics Device Interface (GDI) + maintain a counter that is incremented whenever the clipping list for the entire desktop + changes. A call to this function records this counter with every existing DirectDraw + primary surface on the system. + + */ + + return TRUE; }

1 0

[greatlrd] 23167: more source cleanup
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 06:03:22 2006 New Revision: 23167 URL: http://svn.reactos.org/svn/reactos?rev=23167&view=rev Log: more source cleanup Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 06:03:22 2006 @@ -474,32 +474,30 @@ DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdDestroySurface\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - { - DD_DESTROYSURFACEDATA DestroySurf; - - /* FIXME - * bRealDestroy - * are we doing right ?? - */ - DestroySurf.lpDD = &pDirectDraw->Global; - - DestroySurf.lpDDSurface = hSurface; // ? - DestroySurf.DestroySurface = pDirectDraw->Surf.DestroySurface; + + if (pDirectDraw != NULL) + { + if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) + { + DD_DESTROYSURFACEDATA DestroySurf; + + /* FIXME + * bRealDestroy + * are we doing right ?? + */ + + DestroySurf.lpDD = &pDirectDraw->Global; + DestroySurf.lpDDSurface = hSurface; // ? + DestroySurf.DestroySurface = pDirectDraw->Surf.DestroySurface; - ddRVal = pDirectDraw->Surf.DestroySurface(&DestroySurf); - } - - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + ddRVal = pDirectDraw->Surf.DestroySurface(&DestroySurf); + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; } @@ -511,33 +509,29 @@ PDD_FLIPDATA puFlipData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurfaceTarget, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdFlip\n"); -#endif - - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puFlipData->lpDD; - - /* use our cache version instead */ - puFlipData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_FLIP)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->Surf.Flip(puFlipData); - - /* But back the orignal PDev */ - puFlipData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + + if (pDirectDraw != NULL) + { + if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_FLIP) + { + lgpl = puFlipData->lpDD; + puFlipData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->Surf.Flip(puFlipData); + + puFlipData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; } @@ -547,32 +541,28 @@ HDC hdcClip ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdLock\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puLockData->lpDD; - - /* use our cache version instead */ - puLockData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_LOCK)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->Surf.Lock(puLockData); - - /* But back the orignal PDev */ - puLockData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if (pDirectDraw != NULL) + { + if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_LOCK) + { + lgpl = puLockData->lpDD; + puLockData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->Surf.Lock(puLockData); + + puLockData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; }

1 0

[greatlrd] 23166: small cleanup of the code in this file. and alot of callbacks working as they should if a drv support it.
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 05:49:55 2006 New Revision: 23166 URL: http://svn.reactos.org/svn/reactos?rev=23166&view=rev Log: small cleanup of the code in this file. and alot of callbacks working as they should if a drv support it. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 05:49:55 2006 @@ -264,7 +264,6 @@ RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof( D3DNTHAL_CALLBACKS ) ); } - if (pHalInfo->lpD3DBufCallbacks) { DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); @@ -370,34 +369,28 @@ PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw; -#ifdef DX_DEBUG + DPRINT1("NtGdiDdWaitForVerticalBlank\n"); -#endif - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puWaitForVerticalBlankData->lpDD; - - /* use our cache version instead */ - puWaitForVerticalBlankData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->DD.WaitForVerticalBlank(puWaitForVerticalBlankData); - - /* But back the orignal PDev */ - puWaitForVerticalBlankData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if (pDirectDraw != NULL) + { + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + lgpl = puWaitForVerticalBlankData->lpDD; + puWaitForVerticalBlankData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->DD.WaitForVerticalBlank(puWaitForVerticalBlankData); + + puWaitForVerticalBlankData->lpDD = lgpl; + } + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; } @@ -406,33 +399,33 @@ PDD_CANCREATESURFACEDATA puCanCreateSurfaceData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdCanCreateSurface\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puCanCreateSurfaceData->lpDD; - - /* use our cache version instead */ - puCanCreateSurfaceData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->DD.CanCreateSurface(puCanCreateSurfaceData); - - /* But back the orignal PDev */ - puCanCreateSurfaceData->lpDD = lgpl; + + if (pDirectDraw == NULL) + return DDHAL_DRIVER_NOTHANDLED; + + if (pDirectDraw != NULL) + { + + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + lgpl = puCanCreateSurfaceData->lpDD; + puCanCreateSurfaceData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->DD.CanCreateSurface(puCanCreateSurfaceData); + + puCanCreateSurfaceData->lpDD = lgpl; + } GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return ddRVal; + } + + return ddRVal; } DWORD STDCALL NtGdiDdGetScanLine( @@ -440,33 +433,29 @@ PDD_GETSCANLINEDATA puGetScanLineData ) { - DWORD ddRVal; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdGetScanLine\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puGetScanLineData->lpDD; - - /* use our cache version instead */ - puGetScanLineData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->DD.GetScanLine(puGetScanLineData); - - /* But back the orignal PDev */ - puGetScanLineData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return ddRVal; + + if (pDirectDraw != NULL) + { + if (pDirectDraw->DD.dwFlags & DDHAL_CB32_GETSCANLINE) + { + lgpl = puGetScanLineData->lpDD; + puGetScanLineData->lpDD = &pDirectDraw->Global; + + ddRVal = pDirectDraw->DD.GetScanLine(puGetScanLineData); + + puGetScanLineData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + + return ddRVal; }

1 0

[greatlrd] 23165: Complete NtGdiDdQueryDirectDrawObject now we support all 3d callbacks.
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 05:40:06 2006 New Revision: 23165 URL: http://svn.reactos.org/svn/reactos?rev=23165&view=rev Log: Complete NtGdiDdQueryDirectDrawObject now we support all 3d callbacks. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 05:40:06 2006 @@ -257,17 +257,14 @@ DPRINT1("Found DirectDraw Global DriverData \n"); RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); } - /* FIXME - * we missing D3DHAL_CALLBACKS in the headers - * if (pHalInfo->lpD3DHALCallbacks ) { DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); - RtlMoveMemory(puD3dCallbacks, (ULONG *)pHalInfo->lpD3DHALCallbacks, sizeof( D3DHAL_CALLBACKS )); - } - - */ + RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, sizeof( D3DNTHAL_CALLBACKS ) ); + } + + if (pHalInfo->lpD3DBufCallbacks) { DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); @@ -288,15 +285,11 @@ DWORD ddRVal = 0; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG + DPRINT1("NtGdiDdGetDriverInfo\n"); -#endif - - if (pDirectDraw == NULL) - { -#ifdef DX_DEBUG - DPRINT1("Can not lock DirectDraw handle \n"); -#endif + + if (pDirectDraw == NULL) + { return DDHAL_DRIVER_NOTHANDLED; } @@ -312,14 +305,13 @@ /* Now we are doing the call to drv DrvGetDriverInfo */ if (ddRVal == 2) { -#ifdef DX_DEBUG DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED"); -#endif ddRVal = DDHAL_DRIVER_NOTHANDLED; } else + { ddRVal = pDirectDraw->Hal.GetDriverInfo(puGetDriverInfoData); - + } GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return ddRVal;

1 0

[greatlrd] 23164: cleanup NtGdiDdCreateSurface we can now create a surface from DdCreateSurface.
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 04:41:18 2006 New Revision: 23164 URL: http://svn.reactos.org/svn/reactos?rev=23164&view=rev Log: cleanup NtGdiDdCreateSurface we can now create a surface from DdCreateSurface. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jul 19 04:41:18 2006 @@ -344,42 +344,32 @@ DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw; PDD_DIRECTDRAW_GLOBAL lgpl; -#ifdef DX_DEBUG + DPRINT1("NtGdiDdCreateSurface\n"); -#endif pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - if (pDirectDraw == NULL) - { -#ifdef DX_DEBUG - DPRINT1("Can not lock the DirectDraw handle\n"); -#endif - return DDHAL_DRIVER_NOTHANDLED; - } - - /* backup the orignal PDev and info */ - lgpl = puCreateSurfaceData->lpDD; - - /* use our cache version instead */ - puCreateSurfaceData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) - { -#ifdef DX_DEBUG - DPRINT1("DirectDraw HAL does not support Create Surface"); -#endif - ddRVal = DDHAL_DRIVER_NOTHANDLED; - } - else - { - ddRVal = pDirectDraw->DD.CreateSurface(puCreateSurfaceData); - } - - /* But back the orignal PDev */ - puCreateSurfaceData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if (pDirectDraw != NULL) + { + + if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) + { + /* backup the orignal PDev and info */ + lgpl = puCreateSurfaceData->lpDD; + + /* use our cache version instead */ + puCreateSurfaceData->lpDD = &pDirectDraw->Global; + + /* make the call */ + ddRVal = pDirectDraw->DD.CreateSurface(puCreateSurfaceData); + + /* But back the orignal PDev */ + puCreateSurfaceData->lpDD = lgpl; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + } + return ddRVal; }

1 0

[greatlrd] 23163: Fixing small bug in DdCreateSurface
by greatlrd＠svn.reactos.org 19 Jul '06

19 Jul '06

Author: greatlrd Date: Wed Jul 19 04:39:03 2006 New Revision: 23163 URL: http://svn.reactos.org/svn/reactos?rev=23163&view=rev Log: Fixing small bug in DdCreateSurface Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/dd.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/dd.c Wed Jul 19 04:39:03 2006 @@ -68,11 +68,11 @@ } DWORD CALLBACK -DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd) +DdCreateSurface(PDD_CREATESURFACEDATA pcsd) { int i; - if (pcsd->dwSCnt == 1) + if (pcsd->dwSCnt < 1) { pcsd->ddRVal = DDERR_GENERIC; return DDHAL_DRIVER_NOTHANDLED; Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Wed Jul 19 04:39:03 2006 @@ -82,7 +82,7 @@ DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd ); DWORD CALLBACK -DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd); +DdCreateSurface(PDD_CREATESURFACEDATA pcsd); VOID STDCALL DrvDisableDirectDraw(

1 0

[greatlrd] 23162: framebuf Implement DdCreateSurface not tested. Bugfix the prototyped.
by greatlrd＠svn.reactos.org 18 Jul '06

18 Jul '06

Author: greatlrd Date: Wed Jul 19 03:56:48 2006 New Revision: 23162 URL: http://svn.reactos.org/svn/reactos?rev=23162&view=rev Log: framebuf Implement DdCreateSurface not tested. Bugfix the prototyped. Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/dd.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/dd.c Wed Jul 19 03:56:48 2006 @@ -68,9 +68,49 @@ } DWORD CALLBACK -DdCreateSurface(PDD_CREATESURFACEDATA lpCreateSurface) +DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd) { - lpCreateSurface->ddRVal = DDERR_GENERIC; - return DDHAL_DRIVER_NOTHANDLED; + int i; + + if (pcsd->dwSCnt == 1) + { + pcsd->ddRVal = DDERR_GENERIC; + return DDHAL_DRIVER_NOTHANDLED; + } + + + for (i=0; i<(int)pcsd->dwSCnt; i++) + { + pcsd->lplpSList[i]->lpGbl->lPitch = (DWORD)(pcsd->lplpSList[i]->lpGbl->wWidth * + (pcsd->lplpSList[i]->lpGbl->ddpfSurface.dwRGBBitCount / 8)); + + pcsd->lplpSList[i]->lpGbl->dwBlockSizeX = pcsd->lplpSList[i]->lpGbl->lPitch * + (DWORD)(pcsd->lplpSList[i]->lpGbl->wHeight); + + pcsd->lplpSList[i]->lpGbl->dwBlockSizeY = 1; + + if ( pcsd->lplpSList[i] ->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + /* We maybe should alloc it with EngAlloc + for now we trusting ddraw alloc it */ + pcsd->lplpSList[i]->lpGbl->fpVidMem = 0; + } + else + { + + /* We maybe should alloc it with EngAlloc + for now we trusting ddraw alloc it */ + pcsd->lplpSList[i]->lpGbl->fpVidMem = DDHAL_PLEASEALLOC_BLOCKSIZE; + } + + pcsd->lpDDSurfaceDesc->lPitch = pcsd->lplpSList[i]->lpGbl->lPitch; + pcsd->lpDDSurfaceDesc->dwFlags |= DDSD_PITCH; + + } // for i + + + + pcsd->ddRVal = DD_OK; + return DDHAL_DRIVER_HANDLED; } Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Wed Jul 19 03:56:48 2006 @@ -82,7 +82,7 @@ DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd ); DWORD CALLBACK -DdCreateSurface(PDD_CREATESURFACEDATA lpCreateSurface); +DdCreateSurface(LPDDHAL_CREATESURFACEDATA pcsd); VOID STDCALL DrvDisableDirectDraw(

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