Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[tkreuzer] 28308: 65 tests for NtGdiCreateBitmap

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 13 02:33:21 2007 New Revision: 28308 URL: http://svn.reactos.org/svn/reactos?rev=28308&view=rev Log: 65 tests for NtGdiCreateBitmap Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Mon Aug 13 02:33:21 2007 @@ -1,0 +1,184 @@ +#include "../w32knapi.h" + +W32KAPI +HBITMAP +APIENTRY +NtGdiCreateBitmap( + IN INT cx, + IN INT cy, + IN UINT cPlanes, + IN UINT cBPP, + IN OPTIONAL LPBYTE pjInit +) +{ + return (HBITMAP)Syscall(L"NtGdiCreateBitmap", 5, &cx); +} + +INT +Test_NtGdiCreateBitmap_Params(PTESTINFO pti) +{ + HBITMAP hBmp; + BITMAP bitmap; + BYTE BitmapData[10] = {0x11, 0x22, 0x33}; + + /* Test simple params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + DeleteObject(hBmp); + + /* Test all zero */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(0, 0, 0, 0, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test cx == 0 */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(0, 1, 1, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test negative cx */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(-10, 1, 1, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test cy == 0 */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 0, 1, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test negative cy */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, -2, 1, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test negative cy */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, -2, 1, 1, BitmapData) == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test huge size */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(100000, 100000, 1, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_NOT_ENOUGH_MEMORY); + + /* Test cPlanes == 0 */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 0, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmType == 0); + TEST(bitmap.bmWidth == 1); + TEST(bitmap.bmHeight == 1); + TEST(bitmap.bmWidthBytes == 2); + TEST(bitmap.bmPlanes == 1); + TEST(bitmap.bmBitsPixel == 1); + DeleteObject(hBmp); + + /* Test big cPlanes */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 32, 1, NULL)) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + DeleteObject(hBmp); + + TEST(NtGdiCreateBitmap(1, 1, 33, 1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test cBPP == 0 */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 0, NULL)) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmType == 0); + TEST(bitmap.bmWidth == 1); + TEST(bitmap.bmHeight == 1); + TEST(bitmap.bmWidthBytes == 2); + TEST(bitmap.bmPlanes == 1); + TEST(bitmap.bmBitsPixel == 1); + DeleteObject(hBmp); + + /* Test negative cBPP */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 1, 1, -1, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test bad cBPP */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 3, NULL)) != NULL); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmBitsPixel == 4); + DeleteObject(hBmp); + + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 6, NULL)) != NULL); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmBitsPixel == 8); + DeleteObject(hBmp); + + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 15, NULL)) != NULL); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmBitsPixel == 16); + DeleteObject(hBmp); + + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 17, NULL)) != NULL); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmBitsPixel == 24); + DeleteObject(hBmp); + + TEST((hBmp = NtGdiCreateBitmap(1, 1, 3, 7, NULL)) != NULL); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmBitsPixel == 24); + DeleteObject(hBmp); + + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 25, NULL)) != NULL); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmBitsPixel == 32); + DeleteObject(hBmp); + + TEST(GetLastError() == ERROR_SUCCESS); + + TEST(NtGdiCreateBitmap(1, 1, 1, 33, NULL) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test bad pointer */ + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCreateBitmap(1, 1, 1, 1, (BYTE*)0x80001234) == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test pointer alignment */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 1, &BitmapData[1])) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + DeleteObject(hBmp); + + /* Test normal params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(5, 7, 2, 4, NULL)) != NULL); + TEST(GetLastError() == ERROR_SUCCESS); + ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + TEST(bitmap.bmType == 0); + TEST(bitmap.bmWidth == 5); + TEST(bitmap.bmHeight == 7); + TEST(bitmap.bmWidthBytes == 6); + TEST(bitmap.bmPlanes == 1); + TEST(bitmap.bmBitsPixel == 8); + DeleteObject(hBmp); + + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiCreateBitmap(PTESTINFO pti) +{ + INT ret; + + ret = Test_NtGdiCreateBitmap_Params(pti); + if (ret != APISTATUS_NORMAL) + return ret; + +// ret = Test_NtGdiCreateBitmap_Pixel(pti); +// if (ret != APISTATUS_NORMAL) +// return ret; + + return APISTATUS_NORMAL; + +} Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c Mon Aug 13 02:33:21 2007 @@ -1,0 +1,19 @@ +#include "../w32knapi.h" + +W32KAPI +HBITMAP +APIENTRY +NtGdiCreateCompatibleBitmap( + IN HDC hdc, + IN INT cx, + IN INT cy +) +{ + return (HBITMAP)Syscall(L"NtGdiCreateCompatibleBitmap", 3, &hdc); +} + +INT +Test_NtGdiCreateCompatibleBitmap(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Mon Aug 13 02:33:21 2007 @@ -7,6 +7,8 @@ #include "ntdd/NtGdiDdQueryDirectDrawObject.c" #include "ntgdi/NtGdiArcInternal.c" +#include "ntgdi/NtGdiCreateBitmap.c" +#include "ntgdi/NtGdiCreateCompatibleBitmap.c" //#include "ntgdi/NtGdiDoPalette.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetRandomRgn.c" @@ -23,9 +25,10 @@ { L"NtGdiDdQueryDirectDrawObject", Test_NtGdiDdQueryDirectDrawObject }, { L"NtGdiDdDeleteDirectDrawObject", Test_NtGdiDdDeleteDirectDrawObject }, - /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, + { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, + { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, // { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn },

17 years, 4 months

[ekohl] 28307: Fix a typo.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Aug 13 01:50:37 2007 New Revision: 28307 URL: http://svn.reactos.org/svn/reactos?rev=28307&view=rev Log: Fix a typo. Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/de-DE.rc Mon Aug 13 01:50:37 2007 @@ -3,7 +3,7 @@ IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Datum & Uhrzeit" +CAPTION "Datum && Uhrzeit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "&Datum", -1, 4, 2, 122, 125

17 years, 4 months

[ekohl] 28306: Add some mouse keys settings and general settings.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Aug 13 01:19:52 2007 New Revision: 28306 URL: http://svn.reactos.org/svn/reactos?rev=28306&view=rev Log: Add some mouse keys settings and general settings. Modified: trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Mon Aug 13 01:19:52 2007 @@ -2,7 +2,7 @@ * * PROJECT: ReactOS System Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/advanced.c + * FILE: dll/cpl/access/general.c * PURPOSE: Memory, start-up and profiles settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: @@ -10,8 +10,148 @@ */ #include <windows.h> #include <stdlib.h> +#include <stdio.h> +#include <commctrl.h> +#include <prsht.h> +#include <tchar.h> #include "resource.h" #include "access.h" + + +typedef struct _GLOBAL_DATA +{ + ACCESSTIMEOUT accessTimeout; + SERIALKEYS serialKeys; + BOOL bWarningSounds; + BOOL bSoundOnActivation; +} GLOBAL_DATA, *PGLOBAL_DATA; + + +static VOID +FillResetComboBox(HWND hwnd) +{ + TCHAR szBuffer[16]; + INT i; + + for (i = 0; i < 6; i++) + { + _stprintf(szBuffer, _T("%u"), (i + 1) * 5); + SendMessage(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + } +} + + +static VOID +ReadGlobalData(PGLOBAL_DATA pGlobalData) +{ + DWORD dwDisposition; + DWORD dwLength; + HKEY hKey; + LONG lError; + + /* Get access timeout information */ + pGlobalData->accessTimeout.cbSize = sizeof(ACCESSTIMEOUT); + SystemParametersInfo(SPI_GETACCESSTIMEOUT, + sizeof(ACCESSTIMEOUT), + &pGlobalData->accessTimeout, + 0); + + /* Get serial keys information */ + pGlobalData->serialKeys.cbSize = sizeof(SERIALKEYS); + SystemParametersInfo(SPI_GETSERIALKEYS, + sizeof(SERIALKEYS), + &pGlobalData->serialKeys, + 0); + + pGlobalData->bWarningSounds = TRUE; + pGlobalData->bSoundOnActivation = TRUE; + + lError = RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Control Panel\\Accessibility"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_EXECUTE | KEY_QUERY_VALUE, + NULL, + &hKey, + &dwDisposition); + if (lError != ERROR_SUCCESS) + return; + + dwLength = sizeof(BOOL); + lError = RegQueryValueEx(hKey, + _T("Warning Sounds"), + NULL, + NULL, + (LPBYTE)&pGlobalData->bWarningSounds, + &dwLength); + if (lError != ERROR_SUCCESS) + pGlobalData->bWarningSounds = TRUE; + + dwLength = sizeof(BOOL); + lError = RegQueryValueEx(hKey, + _T("Sound On Activation"), + NULL, + NULL, + (LPBYTE)&pGlobalData->bSoundOnActivation, + &dwLength); + if (lError != ERROR_SUCCESS) + pGlobalData->bSoundOnActivation = TRUE; + + + RegCloseKey(hKey); +} + + +static VOID +WriteGlobalData(PGLOBAL_DATA pGlobalData) +{ + DWORD dwDisposition; + HKEY hKey; + LONG lError; + + SystemParametersInfo(SPI_SETACCESSTIMEOUT, + sizeof(ACCESSTIMEOUT), + &pGlobalData->accessTimeout, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + + SystemParametersInfo(SPI_SETSERIALKEYS, + sizeof(SERIALKEYS), + &pGlobalData->serialKeys, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + + lError = RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Control Panel\\Accessibility"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, + &hKey, + &dwDisposition); + if (lError != ERROR_SUCCESS) + return; + + RegSetValueEx(hKey, + _T("Warning Sounds"), + 0, + REG_DWORD, + (LPBYTE)&pGlobalData->bWarningSounds, + sizeof(BOOL)); + + RegSetValueEx(hKey, + _T("Sound On Activation"), + 0, + REG_DWORD, + (LPBYTE)pGlobalData->bSoundOnActivation, + sizeof(BOOL)); + + RegCloseKey(hKey); +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -20,27 +160,84 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + PGLOBAL_DATA pGlobalData; + LPPSHNOTIFY lppsn; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - break; + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + if (pGlobalData == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + ReadGlobalData(pGlobalData); + + /* Set access timeout info */ + CheckDlgButton(hwndDlg, + IDC_RESET_BOX, + pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? BST_CHECKED : BST_UNCHECKED); + FillResetComboBox(GetDlgItem(hwndDlg, IDC_RESET_COMBO)); + SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_SETCURSEL, + (pGlobalData->accessTimeout.iTimeOutMSec / 300000) - 1, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_RESET_COMBO), + pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? TRUE : FALSE); + + CheckDlgButton(hwndDlg, + IDC_NOTIFICATION_MESSAGE, + pGlobalData->bWarningSounds ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_NOTIFICATION_SOUND, + pGlobalData->bSoundOnActivation ? BST_CHECKED : BST_UNCHECKED); + + /* Set serial keys info */ + CheckDlgButton(hwndDlg, + IDC_SERIAL_BOX, + pGlobalData->serialKeys.dwFlags & SERKF_SERIALKEYSON ? BST_CHECKED : BST_UNCHECKED); + EnableWindow(GetDlgItem(hwndDlg, IDC_SERIAL_BOX), + pGlobalData->serialKeys.dwFlags & SERKF_AVAILABLE ? TRUE : FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SERIAL_BUTTON), + pGlobalData->serialKeys.dwFlags & SERKF_AVAILABLE ? TRUE : FALSE); + + return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_RESET_BOX: + pGlobalData->accessTimeout.dwFlags ^= ATF_TIMEOUTON; + EnableWindow(GetDlgItem(hwndDlg, IDC_RESET_COMBO), + pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? TRUE : FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + + case IDC_RESET_COMBO: + if (HIWORD(wParam) == CBN_CLOSEUP) + { + INT nSel; + nSel = SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_GETCURSEL, 0, 0); + pGlobalData->accessTimeout.iTimeOutMSec = (ULONG)((nSel + 1) * 300000); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; case IDC_NOTIFICATION_MESSAGE: + pGlobalData->bWarningSounds = !pGlobalData->bWarningSounds; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_NOTIFICATION_SOUND: + pGlobalData->bSoundOnActivation = !pGlobalData->bSoundOnActivation; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_SERIAL_BOX: + pGlobalData->serialKeys.dwFlags ^= SERKF_SERIALKEYSON; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_SERIAL_BUTTON: @@ -56,7 +253,19 @@ break; } break; - } + + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY)lParam; + if (lppsn->hdr.code == PSN_APPLY) + { + WriteGlobalData(pGlobalData); + return TRUE; + } + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pGlobalData); + break; } return FALSE; } Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Mon Aug 13 01:19:52 2007 @@ -72,7 +72,7 @@ GROUPBOX "Automatické vypnutí",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Vypnout &funkce usnadnìní po neèinnosti delí ne:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Upozornìní",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -158,6 +158,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Monosti usnadnìní" Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Mon Aug 13 01:19:52 2007 @@ -75,7 +75,7 @@ AUTOCHECKBOX "Ei&ngabehilfen automatisch deaktivieren nach:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 LTEXT "&Minuten",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Benachrichtigung",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Warnsignal ausgeben, wenn eine Funktion eingeschaltet wird",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+15,14 @@ -160,6 +160,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Bedienbarkeit" Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Mon Aug 13 01:19:52 2007 @@ -71,7 +71,7 @@ GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notification",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -157,6 +157,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Mon Aug 13 01:19:52 2007 @@ -75,7 +75,7 @@ GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notificación",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -161,6 +161,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilidad" Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Mon Aug 13 01:19:52 2007 @@ -73,7 +73,7 @@ GROUPBOX "Réinitialisation automatique",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Désactiver les fonctionnalités d'accessibilité après un délai d'inactivité de :",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Avertissement",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -159,6 +159,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilité" Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Mon Aug 13 01:19:52 2007 @@ -73,7 +73,7 @@ GROUPBOX "Automatikus visszaállítás",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Kapcsolja ki a kisegítõ lehetõségeket egy bizonyos idejû tétlenség után:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "&Figyelmeztetés",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -159,6 +159,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Kisegítõ lehetõségek" Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Mon Aug 13 01:19:52 2007 @@ -74,7 +74,7 @@ GROUPBOX "Otomatis Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Matikan fitur aksesibilitas setelah diam selama:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Pemberitahuan",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -160,6 +160,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Aksesibilitas" Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Mon Aug 13 01:19:52 2007 @@ -72,7 +72,7 @@ GROUPBOX "Reset Automatico",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Disattiva le funzioni di accessibilità se fermo per:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notifiche",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -158,6 +158,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Mon Aug 13 01:19:52 2007 @@ -72,7 +72,7 @@ GROUPBOX "©®Zbg",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "[U[âð³øÉ·éÜÅÌÒ¿Ô(&T):",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Êm",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -158,6 +158,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "[U[â" Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Mon Aug 13 01:19:52 2007 @@ -74,7 +74,7 @@ GROUPBOX "Beginwaarden automatisch instellen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "T&oegankelijkheidsfuncties uitschakelen wanneer deze niet gebruikte worden gedurende:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Melding",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -160,6 +160,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Toegankelijkheidsopties" Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Mon Aug 13 01:19:52 2007 @@ -75,7 +75,7 @@ GROUPBOX "Automatyczny reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Wy³¹cz funkcje u³atwiaj¹ce dostêp kiedy komputer nie jest u¿ywany przez:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Minut",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -161,6 +161,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "U³atwienia dostêpu" Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Mon Aug 13 01:19:52 2007 @@ -72,7 +72,7 @@ GROUPBOX "Àâòîìàòè÷åñêèé ñáðîñ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Îòêëþ÷àòü ïðè ïðîñòîå â òå÷åíèå:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Ìèíóòû",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Óâåäîìëåíèå",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -158,6 +158,18 @@ END +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Mon Aug 13 01:19:52 2007 @@ -2,7 +2,7 @@ * * PROJECT: ReactOS System Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/advanced.c + * FILE: dll/cpl/access/mouse.c * PURPOSE: Memory, start-up and profiles settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: @@ -10,30 +10,45 @@ */ #include <windows.h> #include <stdlib.h> +#include <commctrl.h> +#include <prsht.h> +#include <tchar.h> #include "resource.h" #include "access.h" -/* Property page dialog callback */ +typedef struct _GLOBAL_DATA +{ + MOUSEKEYS mouseKeys; +} GLOBAL_DATA, *PGLOBAL_DATA; + + INT_PTR CALLBACK -MousePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +MouseKeysDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: + pGlobalData = (PGLOBAL_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + break; + case WM_COMMAND: switch (LOWORD(wParam)) { - case IDC_MOUSE_BOX: + case IDOK: + EndDialog(hwndDlg, TRUE); break; - case IDC_MOUSE_BUTTON: + case IDCANCEL: + EndDialog(hwndDlg, FALSE); break; default: @@ -44,3 +59,81 @@ return FALSE; } + + +/* Property page dialog callback */ +INT_PTR CALLBACK +MousePageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + LPPSHNOTIFY lppsn; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + if (pGlobalData == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + /* Get mouse keys information */ + pGlobalData->mouseKeys.cbSize = sizeof(MOUSEKEYS); + SystemParametersInfo(SPI_GETMOUSEKEYS, + sizeof(MOUSEKEYS), + &pGlobalData->mouseKeys, + 0); + + /* Set the checkbox */ + CheckDlgButton(hwndDlg, + IDC_MOUSE_BOX, + pGlobalData->mouseKeys.dwFlags & MKF_MOUSEKEYSON ? BST_CHECKED : BST_UNCHECKED); + return TRUE; + + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_MOUSE_BOX: + pGlobalData->mouseKeys.dwFlags ^= MKF_MOUSEKEYSON; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + + case IDC_MOUSE_BUTTON: + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_MOUSEKEYSOPTIONS), + hwndDlg, + (DLGPROC)MouseKeysDlgProc, + (LPARAM)pGlobalData)) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + + default: + break; + } + break; + + case WM_NOTIFY: + lppsn = (LPPSHNOTIFY)lParam; + if (lppsn->hdr.code == PSN_APPLY) + { + SystemParametersInfo(SPI_SETMOUSEKEYS, + sizeof(MOUSEKEYS), + &pGlobalData->mouseKeys, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); + return TRUE; + } + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pGlobalData); + break; + } + + return FALSE; +} Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Mon Aug 13 01:19:52 2007 @@ -25,6 +25,7 @@ #define IDD_TOGGLEKEYSOPTIONS 107 #define IDD_CONTRASTOPTIONS 108 +#define IDD_MOUSEKEYSOPTIONS 109 #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001

