Added patch to complete and properly pack DNS_HEADER structure (by Amine Khaldi, wine-patched/pull/6).

This commit is contained in:
Sebastian Lackner 2015-02-23 22:24:17 +01:00
parent eaefcc8a3f
commit 8b3e8d11a8
3 changed files with 80 additions and 12 deletions

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low
* Added patch to mark DllCanUnloadNow and DllGetClassObject as private (by Amine Khaldi, wine-patched/pull/3).
* Added patch to skip Wine specific __wine_check_for_events calls in ReactOS (by Amine Khaldi, wine-patched/pull/4).
* Added patch to declare pDirectInputCreateEx in a MSVC compatible way (by Amine Khaldi, wine-patched/pull/5).
* Added patch to complete and properly pack DNS_HEADER structure (by Amine Khaldi, wine-patched/pull/6).
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 23 Feb 2015 18:24:51 +0100
wine-staging (1.7.37) unstable; urgency=low

View File

@ -0,0 +1,51 @@
From de201e9e2b3e42200249f2693ef338e319f00e2c Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Feb 2015 21:43:14 +0100
Subject: include/windns.h: Complete and properly pack DNS_HEADER structure.
---
include/windns.h | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/include/windns.h b/include/windns.h
index b8a3e09..fc2a49c 100644
--- a/include/windns.h
+++ b/include/windns.h
@@ -176,22 +176,26 @@ typedef struct _IP4_ARRAY
IP4_ADDRESS AddrArray[1];
} IP4_ARRAY, *PIP4_ARRAY;
+#include <pshpack1.h>
typedef struct _DNS_HEADER
{
WORD Xid;
- BYTE RecursionDesired;
- BYTE Truncation;
- BYTE Authoritative;
- BYTE Opcode;
- BYTE IsResponse;
- BYTE ResponseCode;
- BYTE Reserved;
- BYTE RecursionAvailable;
+ BYTE RecursionDesired:1;
+ BYTE Truncation:1;
+ BYTE Authoritative:1;
+ BYTE Opcode:4;
+ BYTE IsResponse:1;
+ BYTE ResponseCode:4;
+ BYTE CheckingDisabled:1;
+ BYTE AuthenticatedData:1;
+ BYTE Reserved:1;
+ BYTE RecursionAvailable:1;
WORD QuestionCount;
WORD AnswerCount;
WORD NameServerCount;
WORD AdditionalCount;
} DNS_HEADER, *PDNS_HEADER;
+#include <poppack.h>
typedef struct _DNS_MESSAGE_BUFFER
{
--
2.3.0

View File

@ -97,6 +97,7 @@ patch_enable_all ()
enable_imagehlp_BindImageEx="$1"
enable_imm32_Cross_Thread_Access="$1"
enable_include_Winetest="$1"
enable_include_windns="$1"
enable_iphlpapi_TCP_Table="$1"
enable_kernel32_Console_Handles="$1"
enable_kernel32_GetFinalPathNameByHandle="$1"
@ -324,6 +325,9 @@ patch_enable ()
include-Winetest)
enable_include_Winetest="$2"
;;
include-windns)
enable_include_windns="$2"
;;
iphlpapi-TCP_Table)
enable_iphlpapi_TCP_Table="$2"
;;
@ -1525,6 +1529,18 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-DllRedirects
# |
# | Modified files:
@ -1545,18 +1561,6 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-CSMT_Helper
# |
# | Modified files:
@ -2154,6 +2158,18 @@ if test "$enable_include_Winetest" -eq 1; then
) >> "$patchlist"
fi
# Patchset include-windns
# |
# | Modified files:
# | * include/windns.h
# |
if test "$enable_include_windns" -eq 1; then
patch_apply include-windns/0001-include-windns.h-Complete-and-properly-pack-DNS_HEAD.patch
(
echo '+ { "Amine Khaldi", "include/windns.h: Complete and properly pack DNS_HEADER structure.", 1 },';
) >> "$patchlist"
fi
# Patchset iphlpapi-TCP_Table
# |
# | This patchset fixes the following Wine bugs: