Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32774: sorry forgot to commit this one.
by tkreuzer＠svn.reactos.org 28 Mar '08

28 Mar '08

Author: tkreuzer Date: Thu Mar 27 22:44:49 2008 New Revision: 32774 URL: http://svn.reactos.org/svn/reactos?rev=32774&view=rev Log: sorry forgot to commit this one. Added: trunk/rostests/apitests/w32knapi/osver.c (with props) Added: trunk/rostests/apitests/w32knapi/osver.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/osver.c… ============================================================================== --- trunk/rostests/apitests/w32knapi/osver.c (added) +++ trunk/rostests/apitests/w32knapi/osver.c [iso-8859-1] Thu Mar 27 22:44:49 2008 @@ -1,0 +1,49 @@ +#include "w32knapi.h" + +OSVERSIONINFOW g_OsVer; +UINT g_OsIdx; + +ASPI gNOPARAM_ROUTINE_CREATEMENU = {-1,-1,0x00,-1,0x00}; +ASPI gNOPARAM_ROUTINE_CREATEMENUPOPUP = {-1,-1,0x01,-1,0x01}; +ASPI gNOPARAM_ROUTINE_LOADUSERAPIHOOK = {-1,-1,0x1d,-1,0x0e}; +ASPI gONEPARAM_ROUTINE_MAPDEKTOPOBJECT = {-1,-1,0x30,-1,0x31}; +ASPI gONEPARAM_ROUTINE_SWAPMOUSEBUTTON = {-1,-1,0x42,-1,0x44}; + +ASPI gHWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW = {-1,-1,0x45,-1,0x46}; +ASPI gHWND_ROUTINE_GETWNDCONTEXTHLPID = {-1,-1,0x47,-1,0x48}; +ASPI gHWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID = {-1,-1,0x51,-1,0x52}; + +BOOL InitOsVersion() +{ + g_OsVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW((LPOSVERSIONINFOW)&g_OsVer); + if (g_OsVer.dwMajorVersion == 4) + { + g_OsIdx = 0; + return TRUE; + } + else if (g_OsVer.dwMajorVersion == 5) + { + if (g_OsVer.dwMinorVersion == 0) + { + g_OsIdx = 1; + return TRUE; + } + else if (g_OsVer.dwMinorVersion == 1) + { + g_OsIdx = 2; + return TRUE; + } + else if (g_OsVer.dwMinorVersion == 2) + { + g_OsIdx = 3; + return TRUE; + } + } + else if (g_OsVer.dwMajorVersion == 6) + { + g_OsIdx = 4; + return TRUE; + } + return FALSE; +} Propchange: trunk/rostests/apitests/w32knapi/osver.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 32773: - display properties title for recycle bin folder See issue #3140 for more details.
by janderwald＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: janderwald Date: Thu Mar 27 16:02:33 2008 New Revision: 32773 URL: http://svn.reactos.org/svn/reactos?rev=32773&view=rev Log: - display properties title for recycle bin folder See issue #3140 for more details. Modified: trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] Thu Mar 27 16:02:33 2008 @@ -970,8 +970,11 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); + psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE; + psh.pszCaption = MAKEINTRESOURCEW(IDS_RECYCLEBIN_FOLDER_NAME); psh.hwndParent = NULL; psh.u3.phpage = hpsp; + psh.hInstance = shell32_hInstance; hprop = SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBucketDlg, (LPARAM)sDrive, NULL); if (!hprop)

1 0

