Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 31072: Updated config tool : - Prompt on cancel button when there are changes - Use Program Files instead of Desktop by default for browsing - Free pidl resources - Converted last parts of the program to Unicode - Attached MessageBoxes to Window - Code cleanup
by pschweitzer＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: pschweitzer Date: Sat Dec 8 16:17:35 2007 New Revision: 31072 URL: http://svn.reactos.org/svn/reactos?rev=31072&view=rev Log: Updated config tool : - Prompt on cancel button when there are changes - Use Program Files instead of Desktop by default for browsing - Free pidl resources - Converted last parts of the program to Unicode - Attached MessageBoxes to Window - Code cleanup Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sat Dec 8 16:17:35 2007 @@ -7,6 +7,12 @@ - Added help strings when mouse is over a control. (Pierre Schweitzer) - Improved check for log directory (Pierre Schweitzer) - Updated French translation (Pierre Schweitzer) + - Prompt on cancel button when there are changes (Pierre Schweitzer) + - Use Program Files instead of Desktop by default for browsing (Pierre Schweitzer) + - Free Pidl ressources (Pierre Schweitzer) + - Converted last parts of the program to Unicode (Pierre Schweitzer) + - Attached MessageBoxes to Window (Pierre Schweitzer) + - Code cleanup (Pierre Schweitzer) - Add a pushd/popd to options.cmd so that options.exe pulls up a better default path for MinGW/GCC. (Peter Ward) - Set the working directory for the "Options" shortcut correctly (see above bullet). (Colin Fink) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc Sat Dec 8 16:17:35 2007 @@ -56,6 +56,8 @@ MSG_FINDMGWDIR, "Bitte wählen Sie den Ordner, in dem MinGW/GCC liegt:" MSG_FINDOBJDIR, "Bitte wählen Sie den Ordner, in den Sie die OBJ Daten speichern wollen:" MSG_FINDOUTDIR, "Bitte wählen Sie den Ordner, in den Sie die OUT Daten speichern wollen:" + MSG_WARNINGBOX, "Warning" + MSG_EXITCHANGE, "Are you sure you want to exit without saving?" /* Help Strings */ HLP_BACKCOLORC, "Auswählen der Hintergrundfarbe des RosBE DOS Fensters." HLP_FONTCOLORC, "Auswählen der Schriftfarbe des RosBE DOS Fensters." Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc Sat Dec 8 16:17:35 2007 @@ -56,6 +56,8 @@ MSG_FINDMGWDIR, "Please choose the directory where MinGW/GCC is located:" MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:" MSG_FINDOUTDIR, "Please choose the directory where you want to save OUT Files to:" + MSG_WARNINGBOX, "Warning" + MSG_EXITCHANGE, "Are you sure you want to exit without saving?" /* Help Strings */ HLP_BACKCOLORC, "Choose background color for RosBE DOS windows." HLP_FONTCOLORC, "Choose font color for RosBE DOS windows." Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc Sat Dec 8 16:17:35 2007 @@ -56,6 +56,8 @@ MSG_FINDMGWDIR, "Veuillez sélectionner le répertoire où se situe MingW/GCC :" MSG_FINDOBJDIR, "Veuillez choisir le répertoire où vous désirez sauver les fichiers OBJ :" MSG_FINDOUTDIR, "Veuillez choisir le répertoire où vous désirez sauver les fichiers OUT :" + MSG_WARNINGBOX, "Attention" + MSG_EXITCHANGE, "Êtes-vous sûr de vouloir quitter sans sauvegarder ?" /* Help Strings */ HLP_BACKCOLORC, "Choisissez la couleur de fond pour les fenêtres DOS du RosBE." HLP_FONTCOLORC, "Choisissez la couleur du texte pour les fenêtres DOS du RosBE." Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Sat Dec 8 16:17:35 2007 @@ -58,6 +58,8 @@ MSG_FINDMGWDIR, "Óêàæèòå êàòàëîã ðàñïîëîæåíèÿ êîìïèëÿòîðà MinGW:" MSG_FINDOBJDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ îáúåêòíûõ ôàéëîâ:" MSG_FINDOUTDIR, "Óêàæèòå êàòàëîã ñîõðàíåíèÿ êîìïèëèðîâàííûõ ôàéëîâ:" + MSG_WARNINGBOX, "Warning" + MSG_EXITCHANGE, "Are you sure you want to exit without saving?" /* Help Strings */ HLP_BACKCOLORC, "Âûáåðèòå öâåò ôîíà â îêíå êîíñîëè RosBE" HLP_FONTCOLORC, "Âûáåðèòå öâåò øðèôòà â îêíå êîíñîëè RosBE" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Sat Dec 8 16:17:35 2007 @@ -36,17 +36,13 @@ GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); if (writelog && (logdir[0] != 0)) - { if (GetFileAttributes(logdir) == 0xFFFFFFFF) - { if (CreateDirectoryW(logdir, NULL) == 0) { - LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256); - MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); + LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); + MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); return FALSE; } - } - } wcscpy(checkmgw, mingwpath); if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH) @@ -55,7 +51,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString(hInstance, MSG_NOGCCFOUND, msgerror, 256); - MessageBox(NULL, msgerror, NULL, MB_ICONERROR); + MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); return FALSE; } CloseHandle(hFile); @@ -66,24 +62,24 @@ pFile = _wfopen(optionsfile, L"w"); if (pFile) { - fprintf(pFile, "::\n"); - fprintf(pFile, ":: This file has been automatically generated by the ReactOS\n"); - fprintf(pFile, ":: Build Environment options utility.\n"); - fprintf(pFile, "::\n\n"); - fprintf(pFile, "color %X%X\n", background, foreground); - fprintf(pFile, "set _ROSBE_SHOWTIME=%d\n", showtime); - fprintf(pFile, "set _ROSBE_USECCACHE=%d\n", useccache); - fprintf(pFile, "set _ROSBE_STRIP=%d\n", strip); - fprintf(pFile, "set _ROSBE_WRITELOG=%d\n", writelog); - if (logdir[0] != 0) fprintf(pFile, "set _ROSBE_LOGDIR=%S\n", logdir); - if (mingwpath[0] != 0) fprintf(pFile, "set _ROSBE_MINGWPATH=%S\n", mingwpath); - if ((objdir[0] != 0) && objstate) fprintf(pFile, "set _ROSBE_OBJPATH=%S\n", objdir); - if ((outdir[0] != 0) && outstate) fprintf(pFile, "set _ROSBE_OUTPATH=%S\n", outdir); + fwprintf(pFile, L"::\n"); + fwprintf(pFile, L":: This file has been automatically generated by the ReactOS\n"); + fwprintf(pFile, L":: Build Environment options utility.\n"); + fwprintf(pFile, L"::\n\n"); + fwprintf(pFile, L"color %X%X\n", background, foreground); + fwprintf(pFile, L"set _ROSBE_SHOWTIME=%d\n", showtime); + fwprintf(pFile, L"set _ROSBE_USECCACHE=%d\n", useccache); + fwprintf(pFile, L"set _ROSBE_STRIP=%d\n", strip); + fwprintf(pFile, L"set _ROSBE_WRITELOG=%d\n", writelog); + if (logdir[0] != 0) fwprintf(pFile, L"set _ROSBE_LOGDIR=%s\n", logdir); + if (mingwpath[0] != 0) fwprintf(pFile, L"set _ROSBE_MINGWPATH=%s\n", mingwpath); + if ((objdir[0] != 0) && objstate) fwprintf(pFile, L"set _ROSBE_OBJPATH=%s\n", objdir); + if ((outdir[0] != 0) && outstate) fwprintf(pFile, L"set _ROSBE_OUTPATH=%s\n", outdir); fclose(pFile); return TRUE; } LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); - MessageBox(NULL, msgerror, NULL, MB_ICONERROR); + MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); return FALSE; } @@ -93,7 +89,6 @@ INT NbLines = 0; WCHAR optionsfile[MAX_PATH]; WCHAR *ptr, *ptr2; - TCHAR TTempLine[25+MAX_PATH]; WCHAR WTempLine[25+MAX_PATH]; WCHAR SBTitle[256]; @@ -103,9 +98,8 @@ pFile = _wfopen(optionsfile, L"r"); if (pFile) { - while (fgets((char *)TTempLine, 24+MAX_PATH, pFile)) - { - MultiByteToWideChar(CP_ACP, 0, (char *)TTempLine, -1, WTempLine, sizeof(WTempLine)/sizeof(WTempLine[0])); + while (fgetws(WTempLine, 24+MAX_PATH, pFile)) + { ptr = wcstok(WTempLine, L" "); if (wcscmp(ptr, L"color") == 0) { @@ -137,12 +131,11 @@ else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } - free(TTempLine); free(WTempLine); NbLines++; } fclose(pFile); - free(TTempLine); + free(WTempLine); LoadString(hInstance, MSG_SETLOADSUC, SBTitle, 256); SetDlgItemText(hwnd, ID_STATUSBAR, SBTitle); } @@ -206,20 +199,14 @@ GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); if (objstate) - { if ((wcscmp(objdir, DefaultSettings->objdir) != 0) && (wcslen(objdir) > 0)) StateObj = FALSE; - } if (outstate) - { if ((wcscmp(outdir, DefaultSettings->outdir) != 0) && (wcslen(outdir) > 0)) StateOut = FALSE; - } if (writelog) - { if ((wcscmp(logdir, DefaultSettings->logdir) != 0) && (wcslen(logdir) > 0)) StateLog = FALSE; - } State ^= ((foreground == DefaultSettings->foreground) && (background == DefaultSettings->background) && (showtime == DefaultSettings->showtime) && (writelog == DefaultSettings->writelog) && @@ -327,6 +314,14 @@ } case ID_CANCEL: { + WCHAR BoxMsg[256], BoxTitle[128]; + if ((IsWindowEnabled(GetDlgItem(Dlg, ID_OK))) && (wParam == ID_CANCEL)) + { + LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); + LoadString(hInstance, MSG_EXITCHANGE, BoxMsg, 256); + if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDNO) + break; + } PostMessage(Dlg, WM_CLOSE, 0, 0); break; } @@ -337,47 +332,57 @@ { BROWSEINFO PathInfo; LPITEMIDLIST pidl; + LPMALLOC pMalloc; INT Control = ID_LOGDIR; INT IDText = MSG_FINDLOGDIR; WCHAR path[MAX_PATH]; WCHAR Text[512]; - ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); - PathInfo.hwndOwner = Dlg; - - if ((wParam == ID_BROWSEMGW) || (wParam == ID_BROWSEOBJ) || (wParam == ID_BROWSEOUT)) + if (SHGetMalloc(&pMalloc) == NOERROR) { - HINSTANCE hDLL; - ILCREATEFROMPATHW ILCreateFromPathW; - Control = ID_MGWDIR; - IDText = MSG_FINDMGWDIR; - if (wParam == ID_BROWSEOBJ) + ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); + PathInfo.hwndOwner = Dlg; + PathInfo.ulFlags = BIF_EDITBOX; + SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidl); + PathInfo.pidlRoot = pidl; + if ((wParam == ID_BROWSEMGW) || (wParam == ID_BROWSEOBJ) || (wParam == ID_BROWSEOUT)) { - Control = ID_OBJDIR; - IDText = MSG_FINDOBJDIR; + HINSTANCE hDLL; + ILCREATEFROMPATHW ILCreateFromPathW; + Control = ID_MGWDIR; + IDText = MSG_FINDMGWDIR; + if (wParam == ID_BROWSEOBJ) + { + Control = ID_OBJDIR; + IDText = MSG_FINDOBJDIR; + } + else if (wParam == ID_BROWSEOUT) + { + Control = ID_OUTDIR; + IDText = MSG_FINDOUTDIR; + } + hDLL = LoadLibrary(L"shell32.dll"); + if (hDLL) + { + ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); + if (ILCreateFromPathW) + { + GetDlgItemTextW(Dlg, Control, path, MAX_PATH); + PathInfo.pidlRoot = ILCreateFromPathW(path); + } + FreeLibrary(hDLL); + } } - else if (wParam == ID_BROWSEOUT) + LoadString(hInstance, IDText, Text, 512); + PathInfo.lpszTitle = Text; + if ((pidl = SHBrowseForFolder(&PathInfo)) != NULL) { - Control = ID_OUTDIR; - IDText = MSG_FINDOUTDIR; + if (SHGetPathFromIDList(pidl, path)) + SetDlgItemText(Dlg, Control, path); + pMalloc->lpVtbl->Free(pMalloc, pidl); } - hDLL = LoadLibrary(L"shell32.dll"); - if (hDLL) - { - ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); - if (ILCreateFromPathW) - { - GetDlgItemTextW(Dlg, Control, path, MAX_PATH); - PathInfo.pidlRoot = ILCreateFromPathW(path); - } - FreeLibrary(hDLL); - } + pMalloc->lpVtbl->Release(pMalloc); } - LoadString(hInstance, IDText, Text, 512); - PathInfo.lpszTitle = Text; - pidl = SHBrowseForFolder(&PathInfo); - if (pidl && SHGetPathFromIDList(pidl, path)) - SetDlgItemText(Dlg, Control, path); break; } case ID_OTHEROBJ: Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Sat Dec 8 16:17:35 2007 @@ -59,18 +59,20 @@ #define MSG_FINDMGWDIR 0x2c #define MSG_FINDOBJDIR 0x2d #define MSG_FINDOUTDIR 0x2e +#define MSG_WARNINGBOX 0x2f +#define MSG_EXITCHANGE 0x30 /* Help Strings */ -#define HLP_BACKCOLORC 0x2f -#define HLP_FONTCOLORC 0x30 -#define HLP_SBUILDTIME 0x31 -#define HLP_CCACHEUSED 0x32 -#define HLP_STRIPEDEXE 0x33 -#define HLP_FINDMGWDIR 0x34 -#define HLP_FINDLOGDIR 0x35 -#define HLP_FINDOBJDIR 0x36 -#define HLP_FINDOUTDIR 0x37 -#define HLP_SAVEBUTTON 0x38 -#define HLP_QUITBUTTON 0x39 -#define HLP_DEFAULTMSG 0x3a +#define HLP_BACKCOLORC 0x31 +#define HLP_FONTCOLORC 0x32 +#define HLP_SBUILDTIME 0x33 +#define HLP_CCACHEUSED 0x34 +#define HLP_STRIPEDEXE 0x35 +#define HLP_FINDMGWDIR 0x36 +#define HLP_FINDLOGDIR 0x37 +#define HLP_FINDOBJDIR 0x38 +#define HLP_FINDOUTDIR 0x39 +#define HLP_SAVEBUTTON 0x3a +#define HLP_QUITBUTTON 0x3b +#define HLP_DEFAULTMSG 0x3c