17 years, 4 months

[tkreuzer] 28305: - add gdihv to rosapps build - comment out OpenProcess, it crashes ros again

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 13 00:12:21 2007 New Revision: 28305 URL: http://svn.reactos.org/svn/reactos?rev=28305&view=rev Log: - add gdihv to rosapps build - comment out OpenProcess, it crashes ros again Modified: trunk/rosapps/devutils/directory.rbuild trunk/rosapps/devutils/gdihv/proclist.c Modified: trunk/rosapps/devutils/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/directory.rbuild?… ============================================================================== --- trunk/rosapps/devutils/directory.rbuild (original) +++ trunk/rosapps/devutils/directory.rbuild Mon Aug 13 00:12:21 2007 @@ -1,5 +1,9 @@ <directory name="gdb2"> <xi:include href="gdb2/gdb2.rbuild" /> +</directory> + +<directory name="gdihv"> + <xi:include href="gdihv/gdihv.rbuild" /> </directory> <directory name="genguid"> Modified: trunk/rosapps/devutils/gdihv/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/gdihv/proclist.c?… ============================================================================== --- trunk/rosapps/devutils/gdihv/proclist.c (original) +++ trunk/rosapps/devutils/gdihv/proclist.c Mon Aug 13 00:12:21 2007 @@ -80,7 +80,7 @@ hProcess = 0; /* FIXME: HACK: ROS crashes when using OpenProcess with PROCESS_VM_READ */ - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessIds[i]); +// hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessIds[i]); if (hProcess) { GetModuleBaseName(hProcess, NULL, (LPWSTR)strText, MAX_PATH );

17 years, 4 months

[cfinck] 28304: Metadata enhancement for rbuild and version report by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) See issue #2547 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Aug 12 23:17:00 2007 New Revision: 28304 URL: http://svn.reactos.org/svn/reactos?rev=28304&view=rev Log: Metadata enhancement for rbuild and version report by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) See issue #2547 for more details. Added: trunk/reactos/tools/rbuild/backend/versionreport/ trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp trunk/reactos/tools/rbuild/backend/versionreport/versionreport.h trunk/reactos/vreport.xsl Modified: trunk/reactos/Makefile trunk/reactos/base/applications/screensavers/logon/logon.rbuild trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild trunk/reactos/dll/win32/acledit/acledit.rbuild trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28304&r1=2830… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sun Aug 12 23:17:00 2007 @@ -486,6 +486,11 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) depmap +.PHONY: vreport +vreport:$(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) vreport + .PHONY: msvc msvc: $(RBUILD_TARGET) $(ECHO_RBUILD) Modified: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rbuild (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rbuild Sun Aug 12 23:17:00 2007 @@ -12,6 +12,8 @@ <library>glu32</library> <library>winmm</library> + <metadata description = "Default ReactOS Logo screensaver" /> + <file>logon.c</file> <file>logon.rc</file> </module> Modified: trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild (original) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild Sun Aug 12 23:17:00 2007 @@ -8,6 +8,8 @@ <library>user32</library> <library>gdi32</library> + <metadata description = "Starfield simulation screensaver" /> + <file>screensaver.c</file> <file>starfield.rc</file> </module> Modified: trunk/reactos/dll/win32/acledit/acledit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rbuild (original) +++ trunk/reactos/dll/win32/acledit/acledit.rbuild Sun Aug 12 23:17:00 2007 @@ -5,6 +5,9 @@ <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> + + <metadata description = "Access Control List Editor" /> + <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Sun Aug 12 23:17:00 2007 @@ -9,6 +9,12 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + + <metadata + description = "Common controls used by ReactOS" + version = "Autosync" + owner = "Wine" /> + <library>wine</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Sun Aug 12 23:17:00 2007 @@ -8,6 +8,12 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + + <metadata + description = "Common dialog boxes used by ReactOS" + version = "Autosync" + owner = "Wine" /> + <library>wine</library> <library>shell32</library> <library>shlwapi</library> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Sun Aug 12 23:17:00 2007 @@ -19,6 +19,12 @@ <library>advapi32</library> <library>iphlpapi</library> <library>pseh</library> + + <metadata + description = "Support for the RPC layer of RPC over HTTP" + version = "Wine-0_9_10" + owner = "Wine" /> + <file>cproxy.c</file> <file>cpsf.c</file> <file>cstub.c</file> Added: trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/versi… ============================================================================== --- trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp (added) +++ trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp Sun Aug 12 23:17:00 2007 @@ -1,0 +1,128 @@ +/* + * Copyright (C) 2007 Marc Piulachs (marc.piulachs [at] codexchange [dot] net) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER + +#include <iostream> +#include <fstream> +#include <string> +#include <vector> +#include <map> + +#include <stdio.h> + +#include "versionreport.h" +#include "../mingw/mingw.h" + +using std::string; +using std::vector; +using std::map; +using std::ifstream; + +#ifdef OUT +#undef OUT +#endif//OUT + + +static class VReportFactory : public Backend::Factory +{ + public: + + VReportFactory() : Factory("VReport", "Version Report") {} + Backend *operator() (Project &project, + Configuration& configuration) + { + return new VReportBackend(project, configuration); + } + +} factory; + + +VReportBackend::VReportBackend(Project &project, + Configuration& configuration) : Backend(project, configuration) +{ + +} + +void VReportBackend::Process() +{ + string filename_depmap ( "versionreport.xml" ); + printf ( "Creating version report: %s\n", filename_depmap.c_str() ); + + m_VReportFile = fopen ( filename_depmap.c_str(), "wb" ); + + if ( !m_VReportFile ) + { + printf ( "Could not create file '%s'.\n", filename_depmap.c_str() ); + return; + } + + GenerateReport ( m_VReportFile ); + + fclose ( m_VReportFile ); + printf ( "Done.\n" ); +} + +void +VReportBackend::CleanFiles ( void ) +{ + remove ( "versionreport.xml" ); +} + +void +VReportBackend::GenerateReport ( FILE* OUT ) +{ + fprintf ( m_VReportFile, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\r\n" ); + fprintf ( m_VReportFile, "<?xml-stylesheet type=\"text/xsl\" href=\"vreport.xsl\"?>\r\n" ); + fprintf ( m_VReportFile, "<components>\r\n" ); + + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + if ((module.type != Iso) && + (module.type != LiveIso) && + (module.type != IsoRegTest) && + (module.type != LiveIsoRegTest)) + { + Module& module = *ProjectNode.modules[i]; + + if (module.metadata) + { + if (module.metadata->version.length() > 0) + { + fprintf ( m_VReportFile, "\t<component>\r\n" ); + fprintf ( m_VReportFile, "\t\t<name>%s</name>\r\n", module.name.c_str () ); + fprintf ( m_VReportFile, "\t\t<base>%s</base>\r\n", module.GetBasePath().c_str () ); + fprintf ( m_VReportFile, "\t\t<version>%s</version>\r\n", module.metadata->version.c_str () ); + fprintf ( m_VReportFile, "\t\t<date>%s</date>\r\n", module.metadata->date.c_str () ); + fprintf ( m_VReportFile, "\t\t<owner>%s</owner>\r\n", module.metadata->owner.c_str () ); + fprintf ( m_VReportFile, "\t</component>\r\n" ); + } + } + } + } + + fprintf ( m_VReportFile, "</components>" ); +} + + +VReportConfiguration::VReportConfiguration ( const std::string &name ) +{ + /* nothing to do here */ +} Added: trunk/reactos/tools/rbuild/backend/versionreport/versionreport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/versi… ============================================================================== --- trunk/reactos/tools/rbuild/backend/versionreport/versionreport.h (added) +++ trunk/reactos/tools/rbuild/backend/versionreport/versionreport.h Sun Aug 12 23:17:00 2007 @@ -1,0 +1,68 @@ +/* + * Copyright (C) 2007 Marc Piulachs (marc.piulachs [at] codexchange [dot] net) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __VREPORT_H__ +#define __VREPORT_H__ + +#include <fstream> +#include <vector> +#include <string> + +#include "../backend.h" + +class VReportConfiguration +{ + public: + VReportConfiguration(const std::string &name = ""); + virtual ~VReportConfiguration() {} + std::string name; +}; + +class VReportBackend : public Backend +{ + public: + + VReportBackend(Project &project, + Configuration& configuration); + virtual ~VReportBackend() {} + + virtual void Process(); + + private: + + FILE* m_VReportFile; + + std::vector<VReportConfiguration*> m_configurations; + + void GenerateReport ( FILE* OUT ); + void CleanFiles ( void ); + + struct module_data + { + std::vector <std::string> libraries; + std::vector <std::string> references; + + module_data() + {} + ~module_data() + {} + }; + +}; + + +#endif // __VREPORT_H__ Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sun Aug 12 23:17:00 2007 @@ -250,6 +250,7 @@ : project (project), node (moduleNode), importLibrary (NULL), + metadata (NULL), bootstrap (NULL), autoRegister(NULL), linkerScript (NULL), @@ -657,6 +658,17 @@ else non_if_data.defines.push_back ( pDefine ); subs_invalid = true; + } + else if ( e.name == "metadata" ) + { + if ( parseContext.ifData ) + { + throw XMLInvalidBuildFileException ( + e.location, + "<metadata> is not a valid sub-element of <if>" ); + } + metadata = new Metadata ( e, *this ); + subs_invalid = false; } else if ( e.name == "invoke" ) { @@ -1469,6 +1481,61 @@ } +Metadata::Metadata ( const XMLElement& _node, + const Module& _module ) + : node (_node), + module (_module) +{ + /* The module name */ + const XMLAttribute* att = _node.GetAttribute ( "name", false ); + if (att != NULL) + name = att->value; + else + name = module.name; + + /* The module description */ + att = _node.GetAttribute ( "description", false ); + if (att != NULL) + description = att->value; + else + description = ""; + + /* The module version */ + att = _node.GetAttribute ( "version", false ); + if (att != NULL) + version = att->value; + else + version = ""; + + /* The module copyright */ + att = _node.GetAttribute ( "copyright", false ); + if (att != NULL) + copyright = att->value; + else + copyright = ""; + + att = _node.GetAttribute ( "url", false ); + if (att != NULL) + url = att->value; + else + url = ""; + + /* When was this module updated */ + att = _node.GetAttribute ( "date", false ); + if (att != NULL) + date = att->value; + else + date = "?"; + + /* When was this module updated */ + att = _node.GetAttribute ( "owner", false ); + if (att != NULL) + owner = att->value; + else + owner = "ReactOS"; +} + + ImportLibrary::ImportLibrary ( const XMLElement& _node, const Module& _module ) : node (_node), Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sun Aug 12 23:17:00 2007 @@ -101,7 +101,7 @@ class AutoRegister; class SourceFileTest; - +class Metadata; typedef std::map<std::string,Directory*> directory_map; @@ -298,6 +298,7 @@ std::string path; ModuleType type; ImportLibrary* importLibrary; + Metadata* metadata; bool mangledSymbols; bool underscoreSymbols; bool isUnicode; @@ -502,6 +503,24 @@ void ProcessXML(); }; +class Metadata +{ +public: + const XMLElement& node; + const Module& module; + std::string name; + std::string description; + std::string version; + std::string copyright; + std::string url; + std::string date; + std::string owner; + + Metadata ( const XMLElement& _node, + const Module& _module ); + + void ProcessXML(); +}; class ImportLibrary { Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Sun Aug 12 23:17:00 2007 @@ -154,6 +154,23 @@ ${mkdir} $@ endif +RBUILD_VREPORT_BASE = $(RBUILD_BACKEND_BASE_)versionreport +RBUILD_VREPORT_BASE_ = $(RBUILD_VREPORT_BASE)$(SEP) +RBUILD_VREPORT_INT = $(INTERMEDIATE_)$(RBUILD_VREPORT_BASE) +RBUILD_VREPORT_INT_ = $(RBUILD_VREPORT_INT)$(SEP) +RBUILD_VREPORT_OUT = $(OUTPUT_)$(RBUILD_VREPORT_BASE) +RBUILD_VREPORT_OUT_ = $(RBUILD_VREPORT_OUT)$(SEP) + +$(RBUILD_VREPORT_INT): | $(RBUILD_BACKEND_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(RBUILD_VREPORT_OUT): | $(RBUILD_BACKEND_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + RBUILD_MSVC_BASE = $(RBUILD_BACKEND_BASE_)msvc RBUILD_MSVC_BASE_ = $(RBUILD_MSVC_BASE)$(SEP) @@ -197,6 +214,10 @@ dependencymap.cpp \ ) +RBUILD_BACKEND_VREPORT_BASE_SOURCES = $(addprefix $(RBUILD_VREPORT_BASE_), \ + versionreport.cpp \ + ) + RBUILD_BACKEND_MSBUILD_BASE_SOURCES = $(addprefix $(RBUILD_MSBUILD_BASE_), \ msbuild.cpp \ ) @@ -214,6 +235,7 @@ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ + $(RBUILD_BACKEND_VREPORT_BASE_SOURCES) \ $(RBUILD_BACKEND_MSBUILD_BASE_SOURCES) \ $(RBUILD_BACKEND_BASE_)backend.cpp @@ -273,6 +295,9 @@ RBUILD_BACKEND_DEPMAP_HEADERS = \ dependencymap.h +RBUILD_BACKEND_VREPORT_HEADERS = \ + versionreport.h + RBUILD_BACKEND_MSBUILD_HEADERS = \ msbuild.h @@ -287,6 +312,7 @@ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ $(addprefix msbuild$(SEP), $(RBUILD_BACKEND_MSBUILD_HEADERS)) \ + $(addprefix versionreport$(SEP), $(RBUILD_BACKEND_VREPORT_HEADERS)) \ $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) RBUILD_HEADERS = \ @@ -460,6 +486,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_VREPORT_INT_)versionreport.o: $(RBUILD_VREPORT_BASE_)versionreport.cpp $(RBUILD_HEADERS) | $(RBUILD_VREPORT_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_MSBUILD_INT_)msbuild.o: $(RBUILD_MSBUILD_BASE_)msbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_MSBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Added: trunk/reactos/vreport.xsl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/vreport.xsl?rev=28304&view… ============================================================================== --- trunk/reactos/vreport.xsl (added) +++ trunk/reactos/vreport.xsl Sun Aug 12 23:17:00 2007 @@ -1,0 +1,32 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> +<xsl:template match="/"> +<html> +<head> +<title>ReactOS Component Version Report</title> +</head> +<body> +<h1>ReactOS Component Version Report</h1> +<table border="1"> + <tr bgcolor="#9acd32"> + <th align="left">Module Name</th> + <th align="left">Module Location</th> + <th align="left">Version</th> + <th align="left">Date</th> + <th align="left">Owner</th> + </tr> + <xsl:for-each select="components/component"> + <tr> + <td><xsl:value-of select="name"/></td> + <td><xsl:value-of select="base"/></td> + <td><xsl:value-of select="version"/></td> + <td><xsl:value-of select="date"/></td> + <td><xsl:value-of select="owner"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + +</xsl:stylesheet>