[dreimer] 32772: Once more update WinHelp and wordpad. Seems like we have a problem with wordpad, even on windows. Try open it and goto the options dialog and close it again. Then you will see. Can someone investigate in it?
by dreimer＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: dreimer Date: Thu Mar 27 08:13:54 2008 New Revision: 32772 URL: http://svn.reactos.org/svn/reactos?rev=32772&view=rev Log: Once more update WinHelp and wordpad. Seems like we have a problem with wordpad, even on windows. Try open it and goto the options dialog and close it again. Then you will see. Can someone investigate in it? Modified: trunk/reactos/base/applications/winhelp/lang/de-DE.rc trunk/reactos/base/applications/winhelp/winhelp.rbuild trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h trunk/reactos/base/applications/wordpad/wordpad.rbuild Modified: trunk/reactos/base/applications/winhelp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/lang/de-DE.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -50,6 +50,16 @@ } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Abbrechen", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -64,8 +74,8 @@ STID_SEARCH, "&Suchen" STID_BACK, "&Zurück" STID_HISTORY, "&Bisher" -STID_TOPICS, "&Topics" +STID_TOPICS, "&Themen" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" } Modified: trunk/reactos/base/applications/winhelp/winhelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/winhelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/winhelp.rbuild [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -5,14 +5,11 @@ <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>wine</library> - <library>kernel32</library> + <library>comdlg32</library> + <library>shell32</library> <library>user32</library> <library>gdi32</library> - <library>ntdll</library> - <library>comdlg32</library> - <library>advapi32</library> - <library>shell32</library> - <library>comctl32</library> + <library>kernel32</library> <file>callback.c</file> <file>hlpfile.c</file> <file>macro.c</file> Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "&Drucken" STRING_PREVIEW_NEXTPAGE, "&Nächste" STRING_PREVIEW_PREVPAGE, "&Vorherige" + STRING_PREVIEW_TWOPAGES, "Zwei Seiten" + STRING_PREVIEW_ONEPAGE, "Eine Seite" STRING_PREVIEW_CLOSE, "&Schließen" END Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Imprimer" STRING_PREVIEW_NEXTPAGE, "Page suivante" STRING_PREVIEW_PREVPAGE, "Page précédente" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Fermer" END Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -208,6 +208,8 @@ STRING_PREVIEW_PRINT, "ÀÎ¼â" STRING_PREVIEW_NEXTPAGE, "´ÙÀ½ ÆäÀÌÁö" STRING_PREVIEW_PREVPAGE, "ÀÌÀü ÆäÀÌÁö" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "´Ý±â" END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Skriv ut" STRING_PREVIEW_NEXTPAGE, "Neste side" STRING_PREVIEW_PREVPAGE, "Forrige side" + STRING_PREVIEW_TWOPAGES, "To sider" + STRING_PREVIEW_ONEPAGE, "Én side" STRING_PREVIEW_CLOSE, "Lukk" END Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -214,6 +214,8 @@ STRING_PREVIEW_PRINT, "Drukuj" STRING_PREVIEW_NEXTPAGE, "Nast. strona" STRING_PREVIEW_PREVPAGE, "Poprz. strona" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Zamknij" END Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -212,6 +212,8 @@ STRING_PREVIEW_PRINT, "Ïå÷àòü" STRING_PREVIEW_NEXTPAGE, "Ñëåäóþùàÿ ñòðàíèöà" STRING_PREVIEW_PREVPAGE, "Ïðåäûäóùàÿ ñòðàíèöà" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Çàêðûòü" END Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -216,6 +216,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -29,7 +29,9 @@ int page; int pages; HDC hdc; + HDC hdc2; HDC hdcSized; + HDC hdcSized2; RECT window; LPWSTR wszFileName; } previewinfo, *ppreviewinfo; @@ -229,6 +231,7 @@ static int get_num_pages(HWND hEditorWnd, FORMATRANGE fr) { int page = 0; + fr.chrg.cpMin = 0; do { @@ -245,11 +248,10 @@ { int i; - for(i = 1; i <= page; i++) - { - if(i == page) - break; - + fr->chrg.cpMin = 0; + + for(i = 1; i < page; i++) + { fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)fr); } } @@ -431,7 +433,8 @@ AddTextButton(hReBar, STRING_PREVIEW_PRINT, ID_PRINT, BANDID_PREVIEW_BTN1); AddTextButton(hReBar, STRING_PREVIEW_NEXTPAGE, ID_PREVIEW_NEXTPAGE, BANDID_PREVIEW_BTN2); AddTextButton(hReBar, STRING_PREVIEW_PREVPAGE, ID_PREVIEW_PREVPAGE, BANDID_PREVIEW_BTN3); - AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN4); + AddTextButton(hReBar, STRING_PREVIEW_TWOPAGES, ID_PREVIEW_NUMPAGES, BANDID_PREVIEW_BTN4); + AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN5); hStatic = CreateWindowW(WC_STATICW, NULL, WS_VISIBLE | WS_CHILD, 0, 0, 0, 0, @@ -458,6 +461,7 @@ { preview.page = 1; preview.hdc = 0; + preview.hdc2 = 0; preview.wszFileName = wszFileName; preview_bar_show(hMainWnd, TRUE); } @@ -616,17 +620,63 @@ return 0; } +void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight) +{ + HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); + HPEN hPen; + int TopMargin = (int)((float)twips_to_pixels(lpFr->rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); + int BottomMargin = (int)((float)twips_to_pixels(lpFr->rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); + int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + + if(*hdcSized); + DeleteDC(*hdcSized); + *hdcSized = CreateCompatibleDC(hdc); + SelectObject(*hdcSized, hBitmapScaled); + + StretchBlt(*hdcSized, 0, 0, bmNewWidth, bmNewHeight, hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); + + /* Draw margin lines */ + hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); + SelectObject(*hdcSized, hPen); + + MoveToEx(*hdcSized, 0, TopMargin, NULL); + LineTo(*hdcSized, bmNewWidth, TopMargin); + MoveToEx(*hdcSized, 0, BottomMargin, NULL); + LineTo(*hdcSized, bmNewWidth, BottomMargin); + + MoveToEx(*hdcSized, LeftMargin, 0, NULL); + LineTo(*hdcSized, LeftMargin, bmNewHeight); + MoveToEx(*hdcSized, RightMargin, 0, NULL); + LineTo(*hdcSized, RightMargin, bmNewHeight); + +} + +static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, int bmWidth, int bmHeight, RECT* paper, int page) +{ + HBITMAP hBitmapCapture = CreateCompatibleBitmap(lpFr->hdc, bmWidth, bmHeight); + + char_from_pagenum(hEditorWnd, lpFr, page); + SelectObject(lpFr->hdc, hBitmapCapture); + FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); + SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); + /* EM_FORMATRANGE sets fr.rc to indicate the area printed in, but we want to + keep the original for drawing margins */ + lpFr->rc = get_print_rect(lpFr->hdcTarget); + SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); +} + LRESULT print_preview(HWND hMainWnd) { FORMATRANGE fr; GETTEXTLENGTHEX gt; HDC hdc; RECT window, background; - HBITMAP hBitmapCapture, hBitmapScaled; int bmWidth, bmHeight, bmNewWidth, bmNewHeight; float ratioWidth, ratioHeight, ratio; int xOffset, yOffset; int barheight; + float spacing = 20.0; HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); PAINTSTRUCT ps; @@ -643,14 +693,20 @@ bmWidth = twips_to_pixels(fr.rcPage.right, GetDeviceCaps(hdc, LOGPIXELSX)); bmHeight = twips_to_pixels(fr.rcPage.bottom, GetDeviceCaps(hdc, LOGPIXELSY)); - hBitmapCapture = CreateCompatibleBitmap(hdc, bmWidth, bmHeight); - if(!preview.hdc) { RECT paper; HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); preview.hdc = CreateCompatibleDC(hdc); + + if(preview.hdc2) + { + if((int)preview.hdc2 != -1) + DeleteDC(preview.hdc2); + preview.hdc2 = CreateCompatibleDC(hdc); + } + fr.hdc = preview.hdc; gt.flags = GTL_DEFAULT; gt.codepage = 1200; @@ -665,21 +721,29 @@ if(!preview.pages) preview.pages = get_num_pages(hEditorWnd, fr); - SelectObject(preview.hdc, hBitmapCapture); - - char_from_pagenum(hEditorWnd, &fr, preview.page); - - FillRect(preview.hdc, &paper, GetStockObject(WHITE_BRUSH)); - SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)&fr); - SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); + fr.hdc = preview.hdc; + draw_preview(hEditorWnd, &fr, bmWidth, bmHeight, &paper, preview.page); + + if(preview.hdc2) + { + fr.hdc = preview.hdc2; + draw_preview(hEditorWnd, &fr, bmWidth, bmHeight, &paper, preview.page + 1); + } EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_PREVPAGE), preview.page > 1); - EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), preview.page < preview.pages); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), preview.hdc2 ? + (preview.page + 1) < preview.pages : + preview.page < preview.pages); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), preview.pages > 1); } barheight = SendMessageW(hReBar, RB_GETBARHEIGHT, 0, 0); - ratioWidth = ((float)window.right - 20.0) / (float)bmHeight; - ratioHeight = ((float)window.bottom - 20.0 - (float)barheight) / (float)bmHeight; + ratioHeight = ((float)window.bottom - spacing - (float)barheight) / (float)bmHeight; + + if(preview.hdc2) + ratioWidth = ((float)window.right / 2.0 - spacing * 2.0) / (float)bmWidth; + else + ratioWidth = ((float)window.right - spacing * 3.0) / (float)bmWidth; if(ratioWidth > ratioHeight) ratio = ratioHeight; @@ -688,44 +752,16 @@ bmNewWidth = (int)((float)bmWidth * ratio); bmNewHeight = (int)((float)bmHeight * ratio); - hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); - - xOffset = ((window.right - bmNewWidth) / 2); + yOffset = ((window.bottom - bmNewHeight + barheight) / 2); - if(window.right != preview.window.right || window.bottom != preview.window.bottom) - { - HPEN hPen; - int TopMargin = (int)((float)twips_to_pixels(fr.rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int BottomMargin = (int)((float)twips_to_pixels(fr.rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int LeftMargin = (int)((float)twips_to_pixels(fr.rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - int RightMargin = (int)((float)twips_to_pixels(fr.rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - - DeleteDC(preview.hdcSized); - preview.hdcSized = CreateCompatibleDC(hdc); - SelectObject(preview.hdcSized, hBitmapScaled); - - StretchBlt(preview.hdcSized, 0, 0, bmNewWidth, bmNewHeight, preview.hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); - - /* Draw margin lines */ - hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); - SelectObject(preview.hdcSized, hPen); - - MoveToEx(preview.hdcSized, 0, TopMargin, NULL); - LineTo(preview.hdcSized, bmNewWidth, TopMargin); - MoveToEx(preview.hdcSized, 0, BottomMargin, NULL); - LineTo(preview.hdcSized, bmNewWidth, BottomMargin); - - MoveToEx(preview.hdcSized, LeftMargin, 0, NULL); - LineTo(preview.hdcSized, LeftMargin, bmNewHeight); - MoveToEx(preview.hdcSized, RightMargin, 0, NULL); - LineTo(preview.hdcSized, RightMargin, bmNewHeight); - } + if(!preview.hdc2) + xOffset = (window.right - bmNewWidth) / 2; + else + xOffset = (window.right - bmNewWidth * 2) / 2; window.top = barheight; FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); - - SelectObject(hdc, hBitmapScaled); background.left = xOffset - 2; background.right = xOffset + bmNewWidth + 2; @@ -734,7 +770,27 @@ FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + if(window.right != preview.window.right || window.bottom != preview.window.bottom) + { + draw_preview_page(preview.hdc, &preview.hdcSized, &fr, ratio, bmNewWidth, bmNewHeight, bmWidth, bmHeight); + + if(preview.hdc2) + { + background.left += bmNewWidth + spacing; + background.right += bmNewWidth + spacing; + + FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + + draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, ratio, bmNewWidth, bmNewHeight, bmWidth, bmHeight); + } + } + BitBlt(hdc, xOffset, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized, 0, 0, SRCCOPY); + + if(preview.hdc2) + { + BitBlt(hdc, xOffset + bmNewWidth + spacing, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized2, 0, 0, SRCCOPY); + } DeleteDC(fr.hdcTarget); preview.window = window; @@ -742,6 +798,20 @@ EndPaint(hMainWnd, &ps); return 0; +} + +void update_preview(HWND hWnd) +{ + RECT rc; + + DeleteDC(preview.hdc); + preview.hdc = 0; + + preview.window.right = 0; + + GetClientRect(hWnd, &rc); + rc.top += SendMessageW(GetDlgItem(hWnd, IDC_REBAR), RB_GETBARHEIGHT, 0, 0); + InvalidateRect(hWnd, &rc, TRUE); } LRESULT preview_command(HWND hWnd, WPARAM wParam, LPARAM lParam) @@ -755,20 +825,37 @@ case ID_PREVIEW_NEXTPAGE: case ID_PREVIEW_PREVPAGE: { - HWND hReBar = GetDlgItem(hWnd, IDC_REBAR); - RECT rc; - if(LOWORD(wParam) == ID_PREVIEW_NEXTPAGE) preview.page++; else preview.page--; - preview.hdc = 0; - preview.window.right = 0; - - GetClientRect(hWnd, &rc); - rc.top += SendMessageW(hReBar, RB_GETBARHEIGHT, 0, 0); - InvalidateRect(hWnd, &rc, TRUE); + update_preview(hWnd); + } + break; + + case ID_PREVIEW_NUMPAGES: + { + HWND hReBar = GetDlgItem(hWnd, IDC_REBAR); + WCHAR name[MAX_STRING_LEN]; + HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE); + + if(preview.hdc2) + { + DeleteDC(preview.hdc2); + preview.hdc2 = 0; + } else + { + if(preview.page == preview.pages) + preview.page--; + preview.hdc2 = (HDC)-1; + } + + LoadStringW(hInst, preview.hdc2 ? STRING_PREVIEW_ONEPAGE : STRING_PREVIEW_TWOPAGES, + name, MAX_STRING_LEN); + + SetWindowTextW(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), name); + update_preview(hWnd); } break; Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -20,7 +20,7 @@ */ #define WIN32_LEAN_AND_MEAN -//#define _WIN32_IE 0x0400 +#define _WIN32_IE 0x0400 #include <stdarg.h> #include <stdlib.h> Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -44,6 +44,7 @@ #define ID_PREVIEW_NEXTPAGE 1017 #define ID_PREVIEW_PREVPAGE 1018 +#define ID_PREVIEW_NUMPAGES 1019 #define ID_ALIGN_LEFT 1100 #define ID_ALIGN_CENTER 1101 @@ -79,7 +80,7 @@ #define ID_TOGGLE_STATUSBAR 1502 #define ID_TOGGLE_RULER 1503 -#define PREVIEW_BUTTONS 4 +#define PREVIEW_BUTTONS 5 #define FILELIST_ENTRIES 4 #define FILELIST_ENTRY_LENGTH 33 @@ -95,7 +96,8 @@ #define BANDID_PREVIEW_BTN2 7 #define BANDID_PREVIEW_BTN3 8 #define BANDID_PREVIEW_BTN4 9 -#define BANDID_PREVIEW_BUFFER 10 +#define BANDID_PREVIEW_BTN5 10 +#define BANDID_PREVIEW_BUFFER 11 #define ID_WORDWRAP_NONE 0 #define ID_WORDWRAP_WINDOW 1 @@ -178,9 +180,11 @@ #define STRING_PREVIEW_PRINT 1414 #define STRING_PREVIEW_NEXTPAGE 1415 #define STRING_PREVIEW_PREVPAGE 1416 -#define STRING_PREVIEW_CLOSE 1417 - -#define STRING_UNITS_CM 1418 +#define STRING_PREVIEW_TWOPAGES 1417 +#define STRING_PREVIEW_ONEPAGE 1418 +#define STRING_PREVIEW_CLOSE 1419 + +#define STRING_UNITS_CM 1420 #define STRING_DEFAULT_FILENAME 1700 #define STRING_PROMPT_SAVE_CHANGES 1701 Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -4,12 +4,13 @@ <include base="wordpad">.</include> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> + <library>comdlg32</library> + <library>shell32</library> <library>user32</library> <library>gdi32</library> - <library>comdlg32</library> + <library>msvcrt</library> <library>advapi32</library> - <library>shell32</library> + <library>kernel32</library> <library>comctl32</library> <compilationunit name="unit.c"> <file>print.c</file>