1 0

[greatlrd] 31070: fixed bug with EnumDisplayModes for dx 1, 2 it use wrong size of Surface and callbacks. we need two diffrent version of EnumDisplayModes to solv it
by greatlrd＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: greatlrd Date: Sat Dec 8 16:00:55 2007 New Revision: 31070 URL: http://svn.reactos.org/svn/reactos?rev=31070&view=rev Log: fixed bug with EnumDisplayModes for dx 1,2 it use wrong size of Surface and callbacks. we need two diffrent version of EnumDisplayModes to solv it Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Sat Dec 8 16:00:55 2007 @@ -45,6 +45,14 @@ HRESULT WINAPI Main_DirectDraw_EnumDisplayModes( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDDSURFACEDESC pDDSD, + LPVOID pContext, + LPDDENUMMODESCALLBACK pCallback); + +HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes4( LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Sat Dec 8 16:00:55 2007 @@ -16,7 +16,7 @@ HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, - LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback) + LPDDSURFACEDESC pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK pCallback) { HRESULT ret = DD_OK; INT iMode = 0; @@ -30,10 +30,10 @@ { if - ((!IsBadReadPtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) || - (!IsBadWritePtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) || - (!IsBadReadPtr(pDDSD,sizeof(DDSURFACEDESC2))) || - (!IsBadWritePtr(pDDSD,sizeof(DDSURFACEDESC2)))) + ((!IsBadReadPtr(pCallback,sizeof(LPDDENUMMODESCALLBACK))) || + (!IsBadWritePtr(pCallback,sizeof(LPDDENUMMODESCALLBACK))) || + (!IsBadReadPtr(pDDSD,sizeof(DDSURFACEDESC))) || + (!IsBadWritePtr(pDDSD,sizeof(DDSURFACEDESC)))) { ret = DDERR_INVALIDPARAMS; } @@ -44,13 +44,13 @@ while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE) { - DDSURFACEDESC2 SurfaceDesc; - - ZeroMemory(&SurfaceDesc, sizeof(DDSURFACEDESC2)); + DDSURFACEDESC SurfaceDesc; + + ZeroMemory(&SurfaceDesc, sizeof(DDSURFACEDESC)); iMode++; - SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2); + SurfaceDesc.dwSize = sizeof (DDSURFACEDESC); SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; SurfaceDesc.dwHeight = DevMode.dmPelsHeight; SurfaceDesc.dwWidth = DevMode.dmPelsWidth; @@ -109,6 +109,100 @@ } HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes4(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, + LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback) +{ + HRESULT ret = DD_OK; + INT iMode = 0; + DEVMODE DevMode; + + DX_WINDBG_trace(); + + ZeroMemory(&DevMode, sizeof(DEVMODE)); + + _SEH_TRY + { + + if + ((!IsBadReadPtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) || + (!IsBadWritePtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) || + (!IsBadReadPtr(pDDSD,sizeof(DDSURFACEDESC2))) || + (!IsBadWritePtr(pDDSD,sizeof(DDSURFACEDESC2)))) + { + ret = DDERR_INVALIDPARAMS; + } + else + { + + DevMode.dmSize = sizeof(DEVMODE); + + while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE) + { + DDSURFACEDESC2 SurfaceDesc; + + ZeroMemory(&SurfaceDesc, sizeof(DDSURFACEDESC2)); + + iMode++; + + SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2); + SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; + SurfaceDesc.dwHeight = DevMode.dmPelsHeight; + SurfaceDesc.dwWidth = DevMode.dmPelsWidth; + SurfaceDesc.lPitch = DevMode.dmPelsWidth * DevMode.dmBitsPerPel / 8; + SurfaceDesc.dwRefreshRate = DevMode.dmDisplayFrequency; + + SurfaceDesc.ddpfPixelFormat.dwSize = sizeof (DDPIXELFORMAT); + SurfaceDesc.ddpfPixelFormat.dwFlags = DDPF_RGB; + // FIXME: get these + /* + SurfaceDesc.ddpfPixelFormat.dwRBitMask = + SurfaceDesc.ddpfPixelFormat.dwGBitMask = + SurfaceDesc.ddpfPixelFormat.dwBBitMask = + SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask = + */ + SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DevMode.dmBitsPerPel; + + // FIXME1: This->lpLcl->lpGbl->dwMonitorFrequency is not set ! + if(dwFlags & DDEDM_REFRESHRATES && SurfaceDesc.dwRefreshRate != This->lpLcl->lpGbl->dwMonitorFrequency) + { + //continue; // FIXME2: what is SurfaceDesc.dwRefreshRate supposed to be set to ? + } + + // FIXME: Take case when DDEDM_STANDARDVGAMODES flag is not set in account + + if(pDDSD) + { + if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) + continue; + + else if(pDDSD->dwFlags & DDSD_WIDTH && pDDSD->dwWidth != SurfaceDesc.dwWidth) + continue; + + else if(pDDSD->dwFlags & DDSD_PITCH && pDDSD->lPitch != SurfaceDesc.lPitch) + continue; + + else if(pDDSD->dwFlags & DDSD_REFRESHRATE && pDDSD->dwRefreshRate != SurfaceDesc.dwRefreshRate) + continue; + + else if(pDDSD->dwFlags & DDSD_PIXELFORMAT && pDDSD->ddpfPixelFormat.dwRGBBitCount != SurfaceDesc.ddpfPixelFormat.dwRGBBitCount) + continue; // FIXME: test for the other members of ddpfPixelFormat as well + } + + if((*pCallback)(&SurfaceDesc, pContext) == DDENUMRET_CANCEL) + break; + } + } + + } + _SEH_HANDLE + { + } + _SEH_END; + + return ret; +} + +HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) { return Main_DirectDraw_SetDisplayMode2 (This, dwWidth, dwHeight, dwBPP, 0, 0 ); Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c Sat Dec 8 16:00:55 2007 @@ -70,7 +70,7 @@ Main_DirectDraw_EnumSurfaces( LPDIRECTDRAW2 iface, DWORD dwFlags, - LPDDSURFACEDESC2 lpDDSD, + LPDDSURFACEDESC lpDDSD, LPVOID context, LPDDENUMSURFACESCALLBACK callback); Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Sat Dec 8 16:00:55 2007 @@ -59,7 +59,7 @@ LPDIRECTDRAWSURFACE4* dst); HRESULT WINAPI -Main_DirectDraw_EnumDisplayModes( +Main_DirectDraw_EnumDisplayModes4( LPDIRECTDRAW4 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, @@ -182,7 +182,7 @@ Main_DirectDraw_CreatePalette, Main_DirectDraw_CreateSurface4, Main_DirectDraw_DuplicateSurface, - Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumDisplayModes4, Main_DirectDraw_EnumSurfaces, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Sat Dec 8 16:00:55 2007 @@ -63,7 +63,7 @@ LPDIRECTDRAWSURFACE7* dst); HRESULT WINAPI -Main_DirectDraw_EnumDisplayModes( +Main_DirectDraw_EnumDisplayModes4( LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, @@ -197,7 +197,7 @@ Main_DirectDraw_CreatePalette, Main_DirectDraw_CreateSurface4, /* (CreateSurface4 testing / devloping) */ Main_DirectDraw_DuplicateSurface, - Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */ + Main_DirectDraw_EnumDisplayModes4, /* (EnumDisplayModes testing / devloping) */ Main_DirectDraw_EnumSurfaces, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, /* (GetCaps done) */ Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c Sat Dec 8 16:00:55 2007 @@ -70,9 +70,9 @@ Main_DirectDraw_EnumSurfaces( LPDIRECTDRAW iface, DWORD dwFlags, - LPDDSURFACEDESC2 lpDDSD2, + LPDDSURFACEDESC lpDDSD2, LPVOID context, - LPDDENUMSURFACESCALLBACK7 callback); + LPDDENUMSURFACESCALLBACK callback); HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW iface);

