Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[greatlrd] 21516: Implement Surface_GetDC
by aleksey＠studiocerebral.com 08 Apr '06

08 Apr '06

Author: greatlrd Date: Sat Apr 8 13:04:42 2006 New Revision: 21516 URL: http://svn.reactos.ru/svn/reactos?rev=21516&view=rev Log: Implement Surface_GetDC Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Sat Apr 8 13:04:42 2006 @@ -69,10 +69,13 @@ That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; @@ -82,12 +85,15 @@ { return mDdCreateSurface.ddRVal; } + + return DD_OK; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { + DX_STUB_str( "Can not create overlay surface"); ////memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); //memcpy(&This->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); //This->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); @@ -208,19 +214,19 @@ } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) { - DX_STUB; + DX_STUB_str( "Can not create backbuffer surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) { - DX_STUB; + DX_STUB_str( "Can not create texture surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) { - DX_STUB; + DX_STUB_str( "Can not create zbuffer surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) { - DX_STUB; + DX_STUB_str( "Can not create offscreenplain surface"); } return DDERR_INVALIDSURFACETYPE; @@ -289,6 +295,7 @@ // This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; // FIXME dectect if it clipped or not + DX_STUB_str( "Can not create offscreenplain surface"); mDdBlt.IsClipped = FALSE; if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) @@ -304,3 +311,9 @@ return DD_OK; } + +HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 + pDDSD, DWORD flags, HANDLE event) +{ + DX_STUB; +} Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sat Apr 8 13:04:42 2006 @@ -61,16 +61,15 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) -{ /* - IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)iface; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) +{ + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) { - return Hal_DDrawSurface_Lock( iiface, LPRECT prect, pDDSD, flags, event); + return Hal_DDrawSurface_Lock( iface, prect, pDDSD, flags, event); } - return Hel_DDrawSurface_Lock( iiface, LPRECT prect, pDDSD, flags, event);*/ - DX_STUB; + return Hel_DDrawSurface_Lock( iface, prect, pDDSD, flags, event); } HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) @@ -224,7 +223,30 @@ HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { - DX_STUB; + IDirectDrawSurfaceImpl* This; + + if (iface == NULL) + { + return DDERR_INVALIDOBJECT; + } + + if (phDC == NULL) + { + return DDERR_INVALIDPARAMS; + } + + This = (IDirectDrawSurfaceImpl*)iface; + + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) + { + *phDC = (HDC)This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + } + else + { + *phDC = (HDC)This->Surf->mpPrimaryLocals[0]->hDC; + } + + return DD_OK; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat Apr 8 13:04:42 2006 @@ -147,7 +147,10 @@ HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter); +HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); + + HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 ); @@ -159,6 +162,7 @@ HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); +HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); /* Setting for HEL should be move to ros special reg key ? */ @@ -178,4 +182,14 @@ } \ return DDERR_UNSUPPORTED; +#define DX_STUB_str(x) \ + static BOOL firstcall = TRUE; \ + if (firstcall) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcall = FALSE; \ + } + #endif /* __DDRAW_PRIVATE */ Modified: trunk/reactos/dll/directx/ddraw/soft/surface_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Sat Apr 8 13:04:42 2006 @@ -21,3 +21,12 @@ { DX_STUB; } + +HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 + pDDSD, DWORD flags, HANDLE event) +{ + DX_STUB; +} + + +

1 0