1 0

[fireball] 32540: - The bootloader must zero user shared data page before passing control to the kernel. This fixes the "invalid timer state", "assert(SharedUserData->NumberOfPages == 0" family of bugs after warm reboot. See issue #3085 for more details.
by fireball＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: fireball Date: Sun Mar 2 04:26:59 2008 New Revision: 32540 URL: http://svn.reactos.org/svn/reactos?rev=3D32540&view=3Drev Log: - The bootloader must zero user shared data page before passing control to = the kernel. This fixes the "invalid timer state", "assert(SharedUserData->N= umberOfPages =3D=3D 0" family of bugs after warm reboot. See issue #3085 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/= arch/i386/loader.c?rev=3D32540&r1=3D32539&r2=3D32540&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sun Mar 2 04:26:= 59 2008 @@ -202,5 +202,8 @@ PageDir->Pde[0x1FF].Valid =3D 1; PageDir->Pde[0x1FF].Write =3D 1; PageDir->Pde[0x1FF].PageFrameNumber =3D 1; + + /* Zero shared data */ + RtlZeroMemory((PVOID)(2 << MM_PAGE_SHIFT), PAGE_SIZE); } =

1 0

[greatlrd] 32544: small change in DdCreateSurface. now we pass down all usermode surface data to win32k. left todo is translate back all surface data.
by greatlrd＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: greatlrd Date: Sun Mar 2 11:50:11 2008 New Revision: 32544 URL: http://svn.reactos.org/svn/reactos?rev=3D32544&view=3Drev Log: small change in DdCreateSurface. now we pass down all usermode surface dat= a to win32k. left todo is translate back all surface data. = Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32544&r1=3D32543&r2=3D32544&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 11:50:11 2008 @@ -409,13 +409,10 @@ ptmpDdSurfaceMore->dwSurfaceHandle =3D (DWORD) pCreateSurf= ace->lplpSList[i]->dbnOverlayNode.object_int; } = - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - - we only support one surface create at moment - */ + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

1 0