1 0

[cwittich] 31069: Added definition for SEE_MASK_NOASYNC.
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 15:48:14 2007 New Revision: 31069 URL: http://svn.reactos.org/svn/reactos?rev=31069&view=rev Log: Added definition for SEE_MASK_NOASYNC. Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h (original) +++ trunk/reactos/include/psdk/shellapi.h Sat Dec 8 15:48:14 2007 @@ -22,7 +22,8 @@ #define SEE_MASK_HOTKEY 0x20 #define SEE_MASK_NOCLOSEPROCESS 0x40 #define SEE_MASK_CONNECTNETDRV 0x80 -#define SEE_MASK_FLAG_DDEWAIT 0x100 +#define SEE_MASK_NOASYNC 0x00000100 +#define SEE_MASK_FLAG_DDEWAIT SEE_MASK_NOASYNC #define SEE_MASK_DOENVSUBST 0x200 #define SEE_MASK_FLAG_NO_UI 0x400 #define SEE_MASK_NO_CONSOLE 0x8000

1 0

[peterw] 31068: - Add myself to the credits file.
by peterw＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: peterw Date: Sat Dec 8 15:45:18 2007 New Revision: 31068 URL: http://svn.reactos.org/svn/reactos?rev=31068&view=rev Log: - Add myself to the credits file. Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=31068&r1=31067… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Sat Dec 8 15:45:18 2007 @@ -48,6 +48,7 @@ Nathan Woods <npwoods(a)mess.org> Pablo Borobia <pborobia(a)gmail.com> Paolo Pantaleo <paolopan(a)freemail.it> +Peter Ward <dralnix(a)gmail.com> Phillip Susi <phreak(a)iag.net> Rex Jolliff <rex(a)lvcablemodem.com> Richard Campbell <betam4x(a)gmail.com>