17 years, 4 months

[cfinck] 28303: Merge in 27731:27831 and 27995 (otherwise fontview won't compile) The following revisions were not merged in: 27750 - The change in the french translation of vmwinst is not compatible with the old vmwinst version in the branch 27774 - The Freetype update introduced some small regressions 27802 - All parts of this revision were merged in, but not the change in the norwegian vmwinst resource file

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Aug 12 22:20:42 2007 New Revision: 28303 URL: http://svn.reactos.org/svn/reactos?rev=28303&view=rev Log: Merge in 27731:27831 and 27995 (otherwise fontview won't compile) The following revisions were not merged in: 27750 - The change in the french translation of vmwinst is not compatible with the old vmwinst version in the branch 27774 - The Freetype update introduced some small regressions 27802 - All parts of this revision were merged in, but not the change in the norwegian vmwinst resource file Added: branches/ros-branch-0_3_3/documentation/web/ - copied from r27831, trunk/documentation/web/ branches/ros-branch-0_3_3/reactos/base/applications/cacls/cacls.rc - copied unchanged from r27769, trunk/reactos/base/applications/cacls/cacls.rc branches/ros-branch-0_3_3/reactos/base/applications/cacls/lang/el-GR.rc - copied unchanged from r27769, trunk/reactos/base/applications/cacls/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/charmap/lang/sk-SK.rc - copied unchanged from r27831, trunk/reactos/base/applications/charmap/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/lang/el-GR.rc - copied unchanged from r27831, trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/sk-SK.rc - copied, changed from r27769, trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/applications/mmc/lang/sk-SK.rc - copied unchanged from r27831, trunk/reactos/base/applications/mmc/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc - copied unchanged from r27769, trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc - copied unchanged from r27769, trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/lang/el-GR.rc - copied unchanged from r27831, trunk/reactos/base/applications/regedit/clb/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/el-GR.rc - copied unchanged from r27831, trunk/reactos/base/applications/regedit/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc - copied unchanged from r27831, trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc - copied unchanged from r27831, trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/applications/shutdown/lang/fr-FR.rc - copied unchanged from r27769, trunk/reactos/base/applications/shutdown/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/base/applications/shutdown/lang/nb-NO.rc - copied unchanged from r27769, trunk/reactos/base/applications/shutdown/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/shutdown/lang/ru-RU.rc - copied unchanged from r27831, trunk/reactos/base/applications/shutdown/lang/ru-RU.rc branches/ros-branch-0_3_3/reactos/base/applications/shutdown/lang/sk-SK.rc - copied unchanged from r27831, trunk/reactos/base/applications/shutdown/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/applications/shutdown/lang/uk-UA.rc - copied unchanged from r27831, trunk/reactos/base/applications/shutdown/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/applications/sndvol32/lang/sk-SK.rc - copied unchanged from r27769, trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/el-GR.rc - copied unchanged from r27831, trunk/reactos/base/applications/taskmgr/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/wordpad/lang/uk-UA.rc - copied unchanged from r27769, trunk/reactos/base/applications/wordpad/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/setup/reactos/lang/el-GR.rc - copied unchanged from r27831, trunk/reactos/base/setup/reactos/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc - copied unchanged from r27769, trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/uk-UA.rc - copied unchanged from r27831, trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer/res/logov.psd - copied unchanged from r27769, trunk/reactos/base/shell/explorer/res/logov.psd branches/ros-branch-0_3_3/reactos/base/system/expand/lang/lt-LT.rc - copied unchanged from r27831, trunk/reactos/base/system/expand/lang/lt-LT.rc branches/ros-branch-0_3_3/reactos/base/system/expand/lang/uk-UA.rc - copied unchanged from r27769, trunk/reactos/base/system/expand/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/system/format/lang/lt-LT.rc - copied unchanged from r27831, trunk/reactos/base/system/format/lang/lt-LT.rc branches/ros-branch-0_3_3/reactos/base/system/regsvr32/lang/lt-LT.rc - copied unchanged from r27831, trunk/reactos/base/system/regsvr32/lang/lt-LT.rc branches/ros-branch-0_3_3/reactos/base/system/rundll32/lang/lt-LT.rc - copied unchanged from r27831, trunk/reactos/base/system/rundll32/lang/lt-LT.rc branches/ros-branch-0_3_3/reactos/base/system/userinit/lang/lt-LT.rc - copied unchanged from r27831, trunk/reactos/base/system/userinit/lang/lt-LT.rc branches/ros-branch-0_3_3/reactos/base/system/winlogon/lang/lt-LT.rc - copied unchanged from r27831, trunk/reactos/base/system/winlogon/lang/lt-LT.rc branches/ros-branch-0_3_3/reactos/dll/cpl/intl/lang/el-GR.rc - copied unchanged from r27831, trunk/reactos/dll/cpl/intl/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/uk-UA.rc - copied unchanged from r27831, trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/win32/devmgr/lang/pt-BR.rc - copied unchanged from r27831, trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc branches/ros-branch-0_3_3/reactos/dll/win32/msgina/lang/uk-UA.rc - copied unchanged from r27769, trunk/reactos/dll/win32/msgina/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/win32/netid/lang/sk-SK.rc - copied unchanged from r27831, trunk/reactos/dll/win32/netid/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/dll/win32/netid/lang/uk-UA.rc - copied unchanged from r27769, trunk/reactos/dll/win32/netid/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/win32/newdev/lang/nb-NO.rc - copied unchanged from r27831, trunk/reactos/dll/win32/newdev/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/dll/win32/rpcrt4_new/ - copied from r27831, trunk/reactos/dll/win32/rpcrt4_new/ branches/ros-branch-0_3_3/reactos/dll/win32/serialui/lang/uk-UA.rc - copied unchanged from r27831, trunk/reactos/dll/win32/serialui/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc - copied unchanged from r27831, trunk/reactos/dll/win32/syssetup/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/dll/win32/user32/Sk.rc - copied unchanged from r27831, trunk/reactos/dll/win32/user32/Sk.rc branches/ros-branch-0_3_3/rosapps/downloader/translations/uk.rc - copied unchanged from r27831, trunk/rosapps/downloader/translations/uk.rc branches/ros-branch-0_3_3/rosapps/fontview/lang/uk-UA.rc - copied, changed from r27831, trunk/rosapps/fontview/lang/uk-UA.rc branches/ros-branch-0_3_3/rosapps/imagesoft/lang/uk-UA.rc - copied unchanged from r27831, trunk/rosapps/imagesoft/lang/uk-UA.rc branches/ros-branch-0_3_3/rosapps/magnify/ - copied from r27831, trunk/rosapps/magnify/ branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/top.html (contents, props changed) - copied, changed from r27769, trunk/tools/RosBE-Windows/Documentation/files/top.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/valid-html401-blue.png - copied unchanged from r27769, trunk/tools/RosBE-Windows/Documentation/files/valid-html401-blue.png branches/ros-branch-0_3_3/tools/RosBE-Windows/Root/srclist.xml - copied unchanged from r27831, trunk/tools/RosBE-Windows/Root/srclist.xml branches/ros-branch-0_3_3/tools/RosBE-Windows/Root/test.cmd - copied unchanged from r27831, trunk/tools/RosBE-Windows/Root/test.cmd branches/ros-branch-0_3_3/tools/RosBE-Windows/Tools/cutz.cmd - copied unchanged from r27831, trunk/tools/RosBE-Windows/Tools/cutz.cmd branches/ros-branch-0_3_3/web/reactos.org/wiki-images/ - copied from r27831, trunk/web/reactos.org/wiki-images/ Removed: branches/ros-branch-0_3_3/reactos/base/applications/cacls/lang/cacls.rc branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/int.html branches/ros-branch-0_3_3/tools/RosBE-Windows/WriteEnvStr.nsh branches/ros-branch-0_3_3/web/reactos.org/htdocs/wiki/images/template/ Modified: branches/ros-branch-0_3_3/reactos/Makefile branches/ros-branch-0_3_3/reactos/base/applications/cacls/cacls.rbuild branches/ros-branch-0_3_3/reactos/base/applications/cacls/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/cacls/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/calc/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/control/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/control/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/bg-BG.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/de-DE.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/en-US.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/es-ES.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/id-ID.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/it-IT.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/nl-NL.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/ru-RU.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/th-TH.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/zh-CN.rc branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/main.c branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/mmc/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/mscutils/devmgmt/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/notepad/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/notepad/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/base/applications/notepad/res/notepad.ico branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/lang/en-US.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/de-DE.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/en-US.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/th-TH.rc branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/shutdown/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/sndvol32/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/pt-BR.rc branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/winhelp/lang/de-DE.rc branches/ros-branch-0_3_3/reactos/base/applications/winhelp/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/winhelp/lex.yy.c branches/ros-branch-0_3_3/reactos/base/applications/wordpad/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc branches/ros-branch-0_3_3/reactos/base/setup/reactos/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/setup/reactos/rsrc.rc branches/ros-branch-0_3_3/reactos/base/setup/usetup/filesup.c branches/ros-branch-0_3_3/reactos/base/setup/usetup/registry.c branches/ros-branch-0_3_3/reactos/base/setup/welcome/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.c branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.h branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/explorer.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-de.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-en.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-no.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-pl.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-ro.rc branches/ros-branch-0_3_3/reactos/base/system/expand/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/system/expand/rsrc.rc branches/ros-branch-0_3_3/reactos/base/system/format/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/system/format/rsrc.rc branches/ros-branch-0_3_3/reactos/base/system/regsvr32/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/system/regsvr32/rsrc.rc branches/ros-branch-0_3_3/reactos/base/system/rundll32/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/system/rundll32/rsrc.rc branches/ros-branch-0_3_3/reactos/base/system/userinit/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/system/userinit/rsrc.rc branches/ros-branch-0_3_3/reactos/base/system/winlogon/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/system/winlogon/rsrc.rc branches/ros-branch-0_3_3/reactos/boot/freeldr/fdebug/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/dll/cpl/access/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/dll/cpl/intl/intl.rbuild branches/ros-branch-0_3_3/reactos/dll/cpl/intl/intl.rc branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/cpl/ncpa/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/dll/cpl/ncpa/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/powercfg.rc branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/bg-BG.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/cs-CZ.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/da-DK.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/de-DE.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/en-US.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/es-ES.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/hu-HU.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/id-ID.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/it-IT.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/ja-JP.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/nl-NL.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/ru-RU.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/sv-SE.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/th-TH.rc branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/directx/devenum/devenum.rc branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdno/kbdno.c branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdpo/kbdpo.c branches/ros-branch-0_3_3/reactos/dll/win32/avifil32/avifile_Pt.rc branches/ros-branch-0_3_3/reactos/dll/win32/console/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/win32/dbghelp/dbghelp.spec branches/ros-branch-0_3_3/reactos/dll/win32/devmgr/devmgr.rc branches/ros-branch-0_3_3/reactos/dll/win32/devmgr/lang/it-IT.rc branches/ros-branch-0_3_3/reactos/dll/win32/devmgr/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/win32/hhctrl.ocx/No.rc branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_Pt.rc branches/ros-branch-0_3_3/reactos/dll/win32/msgina/msgina.rc branches/ros-branch-0_3_3/reactos/dll/win32/msvfw32/msvfw32_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/netid/netid.rc branches/ros-branch-0_3_3/reactos/dll/win32/newdev/rsrc.rc branches/ros-branch-0_3_3/reactos/dll/win32/oleaut32/oleaut32_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/oleaut32/oleaut32_Pt.rc branches/ros-branch-0_3_3/reactos/dll/win32/secur32/secur32.def branches/ros-branch-0_3_3/reactos/dll/win32/secur32/sspi.c branches/ros-branch-0_3_3/reactos/dll/win32/serialui/serialui.rc branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/lang/No.rc branches/ros-branch-0_3_3/reactos/dll/win32/shdocvw/No.rc branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_De.rc branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_Pl.rc branches/ros-branch-0_3_3/reactos/dll/win32/shlwapi/shlwapi_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/cs-CZ.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/de-DE.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/en-US.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/es-ES.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/hu-HU.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/id-ID.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/it-IT.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/ja-JP.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/nl-NL.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/ru-RU.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/zh-CN.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/resource.h branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/syssetup.rc branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc branches/ros-branch-0_3_3/reactos/dll/win32/wininet/wininet_No.rc branches/ros-branch-0_3_3/reactos/include/psdk/shlguid.h branches/ros-branch-0_3_3/reactos/include/reactos/win32k/ntgdihdl.h branches/ros-branch-0_3_3/reactos/subsystems/ntvdm/lang/pt-BR.rc branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/include/dce.h branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/include/tags.h branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/clipboard.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/windc.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/winpos.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/gdiobj.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/path.c branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/text.c branches/ros-branch-0_3_3/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-branch-0_3_3/reactos/tools/rbuild/exception.cpp branches/ros-branch-0_3_3/reactos/tools/rbuild/exception.h branches/ros-branch-0_3_3/reactos/tools/sysreg/conf_parser.cpp branches/ros-branch-0_3_3/reactos/tools/sysreg/conf_parser.h branches/ros-branch-0_3_3/reactos/tools/sysreg/data_source.h branches/ros-branch-0_3_3/reactos/tools/sysreg/namedpipe_reader.cpp branches/ros-branch-0_3_3/reactos/tools/sysreg/namedpipe_reader.h branches/ros-branch-0_3_3/reactos/tools/sysreg/pipe_reader.cpp branches/ros-branch-0_3_3/reactos/tools/sysreg/pipe_reader.h branches/ros-branch-0_3_3/reactos/tools/sysreg/rosboot_test.cpp branches/ros-branch-0_3_3/reactos/tools/sysreg/rosboot_test.h branches/ros-branch-0_3_3/reactos/tools/sysreg/txtmode.cfg branches/ros-branch-0_3_3/reactos/tools/sysreg/user_types.h branches/ros-branch-0_3_3/rosapps/directory.rbuild branches/ros-branch-0_3_3/rosapps/downloader/rsrc.rc branches/ros-branch-0_3_3/rosapps/fontview/fontview.rc branches/ros-branch-0_3_3/rosapps/fontview/lang/de-DE.rc branches/ros-branch-0_3_3/rosapps/fontview/lang/en-US.rc branches/ros-branch-0_3_3/rosapps/fontview/lang/fr-FR.rc branches/ros-branch-0_3_3/rosapps/fontview/lang/ru-RU.rc branches/ros-branch-0_3_3/rosapps/imagesoft/lang/it-IT.rc branches/ros-branch-0_3_3/rosapps/imagesoft/rsrc.rc branches/ros-branch-0_3_3/tools/RosBE-Unix/RosBE-Builder.sh branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/RosBE.sh branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/build-multi.sh branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/build.sh branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/createshortcut.sh branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/adv.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/basic.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/credits.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/features.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/howto.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/intro.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/main.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/menu.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/index.html branches/ros-branch-0_3_3/tools/RosBE-Windows/Root/ChangeLog.txt branches/ros-branch-0_3_3/tools/RosBE-Windows/Root/RosBE.cmd branches/ros-branch-0_3_3/tools/RosBE-Windows/RosBE.nsi branches/ros-branch-0_3_3/web/reactos.org/htdocs/wiki/includes/SpecialPrefe… branches/ros-branch-0_3_3/web/reactos.org/htdocs/wiki/skins/RosCMS.php [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_3/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/Makefi… Modified: branches/ros-branch-0_3_3/reactos/base/applications/cacls/cacls.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Removed: branches/ros-branch-0_3_3/reactos/base/applications/cacls/lang/cacls.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/cacls/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/calc/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/control/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/control/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Copied: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/sk-SK.rc (from r27769, trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/notepad/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/notepad/res/notepad.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/winhelp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/winhelp/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/winhelp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/wordpad/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… Modified: branches/ros-branch-0_3_3/reactos/base/setup/reactos/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/setup/welcome/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/expand/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/format/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/regsvr32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/rundll32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/userinit/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/winlogon/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… Modified: branches/ros-branch-0_3_3/reactos/boot/freeldr/fdebug/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/boot/f… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/timedate/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… Modified: branches/ros-branch-0_3_3/reactos/dll/directx/devenum/devenum.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/di… Modified: branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdno/kbdno.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/ke… Modified: branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdpo/kbdpo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/ke… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/avifil32/avifile_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/hhctrl.ocx/No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/msvfw32/msvfw32_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/oleaut32/oleaut32_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/oleaut32/oleaut32_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/secur32/secur32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/setupapi/res/lang/No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shdocvw/No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… Modified: branches/ros-branch-0_3_3/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/includ… Modified: branches/ros-branch-0_3_3/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/includ… Modified: branches/ros-branch-0_3_3/reactos/subsystems/ntvdm/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… Modified: branches/ros-branch-0_3_3/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/rbuild/exception.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/rbuild/exception.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/data_source.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… Modified: branches/ros-branch-0_3_3/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/direct… Modified: branches/ros-branch-0_3_3/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/downlo… Modified: branches/ros-branch-0_3_3/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/fontvi… Modified: branches/ros-branch-0_3_3/rosapps/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/fontvi… Modified: branches/ros-branch-0_3_3/rosapps/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/fontvi… Modified: branches/ros-branch-0_3_3/rosapps/fontview/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/fontvi… Modified: branches/ros-branch-0_3_3/rosapps/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/fontvi… Copied: branches/ros-branch-0_3_3/rosapps/fontview/lang/uk-UA.rc (from r27831, trunk/rosapps/fontview/lang/uk-UA.rc) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/fontvi… Modified: branches/ros-branch-0_3_3/rosapps/imagesoft/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/images… Modified: branches/ros-branch-0_3_3/rosapps/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/images… Modified: branches/ros-branch-0_3_3/tools/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Un… Modified: branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/RosBE.sh URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Un… Modified: branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/build-multi.sh URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Un… Modified: branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/build.sh URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Un… Modified: branches/ros-branch-0_3_3/tools/RosBE-Unix/scripts/createshortcut.sh URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Un… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/adv.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/basic.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/credits.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/features.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/howto.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Removed: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/int.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/intro.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/main.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/menu.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Copied: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/files/top.html (from r27769, trunk/tools/RosBE-Windows/Documentation/files/top.html) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Documentation/index.html URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Removed: branches/ros-branch-0_3_3/tools/RosBE-Windows/WriteEnvStr.nsh URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/tools/RosBE-Wi… Modified: branches/ros-branch-0_3_3/web/reactos.org/htdocs/wiki/includes/SpecialPrefe… URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/web/reactos.or… Modified: branches/ros-branch-0_3_3/web/reactos.org/htdocs/wiki/skins/RosCMS.php URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/web/reactos.or…

17 years, 4 months

[tkreuzer] 28302: move NtGdiBitBlt, NtGdiTransparentBlt, NtGdiExtFloodFill, NtGdiMaskBlt, NtGdiPlgBlt, NtGdiStretchBlt, NtGdiAlphaBlend from bitmaps.c to painting.c

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Aug 12 20:20:29 2007 New Revision: 28302 URL: http://svn.reactos.org/svn/reactos?rev=28302&view=rev Log: move NtGdiBitBlt, NtGdiTransparentBlt, NtGdiExtFloodFill, NtGdiMaskBlt, NtGdiPlgBlt, NtGdiStretchBlt, NtGdiAlphaBlend from bitmaps.c to painting.c Added: trunk/reactos/subsystems/win32/win32k/objects/painting.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Sun Aug 12 20:20:29 2007 @@ -31,375 +31,6 @@ (y) < (r).bottom \ ) -BOOL STDCALL -NtGdiBitBlt( - HDC hDCDest, - INT XDest, - INT YDest, - INT Width, - INT Height, - HDC hDCSrc, - INT XSrc, - INT YSrc, - DWORD ROP, - IN DWORD crBackColor, - IN FLONG fl) -{ - PDC DCDest = NULL; - PDC DCSrc = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; - RECTL DestRect; - POINTL SourcePoint, BrushOrigin; - BOOL Status; - XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; - GDIBRUSHINST BrushInst; - BOOL UsesSource = ROP3_USES_SOURCE(ROP); - BOOL UsesPattern = ROP3_USES_PATTERN(ROP); - - DCDest = DC_LockDc(hDCDest); - if (NULL == DCDest) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (UsesSource) - { - if (hDCSrc != hDCDest) - { - DCSrc = DC_LockDc(hDCSrc); - if (NULL == DCSrc) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - else - { - DCSrc = DCDest; - } - } - else - { - DCSrc = NULL; - } - - /* Offset the destination and source by the origin of their DCs. */ - XDest += DCDest->w.DCOrgX; - YDest += DCDest->w.DCOrgY; - if (UsesSource) - { - XSrc += DCSrc->w.DCOrgX; - YSrc += DCSrc->w.DCOrgY; - } - - DestRect.left = XDest; - DestRect.top = YDest; - DestRect.right = XDest+Width; - DestRect.bottom = YDest+Height; - - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); - - SourcePoint.x = XSrc; - SourcePoint.y = YSrc; - - BrushOrigin.x = 0; - BrushOrigin.y = 0; - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - if (UsesSource) - { - if (DCSrc->w.hBitmap == DCDest->w.hBitmap) - BitmapSrc = BitmapDest; - else - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - } - else - { - BitmapSrc = NULL; - } - - if (UsesPattern) - { - BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); - if (NULL == BrushObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); - IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); - } - else - { - BrushObj = NULL; - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { - XlateObj = NULL; - } - else - { - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - if(BrushObj != NULL) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - } - - /* Perform the bitblt operation */ - Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, - DCDest->CombinedClip, XlateObj, &DestRect, - &SourcePoint, NULL, - BrushObj ? &BrushInst.BrushObject : NULL, - &BrushOrigin, ROP3_TO_ROP4(ROP)); - - if (UsesSource && XlateObj != NULL) - EngDeleteXlate(XlateObj); - - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if (UsesSource && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - if (BrushObj != NULL) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - - return Status; -} - -BOOL STDCALL -NtGdiTransparentBlt( - HDC hdcDst, - INT xDst, - INT yDst, - INT cxDst, - INT cyDst, - HDC hdcSrc, - INT xSrc, - INT ySrc, - INT cxSrc, - INT cySrc, - COLORREF TransColor) -{ - PDC DCDest, DCSrc; - RECTL rcDest, rcSrc; - BITMAPOBJ *BitmapDest, *BitmapSrc; - XLATEOBJ *XlateObj; - HPALETTE SourcePalette = 0, DestPalette = 0; - PPALGDI PalDestGDI, PalSourceGDI; - USHORT PalDestMode, PalSrcMode; - ULONG TransparentColor = 0; - BOOL Ret = FALSE; - - if(!(DCDest = DC_LockDc(hdcDst))) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcDst); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if((hdcDst != hdcSrc) && !(DCSrc = DC_LockDc(hdcSrc))) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if(hdcDst == hdcSrc) - { - DCSrc = DCDest; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - if(hdcDst != hdcSrc) - { - DC_UnlockDc(DCDest); - } - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - /* Offset positions */ - xDst += DCDest->w.DCOrgX; - yDst += DCDest->w.DCOrgY; - xSrc += DCSrc->w.DCOrgX; - ySrc += DCSrc->w.DCOrgY; - - if(DCDest->w.hPalette) - DestPalette = DCDest->w.hPalette; - - if(DCSrc->w.hPalette) - SourcePalette = DCSrc->w.hPalette; - - if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if((DestPalette != SourcePalette) && !(PalDestGDI = PALETTE_LockPalette(DestPalette))) - { - PALETTE_UnlockPalette(PalSourceGDI); - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if(DestPalette != SourcePalette) - { - PalDestMode = PalDestGDI->Mode; - PalSrcMode = PalSourceGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - } - else - { - PalDestMode = PalSrcMode = PalSourceGDI->Mode; - } - PALETTE_UnlockPalette(PalSourceGDI); - - /* Translate Transparent (RGB) Color to the source palette */ - if((XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalSrcMode, PAL_RGB, SourcePalette, NULL))) - { - TransparentColor = XLATEOBJ_iXlate(XlateObj, (ULONG)TransColor); - EngDeleteXlate(XlateObj); - } - - /* Create the XLATE object to convert colors between source and destination */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette); - - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - /* FIXME - BitmapDest can be NULL!!!! Don't assert here! */ - ASSERT(BitmapDest); - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - /* FIXME - BitmapSrc can be NULL!!!! Don't assert here! */ - ASSERT(BitmapSrc); - - rcDest.left = xDst; - rcDest.top = yDst; - rcDest.right = rcDest.left + cxDst; - rcDest.bottom = rcDest.top + cyDst; - rcSrc.left = xSrc; - rcSrc.top = ySrc; - rcSrc.right = rcSrc.left + cxSrc; - rcSrc.bottom = rcSrc.top + cySrc; - - if((cxDst != cxSrc) || (cyDst != cySrc)) - { - DPRINT1("TransparentBlt() does not support stretching at the moment!\n"); - goto done; - } - - Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc, - TransparentColor, 0); - -done: - BITMAPOBJ_UnlockBitmap(BitmapDest); - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCSrc); - if(hdcDst != hdcSrc) - { - DC_UnlockDc(DCDest); - } - if(XlateObj) - { - EngDeleteXlate(XlateObj); - } - return Ret; -} - HBITMAP STDCALL NtGdiCreateBitmap( INT Width, @@ -555,20 +186,6 @@ DPRINT ("\t\t%04x\n", Bmp); DC_UnlockDc(Dc); return Bmp; -} - -BOOL STDCALL -NtGdiExtFloodFill( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Color, - UINT FillType) -{ - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); - - /* lie and say we succeded */ - return TRUE; } BOOL STDCALL @@ -683,237 +300,6 @@ return Result; } -/*********************************************************************** - * MaskBlt - * Ported from WINE by sedwards 11-4-03 - * - * Someone thought it would be faster to do it here and then switch back - * to GDI32. I dunno. Write a test and let me know. - */ - -static __inline BYTE -SwapROP3_SrcDst(BYTE bRop3) -{ - return (bRop3 & 0x99) | ((bRop3 & 0x22) << 1) | ((bRop3 & 0x44) >> 1); -} - -#define FRGND_ROP3(ROP4) ((ROP4) & 0x00FFFFFF) -#define BKGND_ROP3(ROP4) (ROP3Table[(SwapROP3_SrcDst((ROP4)>>24)) & 0xFF]) -#define DSTCOPY 0x00AA0029 -#define DSTERASE 0x00220326 /* dest = dest & (~src) : DSna */ - -BOOL STDCALL -NtGdiMaskBlt ( - HDC hdcDest, INT nXDest, INT nYDest, - INT nWidth, INT nHeight, HDC hdcSrc, - INT nXSrc, INT nYSrc, HBITMAP hbmMask, - INT xMask, INT yMask, DWORD dwRop, - IN DWORD crBackColor) -{ - HBITMAP hOldMaskBitmap, hBitmap2, hOldBitmap2, hBitmap3, hOldBitmap3; - HDC hDCMask, hDC1, hDC2; - static const DWORD ROP3Table[256] = - { - 0x00000042, 0x00010289, - 0x00020C89, 0x000300AA, - 0x00040C88, 0x000500A9, - 0x00060865, 0x000702C5, - 0x00080F08, 0x00090245, - 0x000A0329, 0x000B0B2A, - 0x000C0324, 0x000D0B25, - 0x000E08A5, 0x000F0001, - 0x00100C85, 0x001100A6, - 0x00120868, 0x001302C8, - 0x00140869, 0x001502C9, - 0x00165CCA, 0x00171D54, - 0x00180D59, 0x00191CC8, - 0x001A06C5, 0x001B0768, - 0x001C06CA, 0x001D0766, - 0x001E01A5, 0x001F0385, - 0x00200F09, 0x00210248, - 0x00220326, 0x00230B24, - 0x00240D55, 0x00251CC5, - 0x002606C8, 0x00271868, - 0x00280369, 0x002916CA, - 0x002A0CC9, 0x002B1D58, - 0x002C0784, 0x002D060A, - 0x002E064A, 0x002F0E2A, - 0x0030032A, 0x00310B28, - 0x00320688, 0x00330008, - 0x003406C4, 0x00351864, - 0x003601A8, 0x00370388, - 0x0038078A, 0x00390604, - 0x003A0644, 0x003B0E24, - 0x003C004A, 0x003D18A4, - 0x003E1B24, 0x003F00EA, - 0x00400F0A, 0x00410249, - 0x00420D5D, 0x00431CC4, - 0x00440328, 0x00450B29, - 0x004606C6, 0x0047076A, - 0x00480368, 0x004916C5, - 0x004A0789, 0x004B0605, - 0x004C0CC8, 0x004D1954, - 0x004E0645, 0x004F0E25, - 0x00500325, 0x00510B26, - 0x005206C9, 0x00530764, - 0x005408A9, 0x00550009, - 0x005601A9, 0x00570389, - 0x00580785, 0x00590609, - 0x005A0049, 0x005B18A9, - 0x005C0649, 0x005D0E29, - 0x005E1B29, 0x005F00E9, - 0x00600365, 0x006116C6, - 0x00620786, 0x00630608, - 0x00640788, 0x00650606, - 0x00660046, 0x006718A8, - 0x006858A6, 0x00690145, - 0x006A01E9, 0x006B178A, - 0x006C01E8, 0x006D1785, - 0x006E1E28, 0x006F0C65, - 0x00700CC5, 0x00711D5C, - 0x00720648, 0x00730E28, - 0x00740646, 0x00750E26, - 0x00761B28, 0x007700E6, - 0x007801E5, 0x00791786, - 0x007A1E29, 0x007B0C68, - 0x007C1E24, 0x007D0C69, - 0x007E0955, 0x007F03C9, - 0x008003E9, 0x00810975, - 0x00820C49, 0x00831E04, - 0x00840C48, 0x00851E05, - 0x008617A6, 0x008701C5, - 0x008800C6, 0x00891B08, - 0x008A0E06, 0x008B0666, - 0x008C0E08, 0x008D0668, - 0x008E1D7C, 0x008F0CE5, - 0x00900C45, 0x00911E08, - 0x009217A9, 0x009301C4, - 0x009417AA, 0x009501C9, - 0x00960169, 0x0097588A, - 0x00981888, 0x00990066, - 0x009A0709, 0x009B07A8, - 0x009C0704, 0x009D07A6, - 0x009E16E6, 0x009F0345, - 0x00A000C9, 0x00A11B05, - 0x00A20E09, 0x00A30669, - 0x00A41885, 0x00A50065, - 0x00A60706, 0x00A707A5, - 0x00A803A9, 0x00A90189, - 0x00AA0029, 0x00AB0889, - 0x00AC0744, 0x00AD06E9, - 0x00AE0B06, 0x00AF0229, - 0x00B00E05, 0x00B10665, - 0x00B21974, 0x00B30CE8, - 0x00B4070A, 0x00B507A9, - 0x00B616E9, 0x00B70348, - 0x00B8074A, 0x00B906E6, - 0x00BA0B09, 0x00BB0226, - 0x00BC1CE4, 0x00BD0D7D, - 0x00BE0269, 0x00BF08C9, - 0x00C000CA, 0x00C11B04, - 0x00C21884, 0x00C3006A, - 0x00C40E04, 0x00C50664, - 0x00C60708, 0x00C707AA, - 0x00C803A8, 0x00C90184, - 0x00CA0749, 0x00CB06E4, - 0x00CC0020, 0x00CD0888, - 0x00CE0B08, 0x00CF0224, - 0x00D00E0A, 0x00D1066A, - 0x00D20705, 0x00D307A4, - 0x00D41D78, 0x00D50CE9, - 0x00D616EA, 0x00D70349, - 0x00D80745, 0x00D906E8, - 0x00DA1CE9, 0x00DB0D75, - 0x00DC0B04, 0x00DD0228, - 0x00DE0268, 0x00DF08C8, - 0x00E003A5, 0x00E10185, - 0x00E20746, 0x00E306EA, - 0x00E40748, 0x00E506E5, - 0x00E61CE8, 0x00E70D79, - 0x00E81D74, 0x00E95CE6, - 0x00EA02E9, 0x00EB0849, - 0x00EC02E8, 0x00ED0848, - 0x00EE0086, 0x00EF0A08, - 0x00F00021, 0x00F10885, - 0x00F20B05, 0x00F3022A, - 0x00F40B0A, 0x00F50225, - 0x00F60265, 0x00F708C5, - 0x00F802E5, 0x00F90845, - 0x00FA0089, 0x00FB0A09, - 0x00FC008A, 0x00FD0A0A, - 0x00FE02A9, 0x00FF0062, - }; - - if (!hbmMask) - return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0, 0); - - /* 1. make mask bitmap's dc */ - hDCMask = NtGdiCreateCompatibleDC(hdcDest); - hOldMaskBitmap = (HBITMAP)NtGdiSelectObject(hDCMask, hbmMask); - - /* 2. make masked Background bitmap */ - - /* 2.1 make bitmap */ - hDC1 = NtGdiCreateCompatibleDC(hdcDest); - hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap2 = (HBITMAP)NtGdiSelectObject(hDC1, hBitmap2); - - /* 2.2 draw dest bitmap and mask */ - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0); - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, BKGND_ROP3(dwRop), 0, 0); - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, DSTERASE, 0, 0); - - /* 3. make masked Foreground bitmap */ - - /* 3.1 make bitmap */ - hDC2 = NtGdiCreateCompatibleDC(hdcDest); - hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap3 = (HBITMAP)NtGdiSelectObject(hDC2, hBitmap3); - - /* 3.2 draw src bitmap and mask */ - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0); - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0,0); - NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, SRCAND, 0, 0); - - /* 4. combine two bitmap and copy it to hdcDest */ - NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDC2, 0, 0, SRCPAINT, 0, 0); - NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY, 0, 0); - - /* 5. restore all object */ - NtGdiSelectObject(hDCMask, hOldMaskBitmap); - NtGdiSelectObject(hDC1, hOldBitmap2); - NtGdiSelectObject(hDC2, hOldBitmap3); - - /* 6. delete all temp object */ - NtGdiDeleteObject(hBitmap2); - NtGdiDeleteObject(hBitmap3); - - NtGdiDeleteObjectApp(hDC1); - NtGdiDeleteObjectApp(hDC2); - NtGdiDeleteObjectApp(hDCMask); - - return TRUE; -} - -BOOL -APIENTRY -NtGdiPlgBlt( - IN HDC hdcTrg, - IN LPPOINT pptlTrg, - IN HDC hdcSrc, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN HBITMAP hbmMask, - IN INT xMask, - IN INT yMask, - IN DWORD crBackColor) -{ - UNIMPLEMENTED; - return FALSE; -} - LONG STDCALL IntGetBitmapBits( @@ -1148,379 +534,6 @@ NtGdiSelectObject(hDC, OldBrush); NtGdiDeleteObject(NewBrush); return TRUE; -} - -BOOL STDCALL -NtGdiStretchBlt( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - DWORD ROP, - IN DWORD dwBackColor) -{ - PDC DCDest = NULL; - PDC DCSrc = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; - RECTL DestRect; - RECTL SourceRect; - BOOL Status; - XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; - BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); - BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000); - - if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - DCDest = DC_LockDc(hDCDest); - if (NULL == DCDest) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (UsesSource) - { - if (hDCSrc != hDCDest) - { - DCSrc = DC_LockDc(hDCSrc); - if (NULL == DCSrc) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - else - { - DCSrc = DCDest; - } - } - else - { - DCSrc = NULL; - } - - /* Offset the destination and source by the origin of their DCs. */ - XOriginDest += DCDest->w.DCOrgX; - YOriginDest += DCDest->w.DCOrgY; - if (UsesSource) - { - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; - } - - DestRect.left = XOriginDest; - DestRect.top = YOriginDest; - DestRect.right = XOriginDest+WidthDest; - DestRect.bottom = YOriginDest+HeightDest; - - SourceRect.left = XOriginSrc; - SourceRect.top = YOriginSrc; - SourceRect.right = XOriginSrc+WidthSrc; - SourceRect.bottom = YOriginSrc+HeightSrc; - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - if (UsesSource) - { - if (DCSrc->w.hBitmap == DCDest->w.hBitmap) - BitmapSrc = BitmapDest; - else - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - } - else - { - BitmapSrc = NULL; - } - - if ( UsesSource ) - { - int sw = BitmapSrc->SurfObj.sizlBitmap.cx; - int sh = BitmapSrc->SurfObj.sizlBitmap.cy; - if ( SourceRect.left < 0 ) - { - DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right)/abs(SourceRect.right-SourceRect.left); - SourceRect.left = 0; - } - if ( SourceRect.top < 0 ) - { - DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom)/abs(SourceRect.bottom-SourceRect.top); - SourceRect.top = 0; - } - if ( SourceRect.right < -1 ) - { - DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * (-1-SourceRect.left)/abs(SourceRect.right-SourceRect.left); - SourceRect.right = -1; - } - if ( SourceRect.bottom < -1 ) - { - DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * (-1-SourceRect.top)/abs(SourceRect.bottom-SourceRect.top); - SourceRect.bottom = -1; - } - if ( SourceRect.right > sw ) - { - DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * abs(sw-SourceRect.left) / abs(SourceRect.right-SourceRect.left); - SourceRect.right = sw; - } - if ( SourceRect.bottom > sh ) - { - DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * abs(sh-SourceRect.top) / abs(SourceRect.bottom-SourceRect.top); - SourceRect.bottom = sh; - } - sw--; - sh--; - if ( SourceRect.left > sw ) - { - DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right-sw) / abs(SourceRect.right-SourceRect.left); - SourceRect.left = 0; - } - if ( SourceRect.top > sh ) - { - DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom-sh) / abs(SourceRect.bottom-SourceRect.top); - SourceRect.top = 0; - } - if (0 == (DestRect.right-DestRect.left) || 0 == (DestRect.bottom-DestRect.top) || 0 == (SourceRect.right-SourceRect.left) || 0 == (SourceRect.bottom-SourceRect.top)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - Status = FALSE; - goto failed; - } - } - - if (UsesPattern) - { - BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); - if (NULL == BrushObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - } - else - { - BrushObj = NULL; - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; - - /* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - - /* Perform the bitblt operation */ - Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - NULL, DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, NULL, NULL, NULL, - COLORONCOLOR); - - if (UsesSource) - EngDeleteXlate(XlateObj); - if (UsesPattern) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } -failed: - if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - - return Status; -} - -BOOL STDCALL -NtGdiAlphaBlend( - HDC hDCDest, - LONG XOriginDest, - LONG YOriginDest, - LONG WidthDest, - LONG HeightDest, - HDC hDCSrc, - LONG XOriginSrc, - LONG YOriginSrc, - LONG WidthSrc, - LONG HeightSrc, - BLENDFUNCTION BlendFunc, - HANDLE hcmXform) -{ - PDC DCDest = NULL; - PDC DCSrc = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; - RECTL DestRect, SourceRect; - BOOL Status; - XLATEOBJ *XlateObj; - BLENDOBJ BlendObj; - HPALETTE SourcePalette = 0, DestPalette = 0; - BlendObj.BlendFunction = BlendFunc; - - DCDest = DC_LockDc(hDCDest); - if (NULL == DCDest) - { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCDest->IsIC) - { - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (hDCSrc != hDCDest) - { - DCSrc = DC_LockDc(hDCSrc); - if (NULL == DCSrc) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCSrc->IsIC) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - else - { - DCSrc = DCDest; - } - - /* Offset the destination and source by the origin of their DCs. */ - XOriginDest += DCDest->w.DCOrgX; - YOriginDest += DCDest->w.DCOrgY; - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; - - DestRect.left = XOriginDest; - DestRect.top = YOriginDest; - DestRect.right = XOriginDest + WidthDest; - DestRect.bottom = YOriginDest + HeightDest; - - SourceRect.left = XOriginSrc; - SourceRect.top = YOriginSrc; - SourceRect.right = XOriginSrc + WidthSrc; - SourceRect.bottom = YOriginSrc + HeightSrc; - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - if (DCSrc->w.hBitmap == DCDest->w.hBitmap) - BitmapSrc = BitmapDest; - else - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - - /* Create the XLATEOBJ. */ - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { - XlateObj = NULL; - } - else - { - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (BitmapSrc != BitmapDest) - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCDest); - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - - /* Perform the alpha blend operation */ - Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, &BlendObj); - - if (XlateObj != NULL) - EngDeleteXlate(XlateObj); - - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (BitmapSrc != BitmapDest) - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCDest); - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - - return Status; } /* Internal Functions */ Added: trunk/reactos/subsystems/win32/win32k/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/painting.c (added) +++ trunk/reactos/subsystems/win32/win32k/objects/painting.c Sun Aug 12 20:20:29 2007 @@ -1,0 +1,1014 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: bitmaps.c 28300 2007-08-12 15:20:09Z tkreuzer $ */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + + + +BOOL STDCALL +NtGdiAlphaBlend( + HDC hDCDest, + LONG XOriginDest, + LONG YOriginDest, + LONG WidthDest, + LONG HeightDest, + HDC hDCSrc, + LONG XOriginSrc, + LONG YOriginSrc, + LONG WidthSrc, + LONG HeightSrc, + BLENDFUNCTION BlendFunc, + HANDLE hcmXform) +{ + PDC DCDest = NULL; + PDC DCSrc = NULL; + BITMAPOBJ *BitmapDest, *BitmapSrc; + RECTL DestRect, SourceRect; + BOOL Status; + XLATEOBJ *XlateObj; + BLENDOBJ BlendObj; + HPALETTE SourcePalette = 0, DestPalette = 0; + BlendObj.BlendFunction = BlendFunc; + + DCDest = DC_LockDc(hDCDest); + if (NULL == DCDest) + { + DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCDest); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DCDest->IsIC) + { + DC_UnlockDc(DCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + if (hDCSrc != hDCDest) + { + DCSrc = DC_LockDc(hDCSrc); + if (NULL == DCSrc) + { + DC_UnlockDc(DCDest); + DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiAlphaBlend\n", hDCSrc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DCSrc->IsIC) + { + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + } + else + { + DCSrc = DCDest; + } + + /* Offset the destination and source by the origin of their DCs. */ + XOriginDest += DCDest->w.DCOrgX; + YOriginDest += DCDest->w.DCOrgY; + XOriginSrc += DCSrc->w.DCOrgX; + YOriginSrc += DCSrc->w.DCOrgY; + + DestRect.left = XOriginDest; + DestRect.top = YOriginDest; + DestRect.right = XOriginDest + WidthDest; + DestRect.bottom = YOriginDest + HeightDest; + + SourceRect.left = XOriginSrc; + SourceRect.top = YOriginSrc; + SourceRect.right = XOriginSrc + WidthSrc; + SourceRect.bottom = YOriginSrc + HeightSrc; + + /* Determine surfaces to be used in the bitblt */ + BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (DCSrc->w.hBitmap == DCDest->w.hBitmap) + BitmapSrc = BitmapDest; + else + BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + + /* Create the XLATEOBJ. */ + if (DCDest->w.hPalette != 0) + DestPalette = DCDest->w.hPalette; + if (DCSrc->w.hPalette != 0) + SourcePalette = DCSrc->w.hPalette; + + /* KB41464 details how to convert between mono and color */ + if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) + { + XlateObj = NULL; + } + else + { + if (DCDest->w.bitsPerPixel == 1) + { + XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); + } + else if (DCSrc->w.bitsPerPixel == 1) + { + XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); + } + else + { + XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); + } + if (NULL == XlateObj) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + if (BitmapSrc != BitmapDest) + BITMAPOBJ_UnlockBitmap(BitmapSrc); + DC_UnlockDc(DCDest); + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return FALSE; + } + } + + /* Perform the alpha blend operation */ + Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + DCDest->CombinedClip, XlateObj, + &DestRect, &SourceRect, &BlendObj); + + if (XlateObj != NULL) + EngDeleteXlate(XlateObj); + + BITMAPOBJ_UnlockBitmap(BitmapDest); + if (BitmapSrc != BitmapDest) + BITMAPOBJ_UnlockBitmap(BitmapSrc); + DC_UnlockDc(DCDest); + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); + + return Status; +} + +BOOL STDCALL +NtGdiBitBlt( + HDC hDCDest, + INT XDest, + INT YDest, + INT Width, + INT Height, + HDC hDCSrc, + INT XSrc, + INT YSrc, + DWORD ROP, + IN DWORD crBackColor, + IN FLONG fl) +{ + PDC DCDest = NULL; + PDC DCSrc = NULL; + BITMAPOBJ *BitmapDest, *BitmapSrc; + RECTL DestRect; + POINTL SourcePoint, BrushOrigin; + BOOL Status; + XLATEOBJ *XlateObj = NULL; + HPALETTE SourcePalette = 0, DestPalette = 0; + PGDIBRUSHOBJ BrushObj; + GDIBRUSHINST BrushInst; + BOOL UsesSource = ROP3_USES_SOURCE(ROP); + BOOL UsesPattern = ROP3_USES_PATTERN(ROP); + + DCDest = DC_LockDc(hDCDest); + if (NULL == DCDest) + { + DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DCDest->IsIC) + { + DC_UnlockDc(DCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + if (UsesSource) + { + if (hDCSrc != hDCDest) + { + DCSrc = DC_LockDc(hDCSrc); + if (NULL == DCSrc) + { + DC_UnlockDc(DCDest); + DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DCSrc->IsIC) + { + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + } + else + { + DCSrc = DCDest; + } + } + else + { + DCSrc = NULL; + } + + /* Offset the destination and source by the origin of their DCs. */ + XDest += DCDest->w.DCOrgX; + YDest += DCDest->w.DCOrgY; + if (UsesSource) + { + XSrc += DCSrc->w.DCOrgX; + YSrc += DCSrc->w.DCOrgY; + } + + DestRect.left = XDest; + DestRect.top = YDest; + DestRect.right = XDest+Width; + DestRect.bottom = YDest+Height; + + IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); + + SourcePoint.x = XSrc; + SourcePoint.y = YSrc; + + BrushOrigin.x = 0; + BrushOrigin.y = 0; + + /* Determine surfaces to be used in the bitblt */ + BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (UsesSource) + { + if (DCSrc->w.hBitmap == DCDest->w.hBitmap) + BitmapSrc = BitmapDest; + else + BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + } + else + { + BitmapSrc = NULL; + } + + if (UsesPattern) + { + BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); + if (NULL == BrushObj) + { + if (UsesSource && hDCSrc != hDCDest) + { + DC_UnlockDc(DCSrc); + } + if(BitmapDest != NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if(BitmapSrc != NULL && BitmapSrc != BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapSrc); + } + DC_UnlockDc(DCDest); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); + IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); + } + else + { + BrushObj = NULL; + } + + /* Create the XLATEOBJ. */ + if (UsesSource) + { + if (DCDest->w.hPalette != 0) + DestPalette = DCDest->w.hPalette; + + if (DCSrc->w.hPalette != 0) + SourcePalette = DCSrc->w.hPalette; + + /* KB41464 details how to convert between mono and color */ + if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) + { + XlateObj = NULL; + } + else + { + if (DCDest->w.bitsPerPixel == 1) + { + XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); + } + else if (DCSrc->w.bitsPerPixel == 1) + { + XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); + } + else + { + XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); + } + if (NULL == XlateObj) + { + if (UsesSource && hDCSrc != hDCDest) + { + DC_UnlockDc(DCSrc); + } + DC_UnlockDc(DCDest); + if(BitmapDest != NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if(BitmapSrc != NULL && BitmapSrc != BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapSrc); + } + if(BrushObj != NULL) + { + BRUSHOBJ_UnlockBrush(BrushObj); + } + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return FALSE; + } + } + } + + /* Perform the bitblt operation */ + Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, + DCDest->CombinedClip, XlateObj, &DestRect, + &SourcePoint, NULL, + BrushObj ? &BrushInst.BrushObject : NULL, + &BrushOrigin, ROP3_TO_ROP4(ROP)); + + if (UsesSource && XlateObj != NULL) + EngDeleteXlate(XlateObj); + + if(BitmapDest != NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if (UsesSource && BitmapSrc != BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapSrc); + } + if (BrushObj != NULL) + { + BRUSHOBJ_UnlockBrush(BrushObj); + } + if (UsesSource && hDCSrc != hDCDest) + { + DC_UnlockDc(DCSrc); + } + DC_UnlockDc(DCDest); + + return Status; +} + +BOOL STDCALL +NtGdiTransparentBlt( + HDC hdcDst, + INT xDst, + INT yDst, + INT cxDst, + INT cyDst, + HDC hdcSrc, + INT xSrc, + INT ySrc, + INT cxSrc, + INT cySrc, + COLORREF TransColor) +{ + PDC DCDest, DCSrc; + RECTL rcDest, rcSrc; + BITMAPOBJ *BitmapDest, *BitmapSrc; + XLATEOBJ *XlateObj; + HPALETTE SourcePalette = 0, DestPalette = 0; + PPALGDI PalDestGDI, PalSourceGDI; + USHORT PalDestMode, PalSrcMode; + ULONG TransparentColor = 0; + BOOL Ret = FALSE; + + if(!(DCDest = DC_LockDc(hdcDst))) + { + DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcDst); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DCDest->IsIC) + { + DC_UnlockDc(DCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + if((hdcDst != hdcSrc) && !(DCSrc = DC_LockDc(hdcSrc))) + { + DC_UnlockDc(DCDest); + DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiTransparentBlt\n", hdcSrc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if(hdcDst == hdcSrc) + { + DCSrc = DCDest; + } + if (DCSrc->IsIC) + { + DC_UnlockDc(DCSrc); + if(hdcDst != hdcSrc) + { + DC_UnlockDc(DCDest); + } + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + /* Offset positions */ + xDst += DCDest->w.DCOrgX; + yDst += DCDest->w.DCOrgY; + xSrc += DCSrc->w.DCOrgX; + ySrc += DCSrc->w.DCOrgY; + + if(DCDest->w.hPalette) + DestPalette = DCDest->w.hPalette; + + if(DCSrc->w.hPalette) + SourcePalette = DCSrc->w.hPalette; + + if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) + { + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if((DestPalette != SourcePalette) && !(PalDestGDI = PALETTE_LockPalette(DestPalette))) + { + PALETTE_UnlockPalette(PalSourceGDI); + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if(DestPalette != SourcePalette) + { + PalDestMode = PalDestGDI->Mode; + PalSrcMode = PalSourceGDI->Mode; + PALETTE_UnlockPalette(PalDestGDI); + } + else + { + PalDestMode = PalSrcMode = PalSourceGDI->Mode; + } + PALETTE_UnlockPalette(PalSourceGDI); + + /* Translate Transparent (RGB) Color to the source palette */ + if((XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalSrcMode, PAL_RGB, SourcePalette, NULL))) + { + TransparentColor = XLATEOBJ_iXlate(XlateObj, (ULONG)TransColor); + EngDeleteXlate(XlateObj); + } + + /* Create the XLATE object to convert colors between source and destination */ + XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette); + + BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + /* FIXME - BitmapDest can be NULL!!!! Don't assert here! */ + ASSERT(BitmapDest); + BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + /* FIXME - BitmapSrc can be NULL!!!! Don't assert here! */ + ASSERT(BitmapSrc); + + rcDest.left = xDst; + rcDest.top = yDst; + rcDest.right = rcDest.left + cxDst; + rcDest.bottom = rcDest.top + cyDst; + rcSrc.left = xSrc; + rcSrc.top = ySrc; + rcSrc.right = rcSrc.left + cxSrc; + rcSrc.bottom = rcSrc.top + cySrc; + + if((cxDst != cxSrc) || (cyDst != cySrc)) + { + DPRINT1("TransparentBlt() does not support stretching at the moment!\n"); + goto done; + } + + Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc, + TransparentColor, 0); + +done: + BITMAPOBJ_UnlockBitmap(BitmapDest); + BITMAPOBJ_UnlockBitmap(BitmapSrc); + DC_UnlockDc(DCSrc); + if(hdcDst != hdcSrc) + { + DC_UnlockDc(DCDest); + } + if(XlateObj) + { + EngDeleteXlate(XlateObj); + } + return Ret; +} + +BOOL STDCALL +NtGdiExtFloodFill( + HDC hDC, + INT XStart, + INT YStart, + COLORREF Color, + UINT FillType) +{ + DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); + + /* lie and say we succeded */ + return TRUE; +} + +/*********************************************************************** + * MaskBlt + * Ported from WINE by sedwards 11-4-03 + * + * Someone thought it would be faster to do it here and then switch back + * to GDI32. I dunno. Write a test and let me know. + */ + +static __inline BYTE +SwapROP3_SrcDst(BYTE bRop3) +{ + return (bRop3 & 0x99) | ((bRop3 & 0x22) << 1) | ((bRop3 & 0x44) >> 1); +} + +#define FRGND_ROP3(ROP4) ((ROP4) & 0x00FFFFFF) +#define BKGND_ROP3(ROP4) (ROP3Table[(SwapROP3_SrcDst((ROP4)>>24)) & 0xFF]) +#define DSTCOPY 0x00AA0029 +#define DSTERASE 0x00220326 /* dest = dest & (~src) : DSna */ + +BOOL STDCALL +NtGdiMaskBlt ( + HDC hdcDest, INT nXDest, INT nYDest, + INT nWidth, INT nHeight, HDC hdcSrc, + INT nXSrc, INT nYSrc, HBITMAP hbmMask, + INT xMask, INT yMask, DWORD dwRop, + IN DWORD crBackColor) +{ + HBITMAP hOldMaskBitmap, hBitmap2, hOldBitmap2, hBitmap3, hOldBitmap3; + HDC hDCMask, hDC1, hDC2; + static const DWORD ROP3Table[256] = + { + 0x00000042, 0x00010289, + 0x00020C89, 0x000300AA, + 0x00040C88, 0x000500A9, + 0x00060865, 0x000702C5, + 0x00080F08, 0x00090245, + 0x000A0329, 0x000B0B2A, + 0x000C0324, 0x000D0B25, + 0x000E08A5, 0x000F0001, + 0x00100C85, 0x001100A6, + 0x00120868, 0x001302C8, + 0x00140869, 0x001502C9, + 0x00165CCA, 0x00171D54, + 0x00180D59, 0x00191CC8, + 0x001A06C5, 0x001B0768, + 0x001C06CA, 0x001D0766, + 0x001E01A5, 0x001F0385, + 0x00200F09, 0x00210248, + 0x00220326, 0x00230B24, + 0x00240D55, 0x00251CC5, + 0x002606C8, 0x00271868, + 0x00280369, 0x002916CA, + 0x002A0CC9, 0x002B1D58, + 0x002C0784, 0x002D060A, + 0x002E064A, 0x002F0E2A, + 0x0030032A, 0x00310B28, + 0x00320688, 0x00330008, + 0x003406C4, 0x00351864, + 0x003601A8, 0x00370388, + 0x0038078A, 0x00390604, + 0x003A0644, 0x003B0E24, + 0x003C004A, 0x003D18A4, + 0x003E1B24, 0x003F00EA, + 0x00400F0A, 0x00410249, + 0x00420D5D, 0x00431CC4, + 0x00440328, 0x00450B29, + 0x004606C6, 0x0047076A, + 0x00480368, 0x004916C5, + 0x004A0789, 0x004B0605, + 0x004C0CC8, 0x004D1954, + 0x004E0645, 0x004F0E25, + 0x00500325, 0x00510B26, + 0x005206C9, 0x00530764, + 0x005408A9, 0x00550009, + 0x005601A9, 0x00570389, + 0x00580785, 0x00590609, + 0x005A0049, 0x005B18A9, + 0x005C0649, 0x005D0E29, + 0x005E1B29, 0x005F00E9, + 0x00600365, 0x006116C6, + 0x00620786, 0x00630608, + 0x00640788, 0x00650606, + 0x00660046, 0x006718A8, + 0x006858A6, 0x00690145, + 0x006A01E9, 0x006B178A, + 0x006C01E8, 0x006D1785, + 0x006E1E28, 0x006F0C65, + 0x00700CC5, 0x00711D5C, + 0x00720648, 0x00730E28, + 0x00740646, 0x00750E26, + 0x00761B28, 0x007700E6, + 0x007801E5, 0x00791786, + 0x007A1E29, 0x007B0C68, + 0x007C1E24, 0x007D0C69, + 0x007E0955, 0x007F03C9, + 0x008003E9, 0x00810975, + 0x00820C49, 0x00831E04, + 0x00840C48, 0x00851E05, + 0x008617A6, 0x008701C5, + 0x008800C6, 0x00891B08, + 0x008A0E06, 0x008B0666, + 0x008C0E08, 0x008D0668, + 0x008E1D7C, 0x008F0CE5, + 0x00900C45, 0x00911E08, + 0x009217A9, 0x009301C4, + 0x009417AA, 0x009501C9, + 0x00960169, 0x0097588A, + 0x00981888, 0x00990066, + 0x009A0709, 0x009B07A8, + 0x009C0704, 0x009D07A6, + 0x009E16E6, 0x009F0345, + 0x00A000C9, 0x00A11B05, + 0x00A20E09, 0x00A30669, + 0x00A41885, 0x00A50065, + 0x00A60706, 0x00A707A5, + 0x00A803A9, 0x00A90189, + 0x00AA0029, 0x00AB0889, + 0x00AC0744, 0x00AD06E9, + 0x00AE0B06, 0x00AF0229, + 0x00B00E05, 0x00B10665, + 0x00B21974, 0x00B30CE8, + 0x00B4070A, 0x00B507A9, + 0x00B616E9, 0x00B70348, + 0x00B8074A, 0x00B906E6, + 0x00BA0B09, 0x00BB0226, + 0x00BC1CE4, 0x00BD0D7D, + 0x00BE0269, 0x00BF08C9, + 0x00C000CA, 0x00C11B04, + 0x00C21884, 0x00C3006A, + 0x00C40E04, 0x00C50664, + 0x00C60708, 0x00C707AA, + 0x00C803A8, 0x00C90184, + 0x00CA0749, 0x00CB06E4, + 0x00CC0020, 0x00CD0888, + 0x00CE0B08, 0x00CF0224, + 0x00D00E0A, 0x00D1066A, + 0x00D20705, 0x00D307A4, + 0x00D41D78, 0x00D50CE9, + 0x00D616EA, 0x00D70349, + 0x00D80745, 0x00D906E8, + 0x00DA1CE9, 0x00DB0D75, + 0x00DC0B04, 0x00DD0228, + 0x00DE0268, 0x00DF08C8, + 0x00E003A5, 0x00E10185, + 0x00E20746, 0x00E306EA, + 0x00E40748, 0x00E506E5, + 0x00E61CE8, 0x00E70D79, + 0x00E81D74, 0x00E95CE6, + 0x00EA02E9, 0x00EB0849, + 0x00EC02E8, 0x00ED0848, + 0x00EE0086, 0x00EF0A08, + 0x00F00021, 0x00F10885, + 0x00F20B05, 0x00F3022A, + 0x00F40B0A, 0x00F50225, + 0x00F60265, 0x00F708C5, + 0x00F802E5, 0x00F90845, + 0x00FA0089, 0x00FB0A09, + 0x00FC008A, 0x00FD0A0A, + 0x00FE02A9, 0x00FF0062, + }; + + if (!hbmMask) + return NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0, 0); + + /* 1. make mask bitmap's dc */ + hDCMask = NtGdiCreateCompatibleDC(hdcDest); + hOldMaskBitmap = (HBITMAP)NtGdiSelectObject(hDCMask, hbmMask); + + /* 2. make masked Background bitmap */ + + /* 2.1 make bitmap */ + hDC1 = NtGdiCreateCompatibleDC(hdcDest); + hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); + hOldBitmap2 = (HBITMAP)NtGdiSelectObject(hDC1, hBitmap2); + + /* 2.2 draw dest bitmap and mask */ + NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0); + NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, BKGND_ROP3(dwRop), 0, 0); + NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, DSTERASE, 0, 0); + + /* 3. make masked Foreground bitmap */ + + /* 3.1 make bitmap */ + hDC2 = NtGdiCreateCompatibleDC(hdcDest); + hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); + hOldBitmap3 = (HBITMAP)NtGdiSelectObject(hDC2, hBitmap3); + + /* 3.2 draw src bitmap and mask */ + NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0); + NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop), 0,0); + NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, SRCAND, 0, 0); + + /* 4. combine two bitmap and copy it to hdcDest */ + NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hDC2, 0, 0, SRCPAINT, 0, 0); + NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY, 0, 0); + + /* 5. restore all object */ + NtGdiSelectObject(hDCMask, hOldMaskBitmap); + NtGdiSelectObject(hDC1, hOldBitmap2); + NtGdiSelectObject(hDC2, hOldBitmap3); + + /* 6. delete all temp object */ + NtGdiDeleteObject(hBitmap2); + NtGdiDeleteObject(hBitmap3); + + NtGdiDeleteObjectApp(hDC1); + NtGdiDeleteObjectApp(hDC2); + NtGdiDeleteObjectApp(hDCMask); + + return TRUE; +} + +BOOL +APIENTRY +NtGdiPlgBlt( + IN HDC hdcTrg, + IN LPPOINT pptlTrg, + IN HDC hdcSrc, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN HBITMAP hbmMask, + IN INT xMask, + IN INT yMask, + IN DWORD crBackColor) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL STDCALL +NtGdiStretchBlt( + HDC hDCDest, + INT XOriginDest, + INT YOriginDest, + INT WidthDest, + INT HeightDest, + HDC hDCSrc, + INT XOriginSrc, + INT YOriginSrc, + INT WidthSrc, + INT HeightSrc, + DWORD ROP, + IN DWORD dwBackColor) +{ + PDC DCDest = NULL; + PDC DCSrc = NULL; + BITMAPOBJ *BitmapDest, *BitmapSrc; + RECTL DestRect; + RECTL SourceRect; + BOOL Status; + XLATEOBJ *XlateObj = NULL; + HPALETTE SourcePalette = 0, DestPalette = 0; + PGDIBRUSHOBJ BrushObj; + BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); + BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000); + + if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + DCDest = DC_LockDc(hDCDest); + if (NULL == DCDest) + { + DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCDest); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DCDest->IsIC) + { + DC_UnlockDc(DCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + if (UsesSource) + { + if (hDCSrc != hDCDest) + { + DCSrc = DC_LockDc(hDCSrc); + if (NULL == DCSrc) + { + DC_UnlockDc(DCDest); + DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCSrc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (DCSrc->IsIC) + { + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + } + else + { + DCSrc = DCDest; + } + } + else + { + DCSrc = NULL; + } + + /* Offset the destination and source by the origin of their DCs. */ + XOriginDest += DCDest->w.DCOrgX; + YOriginDest += DCDest->w.DCOrgY; + if (UsesSource) + { + XOriginSrc += DCSrc->w.DCOrgX; + YOriginSrc += DCSrc->w.DCOrgY; + } + + DestRect.left = XOriginDest; + DestRect.top = YOriginDest; + DestRect.right = XOriginDest+WidthDest; + DestRect.bottom = YOriginDest+HeightDest; + + SourceRect.left = XOriginSrc; + SourceRect.top = YOriginSrc; + SourceRect.right = XOriginSrc+WidthSrc; + SourceRect.bottom = YOriginSrc+HeightSrc; + + /* Determine surfaces to be used in the bitblt */ + BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (UsesSource) + { + if (DCSrc->w.hBitmap == DCDest->w.hBitmap) + BitmapSrc = BitmapDest; + else + BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + } + else + { + BitmapSrc = NULL; + } + + if ( UsesSource ) + { + int sw = BitmapSrc->SurfObj.sizlBitmap.cx; + int sh = BitmapSrc->SurfObj.sizlBitmap.cy; + if ( SourceRect.left < 0 ) + { + DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right)/abs(SourceRect.right-SourceRect.left); + SourceRect.left = 0; + } + if ( SourceRect.top < 0 ) + { + DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom)/abs(SourceRect.bottom-SourceRect.top); + SourceRect.top = 0; + } + if ( SourceRect.right < -1 ) + { + DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * (-1-SourceRect.left)/abs(SourceRect.right-SourceRect.left); + SourceRect.right = -1; + } + if ( SourceRect.bottom < -1 ) + { + DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * (-1-SourceRect.top)/abs(SourceRect.bottom-SourceRect.top); + SourceRect.bottom = -1; + } + if ( SourceRect.right > sw ) + { + DestRect.right = DestRect.left + (DestRect.right-DestRect.left) * abs(sw-SourceRect.left) / abs(SourceRect.right-SourceRect.left); + SourceRect.right = sw; + } + if ( SourceRect.bottom > sh ) + { + DestRect.bottom = DestRect.top + (DestRect.bottom-DestRect.top) * abs(sh-SourceRect.top) / abs(SourceRect.bottom-SourceRect.top); + SourceRect.bottom = sh; + } + sw--; + sh--; + if ( SourceRect.left > sw ) + { + DestRect.left = DestRect.right - (DestRect.right-DestRect.left) * (SourceRect.right-sw) / abs(SourceRect.right-SourceRect.left); + SourceRect.left = 0; + } + if ( SourceRect.top > sh ) + { + DestRect.top = DestRect.bottom - (DestRect.bottom-DestRect.top) * (SourceRect.bottom-sh) / abs(SourceRect.bottom-SourceRect.top); + SourceRect.top = 0; + } + if (0 == (DestRect.right-DestRect.left) || 0 == (DestRect.bottom-DestRect.top) || 0 == (SourceRect.right-SourceRect.left) || 0 == (SourceRect.bottom-SourceRect.top)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Status = FALSE; + goto failed; + } + } + + if (UsesPattern) + { + BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); + if (NULL == BrushObj) + { + if (UsesSource && hDCSrc != hDCDest) + { + DC_UnlockDc(DCSrc); + } + DC_UnlockDc(DCDest); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + } + else + { + BrushObj = NULL; + } + + /* Create the XLATEOBJ. */ + if (UsesSource) + { + if (DCDest->w.hPalette != 0) + DestPalette = DCDest->w.hPalette; + + if (DCSrc->w.hPalette != 0) + SourcePalette = DCSrc->w.hPalette; + + /* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */ + XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette); + if (NULL == XlateObj) + { + if (UsesSource && hDCSrc != hDCDest) + { + DC_UnlockDc(DCSrc); + } + DC_UnlockDc(DCDest); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return FALSE; + } + } + + /* Perform the bitblt operation */ + Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + NULL, DCDest->CombinedClip, XlateObj, + &DestRect, &SourceRect, NULL, NULL, NULL, + COLORONCOLOR); + + if (UsesSource) + EngDeleteXlate(XlateObj); + if (UsesPattern) + { + BRUSHOBJ_UnlockBrush(BrushObj); + } +failed: + if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) + { + BITMAPOBJ_UnlockBitmap(BitmapSrc); + } + BITMAPOBJ_UnlockBitmap(BitmapDest); + if (UsesSource && hDCSrc != hDCDest) + { + DC_UnlockDc(DCSrc); + } + DC_UnlockDc(DCDest); + + return Status; +} + Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Sun Aug 12 20:20:29 2007 @@ -146,6 +146,7 @@ <file>icm.c</file> <file>line.c</file> <file>metafile.c</file> + <file>painting.c</file> <file>paintobj.c</file> <file>palobj.c</file> <file>path.c</file>

17 years, 4 months

[cfinck] 28301: Finally uncomment the Norwegian keyboard layout again, the bug is really fixed by recent changes :-) See issue #2414 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Aug 12 19:55:56 2007 New Revision: 28301 URL: http://svn.reactos.org/svn/reactos?rev=28301&view=rev Log: Finally uncomment the Norwegian keyboard layout again, the bug is really fixed by recent changes :-) See issue #2414 for more details. Modified: trunk/reactos/boot/bootdata/hivesys.inf 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 (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sun Aug 12 19:55:56 2007 @@ -88,8 +88,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" -;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" -;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters"