[gedmurphy] 21515: - allow container windows on the docking toolbars - hide comboboxes if toolbar is vertical - patch from Thomas
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: gedmurphy Date: Sat Apr 8 03:21:12 2006 New Revision: 21515 URL: http://svn.reactos.ru/svn/reactos?rev=21515&view=rev Log: - allow container windows on the docking toolbars - hide comboboxes if toolbar is vertical - patch from Thomas Removed: trunk/reactos/base/applications/imagesoft/buttons.h Modified: trunk/reactos/base/applications/imagesoft/imageprop.c trunk/reactos/base/applications/imagesoft/imagesoft.rbuild trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/misc.c trunk/reactos/base/applications/imagesoft/opensave.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp trunk/reactos/base/applications/imagesoft/resource.h trunk/reactos/base/applications/imagesoft/tooldock.c Removed: trunk/reactos/base/applications/imagesoft/buttons.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/buttons.h (original) +++ trunk/reactos/base/applications/imagesoft/buttons.h (removed) @@ -1,39 +1,0 @@ -/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - -TBBUTTON StdButtons[] = { - {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ - {TBICON_OPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ - {TBICON_SAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_PRINT, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ - {TBICON_PRINTPRE, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ - {TBICON_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ - {TBICON_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ - {TBICON_REDO, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, -}; - -TBBUTTON TextButtons[] = { - {TBICON_BOLD, ID_BOLD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* bold */ - {TBICON_ITALIC, ID_ITALIC, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* italic */ - {TBICON_ULINE, ID_ULINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* underline */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_TXTLEFT, ID_TXTLEFT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* left justified */ - {TBICON_TXTCENTER,ID_TXTCENTER,TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* centered */ - {TBICON_TXTRIGHT, ID_TXTRIGHT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* right justified */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ -}; Modified: trunk/reactos/base/applications/imagesoft/imageprop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imageprop.c (original) +++ trunk/reactos/base/applications/imagesoft/imageprop.c Sat Apr 8 03:21:12 2006 @@ -5,9 +5,9 @@ UINT ConvertValue(HWND hDlg, UINT EdBoxChanged, UINT LastUnitSel) { LONG Resolution = GetDlgItemInt(hDlg, IDC_RES_EDIT, NULL, FALSE); - FLOAT Width = GetDlgItemInt(hDlg, IDC_WIDTH_EDIT, NULL, FALSE); - FLOAT Height = GetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, NULL, FALSE); - USHORT CurUnit = SendMessage(hUnitType, CB_GETCURSEL, 0, 0); + FLOAT Width = (FLOAT)GetDlgItemInt(hDlg, IDC_WIDTH_EDIT, NULL, FALSE); + FLOAT Height = (FLOAT)GetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, NULL, FALSE); + USHORT CurUnit = (USHORT)SendMessage(hUnitType, CB_GETCURSEL, 0, 0); /* if the user typed in the resolution box */ if ((EdBoxChanged == IDC_RES_EDIT) && (CurUnit != PIXELS)) Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rbuild (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rbuild Sat Apr 8 03:21:12 2006 @@ -7,7 +7,6 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> - <library>ntdll</library> <library>kernel32</library> <library>gdi32</library> <library>user32</library> Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Sat Apr 8 03:21:12 2006 @@ -2,15 +2,15 @@ #include <commctrl.h> #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS image editor\0" -#define REACTOS_STR_INTERNAL_NAME "imagesoft\0" -#define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS image editor\0" +#define REACTOS_STR_INTERNAL_NAME "imagesoft\0" +#define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe\0" #include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 24 DISCARDABLE "manifest.xml" - + STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ImageSoft" Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Sat Apr 8 03:21:12 2006 @@ -1,11 +1,54 @@ #include <precomp.h> -#include "buttons.h" static const TCHAR szMainWndClass[] = TEXT("ImageSoftWndClass"); #define ID_MDI_FIRSTCHILD 50000 #define ID_MDI_WINDOWMENU 5 #define NUM_FLT_WND 3 + +/* toolbar buttons */ +TBBUTTON StdButtons[] = { +/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ + {TBICON_OPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ + {TBICON_SAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_PRINT, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ + {TBICON_PRINTPRE, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ + {TBICON_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ + {TBICON_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ + {TBICON_REDO, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, +}; + +TBBUTTON TextButtons[] = { + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_BOLD, ID_BOLD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* bold */ + {TBICON_ITALIC, ID_ITALIC, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* italic */ + {TBICON_ULINE, ID_ULINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* underline */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_TXTLEFT, ID_TXTLEFT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* left justified */ + {TBICON_TXTCENTER,ID_TXTCENTER,TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* centered */ + {TBICON_TXTRIGHT, ID_TXTRIGHT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* right justified */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ +}; + + /* menu hints */ static const MENU_HINT MainMenuHintTable[] = { @@ -111,7 +154,7 @@ { const TBBUTTON *Buttons = NULL; UINT NumButtons = 0; - UINT StartImageRes; + UINT StartImageRes = 0; HWND hWndClient = NULL; UNREFERENCED_PARAMETER(Context); @@ -207,6 +250,40 @@ } } + switch (Dockbar->BarId) + { + case ID_TOOLBAR_TEXT: + { + HWND hWndCombo; + + /* drop combo box into container window */ + hWndCombo = CreateWindowEx(0, + WC_COMBOBOX, + NULL, + WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 0, 0, 120, 25, + hParent, + NULL, + hInstance, + NULL); + if (hWndCombo != NULL) + { + SetParent(hWndCombo, + hWndClient); + + if (!ToolbarInsertSpaceForControl(hWndClient, + hWndCombo, + 0, + ID_TXTFONTNAME, + TRUE)) + { + DestroyWindow(hWndCombo); + } + } + break; + } + } + if (hWndClient != NULL) { *hwnd = hWndClient; @@ -275,6 +352,15 @@ } } return TRUE; +} + +static VOID +TbCustomControlChange(HWND hWndToolbar, + HWND hWndControl, + BOOL Vert) +{ + /* the toolbar changed from horizontal to vertical or vice versa... */ + return; } static VOID CALLBACK @@ -317,6 +403,9 @@ 0, (LPARAM)dwStyle); + ToolbarUpdateControlSpaces(rbi->hwndChild, + TbCustomControlChange); + if (SendMessage(rbi->hwndChild, TB_GETMAXSIZE, 0, @@ -630,6 +719,7 @@ InitMainWnd(PMAIN_WND_INFO Info) { CLIENTCREATESTRUCT ccs; + INT statwidths[] = {110, -1}; /* FIXME - create controls and initialize the application */ @@ -646,6 +736,12 @@ (HMENU)IDC_STATUSBAR, hInstance, NULL); + + if (Info->hStatus != NULL) + SendMessage(Info->hStatus, + SB_SETPARTS, + sizeof(statwidths)/sizeof(int), + (LPARAM)statwidths); /* create the MDI client window */ ccs.hWindowMenu = GetSubMenu(GetMenu(Info->hSelf), @@ -921,11 +1017,33 @@ case WM_NOTIFY: { + UINT BarId; + LPNMHDR pnmhdr = (LPNMHDR)lParam; if (!TbdHandleNotifications(&Info->ToolDocks, - (LPNMHDR)lParam, + pnmhdr, &Ret)) { - /* FIXME - handle other notifications */ + if (TbdDockBarIdFromClientWindow(&Info->ToolDocks, + pnmhdr->hwndFrom, + &BarId)) + { + switch (BarId) + { + case ID_TOOLBAR_TEXT: + switch (pnmhdr->code) + { + case TBN_DELETINGBUTTON: + { + LPNMTOOLBAR lpnmtb = (LPNMTOOLBAR)lParam; + + ToolbarDeleteControlSpace(pnmhdr->hwndFrom, + &lpnmtb->tbButton); + break; + } + } + break; + } + } } break; } Modified: trunk/reactos/base/applications/imagesoft/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/misc.c (original) +++ trunk/reactos/base/applications/imagesoft/misc.c Sat Apr 8 03:21:12 2006 @@ -47,7 +47,7 @@ uID); if (ln++ > 0) { - (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, ln * sizeof(TCHAR)); if ((*lpTarget) != NULL) { @@ -207,3 +207,169 @@ { MessageBox(NULL, _itot(num, NULL, 10), NULL, 0); } + +/* + * Toolbar custom control routines + */ + +typedef struct _TBCUSTCTL +{ + HWND hWndControl; + INT iCommand; + BOOL HideVertical : 1; + BOOL IsVertical : 1; +} TBCUSTCTL, *PTBCUSTCTL; + +BOOL +ToolbarDeleteControlSpace(HWND hWndToolbar, + const TBBUTTON *ptbButton) +{ + if ((ptbButton->fsStyle & TBSTYLE_SEP) && + ptbButton->dwData != 0) + { + PTBCUSTCTL cctl = (PTBCUSTCTL)ptbButton->dwData; + + DestroyWindow(cctl->hWndControl); + + HeapFree(ProcessHeap, + 0, + cctl); + return TRUE; + } + + return FALSE; +} + +VOID +ToolbarUpdateControlSpaces(HWND hWndToolbar, + ToolbarChangeControlCallback ChangeCallback) +{ + BOOL Vert; + DWORD nButtons, i; + TBBUTTON tbtn; + + Vert = ((SendMessage(hWndToolbar, + TB_GETSTYLE, + 0, + 0) & CCS_VERT) != 0); + + nButtons = SendMessage(hWndToolbar, + TB_BUTTONCOUNT, + 0, + 0); + + for (i = 0; + i != nButtons; + i++) + { + if (SendMessage(hWndToolbar, + TB_GETBUTTON, + (WPARAM)i, + (LPARAM)&tbtn)) + { + if ((tbtn.fsStyle & TBSTYLE_SEP) && tbtn.dwData != 0) + { + PTBCUSTCTL cctl = (PTBCUSTCTL)tbtn.dwData; + + cctl->IsVertical = Vert; + + if (cctl->HideVertical) + { + ShowWindow(cctl->hWndControl, + (Vert ? SW_HIDE : SW_SHOW)); + goto ShowHideSep; + } + else if (cctl->IsVertical != Vert) + { + ChangeCallback(hWndToolbar, + cctl->hWndControl, + Vert); + +ShowHideSep: + /* show/hide the separator */ + SendMessage(hWndToolbar, + TB_HIDEBUTTON, + (WPARAM)cctl->iCommand, + (LPARAM)Vert && cctl->HideVertical); + } + } + } + } +} + +BOOL +ToolbarInsertSpaceForControl(HWND hWndToolbar, + HWND hWndControl, + INT Index, + INT iCmd, + BOOL HideVertical) +{ + PTBCUSTCTL cctl; + RECT rcControl, rcItem; + + cctl = HeapAlloc(ProcessHeap, + 0, + sizeof(TBCUSTCTL)); + if (cctl == NULL) + return FALSE; + + cctl->HideVertical = HideVertical; + cctl->hWndControl = hWndControl; + cctl->iCommand = iCmd; + + if (GetWindowRect(hWndControl, + &rcControl)) + { + TBBUTTON tbtn = {0}; + + tbtn.iBitmap = rcControl.right - rcControl.left; + tbtn.idCommand = iCmd; + tbtn.fsStyle = TBSTYLE_SEP; + tbtn.dwData = (DWORD_PTR)cctl; + + if (SendMessage(hWndToolbar, + TB_GETSTYLE, + 0, + 0) & CCS_VERT) + { + if (HideVertical) + tbtn.fsState |= TBSTATE_HIDDEN; + + cctl->IsVertical = TRUE; + } + else + cctl->IsVertical = FALSE; + + if (SendMessage(hWndToolbar, + TB_INSERTBUTTON, + (WPARAM)Index, + (LPARAM)&tbtn)) + { + if (SendMessage(hWndToolbar, + TB_GETITEMRECT, + (WPARAM)Index, + (LPARAM)&rcItem)) + { + SetWindowPos(hWndControl, + NULL, + rcItem.left, + rcItem.top, + rcItem.right - rcItem.left, + rcItem.bottom - rcItem.top, + SWP_NOZORDER); + + ShowWindow(hWndControl, + SW_SHOW); + + return TRUE; + } + else if (tbtn.fsState & TBSTATE_HIDDEN) + { + ShowWindow(hWndControl, + SW_HIDE); + } + } + } + + return FALSE; +} Modified: trunk/reactos/base/applications/imagesoft/opensave.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/opensave.c (original) +++ trunk/reactos/base/applications/imagesoft/opensave.c Sat Apr 8 03:21:12 2006 @@ -37,7 +37,7 @@ _T("TAG Image File Format (*tif)\0*.tif\0") \ _T("Portable Network Graphics (*png)\0*.png\0\0");*/ - static TCHAR Filter[] = _T("Windows Bitmap (*bmp)\0*.bmp\0"); + static TCHAR Filter[] = _T("Windows Bitmap (*.bmp)\0*.bmp\0"); ofn.lpstrFilter = Filter; ofn.lpstrFile = szFileName; Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Sat Apr 8 03:21:12 2006 @@ -19,7 +19,10 @@ #ifndef RBN_CHEVRONPUSHED #define RBN_CHEVRONPUSHED (RBN_FIRST - 10) #endif -ULONG DbgPrint(PCH Format,...); + +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif #define MAX_KEY_LENGTH 256 #define NUM_MAINTB_IMAGES 10 @@ -152,8 +155,8 @@ BOOL InitImageEditWindowImpl(VOID); VOID UninitImageEditWindowImpl(VOID); + /* tooldock.c */ - typedef enum { TOP_DOCK = 0, @@ -251,6 +254,9 @@ const DOCKBAR *Dockbar, PVOID Context, const DOCKBAR_ITEM_CALLBACKS *DockbarCallbacks); +BOOL TbdDockBarIdFromClientWindow(PTOOLBAR_DOCKS TbDocks, + HWND hWndClient, + UINT *Id); BOOL TbdHandleNotifications(PTOOLBAR_DOCKS TbDocks, LPNMHDR pnmh, LRESULT *Result); @@ -334,6 +340,21 @@ VOID MessageBoxInt(INT num); +BOOL ToolbarDeleteControlSpace(HWND hWndToolbar, + const TBBUTTON *ptbButton); + +typedef VOID (*ToolbarChangeControlCallback)(HWND hWndToolbar, + HWND hWndControl, + BOOL Vert); +VOID ToolbarUpdateControlSpaces(HWND hWndToolbar, + ToolbarChangeControlCallback ChangeCallback); + +BOOL ToolbarInsertSpaceForControl(HWND hWndToolbar, + HWND hWndControl, + INT Index, + INT iCmd, + BOOL HideVertical); + /* opensave.c */ VOID FileInitialize(HWND hwnd); BOOL DoOpenFile(HWND hwnd, LPTSTR lpFileName, LPTSTR lpName); Modified: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Sat Apr 8 03:21:12 2006 @@ -35,6 +35,7 @@ #define ID_TXTLEFT 2033 #define ID_TXTCENTER 2034 #define ID_TXTRIGHT 2035 +#define ID_TXTFONTNAME 2036 #define ID_REFRESH 3000 #define ID_HELP 3001 Modified: trunk/reactos/base/applications/imagesoft/tooldock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/tooldock.c (original) +++ trunk/reactos/base/applications/imagesoft/tooldock.c Sat Apr 8 03:21:12 2006 @@ -261,6 +261,30 @@ { /* Nothing to do */ } +} + +BOOL +TbdDockBarIdFromClientWindow(PTOOLBAR_DOCKS TbDocks, + HWND hWndClient, + UINT *Id) +{ + PDOCKBAR_ITEM Item; + BOOL Ret = FALSE; + + Item = TbDocks->Items; + while (Item != NULL) + { + if (Item->hWndClient == hWndClient) + { + *Id = Item->DockBar.BarId; + Ret = TRUE; + break; + } + + Item = Item->Next; + } + + return Ret; } BOOL @@ -976,13 +1000,13 @@ BOOL KeepActive = *(BOOL*)wParam; HWND hWndActivate = *(HWND*)lParam; PDOCKBAR_ITEM Item; -DbgPrint("-- 0x%p --\n", hWnd); + Item = TbDocks->Items; while (Item != NULL) { if (Item->hWndTool != NULL && Item->hWndTool == hWndActivate) - {DbgPrint("Activate toolbars (0x%p)\n", hWndActivate); + { KeepActive = TRUE; SynchronizeSiblings = FALSE; break; @@ -1000,7 +1024,7 @@ if (Item->hWndTool != NULL && Item->hWndTool != hWnd && Item->hWndTool != hWndActivate) - {DbgPrint("WM_NCACTIVE %p (wnd %p)\n", KeepActive, Item->hWndTool); + { SendMessage(Item->hWndTool, WM_NCACTIVATE, (WPARAM)KeepActive,

