diff options
| -rw-r--r-- | patches/xwin/ERROR.patch | 11 | ||||
| -rw-r--r-- | patches/xwin/TEXT.patch | 11 | ||||
| -rw-r--r-- | patches/xwin/dxguid.patch | 20 | ||||
| -rw-r--r-- | patches/xwin/propertystore.patch | 11 | ||||
| -rw-r--r-- | patches/xwin/winconfig.patch | 13 |
5 files changed, 66 insertions, 0 deletions
diff --git a/patches/xwin/ERROR.patch b/patches/xwin/ERROR.patch index 07fd3325..7352bb9e 100644 --- a/patches/xwin/ERROR.patch +++ b/patches/xwin/ERROR.patch @@ -26,3 +26,14 @@ ErrorF("winReshapeRootless - CombineRgn() failed\n"); } +--- xorg-server-1.20.1.orig/hw/xwin/winmultiwindowshape.c 2018-08-07 18:31:04.000000000 +0200 ++++ xorg-server-1.20.1/hw/xwin/winmultiwindowshape.c 2018-08-25 17:23:10.018564229 +0200 +@@ -180,7 +180,7 @@ + } + + /* Merge the Windows region with the accumulated region */ +- if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) { ++ if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == 0) { + ErrorF("winReshape - CombineRgn () failed: %d\n", + (int) GetLastError()); + } diff --git a/patches/xwin/TEXT.patch b/patches/xwin/TEXT.patch new file mode 100644 index 00000000..d9d81a3e --- /dev/null +++ b/patches/xwin/TEXT.patch @@ -0,0 +1,11 @@ +--- xorg-server-1.20.1.orig/hw/xwin/winwndproc.c 2018-08-07 18:31:04.000000000 +0200 ++++ xorg-server-1.20.1/hw/xwin/winwndproc.c 2018-08-26 03:03:49.505186369 +0200 +@@ -120,7 +120,7 @@ + s_pScreenInfo = s_pScreenPriv->pScreenInfo; + s_pScreen = s_pScreenInfo->pScreen; + s_hwndLastPrivates = hwnd; +- s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); ++ s_uTaskbarRestart = RegisterWindowMessage("TaskbarCreated"); + SetProp(hwnd, WIN_SCR_PROP, s_pScreenPriv); + + /* Setup tray icon */ diff --git a/patches/xwin/dxguid.patch b/patches/xwin/dxguid.patch new file mode 100644 index 00000000..5a5be9af --- /dev/null +++ b/patches/xwin/dxguid.patch @@ -0,0 +1,20 @@ +--- xorg-server-1.20.1.orig/hw/xwin/Makefile.in 2018-08-07 18:31:19.000000000 +0200 ++++ xorg-server-1.20.1/hw/xwin/Makefile.in 2018-08-26 01:51:22.672410381 +0200 +@@ -160,7 +160,7 @@ + winshadgdi.$(OBJEXT) wintaskbar.$(OBJEXT) \ + wintrayicon.$(OBJEXT) winvalargs.$(OBJEXT) winwakeup.$(OBJEXT) \ + winwindow.$(OBJEXT) winwndproc.$(OBJEXT) windisplay.$(OBJEXT) \ +- XWin.$(OBJEXT) miinitext.$(OBJEXT) $(am__objects_1) \ ++ miinitext.$(OBJEXT) $(am__objects_1) \ + $(am__objects_2) $(am__objects_3) $(am__objects_4) + am_XWin_OBJECTS = $(am__objects_5) + XWin_OBJECTS = $(am_XWin_OBJECTS) +@@ -619,7 +619,7 @@ + XWIN_LIBS = @XWIN_LIBS@ $(top_builddir)/pseudoramiX/libPseudoramiX.la \ + $(top_builddir)/Xi/libXistubs.la + XWIN_SERVER_NAME = @XWIN_SERVER_NAME@ +-XWIN_SYS_LIBS = @XWIN_SYS_LIBS@ -ldxguid ++XWIN_SYS_LIBS = @XWIN_SYS_LIBS@ -lkernel32 -luser32 -lgdi32 -ladvapi32 -lshell32 -lw32lib + YACC = @YACC@ + YFLAGS = @YFLAGS@ + abi_ansic = @abi_ansic@ diff --git a/patches/xwin/propertystore.patch b/patches/xwin/propertystore.patch new file mode 100644 index 00000000..38c3281e --- /dev/null +++ b/patches/xwin/propertystore.patch @@ -0,0 +1,11 @@ +--- xorg-server-1.20.1.orig/hw/xwin/propertystore.h 2018-08-07 18:31:04.000000000 +0200 ++++ xorg-server-1.20.1/hw/xwin/propertystore.h 2018-08-26 00:11:27.888563954 +0200 +@@ -26,7 +26,7 @@ + + #include <windows.h> + +-#ifdef __MINGW64_VERSION_MAJOR ++#if defined(__MINGW64_VERSION_MAJOR) || defined(__midipix__) + /* If we are using headers from mingw-w64 project, it provides the PSDK headers this needs ... */ + #include <propkey.h> + #include <propsys.h> diff --git a/patches/xwin/winconfig.patch b/patches/xwin/winconfig.patch new file mode 100644 index 00000000..4e58a776 --- /dev/null +++ b/patches/xwin/winconfig.patch @@ -0,0 +1,13 @@ +--- xorg-server-1.20.1.orig/hw/xwin/winconfig.c 2018-08-07 18:31:04.000000000 +0200 ++++ xorg-server-1.20.1/hw/xwin/winconfig.c 2018-08-26 16:32:01.065234453 +0200 +@@ -301,8 +301,8 @@ + strcpy(regpath, regtempl); + strcat(regpath, layoutName); + +- if (!RegOpenKey(HKEY_LOCAL_MACHINE, regpath, ®key)) +- RegQueryValueEx(regkey, "Layout Text", 0, NULL, ++ if (!RegOpenKeyA(HKEY_LOCAL_MACHINE, regpath, ®key)) ++ RegQueryValueExA(regkey, "Layout Text", 0, NULL, + layoutFriendlyName, &namesize); + + /* Close registry key */ |