17 years, 4 months

[tkreuzer] 28300: rename NtGdiGetBitmapDimensionEx to NtGdiGetBitmapDimension, update ntgdibad.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Aug 12 19:20:09 2007 New Revision: 28300 URL: http://svn.reactos.org/svn/reactos?rev=28300&view=rev Log: rename NtGdiGetBitmapDimensionEx to NtGdiGetBitmapDimension, update ntgdibad.h Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sun Aug 12 19:20:09 2007 @@ -338,7 +338,7 @@ GetAspectRatioFilterEx@8 GetBitmapAttributes@4 GetBitmapBits@12=NtGdiGetBitmapBits@12 -GetBitmapDimensionEx@8=NtGdiGetBitmapDimensionEx@8 +GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8 GetBkColor@4=NtGdiGetBkColor@4 GetBkMode@4=NtGdiGetBkMode@4 GetBoundsRect@12 Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sun Aug 12 19:20:09 2007 @@ -248,14 +248,6 @@ LPSIZE AspectRatio); /* Should be done in user-mode using shared GDI Objects. */ -BOOL -STDCALL -NtGdiGetBitmapDimensionEx ( - HBITMAP hBitmap, - LPSIZE Dimension - ); - -/* Should be done in user-mode using shared GDI Objects. */ COLORREF STDCALL NtGdiGetBkColor(HDC hDC); /* Should be done in user-mode using shared GDI Objects. */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Sun Aug 12 19:20:09 2007 @@ -572,7 +572,7 @@ } BOOL STDCALL -NtGdiGetBitmapDimensionEx( +NtGdiGetBitmapDimension( HBITMAP hBitmap, LPSIZE Dimension) { Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Aug 12 19:20:09 2007 @@ -164,7 +164,7 @@ NtGdiGetAndSetDCDword 4 # NtGdiGetAppClipBox 2 NtGdiGetBitmapBits 3 -# NtGdiGetBitmapDimension 2 +NtGdiGetBitmapDimension 2 NtGdiGetBoundsRect 3 # NtGdiGetCharABCWidthsW 6 # NtGdiGetCharacterPlacementW 6 @@ -776,7 +776,6 @@ NtGdiExtTextOut 8 NtGdiGdiComment 3 NtGdiGetAspectRatioFilterEx 2 -NtGdiGetBitmapDimensionEx 2 NtGdiGetBkColor 1 NtGdiGetBkMode 1 NtGdiGetBrushOrgEx 2