1 0

[peterw] 31067: - Stop scut from listing the default shortcut and inform the user there are no shortcuts if none are found. - Fix six memory leaks in scut (who added these? :P).
by peterw＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: peterw Date: Sat Dec 8 15:45:02 2007 New Revision: 31067 URL: http://svn.reactos.org/svn/reactos?rev=31067&view=rev Log: - Stop scut from listing the default shortcut and inform the user there are no shortcuts if none are found. - Fix six memory leaks in scut (who added these? :P). Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c trunk/tools/RosBE/RosBE-Windows/Tools/info.txt trunk/tools/RosBE/RosBE-Windows/Tools/scut.c trunk/tools/RosBE/Tools/SVN-Readme.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sat Dec 8 15:45:02 2007 @@ -27,6 +27,9 @@ - Switch default install directory back to PROGRAMFILES\RosBE. (Peter Ward) - Detect if running on a x64 system and install to "Program Files" and not "Program Files (x86)" to avoid problems with (). (Peter Ward) - Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an icon. (Peter Ward) +- Make tee read and write in blocks so it's much faster. (Peter Ward) +- Stop scut from listing the default shortcut and inform the user there are no shortcuts if none are found. (Peter Ward) +- Fix six memory leaks in scut (who added these? :P). (Peter Ward) *** Nov 18th, 2007 - RosBE 1.0 Released Modified: trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ec… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c Sat Dec 8 15:45:02 2007 @@ -10,8 +10,10 @@ #include <stdio.h> #include <stdlib.h> -int main(int argc, char** argv) { - if (argc == 2) - printf("%x", atoi(argv[1])); - return 0; +int main(int argc, char** argv) +{ + if (argc == 2) + printf("%x", atoi(argv[1])); + + return 0; } Modified: trunk/tools/RosBE/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/in… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/info.txt Sat Dec 8 15:45:02 2007 @@ -1,4 +1,4 @@ Additional Tools needed: svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 -Built Tools and Rest needs to be copied to /Root/Tools/ +Built Tools and Rest needs to be copied to /Components/Tools/ Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Sat Dec 8 15:45:02 2007 @@ -25,6 +25,7 @@ char* programname; char rosbeappdata[248]; char shortcutfile[260]; +int hasshortcuts = 0; PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path); void checkfile(void); @@ -93,12 +94,24 @@ shortcuts = readshortcuts(); current = shortcuts; - printf("All available shortcuts:\n\n"); - while(current) - { - printf("Shortcut Name: %s\n", current->name); - printf(" -> Path: %s\n", current->path); - current = current->next; + if (hasshortcuts) + { + printf("All available shortcuts:\n\n"); + while(current) + { + if (!_stricmp(current->name, "Default")) + { + current = current->next; + continue; + } + printf("Shortcut Name: %s\n", current->name); + printf(" -> Path: %s\n", current->path); + current = current->next; + } + } + else + { + printf("No shortcuts found, use 'scut add' to create one.\n"); } freeshortcuts(shortcuts); } @@ -119,7 +132,10 @@ fflush(stdin); if(!fgets(name, 260, stdin)) - return 1; + { + freeshortcuts(shortcuts); + return -1; + } } while(strlen(name) <= 1); strcpy(name, strtok(name, "\n")); @@ -142,7 +158,10 @@ fflush(stdin); if(!fgets(path, 260, stdin)) - return 1; + { + freeshortcuts(shortcuts); + return -1; + } } while(strlen(path) <= 1); strcpy(path, strtok(path, "\n")); @@ -176,7 +195,10 @@ fflush(stdin); if(!fgets(name, 260, stdin)) - return 1; + { + freeshortcuts(shortcuts); + return -1; + } } while(strlen(name) <= 1); strcpy(name, strtok(name, "\n")); @@ -226,7 +248,10 @@ fflush(stdin); if(!fgets(name, 260, stdin)) - return 1; + { + freeshortcuts(shortcuts); + return -1; + } } while(strlen(name) <= 1); strcpy(name, strtok(name, "\n")); @@ -253,7 +278,10 @@ fflush(stdin); if(!fgets(path, 260, stdin)) - return 1; + { + freeshortcuts(shortcuts); + return -1; + } } while(strlen(path) <= 1); strcpy(path, strtok(path, "\n")); @@ -293,7 +321,10 @@ fflush(stdin); if(!fgets(name, 260, stdin)) - return 1; + { + freeshortcuts(shortcuts); + return -1; + } } while(strlen(name) <= 1); strcpy(name, strtok(name, "\n")); @@ -311,6 +342,11 @@ } else { + if (argc > 2) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", programname); + return -1; + } shortcuts = readshortcuts(); current = shortcuts; @@ -569,6 +605,11 @@ path = strtok(NULL, "\n"); if (name && path) { + if (_stricmp(name, "Default") && + !hasshortcuts) + { + hasshortcuts = 1; + } head = addshortcut(head, name, path); } } Modified: trunk/tools/RosBE/Tools/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/SVN-Readme.txt?r… ============================================================================== --- trunk/tools/RosBE/Tools/SVN-Readme.txt (original) +++ trunk/tools/RosBE/Tools/SVN-Readme.txt Sat Dec 8 15:45:02 2007 @@ -2,7 +2,7 @@ For RosBE-Windows ------------------ - The built tools need to be copied to RosBE-Windows\Root\Tools + The built tools need to be copied to RosBE-Windows\Components\Tools For RosBE-Unix ---------------