[gbrunmar] 32541: Implemented IDirect3D:CheckDeviceFormat()
by gbrunmar＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: gbrunmar Date: Sun Mar 2 06:29:35 2008 New Revision: 32541 URL: http://svn.reactos.org/svn/reactos?rev=3D32541&view=3Drev Log: Implemented IDirect3D:CheckDeviceFormat() Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h trunk/reactos/dll/directx/d3d9/format.c trunk/reactos/dll/directx/d3d9/format.h trunk/reactos/include/psdk/d3d9types.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _impl.c?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Mar 2 06:29:35 2008 @@ -363,7 +363,7 @@ * One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be checked. * * @param D3DFORMAT BackBufferFormat -* One of the D3DFORMAT enum membersfor the render target mode to be checke= d. D3DFMT_UNKNOWN is only allowed in windowed mode. +* One of the D3DFORMAT enum members for the render target mode to be check= ed. D3DFMT_UNKNOWN is only allowed in windowed mode. * * @param BOOL Windowed * If this value is TRUE, the D3DFORMAT check will be done for windowed mod= e and FALSE equals fullscreen mode. @@ -426,19 +426,200 @@ return D3DERR_NOTAVAILABLE; } = - hResult =3D CheckDeviceFormat(&This->DisplayAdapters[Adapter].DriverCa= ps, DisplayFormat, BackBufferFormat, Windowed); + hResult =3D CheckDeviceType(&This->DisplayAdapters[Adapter].DriverCaps= , DisplayFormat, BackBufferFormat, Windowed); = UNLOCK_D3D9(); return hResult; } = + +/*++ +* @name IDirect3D9::CheckDeviceFormat +* @implemented +* +* The function IDirect3D9Impl_CheckDeviceFormat checks if a specific D3DFO= RMAT +* can be used for a specific purpose like texture, depth/stencil buffer or= as a render target +* on the specified display adapter. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primar= y display. +* The maximum value for this is the value returned by IDirect3D::GetAdapte= rCount(). +* +* @param D3DDEVTYPE DeviceType +* One of the D3DDEVTYPE enum members. +* +* @param D3DFORMAT AdapterFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be checked. +* +* @param DWORD Usage +* Valid values are any of the D3DUSAGE_QUERY constants or any of these D3D= USAGE constants: +* D3DUSAGE_AUTOGENMIPMAP, D3DUSAGE_DEPTHSTENCIL, D3DUSAGE_DMAP, D3DUSAGE_D= YNAMIC, +* D3DUSAGE_NONSECURE, D3DUSAGE_RENDERTARGET and D3DUSAGE_SOFTWAREPROCESSIN= G. +* +* @param D3DRESOURCETYPE RType +* One of the D3DRESOURCETYPE enum members. Specifies what format will be u= sed for. +* +* @param D3DFORMAT CheckFormat +* One of the D3DFORMAT enum members for the surface format to be checked. +* +* @return HRESULT +* If the format is compatible with the specified usage and resource type, = the method returns D3D_OK. +* If the format isn't compatible with the specified usage and resource typ= e - the return value will be D3DERR_NOTAVAILABLE. +* If Adapter is out of range, DeviceType is invalid, AdapterFormat or Chec= kFormat is invalid, +* Usage and RType isn't compatible - the return value will be D3DERR_INVAL= IDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, = UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFo= rmat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckForm= at) { - UNIMPLEMENTED - - return D3D_OK; + LPD3D9_DRIVERCAPS pDriverCaps; + BOOL bIsTextureRType =3D FALSE; + HRESULT hResult; + + LPDIRECT3D9_INT This =3D impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >=3D This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (DeviceType !=3D D3DDEVTYPE_HAL && + DeviceType !=3D D3DDEVTYPE_REF && + DeviceType !=3D D3DDEVTYPE_SW) + { + DPRINT1("Invalid DeviceType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (AdapterFormat =3D=3D D3DFMT_UNKNOWN || + CheckFormat =3D=3D D3DFMT_UNKNOWN) + { + DPRINT1("Invalid D3DFORMAT specified"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if ((Usage & (D3DUSAGE_DONOTCLIP | D3DUSAGE_NPATCHES | D3DUSAGE_POINTS= | D3DUSAGE_RTPATCHES | D3DUSAGE_TEXTAPI | D3DUSAGE_WRITEONLY)) !=3D 0) + { + DPRINT1("Invalid Usage specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (RType =3D=3D D3DRTYPE_TEXTURE || + RType =3D=3D D3DRTYPE_VOLUMETEXTURE || + RType =3D=3D D3DRTYPE_CUBETEXTURE) + { + bIsTextureRType =3D TRUE; + } + else if (RType =3D=3D D3DRTYPE_SURFACE && + (Usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) =3D= =3D 0 && + Usage !=3D 0) + { + DPRINT1("When RType is set to D3DRTYPE_SURFACE, Usage must be 0 or= have set D3DUSAGE_DEPTHSTENCIL or D3DUSAGE_RENDERTARGET"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_DEPTHSTENCIL) !=3D 0) + { + if (FALSE =3D=3D IsZBufferFormat(CheckFormat)) + { + DPRINT1("Invalid CheckFormat Z-Buffer format"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_AUTOGENMIPMAP) !=3D 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_DEPTHSTENCIL and D3= DUSAGE_AUTOGENMIPMAP can't be combined."); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if (FALSE =3D=3D bIsTextureRType && + RType !=3D D3DRTYPE_SURFACE && + RType !=3D D3DRTYPE_VOLUME) + { + DPRINT1("Invalid RType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & (D3DUSAGE_AUTOGENMIPMAP | D3DUSAGE_DEPTHSTENCIL | D3DUSAG= E_RENDERTARGET)) !=3D 0) + { + if (RType =3D=3D D3DRTYPE_VOLUME || RType =3D=3D D3DRTYPE_VOLUMETE= XTURE) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_AUTOGENMIPMAP, D3DU= SAGE_DEPTHSTENCIL and D3DUSAGE_RENDERTARGET can't be combined with RType D3= DRTYPE_VOLUME or D3DRTYPE_VOLUMETEXTURE"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if (FALSE =3D=3D bIsTextureRType && + (Usage & D3DUSAGE_QUERY_VERTEXTEXTURE) !=3D 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_QUERY_VERTEXTEXTURE can= only be used with a texture RType"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_AUTOGENMIPMAP) !=3D 0 && + TRUE =3D=3D IsMultiElementFormat(CheckFormat)) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_AUTOGENMIPMAP can't be = used with a multi-element format"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + pDriverCaps =3D &This->DisplayAdapters[Adapter].DriverCaps; + if ((Usage & D3DUSAGE_DYNAMIC) !=3D 0 && bIsTextureRType =3D=3D TRUE) + { + if ((pDriverCaps->DriverCaps9.Caps2 & D3DCAPS2_DYNAMICTEXTURES) = =3D=3D 0) + { + DPRINT1("Driver doesn't support dynamic textures"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if ((Usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) !=3D= 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_DEPTHSTENCIL and D3= DUSAGE_RENDERTARGET can't be combined with D3DUSAGE_DYNAMIC and a texture R= Type"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if ((Usage & D3DUSAGE_DMAP) !=3D 0) + { + if ((pDriverCaps->DriverCaps9.DevCaps2 & (D3DDEVCAPS2_PRESAMPLEDDM= APNPATCH | D3DDEVCAPS2_DMAPNPATCH)) =3D=3D 0) + { + DPRINT1("Driver doesn't support displacement mapping"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if (RType !=3D D3DRTYPE_TEXTURE) + { + DPRINT1("Invalid Usage speficied, D3DUSAGE_DMAP must be combin= ed with RType D3DRTYPE_TEXTURE"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + hResult =3D CheckDeviceFormat(pDriverCaps, AdapterFormat, Usage, RType= , CheckFormat); + + UNLOCK_D3D9(); + return hResult; } = static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D= 9 iface, UINT Adapter, D3DDEVTYPE DeviceType, Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _private.h?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Mar 2 06:29:35 2008 @@ -222,8 +222,8 @@ /* 0x227c */ DWORD unknown002207; /* 0x2280 */ DWORD unknown002208; /* 0x2284 */ DWORD unknown002209; -/* 0x2288 */ DWORD unknown002210; -/* 0x228c */ DWORD unknown002211; +/* 0x2288 */ DWORD NumSupportedRefFormatOps; +/* 0x228c */ LPDDSURFACEDESC pSupportedRefFormatOps; /* 0x2290 */ DWORD unknown002212; /* 0x2294 */ DWORD unknown002213; /* 0x2298 */ DWORD unknown002214; @@ -1286,8 +1286,8 @@ /* 0x331c */ DWORD unknown003271; /* 0x3320 */ DWORD unknown003272; /* 0x3324 */ DWORD unknown003273; -/* 0x3328 */ DWORD unknown003274; -/* 0x332c */ DWORD unknown003275; +/* 0x3328 */ DWORD NumSupportedSoftwareFormatOps; +/* 0x332c */ LPDDSURFACEDESC pSupportedSoftwareFormatOps; /* 0x3330 */ DWORD unknown003276; /* 0x3334 */ DWORD unknown003277; /* 0x3338 */ DWORD unknown003278; Modified: trunk/reactos/dll/directx/d3d9/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.c?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.c (original) +++ trunk/reactos/dll/directx/d3d9/format.c Sun Mar 2 06:29:35 2008 @@ -8,6 +8,7 @@ = #include "format.h" #include <ddrawi.h> +#include <debug.h> = BOOL IsBackBufferFormat(D3DFORMAT Format) { @@ -18,6 +19,18 @@ BOOL IsExtendedFormat(D3DFORMAT Format) { return (Format =3D=3D D3DFMT_A2R10G10B10); +} + +BOOL IsZBufferFormat(D3DFORMAT Format) +{ + UNIMPLEMENTED + + return TRUE; +} + +BOOL IsMultiElementFormat(D3DFORMAT Format) +{ + return (Format =3D=3D D3DFMT_MULTI2_ARGB8); } = BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp) @@ -38,7 +51,7 @@ return FALSE; } = -HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Display= Format, D3DFORMAT BackBufferFormat, BOOL Windowed) +HRESULT CheckDeviceType(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayFo= rmat, D3DFORMAT BackBufferFormat, BOOL Windowed) { if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, DisplayFormat, D3DFO= RMAT_OP_DISPLAYMODE | D3DFORMAT_OP_3DACCELERATION)) { @@ -89,3 +102,222 @@ = return D3D_OK; } + +static D3DFORMAT GetStencilFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT= CheckFormat) +{ + switch (CheckFormat) + { + case D3DFMT_D15S1: + case D3DFMT_D24S8: + case D3DFMT_D24X8: + case D3DFMT_D24X4S4: + if (IsSupportedFormatOp(pDriverCaps, CheckFormat - 1, 0)) + return CheckFormat - 1; + break; + + case D3DFMT_D16: + if (IsSupportedFormatOp(pDriverCaps, CheckFormat, 0)) + return CheckFormat; + else + return D3DFMT_D16_LOCKABLE; + + default: + /* StencilFormat same as CheckFormat */ + break; + } + + return CheckFormat; +} + +static D3DFORMAT RemoveAlphaChannel(D3DFORMAT CheckFormat) +{ + switch (CheckFormat) + { + case D3DFMT_A8R8G8B8: + return D3DFMT_X8R8G8B8; + + case D3DFMT_A1R5G5B5: + return D3DFMT_X1R5G5B5; + + case D3DFMT_A4R4G4B4: + return D3DFMT_X4R4G4B4; + + case D3DFMT_A8B8G8R8: + return D3DFMT_X8B8G8R8; + + default: + /* CheckFormat has not relevant alpha channel */ + break; + } + + return CheckFormat; +} + +HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) +{ + const DWORD NumFormatOps =3D pDriverCaps->NumSupportedFormatOps; + DWORD NonCompatibleOperations =3D 0, MustSupportOperations =3D 0; + BOOL bSupportedWithAutogen =3D FALSE; + DWORD FormatOpIndex; + + if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, AdapterFormat, D3DFO= RMAT_OP_DISPLAYMODE | D3DFORMAT_OP_3DACCELERATION)) + { + return D3DERR_NOTAVAILABLE; + } + + /* Check for driver auto generated mip map support if requested */ + if ((Usage & (D3DUSAGE_AUTOGENMIPMAP)) !=3D 0) + { + switch (RType) + { + case D3DRTYPE_TEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + case D3DRTYPE_VOLUME: + case D3DRTYPE_VOLUMETEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PVOLUMEMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + case D3DRTYPE_CUBETEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PCUBEMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + default: + /* Do nothing */ + break; + } + + MustSupportOperations |=3D D3DFORMAT_OP_AUTOGENMIPMAP; + } + + /* Translate from RType and Usage parameters to FormatOps */ + switch (RType) + { + case D3DRTYPE_TEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_TEXTURE; + break; + + case D3DRTYPE_VOLUME: + case D3DRTYPE_VOLUMETEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_VOLUMETEXTURE; + break; + + case D3DRTYPE_CUBETEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_CUBETEXTURE; + break; + + default: + /* Do nothing */ + break; + } + + if (Usage =3D=3D 0 && RType =3D=3D D3DRTYPE_SURFACE) + { + MustSupportOperations |=3D D3DFORMAT_OP_OFFSCREENPLAIN; + } + + if ((Usage & D3DUSAGE_DEPTHSTENCIL) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_ZSTENCIL; + } + + if ((Usage & D3DUSAGE_DMAP) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_DMAP; + } + + if ((Usage & D3DUSAGE_QUERY_LEGACYBUMPMAP) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_BUMPMAP; + } + + if ((Usage & D3DUSAGE_QUERY_SRGBREAD) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_SRGBREAD; + } + + if ((Usage & D3DUSAGE_QUERY_SRGBWRITE) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_SRGBWRITE; + } + + if ((Usage & D3DUSAGE_QUERY_VERTEXTEXTURE) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_VERTEXTEXTURE; + } + + CheckFormat =3D GetStencilFormat(pDriverCaps, CheckFormat); + + if ((Usage & D3DUSAGE_RENDERTARGET) !=3D 0) + { + if (AdapterFormat =3D=3D CheckFormat) + { + MustSupportOperations |=3D D3DFORMAT_OP_SAME_FORMAT_RENDERTARG= ET; + } + else + { + D3DFORMAT NonAlphaAdapterFormat; + D3DFORMAT NonAlphaCheckFormat; + + NonAlphaAdapterFormat =3D RemoveAlphaChannel(AdapterFormat); + NonAlphaCheckFormat =3D RemoveAlphaChannel(CheckFormat); + + if (NonAlphaAdapterFormat =3D=3D NonAlphaCheckFormat && + NonAlphaCheckFormat !=3D D3DFMT_UNKNOWN) + { + MustSupportOperations |=3D D3DFORMAT_OP_SAME_FORMAT_UP_TO_= ALPHA_RENDERTARGET; + } + else + { + MustSupportOperations |=3D D3DFORMAT_OP_OFFSCREEN_RENDERTA= RGET; + } + } + } + + if ((Usage & D3DUSAGE_QUERY_FILTER) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_OFFSCREENPLAIN; + } + + if ((Usage & D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_NOALPHABLEND; + } + + if ((Usage & D3DUSAGE_QUERY_WRAPANDMIP) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP; + } + + for (FormatOpIndex =3D 0; FormatOpIndex < NumFormatOps; FormatOpIndex+= +) + { + DWORD dwOperations; + LPDDSURFACEDESC pSurfaceDesc =3D &pDriverCaps->pSupportedFormatOps= [FormatOpIndex]; + + if (pSurfaceDesc->ddpfPixelFormat.dwFourCC !=3D CheckFormat) + continue; + + dwOperations =3D pSurfaceDesc->ddpfPixelFormat.dwOperations; + + if ((dwOperations & NonCompatibleOperations) !=3D 0) + continue; + + if ((dwOperations & MustSupportOperations) =3D=3D MustSupportOpera= tions) + return D3D_OK; + = + if (((dwOperations & MustSupportOperations) | D3DFORMAT_OP_AUTOGEN= MIPMAP) =3D=3D MustSupportOperations) + bSupportedWithAutogen =3D TRUE; + } + + if (TRUE =3D=3D bSupportedWithAutogen) + return D3DOK_NOAUTOGEN; + + return D3DERR_NOTAVAILABLE; +} Modified: trunk/reactos/dll/directx/d3d9/format.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.h?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.h (original) +++ trunk/reactos/dll/directx/d3d9/format.h Sun Mar 2 06:29:35 2008 @@ -12,12 +12,25 @@ #include <d3d9.h> #include "d3d9_private.h" = +#define D3DFORMAT_OP_DMAP 0x00020000L + +/* MSVC compile fix */ +#ifndef D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP +#define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L +#endif + BOOL IsBackBufferFormat(D3DFORMAT Format); = BOOL IsExtendedFormat(D3DFORMAT Format); = +BOOL IsZBufferFormat(D3DFORMAT Format); + +BOOL IsMultiElementFormat(D3DFORMAT Format); + BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp); = -HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Display= Format, D3DFORMAT BackBufferFormat, BOOL Windowed); +HRESULT CheckDeviceType(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayFo= rmat, D3DFORMAT BackBufferFormat, BOOL Windowed); + +HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); = #endif // _FORMAT_H_ Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9type= s.h?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Sun Mar 2 06:29:35 2008 @@ -110,6 +110,9 @@ #define D3DUSAGE_DYNAMIC 0x00000200L #define D3DUSAGE_AUTOGENMIPMAP 0x00000400L #define D3DUSAGE_DMAP 0x00004000L +#ifndef D3D_DISABLE_9EX +#define D3DUSAGE_TEXTAPI 0x10000000L +#endif = #define D3DUSAGE_QUERY_FILTER 0x00020000L #define D3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000L