1 0

[greatlrd] 21514: 1. Implement Surface_GetCaps 2. Implement AddAttachedSurface not tested
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Sat Apr 8 02:18:17 2006 New Revision: 21514 URL: http://svn.reactos.ru/svn/reactos?rev=21514&view=rev Log: 1. Implement Surface_GetCaps 2. Implement AddAttachedSurface not tested Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sat Apr 8 02:18:17 2006 @@ -82,7 +82,18 @@ Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach) { - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + + IDirectDrawSurfaceImpl* That = NULL; + if (pAttach==NULL) + { + return DDERR_INVALIDOBJECT; + } + That = (IDirectDrawSurfaceImpl*)pAttach; + + //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) + return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); } /* MSDN: "not currently implemented." */ @@ -176,7 +187,24 @@ HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) { - DX_STUB; + IDirectDrawSurfaceImpl* This; + + if (iface == NULL) + { + return DDERR_INVALIDOBJECT; + } + + if (pCaps == NULL) + { + return DDERR_INVALIDPARAMS; + } + + This = (IDirectDrawSurfaceImpl*)iface; + + RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); + pCaps->dwCaps = This->Surf->mddsdPrimary.ddsCaps.dwCaps; + + return DD_OK; } HRESULT WINAPI

1 0

[gedmurphy] 21513: [AUDIT] Confirmation from Eric Kohl that this is clean. depends.exe was used to get the names of the exported functions Also adding WordPad to the start menu with this commit
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: gedmurphy Date: Sat Apr 8 00:26:44 2006 New Revision: 21513 URL: http://svn.reactos.ru/svn/reactos?rev=21513&view=rev Log: [AUDIT] Confirmation from Eric Kohl that this is clean. depends.exe was used to get the names of the exported functions Also adding WordPad to the start menu with this commit Modified: trunk/reactos/dll/win32/syssetup/COPYING (props changed) trunk/reactos/dll/win32/syssetup/classinst.c (props changed) trunk/reactos/dll/win32/syssetup/dllmain.c (props changed) trunk/reactos/dll/win32/syssetup/globals.h (props changed) trunk/reactos/dll/win32/syssetup/install.c (contents, props changed) trunk/reactos/dll/win32/syssetup/logfile.c (props changed) trunk/reactos/dll/win32/syssetup/resource.h (contents, props changed) trunk/reactos/dll/win32/syssetup/resources/header.bmp (props changed) trunk/reactos/dll/win32/syssetup/resources/watermark.bmp (props changed) trunk/reactos/dll/win32/syssetup/syssetup.def (props changed) trunk/reactos/dll/win32/syssetup/syssetup.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Cz.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_De.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_En.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/syssetup_Es.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc (props changed) trunk/reactos/dll/win32/syssetup/wizard.c (props changed) Propchange: trunk/reactos/dll/win32/syssetup/COPYING ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/classinst.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/globals.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/install.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Sat Apr 8 00:26:44 2006 @@ -427,6 +427,7 @@ CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"), _T("wordpad.exe"), IDS_CMT_WORDPAD); } Propchange: trunk/reactos/dll/win32/syssetup/install.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/logfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/resource… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Sat Apr 8 00:26:44 2006 @@ -54,7 +54,7 @@ #define IDD_PROCESSPAGE 1060 #define IDC_ACTIVITY 1061 -#define IDC_ITEM 1062 +#define IDC_ITEM 1062 #define IDC_PROCESSPROGRESS 1063 #define IDD_FINISHPAGE 1070 @@ -98,15 +98,16 @@ #define IDS_CMT_IBROWSER 3218 #define IDS_CMT_GETFIREFOX 3219 #define IDS_CMT_SERVMAN 3220 +#define IDS_CMT_WORDPAD 3221 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 #define IDS_REGISTERING_COMPONENTS 3302 -#define IDS_LOADLIBRARY_FAILED 3303 -#define IDS_GETPROCADDR_FAILED 3304 +#define IDS_LOADLIBRARY_FAILED 3303 +#define IDS_GETPROCADDR_FAILED 3304 #define IDS_REGSVR_FAILED 3305 -#define IDS_DLLINSTALL_FAILED 3306 -#define IDS_TIMEOUT 3307 +#define IDS_DLLINSTALL_FAILED 3306 +#define IDS_TIMEOUT 3307 #define IDS_REASON_UNKNOWN 3308 #define IDR_GPL 4000 Propchange: trunk/reactos/dll/win32/syssetup/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/resources/header.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/resources/watermark.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Cz.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_De.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/syssetup/syssetup_En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_En.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_En.rc Sat Apr 8 00:26:44 2006 @@ -195,6 +195,7 @@ IDS_CMT_EXPLORER "Launch Explorer" IDS_CMT_NOTEPAD "Launch Text Editor" IDS_CMT_REGEDIT "Launch Registry Editor" + IDS_CMT_WORDPAD "Launch Document Editor" END STRINGTABLE Propchange: trunk/reactos/dll/win32/syssetup/syssetup_En.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Es.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/wizard.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21512: add wordpad to build
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: gedmurphy Date: Fri Apr 7 22:17:47 2006 New Revision: 21512 URL: http://svn.reactos.ru/svn/reactos?rev=21512&view=rev Log: add wordpad to build Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Apr 7 22:17:47 2006 @@ -31,6 +31,7 @@ ; Base files base\applications\cacls\cacls.exe 1 base\applications\calc\calc.exe 1 +base\applications\control\control.exe 1 base\applications\devmgr\devmgrapp.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 @@ -63,7 +64,7 @@ ;base\applications\utils\ps\ps.exe 1 base\applications\winefile\winefile.exe 1 ;base\applications\winver\winver.exe 1 -base\applications\control\control.exe 1 +base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1 base\services\eventlog\eventlog.exe 1

