This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/bug3 in repository vcxsrv. at 3d8e58c Installers: put -bug3test1 in version string This branch includes the following new commits: new a68b52c Revert "Incorporate winmultiwindow.patch from Oleksandr Shneyder (phoca GmbH)" new 3d8e58c Installers: put -bug3test1 in version string The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/bug3 in repository vcxsrv. commit a68b52cbb133d01cbf860ca731d46ccdc248b56c Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Jun 22 02:20:58 2015 -0400 Revert "Incorporate winmultiwindow.patch from Oleksandr Shneyder (phoca GmbH)" This reverts commit 42ee38cb51a74ccab76faab74a2ed91cdb05b35c. --- xorg-server/hw/xwin/winmultiwindowwindow.c | 49 +--------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c index 02ae7d5..850edc1 100755 --- a/xorg-server/hw/xwin/winmultiwindowwindow.c +++ b/xorg-server/hw/xwin/winmultiwindowwindow.c @@ -107,7 +107,6 @@ winCreateWindowMultiWindow(WindowPtr pWin) winDebug ("winCreateWindowMultiWindow - pWin: %p\n", pWin); #endif - WIN_UNWRAP(CreateWindow); fResult = (*pScreen->CreateWindow) (pWin); WIN_WRAP(CreateWindow, winCreateWindowMultiWindow); @@ -320,7 +319,6 @@ winUnmapWindowMultiWindow(WindowPtr pWin) winDebug ("winUnmapWindowMultiWindow - pWin: %p\n", pWin); #endif - WIN_UNWRAP(UnrealizeWindow); fResult = (*pScreen->UnrealizeWindow) (pWin); WIN_WRAP(UnrealizeWindow, winUnmapWindowMultiWindow); @@ -366,7 +364,6 @@ winMapWindowMultiWindow(WindowPtr pWin) winReshapeMultiWindow(pWin); winUpdateRgnMultiWindow(pWin); - return fResult; } @@ -916,17 +913,11 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd) LONG dX, dY, dW, dH, x, y; DWORD dwStyle, dwExStyle; - int ret; - HMONITOR currentMonitor; - MONITORINFO monitorInfo; - #define WIDTH(rc) (rc.right - rc.left) #define HEIGHT(rc) (rc.bottom - rc.top) winDebug("winAdjustXWindow\n"); - - if (IsIconic(hwnd)) { winDebug("\timmediately return because the window is iconized\n"); /* @@ -950,17 +941,13 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd) dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE); dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE); winDebug("\tWindowStyle: %08x %08x\n", dwStyle, dwExStyle); - AdjustWindowRectEx(&rcDraw, dwStyle, FALSE, dwExStyle); /* The source of adjust */ GetWindowRect(hwnd, &rcWin); - winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n", rcWin.left, rcWin.top, rcWin.right, rcWin.bottom, rcWin.right - rcWin.left, rcWin.bottom - rcWin.top); - - winDebug("\tDraw extend {%d, %d, %d, %d}, {%d, %d}\n", rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom, rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top); @@ -989,43 +976,9 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd) vlist[3] = pDraw->height + dH; winDebug("\tConfigureWindow to (%ld, %ld) - %ldx%ld\n", vlist[0], vlist[1], vlist[2], vlist[3]); - - ret=ConfigureWindow(pWin, CWX | CWY | CWWidth | CWHeight, + return ConfigureWindow(pWin, CWX | CWY | CWWidth | CWHeight, vlist, wClient(pWin)); - - currentMonitor=MonitorFromWindow(hwnd,MONITOR_DEFAULTTONULL); - if(!currentMonitor) - { - return ret; - } - monitorInfo.cbSize=sizeof ( MONITORINFO ); - if(!GetMonitorInfo(currentMonitor, &monitorInfo)) - { - return ret; - } - - - if((rcWin.left <= monitorInfo.rcMonitor.left) && (rcWin.top <= monitorInfo.rcMonitor.top) && - (rcWin.right - rcWin.left > monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left) && - (rcWin.bottom - rcWin.top > monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top)) - { - - SetWindowLongPtr(hwnd, GWL_STYLE, - WS_VISIBLE); - - SetWindowLongPtr(hwnd, GWL_EXSTYLE, - 0); - - SetWindowPos ( hwnd, HWND_TOPMOST, monitorInfo.rcMonitor.left, - monitorInfo.rcMonitor.top, - monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left, - monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top, - 0); - } - - return ret; - #undef WIDTH #undef HEIGHT } -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/bug3 in repository vcxsrv. commit 3d8e58c2f53908bc7bf538887458bdecc0282293 Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Jun 22 02:56:49 2015 -0400 Installers: put -bug3test1 in version string --- xorg-server/installer/vcxsrv-64-debug.nsi | 2 +- xorg-server/installer/vcxsrv-64.nsi | 2 +- xorg-server/installer/vcxsrv-debug.nsi | 2 +- xorg-server/installer/vcxsrv.nsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index aa6cd85..3bc54c5 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -18,7 +18,7 @@ ;-------------------------------- !define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" -!define VERSION "1.17.0.0-2" +!define VERSION "1.17.0.0-2-bug3test1" ; The name of the installer Name "${NAME_STRING}" diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index 6035fd3..6638f69 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -19,7 +19,7 @@ !include "FileFunc.nsh" !define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" -!define VERSION "1.17.0.0-2" +!define VERSION "1.17.0.0-2-bug3test1" !define UNINSTALL_PUBLISHER "X2Go & Arctica Projects" !define UNINSTALL_URL "https://github.com/ArcticaProject/vcxsrv" diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index 725481b..0e956ec 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -18,7 +18,7 @@ ;-------------------------------- !define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" -!define VERSION "1.17.0.0-2" +!define VERSION "1.17.0.0-2-bug3test1" ; The name of the installer Name "${NAME_STRING}" diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index c993211..c1cb85b 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -19,7 +19,7 @@ !include "FileFunc.nsh" !define NAME_STRING "VcXsrv (X2Go/Arctica Builds)" -!define VERSION "1.17.0.0-2" +!define VERSION "1.17.0.0-2-bug3test1" !define UNINSTALL_PUBLISHER "X2Go & Arctica Projects" !define UNINSTALL_URL "https://github.com/ArcticaProject/vcxsrv" -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
-
git-admin＠x2go.org