1 0

[greatlrd] 32545: Fixed all known issue with DdCreateSurface in gdi32, it works with more that one surface now.
by greatlrd＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: greatlrd Date: Sun Mar 2 12:19:08 2008 New Revision: 32545 URL: http://svn.reactos.org/svn/reactos?rev=3D32545&view=3Drev Log: Fixed all known issue with DdCreateSurface in gdi32, it works with more tha= t one surface now. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32545&r1=3D32544&r2=3D32545&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 12:19:08 2008 @@ -274,11 +274,11 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = - - - - -/* TODO : finish all fixme */ = +/* + * @implemented + * + * DdCreateSurface + */ DWORD WINAPI DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) @@ -301,6 +301,24 @@ PHANDLE phSurface =3D NULL, puhSurface =3D NULL; ULONG i; LPDDSURFACEDESC pSurfaceDesc =3D NULL; + + /* TODO : Speed optimze, most games/dx apps/program does not want 1 su= rface, they want lest 2 + * so we need incress the stack so it can contain 2 surface instead of= one, this will incress = + * the speed of the apps when it trying alloc buffer. How to incress t= he surface stack space + * we need create a own struct for DD_SURFACE_LOCAL DdSurfaceLocal, DD= _SURFACE_MORE DdSurfaceMore + * DD_SURFACE_GLOBAL DdSurfaceGlobal. HANDLE hPrevSurface, hSurface. l= ike + * struct { DD_SURFACE_LOCAL DdSurfaceLocal1, DD_SURFACE_LOCAL DdSurfa= ceLocal2 } + * lest so it contain two surface. maybe 4. we need watch what is most= common here before = + * we create the size activate this IF when you start doing the optim= ze and please also + * take report from user which value they got here + */ = +#if 0 + { + char buffer[1024]; \ + sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%= d)\n", __FUNCTION__,SurfaceCount,__FILE__,__LINE__ ); + OutputDebugStringA(buffer); + } +#endif = /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) @@ -475,12 +493,11 @@ lcl->lpSurfMore->ddsCapsEx.dwCaps3 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps3; lcl->lpSurfMore->ddsCapsEx.dwCaps4 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps4; } - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - we only support one surface create at moment - */ + + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

1 0

[greatlrd] 32543: started adding support for more that one surface in DdCreateSurface
by greatlrd＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: greatlrd Date: Sun Mar 2 10:28:54 2008 New Revision: 32543 URL: http://svn.reactos.org/svn/reactos?rev=3D32543&view=3Drev Log: started adding support for more that one surface in DdCreateSurface Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32543&r1=3D32542&r2=3D32543&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 10:28:54 2008 @@ -274,6 +274,10 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = + + + + /* TODO : finish all fixme */ = DWORD WINAPI @@ -286,7 +290,6 @@ DD_SURFACE_GLOBAL DdSurfaceGlobal; = HANDLE hPrevSurface, hSurface; - = PDD_SURFACE_LOCAL pDdSurfaceLocal =3D NULL; PDD_SURFACE_MORE pDdSurfaceMore =3D NULL; @@ -302,8 +305,40 @@ /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) { - /* We'll have to allocate more data, our stack isn't big enough */ - + /* We got more that one surface so we need alloc memory for them */ + pDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) HeapAlloc(GetProcessHeap()= , HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_LOCAL) * SurfaceCount )); + pDdSurfaceMore =3D (PDD_SURFACE_MORE) HeapAlloc(GetProcessHeap(), = HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_MORE) * SurfaceCount )); + pDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) HeapAlloc(GetProcessHea= p(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_GLOBAL) * SurfaceCount )); + phSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeo= f(HANDLE) * SurfaceCount )); + puhSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (size= of(HANDLE) * SurfaceCount )); + + /* check if we sueese alloc all memory we need */ + if ((pDdSurfaceLocal =3D=3D NULL) || (pDdSurfaceMore =3D=3D NULL) = || (pDdSurfaceGlobal =3D=3D NULL) || (phSurface =3D=3D NULL) || (puhSurface= =3D=3D NULL)) + { + pCreateSurface->ddRVal =3D DDERR_OUTOFMEMORY; + + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } + + return DDHAL_DRIVER_HANDLED; + } } else { @@ -455,7 +490,25 @@ /* Check if we have to free all our local allocations */ if (SurfaceCount > 1) { - /* FIXME: */ + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } } = /* Return */ @@ -1094,9 +1147,7 @@ * ReactOS keep this behoir to be compatible with * Windows XP */ - pData->ddRVal =3D retValue; - = - + pData->ddRVal =3D retValue; = } = /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */

1 0