1 0

[greatlrd] 21511: sorry did commit wrong version for Dx dhal blt here is it. can blt a surface (not tested).
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 22:08:45 2006 New Revision: 21511 URL: http://svn.reactos.ru/svn/reactos?rev=21511&view=rev Log: sorry did commit wrong version for Dx dhal blt here is it. can blt a surface (not tested). Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Fri Apr 7 22:08:45 2006 @@ -232,7 +232,11 @@ DDHAL_BLTDATA mDdBlt; IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - //IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; + IDirectDrawSurfaceImpl* That = NULL; + if (src!=NULL) + { + That = (IDirectDrawSurfaceImpl*)src; + } if (This==NULL) { @@ -268,10 +272,13 @@ { memcpy(& mDdBlt.rDest, rSrc, sizeof(DDBLTFX)); } - - - // FIXME setup src surface - mDdBlt.lpDDSrcSurface = NULL; //src-> + + if (src != NULL) + { + mDdBlt.lpDDSrcSurface = That->Surf->mpPrimaryLocals[0]; + } + + //mDdBlt.lpDDSrcSurface = NULL; //src-> mDdBlt.lpDD = &This->owner->mDDrawGlobal; mDdBlt.Blt = This->owner->mCallbacks.HALDDSurface.Blt;

1 0