17 years, 4 months

[greatlrd] 28299: win32kdxtest does not contain any more test for NtGdiDdQueryDirectDrawObject So now I start adding new test, that I did manual testing for and reading debugout put for. we still missing test for NtGdiDdQueryDirectDrawObject

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 12 18:11:00 2007 New Revision: 28299 URL: http://svn.reactos.org/svn/reactos?rev=28299&view=rev Log: win32kdxtest does not contain any more test for NtGdiDdQueryDirectDrawObject So now I start adding new test, that I did manual testing for and reading debugout put for. we still missing test for NtGdiDdQueryDirectDrawObject Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Sun Aug 12 18:11:00 2007 @@ -87,6 +87,8 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, pCallBackFlags, puD3dCallbacks, @@ -103,6 +105,8 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); pHalInfo = &HalInfo; RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, @@ -120,6 +124,8 @@ RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); ASSERT1(pHalInfo != NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) @@ -127,8 +133,6 @@ RTEST(pHalInfo->dwSize != sizeof(DD_HALINFO)); ASSERT1(pHalInfo->dwSize != sizeof(DD_HALINFO)); } - - if (pHalInfo->dwSize == sizeof(DD_HALINFO)) { @@ -222,6 +226,8 @@ RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); ASSERT1(pHalInfo != NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -258,6 +264,8 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); ASSERT1(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ @@ -297,6 +305,8 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); ASSERT1(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ @@ -332,73 +342,140 @@ { RTEST(puD3dCallbacks != NULL); RTEST(puD3dDriverData != NULL); - } - - RTEST(puD3dBufferCallbacks == NULL); - RTEST(puD3dTextureFormats == NULL); - RTEST(puNumFourCC == NULL); - RTEST(puFourCC == NULL); - ASSERT1(pHalInfo != NULL); - - /* We do not retesting DD_HALINFO, instead we compare it */ - RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); - - /* NT4 this will fail */ - RTEST(pCallBackFlags[2] == 0); - - + RTEST(puD3dBufferCallbacks != NULL); + } + + + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); + ASSERT1(pHalInfo != NULL); + + /* We do not retesting DD_HALINFO, instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + + /* NT4 this will fail */ + RTEST(pCallBackFlags[2] == 0); /* Next Start 6 */ - //pHalInfo = &HalInfo; - //pCallBackFlags = CallBackFlags; - //puD3dCallbacks = &D3dCallbacks; - //puD3dDriverData = &D3dDriverData; - //puD3dBufferCallbacks = &D3dBufferCallbacks; - - //RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); - //RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); - //RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); - ////RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS)); - //RtlZeroMemory(&D3dBufferCallbacks,sizeof(D3DNTHAL_CALLBACKS)); - - //RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, - // pCallBackFlags, puD3dCallbacks, - // puD3dDriverData, puD3dBufferCallbacks, - // puD3dTextureFormats, puNumHeaps, - // puvmList, puNumFourCC, - // puFourCC)== FALSE); - //RTEST(pHalInfo != NULL); - //RTEST(pCallBackFlags != NULL); - - //if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) - //{ - // RTEST(puD3dCallbacks != NULL); - // RTEST(puD3dDriverData != NULL); - // RTEST(puD3dBufferCallbacks != NULL); - //} - - - //RTEST(puD3dTextureFormats == NULL); - //RTEST(puNumFourCC == NULL); - //RTEST(puFourCC == NULL); - //ASSERT1(pHalInfo != NULL); - - ///* We do not retesting DD_HALINFO, instead we compare it */ - //RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); - //RTEST(pCallBackFlags[0] != 0); - //RTEST(pCallBackFlags[1] != 0); - - ///* NT4 this will fail */ - //RTEST(pCallBackFlags[2] == 0); - - -/* FIXME - RTEST(puD3dTextureFormats == NULL); - RTEST(puNumFourCC == NULL); - RTEST(puFourCC == NULL); -*/ + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + RtlZeroMemory(&D3dBufferCallbacks,sizeof(DD_D3DBUFCALLBACKS)); + + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + RTEST(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); + + if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) + { + RTEST(puD3dCallbacks != NULL); + RTEST(puD3dDriverData != NULL); + RTEST(puD3dBufferCallbacks != NULL); + } + + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); + ASSERT1(pHalInfo != NULL); + + /* We do not retesting DD_HALINFO, instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + + /* NT4 this will fail */ + RTEST(pCallBackFlags[2] == 0); + +/* Next Start 7 */ + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + + /* It is forbein to return a DDSURFACEDESC2 it should always be DDSURFACEDESC + This is only for detected bad drivers that does not follow the rules, if they + does not follow tthe rules only not everthing being copy then in gdi32.dll + gdi32.dll always assume it is DDSURFACEDESC size + */ + if (puD3dDriverData->dwNumTextureFormats != 0) + { + puD3dTextureFormats = malloc (puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + } + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + RtlZeroMemory(&D3dBufferCallbacks,sizeof(DD_D3DBUFCALLBACKS)); + + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + RTEST(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); + + if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) + { + RTEST(puD3dCallbacks != NULL); + RTEST(puD3dDriverData != NULL); + RTEST(puD3dBufferCallbacks != NULL); + if (puD3dDriverData->dwNumTextureFormats != 0) + { + /* FIXME add a better test for texture */ + RTEST(puD3dTextureFormats != NULL); + } + } + + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); + ASSERT1(pHalInfo != NULL); + + /* We do not retesting DD_HALINFO, instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + + /* NT4 this will fail */ + RTEST(pCallBackFlags[2] == 0); + + + + /* Todo + * adding test for + * puD3dCallbacks + * puD3dDriverData + * puD3dBufferCallbacks + * puNumFourCC + * puFourCC + * puNumHeaps + * puvmList + */ + /* Cleanup ReactX setup */ DeleteDC(hdc); Syscall(L"NtGdiDdDeleteDirectDrawObject", 1, &hDirectDraw);

17 years, 4 months

← Newer
1
...
40
41
42
43
44
45
46
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007