mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wfreerdp-server: multimon working on win7

Browse Source
This commit is contained in:
C-o-r-E 2012-11-01 17:12:05 -04:00
parent 85c111834d
commit dd477a6a18
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/Windows/wf_info.c
View File

@ -359,7 +359,7 @@ void wf_info_getScreenData(wfInfo* wfi, long* width, long* height, BYTE** pBits,
offset = (4 * wfi->invalid.left) + (wfi->invalid.top * wfi->servscreen_width * 4); offset = (4 * wfi->invalid.left) + (wfi->invalid.top * wfi->servscreen_width * 4);
*pBits = ((BYTE*) (changes->Userbuffer)) + offset; *pBits = ((BYTE*) (changes->Userbuffer)) + offset;
*pitch = wfi->servscreen_width * 4; *pitch = wfi->virtscreen_width * 4;
} }
#endif #endif
} }

18
server/Windows/wf_mirage.c
View File

@ -182,20 +182,18 @@ BOOL wf_mirror_driver_update(wfInfo* wfi, int unload)
if (!unload) if (!unload)
{ {
int vscreen_w;
int vscreen_h;
//first let's get the virtual screen dimentions //first let's get the virtual screen dimentions
vscreen_w = GetSystemMetrics(SM_CXVIRTUALSCREEN); wfi->virtscreen_width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
vscreen_h = GetSystemMetrics(SM_CYVIRTUALSCREEN); wfi->virtscreen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
/* /*
* Will have to come back to this for supporting non primary displays and multimonitor setups * Will have to come back to this for supporting non primary displays and multimonitor setups
*/ */
dc = GetDC(NULL); /*dc = GetDC(NULL);
wfi->servscreen_width = GetDeviceCaps(dc, HORZRES); wfi->servscreen_width = GetDeviceCaps(dc, HORZRES);
wfi->servscreen_height = GetDeviceCaps(dc, VERTRES); wfi->servscreen_height = GetDeviceCaps(dc, VERTRES);
wfi->bitsPerPixel = GetDeviceCaps(dc, BITSPIXEL); wfi->bitsPerPixel = GetDeviceCaps(dc, BITSPIXEL);
ReleaseDC(NULL, dc); ReleaseDC(NULL, dc);*/
} }
else else
@ -217,11 +215,11 @@ BOOL wf_mirror_driver_update(wfInfo* wfi, int unload)
deviceMode->dmSize = sizeof(DEVMODE); deviceMode->dmSize = sizeof(DEVMODE);
deviceMode->dmDriverExtra = drvExtraSaved; deviceMode->dmDriverExtra = drvExtraSaved;
deviceMode->dmPelsWidth = wfi->servscreen_width; deviceMode->dmPelsWidth = wfi->virtscreen_width;
deviceMode->dmPelsHeight = wfi->servscreen_height; deviceMode->dmPelsHeight = wfi->virtscreen_height;
deviceMode->dmBitsPerPel = wfi->bitsPerPixel; deviceMode->dmBitsPerPel = wfi->bitsPerPixel;
deviceMode->dmPosition.x = 0; deviceMode->dmPosition.x = wfi->servscreen_xoffset;
deviceMode->dmPosition.y = 0; deviceMode->dmPosition.y = wfi->servscreen_yoffset;
deviceMode->dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_POSITION; deviceMode->dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_POSITION;