1 0

[peterw] 31066: - Make tee read and write in blocks so it's much faster.
by peterw＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: peterw Date: Sat Dec 8 07:11:37 2007 New Revision: 31066 URL: http://svn.reactos.org/svn/reactos?rev=31066&view=rev Log: - Make tee read and write in blocks so it's much faster. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/tee.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/tee.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/te… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/tee.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/tee.c Sat Dec 8 07:11:37 2007 @@ -10,9 +10,11 @@ #include <stdio.h> #include <string.h> +#define LINE_MAX 1024 + int main(int argc, char* argv[]) { - int charbuff; + char buff[LINE_MAX]; FILE *fp; if (argc > 2) @@ -31,16 +33,20 @@ return 0; } - fp = fopen(argv[1], "w"); - if (!fp) + if (!(fp = fopen(argv[1], "w"))) { fprintf(stderr, "%s: Error cannot create/open file \"%s\".\n", argv[0], argv[1]); return -1; } - while ((charbuff = fgetc(stdin)) != EOF) + while (!feof(stdin)) { - fputc(charbuff, stdout); - fputc(charbuff, fp); + fgets(buff, LINE_MAX, stdin); + if (strlen(buff) > 0) + { + fwrite(buff, 1, strlen(buff), stdout); + fwrite(buff, 1, strlen(buff), fp); + } + memset(&buff, '\0', LINE_MAX); } if (fclose(fp)) {