[greatlrd] 21510: 1. Implement almost full dx hal DdBlt into ddraw we only need adding clipper or not set it to true or false. Then ddraw dx hal blt is complete 2. Split complete each surface getting own memory 3. Remove create for overlay for now the code need be more tested
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 22:03:21 2006 New Revision: 21510 URL: http://svn.reactos.ru/svn/reactos?rev=21510&view=rev Log: 1. Implement almost full dx hal DdBlt into ddraw we only need adding clipper or not set it to true or false. Then ddraw dx hal blt is complete 2. Split complete each surface getting own memory 3. Remove create for overlay for now the code need be more tested Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Fri Apr 7 22:03:21 2006 @@ -13,7 +13,7 @@ HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter) { - UINT i; + //UINT i; IDirectDrawImpl* This = (IDirectDrawImpl*)iface; IDirectDrawSurfaceImpl* That = ppSurf; @@ -28,11 +28,12 @@ mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - memcpy(&This->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + { + + memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; + mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { @@ -44,31 +45,31 @@ return DDERR_NOTINITIALIZED; } - memset(&This->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - memset(&This->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - This->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&This->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - This->mPrimaryLocal.lpGbl = &This->mPrimaryGlobal; - This->mPrimaryLocal.lpSurfMore = &This->mPrimaryMore; - This->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + memset(&That->Surf->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Surf->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->Surf->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + That->Surf->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + That->Surf->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Surf->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); /* FIXME Check the flags if we shall create a primaresurface for overlay or something else Examine windows which flags are being set for we assume this is right unsue I think */ - //This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; - That->Surf->mpPrimaryLocals[0] = &This->mPrimaryLocal; - - mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; + //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; @@ -87,121 +88,122 @@ } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - //memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); - memcpy(&This->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); - This->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - //This->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - //This->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - //This->mddsdOverlay.dwWidth = 100; //pels; - //This->mddsdOverlay.dwHeight = 100; // lines; - //This->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - //This->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - //This->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - //This->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; + ////memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); + //memcpy(&This->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); + //This->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); + ////This->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; + + ////This->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + + ////This->mddsdOverlay.dwWidth = 100; //pels; + ////This->mddsdOverlay.dwHeight = 100; // lines; + ////This->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; + + ////This->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + ////This->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; + ////This->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay; // pDDSD; - - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - memset(&This->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - This->mOverlayGlobal.dwGlobalFlags = 0; - This->mOverlayGlobal.lpDD = &This->mDDrawGlobal; - This->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; - This->mOverlayGlobal.wWidth = (WORD)This->mddsdOverlay.dwWidth; - This->mOverlayGlobal.wHeight = (WORD)This->mddsdOverlay.dwHeight; - This->mOverlayGlobal.lPitch = -1; - This->mOverlayGlobal.ddpfSurface = This->mddsdOverlay.ddpfPixelFormat; - - // setup front- and backbuffer surfaces - UINT cSurfaces = This->mddsdOverlay.dwBackBufferCount + 1; - for (i = 0; i < cSurfaces; i++) - { - memset(&This->mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - This->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&This->mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - This->mOverlayLocal[i].lpGbl = &This->mOverlayGlobal; - This->mOverlayLocal[i].lpSurfMore = &This->mOverlayMore[i]; - This->mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - This->mOverlayLocal[i].dwFlags = (i == 0) ? - (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): - (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); - - This->mOverlayLocal[i].dwFlags |= DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| DDRAWISURF_HASPIXELFORMAT| DDRAWISURF_HASOVERLAYDATA; - - This->mOverlayLocal[i].ddsCaps.dwCaps = This->mddsdOverlay.ddsCaps.dwCaps; - This->mpOverlayLocals[i] = &This->mOverlayLocal[i]; - } - - for (i = 0; i < cSurfaces; i++) - { - UINT j = (i + 1) % cSurfaces; - if (!DdAttachSurface(This->mpOverlayLocals[i], This->mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - return DD_FALSE; - } - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = This->mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; - mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; - mDdUpdateOverlay.lpDDSrcSurface = This->mpOverlayLocals[0];//pDDSurface; - mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - - mDdUpdateOverlay.rDest.top = 0; - mDdUpdateOverlay.rDest.left = 0; - mDdUpdateOverlay.rDest.right = 50; - mDdUpdateOverlay.rDest.bottom = 50; - - mDdUpdateOverlay.rSrc.top = 0; - mDdUpdateOverlay.rSrc.left = 0; - mDdUpdateOverlay.rSrc.right = 50; - mDdUpdateOverlay.rSrc.bottom = 50; + //mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + //mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; + //mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay; // pDDSD; + + + //if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCanCreateSurface.ddRVal != DD_OK) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //memset(&This->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + //This->mOverlayGlobal.dwGlobalFlags = 0; + //This->mOverlayGlobal.lpDD = &This->mDDrawGlobal; + //This->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; + //This->mOverlayGlobal.wWidth = (WORD)This->mddsdOverlay.dwWidth; + //This->mOverlayGlobal.wHeight = (WORD)This->mddsdOverlay.dwHeight; + //This->mOverlayGlobal.lPitch = -1; + //This->mOverlayGlobal.ddpfSurface = This->mddsdOverlay.ddpfPixelFormat; + + //// setup front- and backbuffer surfaces + //UINT cSurfaces = This->mddsdOverlay.dwBackBufferCount + 1; + //for (i = 0; i < cSurfaces; i++) + //{ + // memset(&This->mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + // This->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + // memset(&This->mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + // This->mOverlayLocal[i].lpGbl = &This->mOverlayGlobal; + // This->mOverlayLocal[i].lpSurfMore = &This->mOverlayMore[i]; + // This->mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); + // This->mOverlayLocal[i].dwFlags = (i == 0) ? + // (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): + // (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); + + // This->mOverlayLocal[i].dwFlags |= DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| DDRAWISURF_HASPIXELFORMAT| DDRAWISURF_HASOVERLAYDATA; + + // This->mOverlayLocal[i].ddsCaps.dwCaps = This->mddsdOverlay.ddsCaps.dwCaps; + // This->mpOverlayLocals[i] = &This->mOverlayLocal[i]; + //} + + //for (i = 0; i < cSurfaces; i++) + //{ + // UINT j = (i + 1) % cSurfaces; + // if (!DdAttachSurface(This->mpOverlayLocals[i], This->mpOverlayLocals[j])) + // { + // // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); + // return DD_FALSE; + // } + //} + + //mDdCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + //mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay;//pDDSD; + //mDdCreateSurface.lplpSList = This->mpOverlayLocals; //cSurfaces; + //mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + //if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCreateSurface.ddRVal != DD_OK) + //{ + // return mDdCreateSurface.ddRVal; + //} + + //DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + //mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; + //mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; + //mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; + //mDdUpdateOverlay.lpDDSrcSurface = This->mpOverlayLocals[0];//pDDSurface; + //mDdUpdateOverlay.dwFlags = DDOVER_SHOW; + + //mDdUpdateOverlay.rDest.top = 0; + //mDdUpdateOverlay.rDest.left = 0; + //mDdUpdateOverlay.rDest.right = 50; + //mDdUpdateOverlay.rDest.bottom = 50; + + //mDdUpdateOverlay.rSrc.top = 0; + //mDdUpdateOverlay.rSrc.left = 0; + //mDdUpdateOverlay.rSrc.right = 50; + //mDdUpdateOverlay.rSrc.bottom = 50; - if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - return mDdUpdateOverlay.ddRVal; - } - - return DD_OK; + //if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdUpdateOverlay.ddRVal != DD_OK) + //{ + // return mDdUpdateOverlay.ddRVal; + //} + + //return DD_OK; + return DDERR_INVALIDSURFACETYPE; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) @@ -277,7 +279,7 @@ mDdBlt.dwFlags = dwFlags; - This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + // This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; // FIXME dectect if it clipped or not mDdBlt.IsClipped = FALSE; Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Fri Apr 7 22:03:21 2006 @@ -46,21 +46,7 @@ UINT mcTextures; DDSURFACEDESC *mpTextures; - /* Surface */ - DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; - DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; - DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; - //DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; - DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; - DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - //DDRAWI_DDRAWCLIPPER_INT mPrimaryClipperInterface; - DDSURFACEDESC mddsdPrimary; - DDSURFACEDESC mddsdOverlay; - - DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; - DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; - DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; - DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; + /* ExclusiveOwner */ @@ -77,8 +63,16 @@ /******** Surface Object ********/ typedef struct -{ +{ + DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; + DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; + + DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; + DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; + + DDSURFACEDESC mddsdPrimary; } DxSurf; typedef struct