[hpoussin] 32538: Clean up generated makefile.auto
by hpoussin＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: hpoussin Date: Fri Feb 29 10:02:54 2008 New Revision: 32538 URL: http://svn.reactos.org/svn/reactos?rev=3D32538&view=3Drev Log: Clean up generated makefile.auto Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32538&r1=3D32537&r2=3D32538&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 29 1= 0:02:54 2008 @@ -611,7 +611,7 @@ } fprintf ( fMakefile, " 2>$(NUL)\n" ); = - if( ProxyMakefile::GenerateProxyMakefile(module) ) + if( ProxyMakefile::GenerateProxyMakefile(module) ) { DirectoryLocation root; = @@ -770,11 +770,7 @@ { CompilerFlag& compilerFlag =3D *compilerFlags[i]; if ( compilerFlag.compiler =3D=3D type ) - { - if ( parameters.length () > 0 ) - parameters +=3D " "; - parameters +=3D compilerFlag.flag; - } + parameters +=3D " " + compilerFlag.flag; } return parameters; } @@ -855,7 +851,7 @@ { fprintf ( fMakefile, - " %s", + "%s", compilerParameters.c_str () ); } } @@ -1250,21 +1246,21 @@ Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); -Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" +Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(m= odule_name)_CFLAGS)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule bootRule ( "$(module_output): $(source) $(dependencies) | $(OUTPUT)$(= SEP)$(source_dir)\n" +Rule bootRule ( "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(S= EP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(so= urce_dir)\n" +Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source) $(dependencies) $(WRC_TARGET) | $(INT= ERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" +Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source)$(dependencies) $(WRC_TARGET) | $(INTE= RMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS}= $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\= n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPOR= ARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(m= odule_name).$(source_name_noext).res.tmp\n" @@ -1277,71 +1273,71 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) $(dependencies) $(WINEBUILD_TARGET) | $(INTERM= EDIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $= (source_path)$(SEP)$(source_name_noext).spec\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt).stubs.c $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compi= ler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SE= P)$(source_dir)\n" +Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP= )$(source_dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -= h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(sourc= e)\n", + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(source= )\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" +Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\= n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h $(dep= endencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(comp= iler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" +Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\= n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h $(dep= endencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(comp= iler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" +Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source= _dir)\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\= n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h $(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h = -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $= (INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(depen= dencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(comp= iler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source) $(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_di= r)\n" +Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir= )\n" "\t$(ECHO_WIDL)\n" - "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -= T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source= )\n", + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T= $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)= \n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" +Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_fl= ags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", NULL ); -Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$= (source_dir)\n" +Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(= source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(co= mpiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o", NULL ); -Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" +Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" "\t$(ECHO_CC)\n" "\t${gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_fl= ags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", NULL ); -Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source) $(dependencies) | $(INTERMEDIATE)$(SEP)$= (source_dir)\n" +Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(= source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(co= mpiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o", NULL ); @@ -1359,15 +1355,9 @@ string flags; string extension =3D GetExtension ( *sourceFile ); if ( extension =3D=3D ".cc" || extension =3D=3D ".cpp" || extension =3D= =3D ".cxx" ) - { flags =3D GenerateCompilerParametersFromVector ( module.non_if_data.comp= ilerFlags, CompilerTypeCPP ); - } else - { flags =3D GenerateCompilerParametersFromVector ( module.non_if_data.comp= ilerFlags, CompilerTypeCC ); - } - if ( flags !=3D "" ) - flags =3D " " + flags; = if ( pchFilename ) { @@ -1378,7 +1368,8 @@ /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); + if ( rpcDependencies.size () > 0 ) + dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); = rule->Execute ( fMakefile, backend, module, generatedSourceFileName, clea= n_files, dependencies, flags ); = @@ -1488,7 +1479,7 @@ break; } = - if ( extension =3D=3D ".c" || extension =3D=3D ".cc" || extension =3D=3D = ".cpp" || extension =3D=3D ".cxx" ) + if ( extension =3D=3D ".c" || extension =3D=3D ".cc" || extension =3D=3D = ".cpp" || extension =3D=3D ".cxx" ) { GenerateGccCommand ( &sourceFile, customRule, @@ -1658,7 +1649,7 @@ = string linkerScriptArgument; if ( module.linkerScript !=3D NULL ) - linkerScriptArgument =3D ssprintf ( "-Wl,-T,%s", backend->GetFullName ( = module.linkerScript->file ).c_str () ); + linkerScriptArgument =3D ssprintf ( " -Wl,-T,%s", backend->GetFullName (= module.linkerScript->file ).c_str () ); else linkerScriptArgument =3D ""; = @@ -1674,7 +1665,7 @@ if ( !module.IsDLL () ) { fprintf ( fMakefile, - "\t%s %s %s -o %s %s %s %s\n", + "\t%s %s%s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1691,15 +1682,15 @@ CLEAN_FILE ( temp_exp ); = fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-exp %s %s %s\n", + "\t${dlltool} --dllname %s --def %s --output-exp %s%s%s\n", targetName.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), backend->GetFullName ( temp_exp ).c_str (), - module.mangledSymbols ? "" : "--kill-at", - module.underscoreSymbols ? "--add-underscore" : "" ); + module.mangledSymbols ? "" : " --kill-at", + module.underscoreSymbols ? " --add-underscore" : "" ); = fprintf ( fMakefile, - "\t%s %s %s %s -o %s %s %s %s\n", + "\t%s %s%s %s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1710,7 +1701,7 @@ GetLinkerMacro ().c_str () ); = fprintf ( fMakefile, - "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", + "\t$(Q)$(PEFIXUP_TARGET) %s -exports%s\n", target_macro.c_str (), pefixupParameters.c_str() ); = @@ -1727,7 +1718,7 @@ //printf ( "%s will have all its functions exported\n", // module.target->name.c_str () ); fprintf ( fMakefile, - "\t%s %s %s -o %s %s %s %s\n", + "\t%s %s%s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), @@ -1822,7 +1813,8 @@ /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); + if ( rpcDependencies.size () > 0 ) + dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *pchFilename ).c_str(), @@ -1855,11 +1847,11 @@ const FileLocation *definitionFilename =3D GetDefinitionFilename (); = fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib $@ %s %s\n", + "\t${dlltool} --dllname %s --def %s --output-lib $@%s%s\n", module.importLibrary->dllname.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), - module.mangledSymbols ? "" : "--kill-at", - module.underscoreSymbols ? "--add-underscore" : "" ); + module.mangledSymbols ? "" : " --kill-at", + module.underscoreSymbols ? " --add-underscore" : "" ); = delete definitionFilename; } @@ -2284,7 +2276,7 @@ string extension =3D GetExtension ( sourceFile ); if (extension =3D=3D ".mc" || extension =3D=3D ".MC" ) { - string dependency =3D ssprintf ( " $(%s_MCHEADERS)", m.name.c_str () ); + string dependency =3D ssprintf ( "$(%s_MCHEADERS)", m.name.c_str () ); dependencies.push_back ( dependency ); } } @@ -2383,12 +2375,12 @@ fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); = fprintf ( fMakefile, - "\t${dlltool} --dllname %s --def %s --output-lib %s %s %s\n\n", + "\t${dlltool} --dllname %s --def %s --output-lib %s%s%s\n\n", module.output->name.c_str (), backend->GetFullName ( *defFilename ).c_str (), backend->GetFullName ( *library_target ).c_str (), - module.mangledSymbols ? "" : "--kill-at", - module.underscoreSymbols ? "--add-underscore" : "" ); + module.mangledSymbols ? "" : " --kill-at", + module.underscoreSymbols ? " --add-underscore" : "" ); = delete defFilename; delete library_target; @@ -2575,7 +2567,7 @@ = GenerateLinkerCommand ( dependencies, linkerParameters + " $(NTOSKRNL_SHARED)", - "-sections" ); + " -sections" ); } else { @@ -2677,7 +2669,7 @@ module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linkerParameters, - "-sections" ); + " -sections" ); } else { @@ -2726,7 +2718,7 @@ module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, linkerParameters, - "-sections" ); + " -sections" ); } else { @@ -3134,24 +3126,24 @@ = fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); = - if (Environment::GetArch() =3D=3D "arm") - { - fprintf ( fMakefile, - "\t${gcc} -Wl,--subsystem,native -Wl,--section-start,star= tup=3D0x8000 -o %s %s %s %s\n", - backend->GetFullName ( junk_tmp ).c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str (), - GetLinkerMacro ().c_str ()); - } - else - { - fprintf ( fMakefile, - "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s = %s %s %s\n", - backend->GetFullName ( junk_tmp ).c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str (), - GetLinkerMacro ().c_str ()); - } + if (Environment::GetArch() =3D=3D "arm") + { + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,--section-start,startup=3D= 0x8000 -o %s %s %s %s\n", + backend->GetFullName ( junk_tmp ).c_str (), + objectsMacro.c_str (), + linkDepsMacro.c_str (), + GetLinkerMacro ().c_str ()); + } + else + { + fprintf ( fMakefile, + "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s %s = %s\n", + backend->GetFullName ( junk_tmp ).c_str (), + objectsMacro.c_str (), + linkDepsMacro.c_str (), + GetLinkerMacro ().c_str ()); + } fprintf ( fMakefile, "\t${objcopy} -O binary %s $@\n", backend->GetFullName ( junk_tmp ).c_str () ); @@ -3439,12 +3431,12 @@ FileLocation reactosInf ( bootcdReactos.directory, bootcdReactos.relative_path, "reactos.inf" ); - FileLocation vgafontsCab( bootcdReactos.directory, - bootcdReactos.relative_path, - "vgafonts.cab"); - FileLocation vgafontsDir( SourceDirectory, - "media" + sSep + "vgafonts", - "" ); + FileLocation vgafontsCab( bootcdReactos.directory, + bootcdReactos.relative_path, + "vgafonts.cab"); + FileLocation vgafontsDir( SourceDirectory, + "media" + sSep + "vgafonts", + "" ); = vSourceFiles.push_back ( reactosDff ); = @@ -3474,10 +3466,10 @@ cdFiles.c_str (), cdDirectories.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); - fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -M raw -S %s %s\\*.bin\n", // E= scape the asterisk for Make - backend->GetFullName ( vgafontsCab ).c_str (), - backend->GetFullName ( vgafontsDir ).c_str ()); + fprintf ( fMakefile, + "\t$(Q)$(CABMAN_TARGET) -M raw -S %s %s\\*.bin\n", // Esca= pe the asterisk for Make + backend->GetFullName ( vgafontsCab ).c_str (), + backend->GetFullName ( vgafontsDir ).c_str ()); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (), Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/rule.cpp?rev=3D32538&r1=3D32537&r2=3D32538&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/rule.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.cpp Fri Feb 29 10:02:54 2= 008 @@ -40,10 +40,8 @@ const std::string& additional_dependencies, const std::string&= compiler_flags ) { string ret =3D str; - string dep =3D ""; + string dep =3D additional_dependencies; = - if ( additional_dependencies.length () > 0 ) - dep +=3D additional_dependencies; dep +=3D " " + module.xmlbuildFile; = if ( source )

1 0