1 0

[jimtabor] 31065: Move WS_EX_MDICHILD check back in win32k. Reordered CreateWindowEx menu sets. All based on wine logic. Should SetMenu first or System menu? Tested with FF and AbiWord.
by jimtabor＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: jimtabor Date: Sat Dec 8 01:56:58 2007 New Revision: 31065 URL: http://svn.reactos.org/svn/reactos?rev=31065&view=rev Log: Move WS_EX_MDICHILD check back in win32k. Reordered CreateWindowEx menu sets. All based on wine logic. Should SetMenu first or System menu? Tested with FF and AbiWord. Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sat Dec 8 01:56:58 2007 @@ -354,13 +354,6 @@ hInstance, lpParam, FALSE); - - if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD) && hwnd != (HWND)0) - { - SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); - SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); - } - return hwnd; } @@ -466,13 +459,6 @@ hInstance, lpParam, TRUE); - - if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD) && hwnd != (HWND)0) - { - SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); - SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); - } - return hwnd; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sat Dec 8 01:56:58 2007 @@ -1657,18 +1657,6 @@ Wnd->Instance = hInstance; Window->hSelf = hWnd; - if (!hMenu) - hMenu = Wnd->Class->hMenu; - - if (0 != (dwStyle & WS_CHILD)) - { - Wnd->IDMenu = (UINT) hMenu; - } - else - { - IntSetMenu(Window, hMenu, &MenuChanged); - } - Window->MessageQueue = PsGetCurrentThreadWin32Thread()->MessageQueue; IntReferenceMessageQueue(Window->MessageQueue); Window->Parent = ParentWindow; @@ -1770,8 +1758,7 @@ } /* create system menu */ - if((dwStyle & WS_SYSMENU) && - (dwStyle & WS_CAPTION) == WS_CAPTION) + if((dwStyle & WS_SYSMENU) )//&& (dwStyle & WS_CAPTION) == WS_CAPTION) { SystemMenu = IntGetSystemMenu(Window, TRUE, TRUE); if(SystemMenu) @@ -1780,6 +1767,20 @@ IntReleaseMenuObject(SystemMenu); } } + + /* Set the window menu */ + if ((dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) + { + if (hMenu) + IntSetMenu(Window, hMenu, &MenuChanged); + else + { + hMenu = Wnd->Class->hMenu; + if (hMenu) IntSetMenu(Window, hMenu, &MenuChanged); + } + } + else + Wnd->IDMenu = (UINT) hMenu; /* Insert the window into the thread's window list. */ InsertTailList (&PsGetCurrentThreadWin32Thread()->WindowListHead, &Window->ThreadListEntry); @@ -2051,7 +2052,6 @@ RETURN((HWND)0); } - /* Send move and size messages. */ if (!(Window->Flags & WINDOWOBJECT_NEED_SIZE)) { @@ -2064,7 +2064,6 @@ { DPRINT("Sending bogus WM_SIZE\n"); } - lParam = MAKE_LONG(Window->Wnd->ClientRect.right - Window->Wnd->ClientRect.left, @@ -2073,7 +2072,6 @@ co_IntSendMessage(Window->hSelf, WM_SIZE, SIZE_RESTORED, lParam); - DPRINT("IntCreateWindow(): About to send WM_MOVE\n"); if (0 != (Wnd->Style & WS_CHILD) && ParentWindow) @@ -2087,14 +2085,10 @@ Wnd->ClientRect.top); } - co_IntSendMessage(Window->hSelf, WM_MOVE, 0, lParam); - /* Call WNDOBJ change procs */ IntEngWindowChanged(Window, WOC_RGN_CLIENT); - - } /* Show or maybe minimize or maximize the window. */ @@ -2105,11 +2099,13 @@ SwFlag = (Wnd->Style & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE; + co_WinPosMinMaximize(Window, SwFlag, &NewPos); - SwFlag = - ((Wnd->Style & WS_CHILD) || UserGetActiveWindow()) ? - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED : - SWP_NOZORDER | SWP_FRAMECHANGED; + + SwFlag = ((Wnd->Style & WS_CHILD) || UserGetActiveWindow()) ? + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED : + SWP_NOZORDER | SWP_FRAMECHANGED; + DPRINT("IntCreateWindow(): About to minimize/maximize\n"); DPRINT("%d,%d %dx%d\n", NewPos.left, NewPos.top, NewPos.right, NewPos.bottom); co_WinPosSetWindowPos(Window, 0, NewPos.left, NewPos.top, @@ -2149,8 +2145,20 @@ if (dwStyle & WS_VISIBLE) { + if (Wnd->Style & WS_MAXIMIZE) + dwShowMode = SW_SHOW; + else if (Wnd->Style & WS_MINIMIZE) + dwShowMode = SW_SHOWMINIMIZED; + DPRINT("IntCreateWindow(): About to show window\n"); co_WinPosShowWindow(Window, dwShowMode); + + if (Wnd->ExStyle & WS_EX_MDICHILD) + { + co_IntSendMessage(ParentWindow->hSelf, WM_MDIREFRESHMENU, 0, 0); + /* ShowWindow won't activate child windows */ + co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + } } DPRINT("IntCreateWindow(): = %X\n", hWnd);

1 0

[cfinck] 31064: Fix the name of our RosBE founder :-D
by cfinck＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: cfinck Date: Sat Dec 8 00:56:44 2007 New Revision: 31064 URL: http://svn.reactos.org/svn/reactos?rev=31064&view=rev Log: Fix the name of our RosBE founder :-D Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[greatlrd] 31063: revert 30735 that change was wrong it should have gone into own header call ddrawex.h for it deal with directdraw 3 (ddrawex.dll)
by greatlrd＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: greatlrd Date: Sat Dec 8 00:01:48 2007 New Revision: 31063 URL: http://svn.reactos.org/svn/reactos?rev=31063&view=rev Log: revert 30735 that change was wrong it should have gone into own header call ddrawex.h for it deal with directdraw 3 (ddrawex.dll) Modified: trunk/reactos/include/dxsdk/ddraw.h trunk/reactos/include/dxsdk/ddrawex.h Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h (original) +++ trunk/reactos/include/dxsdk/ddraw.h Sat Dec 8 00:01:48 2007 @@ -673,7 +673,6 @@ DEFINE_GUID( CLSID_DirectDrawClipper, 0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); DEFINE_GUID( IID_IDirectDraw, 0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); DEFINE_GUID( IID_IDirectDraw2, 0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); -DEFINE_GUID( IID_IDirectDraw3, 0x618F8AD4,0x8b7A,0x11D0,0x8F,0xCC,0x00,0xC0,0x4F,0xd9,0x18,0x9D ); DEFINE_GUID( IID_IDirectDraw4, 0x9C59509A,0x39BD,0x11D1,0x8c,0x4A,0x00,0xC0,0x4F,0xd9,0x30,0xC5 ); DEFINE_GUID( IID_IDirectDraw7, 0x15E65EC0,0x3B9C,0x11D2,0xb9,0x2F,0x00,0x60,0x97,0x97,0xEA,0x5B ); DEFINE_GUID( IID_IDirectDrawSurface, 0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); @@ -695,7 +694,6 @@ typedef struct IDirectDraw *LPDIRECTDRAW; typedef struct IDirectDraw2 *LPDIRECTDRAW2; -typedef struct IDirectDraw3 *LPDIRECTDRAW3; typedef struct IDirectDraw4 *LPDIRECTDRAW4; typedef struct IDirectDraw7 *LPDIRECTDRAW7; typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE; @@ -1544,92 +1542,6 @@ #define IDirectDraw2_WaitForVerticalBlank(p, a, b) (p)->WaitForVerticalBlank(a, b) #define IDirectDraw2_GetAvailableVidMem(p, a, b, c) (p)->GetAvailableVidMem(a, b, c) #endif -#endif - -#if defined( _WIN32 ) && !defined( _NO_COM ) - #undef INTERFACE - #define INTERFACE IDirectDraw3 - DECLARE_INTERFACE_(IDirectDraw3,IUnknown) - { - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(Compact)(THIS) PURE; - STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE; - STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE; - STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; - STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; - STDMETHOD(FlipToGDISurface)(THIS) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; - STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; - STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; - STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE; - STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; - STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; - STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE; - STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE; - STDMETHOD(RestoreDisplayMode)(THIS) PURE; - STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; - STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; - STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; - STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; - STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE *pSurf) PURE; - }; - #if !defined(__cplusplus) || defined(CINTERFACE) - #define IDirectDraw3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) - #define IDirectDraw3_AddRef(p) (p)->lpVtbl->AddRef(p) - #define IDirectDraw3_Release(p) (p)->lpVtbl->Release(p) - #define IDirectDraw3_Compact(p) (p)->lpVtbl->Compact(p) - #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c) - #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d) - #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c) - #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b) - #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d) - #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d) - #define IDirectDraw3_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p) - #define IDirectDraw3_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b) - #define IDirectDraw3_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) - #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b) - #define IDirectDraw3_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a) - #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a) - #define IDirectDraw3_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a) - #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a) - #define IDirectDraw3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) - #define IDirectDraw3_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p) - #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b) - #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e) - #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b) - #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c) - #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b) - #else - #define IDirectDraw3_QueryInterface(p,a,b) (p)->QueryInterface(a,b) - #define IDirectDraw3_AddRef(p) (p)->AddRef() - #define IDirectDraw3_Release(p) (p)->Release() - #define IDirectDraw3_Compact(p) (p)->Compact() - #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c) - #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d) - #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c) - #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b) - #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d) - #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d) - #define IDirectDraw3_FlipToGDISurface(p) (p)->FlipToGDISurface() - #define IDirectDraw3_GetCaps(p,a,b) (p)->GetCaps(a,b) - #define IDirectDraw3_GetDisplayMode(p,a) (p)->GetDisplayMode(a) - #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b) - #define IDirectDraw3_GetGDISurface(p,a) (p)->GetGDISurface(a) - #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a) - #define IDirectDraw3_GetScanLine(p,a) (p)->GetScanLine(a) - #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a) - #define IDirectDraw3_Initialize(p,a) (p)->Initialize(a) - #define IDirectDraw3_RestoreDisplayMode(p) (p)->RestoreDisplayMode() - #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b) - #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e) - #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b) - #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c) - #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b) - #endif #endif #if defined( _WIN32 ) && !defined( _NO_COM ) Modified: trunk/reactos/include/dxsdk/ddrawex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddrawex.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/ddrawex.h (original) +++ trunk/reactos/include/dxsdk/ddrawex.h Sat Dec 8 00:01:48 2007 @@ -16,6 +16,161 @@ #define DDERR_BADPROCADDRESS MAKE_DDHRESULT( 903 ) #define DDERR_LEGACYUSAGE MAKE_DDHRESULT( 904 ) +typedef struct IDirectDraw3 *LPDIRECTDRAW3; + +#ifndef DIRECTDRAW_VERSION + #define DDSD_LPSURFACE 0x00000800 + + DEFINE_GUID( IID_IDirectDrawSurface3, 0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB ); + typedef struct IDirectDrawSurface3 *LPDIRECTDRAWSURFACE3; + #if defined( _WIN32 ) && !defined( _NO_COM ) + #undef INTERFACE + #define INTERFACE IDirectDrawSurface3 + DECLARE_INTERFACE_( IDirectDrawSurface3, IUnknown ) + { + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3) PURE; + STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE; + STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE3, LPRECT,DWORD, LPDDBLTFX) PURE; + STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE; + STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE3, LPRECT,DWORD) PURE; + STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE3) PURE; + STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE; + STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE; + STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE3, DWORD) PURE; + STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE3*) PURE; + STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE; + STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE; + STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *) PURE; + STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE; + STDMETHOD(GetDC)(THIS_ HDC *) PURE; + STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE; + STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE; + STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *) PURE; + STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT) PURE; + STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE; + STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE; + STDMETHOD(IsLost)(THIS) PURE; + STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE; + STDMETHOD(ReleaseDC)(THIS_ HDC) PURE; + STDMETHOD(Restore)(THIS) PURE; + STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE; + STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE; + STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE; + STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE; + STDMETHOD(Unlock)(THIS_ LPVOID) PURE; + STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE3,LPRECT,DWORD, LPDDOVERLAYFX) PURE; + STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE3) PURE; + STDMETHOD(GetDDInterface)(THIS_ LPVOID *) PURE; + STDMETHOD(PageLock)(THIS_ DWORD) PURE; + STDMETHOD(PageUnlock)(THIS_ DWORD) PURE; + STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC, DWORD ) PURE; + }; + #endif +#endif + +#if defined( _WIN32 ) && !defined( _NO_COM ) +#undef INTERFACE +#define INTERFACE IDirectDrawFactory + +DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(CreateDirectDraw) (THIS_ GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw) PURE; + STDMETHOD(DirectDrawEnumerate) (THIS_ LPDDENUMCALLBACK lpCallback, LPVOID lpContext) PURE; +}; +#endif + +#if defined( _WIN32 ) && !defined( _NO_COM ) + #undef INTERFACE + #define INTERFACE IDirectDraw3 + DECLARE_INTERFACE_(IDirectDraw3,IUnknown) + { + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(Compact)(THIS) PURE; + STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE; + STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE; + STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; + STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; + STDMETHOD(FlipToGDISurface)(THIS) PURE; + STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; + STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; + STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; + STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE; + STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; + STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; + STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE; + STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE; + STDMETHOD(RestoreDisplayMode)(THIS) PURE; + STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; + STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; + STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; + STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; + STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE *pSurf) PURE; + }; + #if !defined(__cplusplus) || defined(CINTERFACE) + #define IDirectDraw3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) + #define IDirectDraw3_AddRef(p) (p)->lpVtbl->AddRef(p) + #define IDirectDraw3_Release(p) (p)->lpVtbl->Release(p) + #define IDirectDraw3_Compact(p) (p)->lpVtbl->Compact(p) + #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c) + #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d) + #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c) + #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b) + #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d) + #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d) + #define IDirectDraw3_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p) + #define IDirectDraw3_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b) + #define IDirectDraw3_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) + #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b) + #define IDirectDraw3_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a) + #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a) + #define IDirectDraw3_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a) + #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a) + #define IDirectDraw3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) + #define IDirectDraw3_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p) + #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b) + #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e) + #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b) + #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c) + #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b) + #else + #define IDirectDraw3_QueryInterface(p,a,b) (p)->QueryInterface(a,b) + #define IDirectDraw3_AddRef(p) (p)->AddRef() + #define IDirectDraw3_Release(p) (p)->Release() + #define IDirectDraw3_Compact(p) (p)->Compact() + #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c) + #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d) + #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c) + #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b) + #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d) + #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d) + #define IDirectDraw3_FlipToGDISurface(p) (p)->FlipToGDISurface() + #define IDirectDraw3_GetCaps(p,a,b) (p)->GetCaps(a,b) + #define IDirectDraw3_GetDisplayMode(p,a) (p)->GetDisplayMode(a) + #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b) + #define IDirectDraw3_GetGDISurface(p,a) (p)->GetGDISurface(a) + #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a) + #define IDirectDraw3_GetScanLine(p,a) (p)->GetScanLine(a) + #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a) + #define IDirectDraw3_Initialize(p,a) (p)->Initialize(a) + #define IDirectDraw3_RestoreDisplayMode(p) (p)->RestoreDisplayMode() + #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b) + #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e) + #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b) + #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c) + #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b) + #endif +#endif #ifdef __cplusplus }

1 0

[greatlrd] 31062: Start building up ddrawex.h it is directdraw 3 header, ms have separeate directdraw 3 to a file ddrawex.dll
by greatlrd＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: greatlrd Date: Sat Dec 8 00:00:26 2007 New Revision: 31062 URL: http://svn.reactos.org/svn/reactos?rev=31062&view=rev Log: Start building up ddrawex.h it is directdraw 3 header, ms have separeate directdraw 3 to a file ddrawex.dll Added: trunk/reactos/include/dxsdk/ddrawex.h (with props) Added: trunk/reactos/include/dxsdk/ddrawex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddrawex.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/ddrawex.h (added) +++ trunk/reactos/include/dxsdk/ddrawex.h Sat Dec 8 00:00:26 2007 @@ -1,0 +1,23 @@ +#ifndef __DDRAWEXH__ +#define __DDRAWEXH__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <ddraw.h> +DEFINE_GUID(CLSID_DirectDrawFactory, 0x4FD2A832, 0x86C8, 0x11D0, 0x8F, 0xCA, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0x9D); +DEFINE_GUID(IID_IDirectDrawFactory, 0x4FD2A833, 0x86C8, 0x11D0, 0x8F, 0xCA, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0x9D); +DEFINE_GUID(IID_IDirectDraw3, 0x618F8AD4, 0x8B7A, 0x11D0, 0x8F, 0xCC, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0x9D); + +#define DDSCAPS_DATAEXCHANGE (DDSCAPS_SYSTEMMEMORY|DDSCAPS_VIDEOMEMORY) +#define DDERR_LOADFAILED MAKE_DDHRESULT( 901 ) +#define DDERR_BADVERSIONINFO MAKE_DDHRESULT( 902 ) +#define DDERR_BADPROCADDRESS MAKE_DDHRESULT( 903 ) +#define DDERR_LEGACYUSAGE MAKE_DDHRESULT( 904 ) + + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/dxsdk/ddrawex.h ------------------------------------------------------------------------------ svn:eol-style = native

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