From 1051d1524c00edf4992f92c58240b9b4f817a3b1 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 22 Apr 2016 18:10:42 +0200 Subject: [PATCH] Rebase against ef36a25aec33670cd2099e4bce379bd6e2ac42a0. --- ...dering-targets-in-video-memory-if-po.patch | 2 +- patches/patchinstall.sh | 29 +------- patches/reg-Implement_Query/definition | 1 + ...x-async-check-in-HTTPREQ_ReadFileEx.patch} | 0 ...nused-sync-argument-from-HTTPREQ_Rea.patch | 70 ------------------- ...ndle-async-mode-in-HTTPREQ_ReadFile.patch} | 0 6 files changed, 5 insertions(+), 97 deletions(-) rename patches/wininet-HTTPREQ_ReadFile_Async/{0002-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch => 0001-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch} (100%) delete mode 100644 patches/wininet-HTTPREQ_ReadFile_Async/0001-wininet-Remove-unused-sync-argument-from-HTTPREQ_Rea.patch rename patches/wininet-HTTPREQ_ReadFile_Async/{0003-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch => 0002-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch} (100%) diff --git a/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch b/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch index 21553d8b..99426cf9 100644 --- a/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch +++ b/patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch @@ -180,7 +180,7 @@ index 77a3d44..ca84719 100644 + if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && + SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_RENDERTARGET, -+ WINED3D_RTYPE_SURFACE, wined3d_desc.format))) ++ WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format))) + { + FIXME("Application wants to create rendering target in system memory, using video memory instead\n"); + wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 86c336dc..2667bddd 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "7c18fe17c76efd7d7a2b2648c48e5990c2ae780a" + echo "ef36a25aec33670cd2099e4bce379bd6e2ac42a0" } # Show version information @@ -264,7 +264,6 @@ patch_enable_all () enable_quartz_MediaSeeking_Positions="$1" enable_quartz_Silence_FIXMEs="$1" enable_rasapi32_RasEnumDevicesA="$1" - enable_reg_Implement_Query="$1" enable_riched20_IText_Interface="$1" enable_rpcrt4_Pipe_Transport="$1" enable_rpcrt4_RpcBindingServerFromClient="$1" @@ -966,9 +965,6 @@ patch_enable () rasapi32-RasEnumDevicesA) enable_rasapi32_RasEnumDevicesA="$2" ;; - reg-Implement_Query) - enable_reg_Implement_Query="$2" - ;; riched20-IText_Interface) enable_riched20_IText_Interface="$2" ;; @@ -5735,23 +5731,6 @@ if test "$enable_rasapi32_RasEnumDevicesA" -eq 1; then ) >> "$patchlist" fi -# Patchset reg-Implement_Query -# | -# | This patchset fixes the following Wine bugs: -# | * [#24017] Implement query operation in reg.exe -# | -# | Modified files: -# | * programs/reg/reg.c -# | -if test "$enable_reg_Implement_Query" -eq 1; then - patch_apply reg-Implement_Query/0001-reg-Query-all-values-and-subkeys-in-a-specified-key.patch - patch_apply reg-Implement_Query/0002-reg-Add-support-for-querying-the-registry-with-the-v.patch - ( - echo '+ { "Hugh McMaster", "reg: Query all values and subkeys in a specified key.", 3 },'; - echo '+ { "Hugh McMaster", "reg: Add support for querying the registry with the /v and /ve switches.", 2 },'; - ) >> "$patchlist" -fi - # Patchset riched20-IText_Interface # | # | Modified files: @@ -7528,11 +7507,9 @@ fi # | * dlls/wininet/http.c # | if test "$enable_wininet_HTTPREQ_ReadFile_Async" -eq 1; then - patch_apply wininet-HTTPREQ_ReadFile_Async/0001-wininet-Remove-unused-sync-argument-from-HTTPREQ_Rea.patch - patch_apply wininet-HTTPREQ_ReadFile_Async/0002-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch - patch_apply wininet-HTTPREQ_ReadFile_Async/0003-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch + patch_apply wininet-HTTPREQ_ReadFile_Async/0001-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch + patch_apply wininet-HTTPREQ_ReadFile_Async/0002-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch ( - echo '+ { "Sebastian Lackner", "wininet: Remove unused '\''sync'\'' argument from HTTPREQ_Read.", 1 },'; echo '+ { "Michael Müller", "wininet: Fix async check in HTTPREQ_ReadFileEx.", 1 },'; echo '+ { "Michael Müller", "wininet: Handle async mode in HTTPREQ_ReadFile.", 1 },'; ) >> "$patchlist" diff --git a/patches/reg-Implement_Query/definition b/patches/reg-Implement_Query/definition index f97cefe0..0af7945e 100644 --- a/patches/reg-Implement_Query/definition +++ b/patches/reg-Implement_Query/definition @@ -1 +1,2 @@ Fixes: [24017] Implement query operation in reg.exe +Disabled: true diff --git a/patches/wininet-HTTPREQ_ReadFile_Async/0002-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch b/patches/wininet-HTTPREQ_ReadFile_Async/0001-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch similarity index 100% rename from patches/wininet-HTTPREQ_ReadFile_Async/0002-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch rename to patches/wininet-HTTPREQ_ReadFile_Async/0001-wininet-Fix-async-check-in-HTTPREQ_ReadFileEx.patch diff --git a/patches/wininet-HTTPREQ_ReadFile_Async/0001-wininet-Remove-unused-sync-argument-from-HTTPREQ_Rea.patch b/patches/wininet-HTTPREQ_ReadFile_Async/0001-wininet-Remove-unused-sync-argument-from-HTTPREQ_Rea.patch deleted file mode 100644 index 79b200aa..00000000 --- a/patches/wininet-HTTPREQ_ReadFile_Async/0001-wininet-Remove-unused-sync-argument-from-HTTPREQ_Rea.patch +++ /dev/null @@ -1,70 +0,0 @@ -From bacfca9bbf82b6105cd377b7872c9d65bf27be57 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 9 Apr 2016 05:01:18 +0200 -Subject: wininet: Remove unused 'sync' argument from HTTPREQ_Read. - ---- - dlls/wininet/http.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c -index 143dc75..bdc659d 100644 ---- a/dlls/wininet/http.c -+++ b/dlls/wininet/http.c -@@ -3036,7 +3036,7 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD - } - - /* read data from the http connection (the read section must be held) */ --static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read, BOOL sync) -+static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read) - { - DWORD current_read = 0, ret_read = 0; - blocking_mode_t blocking_mode; -@@ -3090,7 +3090,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) - DWORD bytes_read, res; - BYTE buf[4096]; - -- res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); -+ res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read); - if(res != ERROR_SUCCESS) { - ret = FALSE; - break; -@@ -3114,7 +3114,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW - if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - -- res = HTTPREQ_Read(req, buffer, size, read, TRUE); -+ res = HTTPREQ_Read(req, buffer, size, read); - if(res == ERROR_SUCCESS) - res = hdr->dwError; - LeaveCriticalSection( &req->read_section ); -@@ -3137,7 +3137,7 @@ static void AsyncReadFileExProc(task_header_t *hdr) - - TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr); - -- res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read, TRUE); -+ res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read); - send_request_complete(req, res == ERROR_SUCCESS, res); - } - -@@ -3161,7 +3161,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO - { - if (get_avail_data(req)) - { -- res = HTTPREQ_Read(req, buf, size, &read, FALSE); -+ res = HTTPREQ_Read(req, buf, size, &read); - LeaveCriticalSection( &req->read_section ); - goto done; - } -@@ -3187,7 +3187,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - - while(1) { -- res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, !(flags & IRF_NO_WAIT)); -+ res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread); - if(res != ERROR_SUCCESS) - break; - --- -2.7.1 - diff --git a/patches/wininet-HTTPREQ_ReadFile_Async/0003-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch b/patches/wininet-HTTPREQ_ReadFile_Async/0002-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch similarity index 100% rename from patches/wininet-HTTPREQ_ReadFile_Async/0003-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch rename to patches/wininet-HTTPREQ_ReadFile_Async/0002-wininet-Handle-async-mode-in-HTTPREQ_ReadFile.patch