[greatlrd] 32539: finish implemented of DvpVideoport, misc, misc2, Color Control, NT callbacks not tested to 100% yet stub up almost all callbacks that DdGetDriverInfo setup, mark out where DirectX DdBltAlphaBlend are ReactOS gdi32.dll was tested in windows xp and it seam working fine with dx1-7 at moment, even not everything are finish.
by greatlrd＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: greatlrd Date: Sat Mar 1 11:28:44 2008 New Revision: 32539 URL: http://svn.reactos.org/svn/reactos?rev=3D32539&view=3Drev Log: finish implemented of DvpVideoport, misc, misc2, Color Control, NT callback= s not tested to 100% yet stub up almost all callbacks that DdGetDriverInfo setup, mark out where Dir= ectX DdBltAlphaBlend are = ReactOS gdi32.dll was tested in windows xp and it seam working fine with d= x1-7 at moment, even not everything are finish. = Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32539&r1=3D32538&r2=3D32539&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sat Mar 1 11:28:44 2008 @@ -603,7 +603,7 @@ WINAPI DvpWaitForVideoPortSync(LPDDHAL_WAITFORVPORTSYNCDATA pDvdWaitForVideoPortS= ync) { - return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoP= ort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); + return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoP= ort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); } = /* @@ -670,121 +670,485 @@ return NtGdiDvpUpdateVideoPort(pDvdUpdateVideoPort->lpVideoPort->hDDVi= deoPort,phSurfaceVideo,phSurfaceVbi, (PDD_UPDATEVPORTDATA)pDvdUpdateVideoPo= rt); } = +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortField(LPDDHAL_FLIPVPORTDATA pDvdGetVideoPortField) +{ + return NtGdiDvpGetVideoPortField(pDvdGetVideoPortField->lpVideoPort->h= DDVideoPort, (PDD_GETVPORTFIELDDATA)pDvdGetVideoPortField); +} + +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortInputFormats(LPDDHAL_GETVPORTINPUTFORMATDATA pDvdGetVideoPo= rtInputFormat) +{ + return NtGdiDvpGetVideoPortInputFormats(pDvdGetVideoPortInputFormat->l= pVideoPort->hDDVideoPort, (PDD_GETVPORTINPUTFORMATDATA) pDvdGetVideoPortInp= utFormat); +} + + +/* + * @implemented + * + * DvpGetVideoPortLine + */ +DWORD +WINAPI +DvpGetVideoPortLine(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortLine) +{ + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortLine->lpVideoPort->hDD= VideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortLine); +} + +/* + * @implemented + * + * DvpGetVideoPortOutputFormats + */ +DWORD +WINAPI +DvpGetVideoPortOutputFormats(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortOutp= utFormat) +{ + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortOutputFormat->lpVideoP= ort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortOutputFormat); +} + + +/* + * @implemented + * + * DvpGetVideoPortConnectInfo + */ +DWORD +WINAPI +DvpGetVideoPortConnectInfo(LPDDHAL_GETVPORTCONNECTDATA pDvdGetVideoPortInf= o) +{ + return NtGdiDvpGetVideoPortConnectInfo( GetDdHandle( pDvdGetVideoPortI= nfo->lpDD->lpGbl->hDD) , (PDD_GETVPORTCONNECTDATA) pDvdGetVideoPortInfo); +} + +/* + * @implemented + * + * DdGetAvailDriverMemory + */ +DWORD +WINAPI +DdGetAvailDriverMemory(LPDDHAL_GETAVAILDRIVERMEMORYDATA pDdGetAvailDriverM= emory) +{ + return NtGdiDdGetAvailDriverMemory(GetDdHandle( pDdGetAvailDriverMemory-= >lpDD->hDD), (PDD_GETAVAILDRIVERMEMORYDATA) pDdGetAvailDriverMemory); +} + +/* + * @implemented + * + * DdAlphaBlt + */ +DWORD +WINAPI +DdAlphaBlt(LPDDHAL_BLTDATA pDdAlphaBlt) +{ + HANDLE hDDSrcSurface =3D 0; = + + if (pDdAlphaBlt->lpDDSrcSurface !=3D 0) + { + hDDSrcSurface =3D (HANDLE) pDdAlphaBlt->lpDDSrcSurface->hDDSurface= ; = + } + = + return NtGdiDdAlphaBlt((HANDLE)pDdAlphaBlt->lpDDDestSurface->hDDSurfac= e, hDDSrcSurface, (PDD_BLTDATA)&pDdAlphaBlt); +} + +/* + * @implemented + * + * DdCreateSurfaceEx + */ +DWORD +WINAPI +DdCreateSurfaceEx(LPDDHAL_CREATESURFACEEXDATA pDdCreateSurfaceEx) +{ + pDdCreateSurfaceEx->ddRVal =3D NtGdiDdCreateSurfaceEx( GetDdHandle(pDd= CreateSurfaceEx->lpDDLcl->lpGbl->hDD), + (HANDLE)pDdCreate= SurfaceEx->lpDDSLcl->hDDSurface, = + pDdCreateSurfaceE= x->lpDDSLcl->lpSurfMore->dwSurfaceHandle); = + return TRUE; +} + +/* + * @implemented + * + * DdColorControl + */ +DWORD +WINAPI +DdColorControl(LPDDHAL_COLORCONTROLDATA pDdColorControl) +{ + return NtGdiDdColorControl( (HANDLE) pDdColorControl->lpDDSurface->hDD= Surface, (PDD_COLORCONTROLDATA) &pDdColorControl); +} + + +/* + * @implemented + * + * DdSetExclusiveMode + */ +DWORD +WINAPI +DdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA pDdSetExclusiveMode) +{ + return NtGdiDdSetExclusiveMode( GetDdHandle(pDdSetExclusiveMode->lpDD-= >hDD), (PDD_SETEXCLUSIVEMODEDATA) &pDdSetExclusiveMode); +} + +/* + * @implemented + * + * DdFlipToGDISurface + */ +DWORD +WINAPI +DdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA pDdFlipToGDISurface) +{ + return NtGdiDdFlipToGDISurface( GetDdHandle(pDdFlipToGDISurface->lpDD-= >hDD), (PDD_FLIPTOGDISURFACEDATA) &pDdFlipToGDISurface); +} + + + + /* TODO */ - DWORD WINAPI DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) -{ - HANDLE hDD =3D GetDdHandle(pData->dwContext); - - /* Get videoport callbacks */ - if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) - { - DDHAL_GETDRIVERINFODATA pDvdPortInfo; - DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; - DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPORTCAL= LBACKS *)pData->lpvData; - DWORD retValue; +{ = + DDHAL_GETDRIVERINFODATA pDrvInfoData; + DWORD retValue =3D DDHAL_DRIVER_NOTHANDLED; + HANDLE hDD; + + /* FIXME add SEH around this functions */ + + RtlZeroMemory(&pDrvInfoData, sizeof (DDHAL_GETDRIVERINFODATA)); = = + RtlCopyMemory(&pDrvInfoData.guidInfo, &pData->guidInfo, sizeof(GUI= D)); + = + hDD =3D GetDdHandle(pData->dwContext); + + pDrvInfoData.dwSize =3D sizeof (DDHAL_GETDRIVERINFODATA); + pDrvInfoData.ddRVal =3D DDERR_GENERIC; = + pDrvInfoData.dwContext =3D (ULONG_PTR)hDD; = - /* Clear user out buffer */ - RtlZeroMemory(pUserDvdPort, DDVIDEOPORTCALLBACKSSIZE); = - - /* Clear internal out buffer and set it up*/ - RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); - pDvdPort.dwSize =3D DDVIDEOPORTCALLBACKSSIZE; - - /* Clear internal in buffer and set it up*/ - RtlZeroMemory(&pDvdPortInfo, sizeof (DDHAL_GETDRIVERINFODATA)); = = - pDvdPortInfo.dwSize =3D sizeof (DDHAL_GETDRIVERINFODATA); - pDvdPortInfo.guidInfo =3D GUID_VideoPortCallbacks; - pDvdPortInfo.lpvData =3D (PVOID)&pDvdPort; - pDvdPortInfo.ddRVal =3D DDERR_GENERIC; - pDvdPortInfo.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = - pDvdPortInfo.dwContext =3D (ULONG_PTR) hDD; + = + /* Videoport Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) + { = + DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; + DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPOR= TCALLBACKS *)pData->lpvData; = + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); + pDvdPort.dwSize =3D DDVIDEOPORTCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pDvdPort; = + pDrvInfoData.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + /* Setup user out buffer and convert kmode callbacks to user m= ode */ + pUserDvdPort->dwSize =3D DDVIDEOPORTCALLBACKSSIZE; = + pUserDvdPort->dwFlags =3D pDrvInfoData.dwFlags =3D 0; + = + pUserDvdPort->dwFlags =3D (pDrvInfoData.dwFlags & ~(DDHAL_VPOR= T32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT3= 2_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) | + (DDHAL_VPORT3= 2_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT3= 2_DESTROY | DDHAL_VPORT32_UPDATE); + + pData->dwActualSize =3D DDVIDEOPORTCALLBACKSSIZE; = + pUserDvdPort->CreateVideoPort =3D (LPDDHALVPORTCB_CREATEVIDEOP= ORT) DvpCreateVideoPort; + pUserDvdPort->FlipVideoPort =3D (LPDDHALVPORTCB_FLIP) DvpFlipV= ideoPort; + pUserDvdPort->DestroyVideoPort =3D (LPDDHALVPORTCB_DESTROYVPOR= T) DvpDestroyVideoPort; + pUserDvdPort->UpdateVideoPort =3D (LPDDHALVPORTCB_UPDATE) DvpU= pdateVideoPort; + + if (pDvdPort.CanCreateVideoPort) + { + pUserDvdPort->CanCreateVideoPort =3D (LPDDHALVPORTCB_CANCR= EATEVIDEOPORT) DvpCanCreateVideoPort; + } + + if (pDvdPort.GetVideoPortBandwidth) + { + pUserDvdPort->GetVideoPortBandwidth =3D (LPDDHALVPORTCB_GE= TBANDWIDTH) DvpGetVideoPortBandwidth; + } + + if (pDvdPort.GetVideoPortInputFormats) + { + pUserDvdPort->GetVideoPortInputFormats =3D (LPDDHALVPORTCB= _GETINPUTFORMATS) DvpGetVideoPortInputFormats; + } + + if (pDvdPort.GetVideoPortOutputFormats) + { + pUserDvdPort->GetVideoPortOutputFormats =3D (LPDDHALVPORTC= B_GETOUTPUTFORMATS) DvpGetVideoPortOutputFormats; + } + + if (pDvdPort.GetVideoPortField) + { + pUserDvdPort->GetVideoPortField =3D (LPDDHALVPORTCB_GETFIE= LD) DvpGetVideoPortField; = + } + + if (pDvdPort.GetVideoPortLine) + { + pUserDvdPort->GetVideoPortLine =3D (LPDDHALVPORTCB_GETLINE= ) DvpGetVideoPortLine; + } + + if (pDvdPort.GetVideoPortConnectInfo) + { + pUserDvdPort->GetVideoPortConnectInfo =3D (LPDDHALVPORTCB_= GETVPORTCONNECT) DvpGetVideoPortConnectInfo; + } + + if (pDvdPort.GetVideoPortFlipStatus) + { + pUserDvdPort->GetVideoPortFlipStatus =3D (LPDDHALVPORTCB_G= ETFLIPSTATUS) DvpGetVideoPortFlipStatus; + } = - /* Call win32k */ - retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDv= dPortInfo); - - /* Setup user out buffer and convert kmode callbacks to user mode = */ - pUserDvdPort->dwSize =3D DDVIDEOPORTCALLBACKSSIZE; = - = - pUserDvdPort->dwFlags =3D (pDvdPortInfo.dwFlags & ~(DDHAL_VPORT32_= CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | - DDHAL_VPORT32_DE= STROY | DDHAL_VPORT32_UPDATE )) | - (DDHAL_VPORT32_CR= EATEVIDEOPORT | DDHAL_VPORT32_FLIP | - DDHAL_VPORT32_DE= STROY | DDHAL_VPORT32_UPDATE); - - pData->dwActualSize =3D DDVIDEOPORTCALLBACKSSIZE; = - pUserDvdPort->CreateVideoPort =3D (LPDDHALVPORTCB_CREATEVIDEOPORT)= DvpCreateVideoPort; - pUserDvdPort->FlipVideoPort =3D (LPDDHALVPORTCB_FLIP) DvpFlipVideo= Port; - pUserDvdPort->DestroyVideoPort =3D (LPDDHALVPORTCB_DESTROYVPORT) D= vpDestroyVideoPort; - pUserDvdPort->UpdateVideoPort =3D (LPDDHALVPORTCB_UPDATE) DvpUpdat= eVideoPort; - - if (pDvdPort.CanCreateVideoPort) - { - pUserDvdPort->CanCreateVideoPort =3D (LPDDHALVPORTCB_CANCREAT= EVIDEOPORT) DvpCanCreateVideoPort; - } - - if (pDvdPort.GetVideoPortBandwidth) - { - pUserDvdPort->GetVideoPortBandwidth =3D (LPDDHALVPORTCB_GETBAN= DWIDTH) DvpGetVideoPortBandwidth; - } - - if (pDvdPort.GetVideoPortInputFormats) - { - pUserDvdPort->GetVideoPortInputFormats =3D (LPDDHALVPORTCB_GET= INPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats - } - - if (pDvdPort.GetVideoPortOutputFormats) - { - pUserDvdPort->GetVideoPortOutputFormats =3D (LPDDHALVPORTCB_GE= TOUTPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats - } - - if (pDvdPort.GetVideoPortField) - { - pUserDvdPort->GetVideoPortField =3D (LPDDHALVPORTCB_GETFIELD) = NULL; // FIXME : DvpGetVideoPortField = - } - - if (pDvdPort.GetVideoPortLine) - { - pUserDvdPort->GetVideoPortLine =3D (LPDDHALVPORTCB_GETLINE) NU= LL; // FIXME : DvpGetVideoPortLine - } - - if (pDvdPort.GetVideoPortConnectInfo) - { - pUserDvdPort->GetVideoPortConnectInfo =3D (LPDDHALVPORTCB_GETV= PORTCONNECT) NULL; // FIXME : DvpGetVideoPortConnectInfo - } - - if (pDvdPort.GetVideoPortFlipStatus) - { - pUserDvdPort->GetVideoPortFlipStatus =3D (LPDDHALVPORTCB_GETFL= IPSTATUS) DvpGetVideoPortFlipStatus; - } - = - if (pDvdPort.WaitForVideoPortSync) - { - pUserDvdPort->WaitForVideoPortSync =3D (LPDDHALVPORTCB_WAITFOR= SYNC) DvpWaitForVideoPortSync; = - } - - if (pDvdPort.GetVideoSignalStatus) - { - pUserDvdPort->GetVideoSignalStatus =3D (LPDDHALVPORTCB_GETSIGN= ALSTATUS) DvpGetVideoSignalStatus; - } - - if (pDvdPort.ColorControl) - { - pUserDvdPort->ColorControl =3D (LPDDHALVPORTCB_COLORCONTROL) D= vpColorControl; - } - - /* Windows XP never repot back the true return value, = - * it only report back if we have a driver or not - * ReactOS keep this behoir to be compatible with - * Windows XP - */ - pData->ddRVal =3D retValue; - return retValue; - } - - /* FIXME not supported yet */ - return 0; + if (pDvdPort.WaitForVideoPortSync) + { + pUserDvdPort->WaitForVideoPortSync =3D (LPDDHALVPORTCB_WAI= TFORSYNC) DvpWaitForVideoPortSync; = + } + + if (pDvdPort.GetVideoSignalStatus) + { + pUserDvdPort->GetVideoSignalStatus =3D (LPDDHALVPORTCB_GET= SIGNALSTATUS) DvpGetVideoSignalStatus; + } + + if (pDvdPort.ColorControl) + { + pUserDvdPort->ColorControl =3D (LPDDHALVPORTCB_COLORCONTRO= L) DvpColorControl; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Color Control Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_ColorControlCallbacks)) + { + DDHAL_DDCOLORCONTROLCALLBACKS pColorControl; + DDHAL_DDCOLORCONTROLCALLBACKS* pUserColorControl =3D (DDHAL_DD= COLORCONTROLCALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pColorControl, DDCOLORCONTROLCALLBACKSSIZE); + pColorControl.dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pColorControl; = + pDrvInfoData.dwExpectedSize =3D DDCOLORCONTROLCALLBACKSSIZE ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + = + pData->dwActualSize =3D DDCOLORCONTROLCALLBACKSSIZE; + pData->dwFlags =3D pDrvInfoData.dwFlags; + + pUserColorControl->dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; + pUserColorControl->dwFlags =3D pUserColorControl->dwFlags; + = + if (pColorControl.ColorControl !=3D NULL) + { + pUserColorControl->ColorControl =3D (LPDDHALCOLORCB_COLORC= ONTROL) DdColorControl; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Misc Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MiscellaneousCallback= s)) + { + DDHAL_DDMISCELLANEOUSCALLBACKS pMisc; + DDHAL_DDMISCELLANEOUSCALLBACKS* pUserMisc =3D (DDHAL_DDMISCELL= ANEOUSCALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUSCALLBACKSSIZE); + pMisc.dwSize =3D DDMISCELLANEOUSCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pMisc; = + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUSCALLBACKSSIZE ;= = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D DDMISCELLANEOUSCALLBACKSSIZE; + + /* Only one callbacks are supported */ = + pUserMisc->dwFlags =3D pMisc.dwFlags & DDHAL_MISCCB32_GETAVAIL= DRIVERMEMORY; + pUserMisc->GetAvailDriverMemory =3D (LPDDHAL_GETAVAILDRIVERMEM= ORY) DdGetAvailDriverMemory; + + /* This callbacks are only for win9x and theirfor it is not lo= nger use in NT or ReactOS + * pUserMisc->UpdateNonLocalHeap; + * pUserMisc->GetHeapAlignment; + * pUserMisc->GetSysmemBltStatus; */ + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Misc 2 Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_Miscellaneous2Callbac= ks)) + { + DDHAL_DDMISCELLANEOUS2CALLBACKS pMisc; + DDHAL_DDMISCELLANEOUS2CALLBACKS* pUserMisc =3D (DDHAL_DDMISCEL= LANEOUS2CALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUS2CALLBACKSSIZE); + pMisc.dwSize =3D DDMISCELLANEOUS2CALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pMisc; = + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUS2CALLBACKSSIZE = ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D DDMISCELLANEOUS2CALLBACKSSIZE; + + pUserMisc->dwFlags =3D pMisc.dwFlags; + + /* This functions are not documneted in MSDN for this struct, = here is directx/reactx alpha blend */ = + if ( pMisc.Reserved ) + { + pUserMisc->Reserved =3D (LPVOID) DdAlphaBlt; + } + + if ( pMisc.CreateSurfaceEx ) + { + pUserMisc->CreateSurfaceEx =3D (LPDDHAL_CREATESURFACEEX) D= dCreateSurfaceEx; + } + + if ( pMisc.GetDriverState ) + { + pUserMisc->GetDriverState =3D (LPDDHAL_GETDRIVERSTATE) NtG= diDdGetDriverState; + } + + /* NOTE : pUserMisc->DestroyDDLocal is outdated and are not be= ign tuch */ + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* NT Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_NTCallbacks)) + { + /* MS does not have DHAL_* version of this callbacks = + * so we are force using PDD_* callbacks here = + */ + DD_NTCALLBACKS pNtKernel; + PDD_NTCALLBACKS pUserNtKernel =3D (PDD_NTCALLBACKS)pData->lpvD= ata; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pNtKernel, sizeof(DD_NTCALLBACKS)); + pNtKernel.dwSize =3D sizeof(DD_NTCALLBACKS); + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pNtKernel; = + pDrvInfoData.dwExpectedSize =3D sizeof(DD_NTCALLBACKS) ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D sizeof(DD_NTCALLBACKS); + + pUserNtKernel->dwSize =3D sizeof(DD_NTCALLBACKS); + pUserNtKernel->dwFlags =3D pNtKernel.dwFlags; = + pUserNtKernel->FreeDriverMemory =3D 0; + = + if (pNtKernel.SetExclusiveMode) + { = + pUserNtKernel->SetExclusiveMode =3D (PDD_SETEXCLUSIVEMODE)= DdSetExclusiveMode; = + } + + if (pNtKernel.FlipToGDISurface) + { + pUserNtKernel->FlipToGDISurface =3D (PDD_FLIPTOGDISURFACE)= DdFlipToGDISurface; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + = + + } + + /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks2)) + { + // FIXME GUID_D3DCallbacks2 + } + + /* D3D Callbacks version 3 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks3)) + { + // FIXME GUID_D3DCallbacks3 + } + + /* D3DParseUnknownCommand Callbacks check and setup for DirectX/ R= eactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DParseUnknownComman= dCallback)) + { + // FIXME GUID_D3DParseUnknownCommandCallback + } + + /* MotionComp Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MotionCompCallbacks)) + { + // FIXME GUID_MotionCompCallbacks + } + + /* FIXME VPE2 Callbacks check and setup for DirectX/ ReactX */ + //else if (IsEqualGUID(&pData->guidInfo, &GUID_VPE2Callbacks)) + //{ + // FIXME GUID_VPE2Callbacks + //} + else + { + /* set up internal buffer */ = + pDrvInfoData.dwExpectedSize =3D pData->dwExpectedSize; = + pDrvInfoData.lpvData =3D pData->lpvData; + + /* We do not cover all callbacks for user mode, they are only = cover by kmode */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + /* Setup return data */ = + pData->dwActualSize =3D pDrvInfoData.dwActualSize; + pData->lpvData =3D pDrvInfoData.lpvData; = + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + return retValue; } = = @@ -1594,3 +1958,4 @@ = = = +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs