mirror of
https://github.com/reactos/reactos.git
synced 2024-07-12 07:35:10 +00:00
Fixing smaller bugs in startup.c it does not set windows handler or use windows handler hdc it create own hdc
svn path=/trunk/; revision=27191
This commit is contained in:
parent
33ce8924d2
commit
7ac1277f52
|
@ -172,8 +172,9 @@ StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* Windows handler are by set of SetCooperLevel
|
||||||
DX_STUB_str("here\n");
|
* so do not set it
|
||||||
|
*/
|
||||||
|
|
||||||
if (reenable == FALSE)
|
if (reenable == FALSE)
|
||||||
{
|
{
|
||||||
|
@ -183,8 +184,8 @@ StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable)
|
||||||
devicetypes= 1;
|
devicetypes= 1;
|
||||||
|
|
||||||
/* Create HDC for default, hal and hel driver */
|
/* Create HDC for default, hal and hel driver */
|
||||||
This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow();
|
// This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow();
|
||||||
This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd);
|
This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL);
|
||||||
|
|
||||||
/* cObsolete is undoc in msdn it being use in CreateDCA */
|
/* cObsolete is undoc in msdn it being use in CreateDCA */
|
||||||
RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7);
|
RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7);
|
||||||
|
@ -197,8 +198,8 @@ StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable)
|
||||||
{
|
{
|
||||||
devicetypes = 2;
|
devicetypes = 2;
|
||||||
/* Create HDC for default, hal driver */
|
/* Create HDC for default, hal driver */
|
||||||
This->lpLcl->hWnd =(ULONG_PTR) GetActiveWindow();
|
// This->lpLcl->hWnd =(ULONG_PTR) GetActiveWindow();
|
||||||
This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd);
|
This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL);
|
||||||
|
|
||||||
/* cObsolete is undoc in msdn it being use in CreateDCA */
|
/* cObsolete is undoc in msdn it being use in CreateDCA */
|
||||||
RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7);
|
RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7);
|
||||||
|
@ -210,8 +211,8 @@ StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable)
|
||||||
devicetypes = 3;
|
devicetypes = 3;
|
||||||
|
|
||||||
/* Create HDC for default, hal and hel driver */
|
/* Create HDC for default, hal and hel driver */
|
||||||
This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow();
|
//This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow();
|
||||||
This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd);
|
This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL);
|
||||||
|
|
||||||
/* cObsolete is undoc in msdn it being use in CreateDCA */
|
/* cObsolete is undoc in msdn it being use in CreateDCA */
|
||||||
RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7);
|
RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7);
|
||||||
|
@ -225,15 +226,17 @@ StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable)
|
||||||
* the register. we do not support that yet
|
* the register. we do not support that yet
|
||||||
*/
|
*/
|
||||||
devicetypes = 4;
|
devicetypes = 4;
|
||||||
This->lpLcl->hDC = (ULONG_PTR) NULL ;
|
//This->lpLcl->hDC = (ULONG_PTR) NULL ;
|
||||||
This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow();
|
//This->lpLcl->hDC = (ULONG_PTR)CreateDCA("DISPLAY",NULL,NULL,NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
if ( (HDC)This->lpLcl->hDC == NULL)
|
if ( (HDC)This->lpLcl->hDC == NULL)
|
||||||
{
|
{
|
||||||
DX_STUB_str("DDERR_OUTOFMEMORY\n");
|
DX_STUB_str("DDERR_OUTOFMEMORY\n");
|
||||||
return DDERR_OUTOFMEMORY ;
|
return DDERR_OUTOFMEMORY ;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
This->lpLcl->lpDDCB = ddgbl.lpDDCBtmp;
|
This->lpLcl->lpDDCB = ddgbl.lpDDCBtmp;
|
||||||
|
@ -585,6 +588,11 @@ StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable)
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mHALInfo.dwFlags & DDHALINFO_GETDRIVERINFO2)
|
||||||
|
{
|
||||||
|
This->lpLcl->lpGbl->dwFlags = This->lpLcl->lpGbl->dwFlags | DDRAWI_DRIVERINFO2;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return DD_OK;
|
return DD_OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue