From 70bc9a4e63907196dbbf05fa55b8bde1f4868bf1 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 14 Oct 2016 23:49:07 +0200 Subject: [PATCH] Rebase against 7ce384c4153112201aa263da6dee15fed21a4e06. --- patches/patchinstall.sh | 2 +- ...nd-dll-with-STAGING_CSMT-definition-.patch | 8 +++---- .../wined3d-CSMT_Main/9999-IfDefined.patch | 4 ++-- .../0001-wuauserv-Add-dummy-service.patch | 22 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index dc07cca4..054e17d8 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "86b5ec3fd1fb8c42f7e79b29647c59cd698aa236" + echo "7ce384c4153112201aa263da6dee15fed21a4e06" } # Show version information diff --git a/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch b/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch index 9d59d079..ab04c88e 100644 --- a/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch +++ b/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch @@ -1,4 +1,4 @@ -From 075a73bb6277b9d3968cdb451cb5ae72573c052d Mon Sep 17 00:00:00 2001 +From 067858d5fc5eedfd513b38cd4ed2c69a1b1d1270 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 14 Dec 2014 20:49:28 +0100 Subject: wined3d: Add second dll with STAGING_CSMT definition set. @@ -12,17 +12,17 @@ Subject: wined3d: Add second dll with STAGING_CSMT definition set. create mode 100644 dlls/wined3d-csmt/version.rc diff --git a/configure.ac b/configure.ac -index cc98f4f..5fc75a7 100644 +index 1ff19c4..bf2414d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3375,6 +3375,7 @@ WINE_CONFIG_DLL(winealsa.drv) +@@ -3424,6 +3424,7 @@ WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) +WINE_CONFIG_DLL(wined3d-csmt) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) - WINE_CONFIG_DLL(winejoystick.drv) + WINE_CONFIG_DLL(winehid.sys) diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in new file mode 100644 index 0000000..bf064ed diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 607a67e8..c3c393e1 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -54,7 +54,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ -@@ -4724,7 +4744,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context +@@ -4727,7 +4747,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context } else { @@ -66,7 +66,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader shader_arb_ps_local_constants(compiled, context, state, rt_height); } -@@ -7984,8 +8008,16 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ +@@ -7987,8 +8011,16 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); diff --git a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch index 75a2ba56..6a9da55f 100644 --- a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch +++ b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch @@ -1,4 +1,4 @@ -From 4aef2c13b8f93320c112fb3646b7cc37d0be2dc4 Mon Sep 17 00:00:00 2001 +From 8d954ec809284c36ac4d8ea4f16b42cb9920b896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 11 Mar 2016 21:44:53 +0100 Subject: wuauserv: Add dummy service. @@ -13,10 +13,10 @@ Subject: wuauserv: Add dummy service. create mode 100644 programs/wuauserv/main.c diff --git a/configure.ac b/configure.ac -index 8d5116c..3bfb84c 100644 +index ba8fd0f..f6ffe87 100644 --- a/configure.ac +++ b/configure.ac -@@ -3564,6 +3564,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[clean,install]) +@@ -3616,6 +3616,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[clean,install]) WINE_CONFIG_PROGRAM(write,,[clean,install]) WINE_CONFIG_PROGRAM(wscript,,[clean,install]) WINE_CONFIG_TEST(programs/wscript/tests) @@ -25,34 +25,34 @@ index 8d5116c..3bfb84c 100644 WINE_CONFIG_PROGRAM(xcopy,,[clean,install]) WINE_CONFIG_TEST(programs/xcopy/tests) diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 4e29026..04f60ff 100644 +index fcf9c4a..5ca83a1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -131,6 +131,7 @@ AddService=LanmanServer,0,LanmanServerService - AddService=FontCache,0,FontCacheService +@@ -132,6 +132,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService + AddService=WineHID,0,WineHIDService +AddService=wuauserv,0,wuauService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService -@@ -146,6 +147,7 @@ AddService=LanmanServer,0,LanmanServerService - AddService=FontCache,0,FontCacheService +@@ -148,6 +149,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService + AddService=WineHID,0,WineHIDService +AddService=wuauserv,0,wuauService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService -@@ -161,6 +163,7 @@ AddService=LanmanServer,0,LanmanServerService - AddService=FontCache,0,FontCacheService +@@ -164,6 +166,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=WineBus,0,WineBusService + AddService=WineHID,0,WineHIDService +AddService=wuauserv,0,wuauService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" -@@ -3279,6 +3282,14 @@ ErrorControl=1 +@@ -3301,6 +3304,14 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"