1 0

[tretiakov] 21509: Update svn:ignore. config.xml -> config.rbuild
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 20:20:18 2006 New Revision: 21509 URL: http://svn.reactos.ru/svn/reactos?rev=21509&view=rev Log: Update svn:ignore. config.xml -> config.rbuild Modified: trunk/reactos/ (props changed) Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Apr 7 20:20:18 2006 @@ -23,7 +23,7 @@ *.patch *.diff makefile.auto -config.xml +config.rbuild obj-* output-* doxy-doc

1 0

[greatlrd] 21508: first part to change the arch of Surface time move surface into it own struct. so we can easy create a new one. no surface should be store global in ddraw.dll
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 20:16:34 2006 New Revision: 21508 URL: http://svn.reactos.ru/svn/reactos?rev=21508&view=rev Log: first part to change the arch of Surface time move surface into it own struct. so we can easy create a new one. no surface should be store global in ddraw.dll Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Fri Apr 7 20:16:34 2006 @@ -11,10 +11,11 @@ #include "rosdraw.h" -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter) { UINT i; IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* That = ppSurf; DDHAL_CREATESURFACEDATA mDdCreateSurface; DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; @@ -65,10 +66,10 @@ */ //This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; - This->mpPrimaryLocals[0] = &This->mPrimaryLocal; + That->Surf->mpPrimaryLocals[0] = &This->mPrimaryLocal; mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; - mDdCreateSurface.lplpSList = This->mpPrimaryLocals; + mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) @@ -176,7 +177,7 @@ DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->mpPrimaryLocals[0]; + mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; mDdUpdateOverlay.lpDDSrcSurface = This->mpOverlayLocals[0];//pDDSurface; mDdUpdateOverlay.dwFlags = DDOVER_SHOW; @@ -227,17 +228,23 @@ LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { DDHAL_BLTDATA mDdBlt; - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + //IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; + if (This==NULL) + { + return DD_FALSE; + } + if (!(This->owner->mDDrawGlobal.lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT)) { return DDERR_NODRIVERSUPPORT; } - mDdBlt.lpDDDestSurface = This->owner->mpPrimaryLocals[0]; - - if (!DdResetVisrgn(This->owner->mpPrimaryLocals[0], NULL)) + mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->Surf->mpPrimaryLocals[0], NULL)) { return DDERR_NOGDI; } @@ -266,11 +273,11 @@ mDdBlt.lpDD = &This->owner->mDDrawGlobal; mDdBlt.Blt = This->owner->mCallbacks.HALDDSurface.Blt; - mDdBlt.lpDDDestSurface = This->owner->mpPrimaryLocals[0]; + mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; mDdBlt.dwFlags = dwFlags; - This->owner->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; // FIXME dectect if it clipped or not mDdBlt.IsClipped = FALSE; Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Fri Apr 7 20:16:34 2006 @@ -232,6 +232,7 @@ LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { HRESULT ret; + DxSurf *surf; if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; @@ -252,10 +253,21 @@ } ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); + surf = (DxSurf*)HeapAlloc(GetProcessHeap(), 0, sizeof(DxSurf)); + + if (surf == NULL) + { + // FIXME Free memmory at exit + return E_OUTOFMEMORY; + } + + + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; + // FIXME free This->mDDrawGlobal.dsList on release This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDRAWI_DDRAWSURFACE_INT)); That->owner = (IDirectDrawImpl *)This; @@ -264,19 +276,19 @@ /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ That->owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; - - + + That->Surf = surf; if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) { - ret = Hal_DirectDraw_CreateSurface (iface, pDDSD, ppSurf, pUnkOuter); + ret = Hal_DirectDraw_CreateSurface (iface, pDDSD, That, pUnkOuter); } else { ret = Hel_DirectDraw_CreateSurface (iface, pDDSD, ppSurf, pUnkOuter); } - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)&This->mPrimaryLocal; + //This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)&This->mPrimaryLocal; // the real surface object creation Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Fri Apr 7 20:16:34 2006 @@ -50,7 +50,7 @@ DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; - DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; + //DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; //DDRAWI_DDRAWCLIPPER_INT mPrimaryClipperInterface; @@ -76,6 +76,10 @@ } IDirectDrawImpl; /******** Surface Object ********/ +typedef struct +{ + DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; +} DxSurf; typedef struct { @@ -90,7 +94,13 @@ DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; DDSURFACEDESC ddsd; + DxSurf *Surf; + } IDirectDrawSurfaceImpl; + + + + /******** Clipper Object ********/ @@ -142,7 +152,7 @@ HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); +HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter); HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 );

1 0

[tretiakov] 21507: [AUDIT] \trunk\reactos\drivers\bus\serenum (Unlocked) Herve Poussineau (the author) said parts he wrote are clean. There were no actual code from other contributors (only warning fixes etc.)
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 19:34:51 2006 New Revision: 21507 URL: http://svn.reactos.ru/svn/reactos?rev=21507&view=rev Log: [AUDIT] \trunk\reactos\drivers\bus\serenum (Unlocked) Herve Poussineau (the author) said parts he wrote are clean. There were no actual code from other contributors (only warning fixes etc.) Modified: trunk/reactos/drivers/bus/serenum/detect.c (props changed) trunk/reactos/drivers/bus/serenum/fdo.c (props changed) trunk/reactos/drivers/bus/serenum/misc.c (props changed) trunk/reactos/drivers/bus/serenum/pdo.c (props changed) trunk/reactos/drivers/bus/serenum/serenum.c (props changed) trunk/reactos/drivers/bus/serenum/serenum.h (props changed) trunk/reactos/drivers/bus/serenum/serenum.rc (props changed) Propchange: trunk/reactos/drivers/bus/serenum/detect.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/fdo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/pdo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/serenum.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/serenum.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/serenum.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
33
Older →

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 April 2006