- Wine-Devel - list.winehq.org

[PATCH 1/4] include: Move fundamental ORPC types to separate private header.
by Nikolay Sivov Aug. 14, 2020

Aug. 14, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The point is to make necessary types available to rpcss idls and code, combase and ole32. dlls/ole32/dcom.idl | 151 +-------------------------------- include/Makefile.in | 1 + include/wine/orpc.idl | 189 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 150 deletions(-) create mode 100644 include/wine/orpc.idl diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index c3d090a9cb6..e00aba5834c 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -22,7 +22,7 @@ #pragma makedep proxy #pragma makedep register -import "unknwn.idl"; +#include "wine/orpc.idl" [ threading(both), @@ -30,155 +30,6 @@ import "unknwn.idl"; ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -[ - uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), - pointer_default(unique) -] -interface ObjectRpcBaseTypes -{ - typedef unsigned hyper ID; - typedef ID MID; - typedef ID OXID; - typedef ID OID; - typedef ID SETID; - typedef GUID IPID; - typedef GUID CID; - typedef REFGUID REFIPID; - - const unsigned short COM_MINOR_VERSION_1 = 1; - const unsigned short COM_MINOR_VERSION_2 = 2; - - const unsigned short COM_MAJOR_VERSION = 5; - const unsigned short COM_MINOR_VERSION = 3; - - typedef struct tagCOMVERSION { - unsigned short MajorVersion; - unsigned short MinorVersion; - } COMVERSION; - - const unsigned long ORPCF_NULL = 0; - const unsigned long ORPCF_LOCAL = 1; - const unsigned long ORPCF_RESERVED1 = 2; - const unsigned long ORPCF_RESERVED2 = 4; - const unsigned long ORPCF_RESERVED3 = 8; - const unsigned long ORPCF_RESERVED4 = 16; - - typedef struct tagORPC_EXTENT { - GUID id; - unsigned long size; - [size_is((size+7)&~7)] byte data[]; - } ORPC_EXTENT; - - typedef struct tagORPC_EXTENT_ARRAY { - unsigned long size; - unsigned long reserved; - [size_is((size+1)&~1,), unique] ORPC_EXTENT **extent; - } ORPC_EXTENT_ARRAY; - - typedef struct tagORPCTHIS { - COMVERSION version; - unsigned long flags; - unsigned long reserved1; - CID cid; - [unique] ORPC_EXTENT_ARRAY *extensions; - } ORPCTHIS; - - typedef struct tagORPCTHAT { - unsigned long flags; - [unique] ORPC_EXTENT_ARRAY *extensions; - } ORPCTHAT; - - const unsigned short NCADG_IP_UDP = 0x08; - const unsigned short NCACN_IP_TCP = 0x07; - const unsigned short NCADG_IPX = 0x0E; - const unsigned short NCACN_SPX = 0x0C; - const unsigned short NCACN_NB_NB = 0x12; - const unsigned short NCACN_NB_IPX = 0x0D; - const unsigned short NCACN_DNET_NSP = 0x04; - const unsigned short NCACN_HTTP = 0x1F; - - typedef struct tagSTRINGBINDING { - unsigned short wTowerId; - [string] WCHAR aNetworkAddr[]; - } STRINGBINDING; - - const unsigned short COM_C_AUTHZ_NONE = 0xffff; - - typedef struct tagSECURITYBINDING { - unsigned short wAuthnSvc; - unsigned short wAuthzSvc; - [string] WCHAR aPrincName[]; - } SECURITYBINDING; - - typedef struct tagDUALSTRINGARRAY { - unsigned short wNumEntries; - unsigned short wSecurityOffset; - [size_is(wNumEntries)] unsigned short aStringArray[]; - } DUALSTRINGARRAY; - - typedef struct tagOXID_INFO { - DWORD dwTid; - DWORD dwPid; - IPID ipidRemUnknown; - DWORD dwAuthnHint; - DUALSTRINGARRAY *psa; - } OXID_INFO; - - const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */ - const unsigned long OBJREF_STANDARD = 0x1; - const unsigned long OBJREF_HANDLER = 0x2; - const unsigned long OBJREF_CUSTOM = 0x4; - const unsigned long SORF_OXRES1 = 0x1; - const unsigned long SORF_OXRES2 = 0x20; - const unsigned long SORF_OXRES3 = 0x40; - const unsigned long SORF_OXRES4 = 0x80; - const unsigned long SORF_OXRES5 = 0x100; - const unsigned long SORF_OXRES6 = 0x200; - const unsigned long SORF_OXRES7 = 0x400; - const unsigned long SORF_OXRES8 = 0x800; - const unsigned long SORF_NULL = 0x0; - const unsigned long SORF_NOPING = 0x1000; - - typedef struct tagSTDOBJREF { - unsigned long flags; - unsigned long cPublicRefs; - OXID oxid; - OID oid; - IPID ipid; - } STDOBJREF; - - typedef struct tagOBJREF { - unsigned long signature; - unsigned long flags; - GUID iid; - [switch_is(flags)] union { - [case(OBJREF_STANDARD)] struct OR_STANDARD { - STDOBJREF std; - DUALSTRINGARRAY saResAddr; - } u_standard; - [case(OBJREF_HANDLER)] struct OR_HANDLER { - STDOBJREF std; - CLSID clsid; - DUALSTRINGARRAY saResAddr; - } u_handler; - [case(OBJREF_CUSTOM)] struct OR_CUSTOM { - CLSID clsid; - unsigned long cbExtension; - ULONG size; - [size_is(size), ref] byte *pData; - } u_custom; - } u_objref; - } OBJREF; - - typedef struct tagMInterfacePointer { - ULONG ulCntData; - [size_is(ulCntData)] BYTE abData[]; - } MInterfacePointer; - - typedef [unique] MInterfacePointer *PMInterfacePointer; - -} /* interface ObjectRpcBaseTypes */ - [ object, uuid(00000131-0000-0000-C000-000000000046) diff --git a/include/Makefile.in b/include/Makefile.in index 23a7d736dd5..49b174ed319 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -740,6 +740,7 @@ SOURCES = \ wine/fil_data.idl \ wine/itss.idl \ wine/library.h \ + wine/orpc.idl \ wine/svcctl.idl \ wine/winedxgi.idl \ winerror.h \ diff --git a/include/wine/orpc.idl b/include/wine/orpc.idl new file mode 100644 index 00000000000..c72a43ff2fe --- /dev/null +++ b/include/wine/orpc.idl @@ -0,0 +1,189 @@ +/* + * Copyright 2003 Ove Kåven, TransGaming Technologies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; + +[ + uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), + pointer_default(unique) +] +interface ObjectRpcBaseTypes +{ + typedef unsigned hyper ID; + typedef ID MID; + typedef ID OXID; + typedef ID OID; + typedef ID SETID; + typedef GUID IPID; + typedef GUID CID; + typedef REFGUID REFIPID; + + const unsigned short COM_MINOR_VERSION_1 = 1; + const unsigned short COM_MINOR_VERSION_2 = 2; + + const unsigned short COM_MAJOR_VERSION = 5; + const unsigned short COM_MINOR_VERSION = 3; + + typedef struct tagCOMVERSION + { + unsigned short MajorVersion; + unsigned short MinorVersion; + } COMVERSION; + + const unsigned long ORPCF_NULL = 0; + const unsigned long ORPCF_LOCAL = 1; + const unsigned long ORPCF_RESERVED1 = 2; + const unsigned long ORPCF_RESERVED2 = 4; + const unsigned long ORPCF_RESERVED3 = 8; + const unsigned long ORPCF_RESERVED4 = 16; + + typedef struct tagORPC_EXTENT + { + GUID id; + unsigned long size; + [size_is((size + 7) & ~7)] byte data[]; + } ORPC_EXTENT; + + typedef struct tagORPC_EXTENT_ARRAY + { + unsigned long size; + unsigned long reserved; + [size_is((size + 1) & ~1,), unique] ORPC_EXTENT **extent; + } ORPC_EXTENT_ARRAY; + + typedef struct tagORPCTHIS + { + COMVERSION version; + unsigned long flags; + unsigned long reserved1; + CID cid; + [unique] ORPC_EXTENT_ARRAY *extensions; + } ORPCTHIS; + + typedef struct tagORPCTHAT + { + unsigned long flags; + [unique] ORPC_EXTENT_ARRAY *extensions; + } ORPCTHAT; + + const unsigned short NCADG_IP_UDP = 0x08; + const unsigned short NCACN_IP_TCP = 0x07; + const unsigned short NCADG_IPX = 0x0E; + const unsigned short NCACN_SPX = 0x0C; + const unsigned short NCACN_NB_NB = 0x12; + const unsigned short NCACN_NB_IPX = 0x0D; + const unsigned short NCACN_DNET_NSP = 0x04; + const unsigned short NCACN_HTTP = 0x1F; + + typedef struct tagSTRINGBINDING + { + unsigned short wTowerId; + [string] WCHAR aNetworkAddr[]; + } STRINGBINDING; + + const unsigned short COM_C_AUTHZ_NONE = 0xffff; + + typedef struct tagSECURITYBINDING + { + unsigned short wAuthnSvc; + unsigned short wAuthzSvc; + [string] WCHAR aPrincName[]; + } SECURITYBINDING; + + typedef struct tagDUALSTRINGARRAY + { + unsigned short wNumEntries; + unsigned short wSecurityOffset; + [size_is(wNumEntries)] unsigned short aStringArray[]; + } DUALSTRINGARRAY; + + typedef struct tagOXID_INFO + { + DWORD dwTid; + DWORD dwPid; + IPID ipidRemUnknown; + DWORD dwAuthnHint; + DUALSTRINGARRAY *psa; + } OXID_INFO; + + const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */ + const unsigned long OBJREF_STANDARD = 0x1; + const unsigned long OBJREF_HANDLER = 0x2; + const unsigned long OBJREF_CUSTOM = 0x4; + const unsigned long SORF_OXRES1 = 0x1; + const unsigned long SORF_OXRES2 = 0x20; + const unsigned long SORF_OXRES3 = 0x40; + const unsigned long SORF_OXRES4 = 0x80; + const unsigned long SORF_OXRES5 = 0x100; + const unsigned long SORF_OXRES6 = 0x200; + const unsigned long SORF_OXRES7 = 0x400; + const unsigned long SORF_OXRES8 = 0x800; + const unsigned long SORF_NULL = 0x0; + const unsigned long SORF_NOPING = 0x1000; + + typedef struct tagSTDOBJREF + { + unsigned long flags; + unsigned long cPublicRefs; + OXID oxid; + OID oid; + IPID ipid; + } STDOBJREF; + + typedef struct tagOBJREF + { + unsigned long signature; + unsigned long flags; + GUID iid; + [switch_is(flags)] + union + { + [case(OBJREF_STANDARD)] + struct OR_STANDARD + { + STDOBJREF std; + DUALSTRINGARRAY saResAddr; + } u_standard; + + [case(OBJREF_HANDLER)] + struct OR_HANDLER + { + STDOBJREF std; + CLSID clsid; + DUALSTRINGARRAY saResAddr; + } u_handler; + + [case(OBJREF_CUSTOM)] + struct OR_CUSTOM + { + CLSID clsid; + unsigned long cbExtension; + ULONG size; + [size_is(size), ref] byte *pData; + } u_custom; + } u_objref; + } OBJREF; + + typedef struct tagMInterfacePointer + { + ULONG ulCntData; + [size_is(ulCntData)] BYTE abData[]; + } MInterfacePointer; + + typedef [unique] MInterfacePointer *PMInterfacePointer; +} -- 2.28.0

3 9

[PATCH 2/2] windowscodecs/tests: Add tests for decoding BC1 format.
by Ziqing Hui Aug. 14, 2020

Aug. 14, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 104 +++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)

1 0

[PATCH 8/8] kernelbase: Use PEB ConsoleHandle to check for console connection in AllocConsole.
by Jacek Caban Aug. 14, 2020

Aug. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/kernel_main.c | 1 + dlls/kernelbase/console.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-)

2 1

[PATCH 7/8] kernelbase: Move CONTROL_C_EXIT handler to kernelbase.
by Jacek Caban Aug. 14, 2020

Aug. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 31 ------------------------------- dlls/kernel32/console_private.h | 1 - dlls/kernel32/kernel_main.c | 3 --- dlls/kernelbase/console.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/main.c | 1 + 6 files changed, 21 insertions(+), 35 deletions(-)

2 1

[PATCH 6/8] kernel32: Use PEB console handle in CONSOLE_HandleCtrlC to check console connection.
by Jacek Caban Aug. 14, 2020

Aug. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

2 1

[PATCH 5/8] kernel32: Set PEB ConsoleHandle for bare console.
by Jacek Caban Aug. 14, 2020

Aug. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH 4/8] server: Pass console handle to the child process.
by Jacek Caban Aug. 14, 2020

Aug. 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 1 - server/console.c | 8 ++++++-- server/process.c | 3 ++- server/process.h | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-)

2 1

[PATCH] winapi_test: Update generated.c files, after 8bd4bc47166716762bf03e29e87b9eaaa9cb7b41.
by Serge Gautherie Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/gdi32/tests/generated.c | 10 ++++++ dlls/ntdll/tests/generated.c | 16 +++++++++ dlls/rpcrt4/tests/generated.c | 2 ++ dlls/shell32/tests/generated.c | 6 ++++ dlls/winmm/tests/generated.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 110 insertions(+) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 6b00060..40c2b91 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -468,6 +468,7 @@ static void test_pack_COLOR16(void) /* COLOR16 */ TEST_TYPE_SIZE (COLOR16, 2) TEST_TYPE_ALIGN (COLOR16, 2) + TEST_TYPE_UNSIGNED(COLOR16) } static void test_pack_COLORADJUSTMENT(void) @@ -3014,6 +3015,7 @@ static void test_pack_FXPT16DOT16(void) /* FXPT16DOT16 */ TEST_TYPE_SIZE (FXPT16DOT16, 4) TEST_TYPE_ALIGN (FXPT16DOT16, 4) + TEST_TYPE_SIGNED (FXPT16DOT16) } static void test_pack_FXPT2DOT30(void) @@ -3021,6 +3023,7 @@ static void test_pack_FXPT2DOT30(void) /* FXPT2DOT30 */ TEST_TYPE_SIZE (FXPT2DOT30, 4) TEST_TYPE_ALIGN (FXPT2DOT30, 4) + TEST_TYPE_SIGNED (FXPT2DOT30) } static void test_pack_GCP_RESULTSA(void) @@ -3295,6 +3298,7 @@ static void test_pack_LCSCSTYPE(void) /* LCSCSTYPE */ TEST_TYPE_SIZE (LCSCSTYPE, 4) TEST_TYPE_ALIGN (LCSCSTYPE, 4) + TEST_TYPE_SIGNED (LCSCSTYPE) } static void test_pack_LCSGAMUTMATCH(void) @@ -3302,6 +3306,7 @@ static void test_pack_LCSGAMUTMATCH(void) /* LCSGAMUTMATCH */ TEST_TYPE_SIZE (LCSGAMUTMATCH, 4) TEST_TYPE_ALIGN (LCSGAMUTMATCH, 4) + TEST_TYPE_SIGNED (LCSGAMUTMATCH) } static void test_pack_LINEDDAPROC(void) @@ -6991,6 +6996,7 @@ static void test_pack_COLOR16(void) /* COLOR16 */ TEST_TYPE_SIZE (COLOR16, 2) TEST_TYPE_ALIGN (COLOR16, 2) + TEST_TYPE_UNSIGNED(COLOR16) } static void test_pack_COLORADJUSTMENT(void) @@ -9537,6 +9543,7 @@ static void test_pack_FXPT16DOT16(void) /* FXPT16DOT16 */ TEST_TYPE_SIZE (FXPT16DOT16, 4) TEST_TYPE_ALIGN (FXPT16DOT16, 4) + TEST_TYPE_SIGNED (FXPT16DOT16) } static void test_pack_FXPT2DOT30(void) @@ -9544,6 +9551,7 @@ static void test_pack_FXPT2DOT30(void) /* FXPT2DOT30 */ TEST_TYPE_SIZE (FXPT2DOT30, 4) TEST_TYPE_ALIGN (FXPT2DOT30, 4) + TEST_TYPE_SIGNED (FXPT2DOT30) } static void test_pack_GCP_RESULTSA(void) @@ -9818,6 +9826,7 @@ static void test_pack_LCSCSTYPE(void) /* LCSCSTYPE */ TEST_TYPE_SIZE (LCSCSTYPE, 4) TEST_TYPE_ALIGN (LCSCSTYPE, 4) + TEST_TYPE_SIGNED (LCSCSTYPE) } static void test_pack_LCSGAMUTMATCH(void) @@ -9825,6 +9834,7 @@ static void test_pack_LCSGAMUTMATCH(void) /* LCSGAMUTMATCH */ TEST_TYPE_SIZE (LCSGAMUTMATCH, 4) TEST_TYPE_ALIGN (LCSGAMUTMATCH, 4) + TEST_TYPE_SIGNED (LCSGAMUTMATCH) } static void test_pack_LINEDDAPROC(void) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index bf705a4..d1976e8 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -94,6 +94,7 @@ static void test_pack_DWORD_PTR(void) /* DWORD_PTR */ TEST_TYPE_SIZE (DWORD_PTR, 8) TEST_TYPE_ALIGN (DWORD_PTR, 8) + TEST_TYPE_UNSIGNED(DWORD_PTR) } static void test_pack_HALF_PTR(void) @@ -173,6 +174,7 @@ static void test_pack_SIZE_T(void) /* SIZE_T */ TEST_TYPE_SIZE (SIZE_T, 8) TEST_TYPE_ALIGN (SIZE_T, 8) + TEST_TYPE_UNSIGNED(SIZE_T) } static void test_pack_SSIZE_T(void) @@ -180,6 +182,7 @@ static void test_pack_SSIZE_T(void) /* SSIZE_T */ TEST_TYPE_SIZE (SSIZE_T, 8) TEST_TYPE_ALIGN (SSIZE_T, 8) + TEST_TYPE_SIGNED (SSIZE_T) } static void test_pack_UHALF_PTR(void) @@ -484,6 +487,7 @@ static void test_pack_HRESULT(void) /* HRESULT */ TEST_TYPE_SIZE (HRESULT, 4) TEST_TYPE_ALIGN (HRESULT, 4) + TEST_TYPE_SIGNED (HRESULT) } static void test_pack_IMAGE_ARCHIVE_MEMBER_HEADER(void) @@ -2809,6 +2813,7 @@ static void test_pack_SECURITY_CONTEXT_TRACKING_MODE(void) /* SECURITY_CONTEXT_TRACKING_MODE */ TEST_TYPE_SIZE (SECURITY_CONTEXT_TRACKING_MODE, 1) TEST_TYPE_ALIGN (SECURITY_CONTEXT_TRACKING_MODE, 1) + TEST_TYPE_UNSIGNED(SECURITY_CONTEXT_TRACKING_MODE) } static void test_pack_SECURITY_DESCRIPTOR(void) @@ -3228,6 +3233,7 @@ static void test_pack_LPARAM(void) /* LPARAM */ TEST_TYPE_SIZE (LPARAM, 8) TEST_TYPE_ALIGN (LPARAM, 8) + TEST_TYPE_SIGNED (LPARAM) } static void test_pack_LPCRECT(void) @@ -3296,6 +3302,7 @@ static void test_pack_LRESULT(void) /* LRESULT */ TEST_TYPE_SIZE (LRESULT, 8) TEST_TYPE_ALIGN (LRESULT, 8) + TEST_TYPE_SIGNED (LRESULT) } static void test_pack_POINT(void) @@ -3486,6 +3493,7 @@ static void test_pack_WPARAM(void) /* WPARAM */ TEST_TYPE_SIZE (WPARAM, 8) TEST_TYPE_ALIGN (WPARAM, 8) + TEST_TYPE_UNSIGNED(WPARAM) } #else /* _WIN64 */ @@ -3511,6 +3519,7 @@ static void test_pack_DWORD_PTR(void) /* DWORD_PTR */ TEST_TYPE_SIZE (DWORD_PTR, 4) TEST_TYPE_ALIGN (DWORD_PTR, 4) + TEST_TYPE_UNSIGNED(DWORD_PTR) } static void test_pack_HALF_PTR(void) @@ -3590,6 +3599,7 @@ static void test_pack_SIZE_T(void) /* SIZE_T */ TEST_TYPE_SIZE (SIZE_T, 4) TEST_TYPE_ALIGN (SIZE_T, 4) + TEST_TYPE_UNSIGNED(SIZE_T) } static void test_pack_SSIZE_T(void) @@ -3597,6 +3607,7 @@ static void test_pack_SSIZE_T(void) /* SSIZE_T */ TEST_TYPE_SIZE (SSIZE_T, 4) TEST_TYPE_ALIGN (SSIZE_T, 4) + TEST_TYPE_SIGNED (SSIZE_T) } static void test_pack_UHALF_PTR(void) @@ -3901,6 +3912,7 @@ static void test_pack_HRESULT(void) /* HRESULT */ TEST_TYPE_SIZE (HRESULT, 4) TEST_TYPE_ALIGN (HRESULT, 4) + TEST_TYPE_SIGNED (HRESULT) } static void test_pack_IMAGE_ARCHIVE_MEMBER_HEADER(void) @@ -6226,6 +6238,7 @@ static void test_pack_SECURITY_CONTEXT_TRACKING_MODE(void) /* SECURITY_CONTEXT_TRACKING_MODE */ TEST_TYPE_SIZE (SECURITY_CONTEXT_TRACKING_MODE, 1) TEST_TYPE_ALIGN (SECURITY_CONTEXT_TRACKING_MODE, 1) + TEST_TYPE_UNSIGNED(SECURITY_CONTEXT_TRACKING_MODE) } static void test_pack_SECURITY_DESCRIPTOR(void) @@ -6645,6 +6658,7 @@ static void test_pack_LPARAM(void) /* LPARAM */ TEST_TYPE_SIZE (LPARAM, 4) TEST_TYPE_ALIGN (LPARAM, 4) + TEST_TYPE_SIGNED (LPARAM) } static void test_pack_LPCRECT(void) @@ -6713,6 +6727,7 @@ static void test_pack_LRESULT(void) /* LRESULT */ TEST_TYPE_SIZE (LRESULT, 4) TEST_TYPE_ALIGN (LRESULT, 4) + TEST_TYPE_SIGNED (LRESULT) } static void test_pack_POINT(void) @@ -6903,6 +6918,7 @@ static void test_pack_WPARAM(void) /* WPARAM */ TEST_TYPE_SIZE (WPARAM, 4) TEST_TYPE_ALIGN (WPARAM, 4) + TEST_TYPE_UNSIGNED(WPARAM) } #endif /* _WIN64 */ diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index fe8bc4b..3c14326 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -91,6 +91,7 @@ static void test_pack_RPC_STATUS(void) /* RPC_STATUS */ TEST_TYPE_SIZE (RPC_STATUS, 4) TEST_TYPE_ALIGN (RPC_STATUS, 4) + TEST_TYPE_SIGNED (RPC_STATUS) } static void test_pack_PRPC_POLICY(void) @@ -952,6 +953,7 @@ static void test_pack_RPC_STATUS(void) /* RPC_STATUS */ TEST_TYPE_SIZE (RPC_STATUS, 4) TEST_TYPE_ALIGN (RPC_STATUS, 4) + TEST_TYPE_SIGNED (RPC_STATUS) } static void test_pack_PRPC_POLICY(void) diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index 34626c2..86e8e54 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -360,6 +360,7 @@ static void test_pack_OLECHAR(void) /* OLECHAR */ TEST_TYPE_SIZE (OLECHAR, 2) TEST_TYPE_ALIGN (OLECHAR, 2) + TEST_TYPE_UNSIGNED(OLECHAR) } static void test_pack_PROPID(void) @@ -367,6 +368,7 @@ static void test_pack_PROPID(void) /* PROPID */ TEST_TYPE_SIZE (PROPID, 4) TEST_TYPE_ALIGN (PROPID, 4) + TEST_TYPE_UNSIGNED(PROPID) } static void test_pack_RemHBITMAP(void) @@ -451,6 +453,7 @@ static void test_pack_SCODE(void) /* SCODE */ TEST_TYPE_SIZE (SCODE, 4) TEST_TYPE_ALIGN (SCODE, 4) + TEST_TYPE_SIGNED (SCODE) } static void test_pack_UP_BYTE_BLOB(void) @@ -2178,6 +2181,7 @@ static void test_pack_OLECHAR(void) /* OLECHAR */ TEST_TYPE_SIZE (OLECHAR, 2) TEST_TYPE_ALIGN (OLECHAR, 2) + TEST_TYPE_UNSIGNED(OLECHAR) } static void test_pack_PROPID(void) @@ -2185,6 +2189,7 @@ static void test_pack_PROPID(void) /* PROPID */ TEST_TYPE_SIZE (PROPID, 4) TEST_TYPE_ALIGN (PROPID, 4) + TEST_TYPE_UNSIGNED(PROPID) } static void test_pack_RemHBITMAP(void) @@ -2269,6 +2274,7 @@ static void test_pack_SCODE(void) /* SCODE */ TEST_TYPE_SIZE (SCODE, 4) TEST_TYPE_ALIGN (SCODE, 4) + TEST_TYPE_SIGNED (SCODE) } static void test_pack_UP_BYTE_BLOB(void) diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ccc0d20..ae183af 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -905,6 +905,8 @@ static void test_pack_MIXERCONTROLDETAILS_UNSIGNED(void) static void test_pack_MMIOINFO(void) { /* MMIOINFO (pack 1) */ + TEST_TYPE_SIZE (MMIOINFO, 100) + TEST_TYPE_ALIGN (MMIOINFO, 1) TEST_FIELD_SIZE (MMIOINFO, dwFlags, 4) TEST_FIELD_ALIGN (MMIOINFO, dwFlags, 1) TEST_FIELD_OFFSET(MMIOINFO, dwFlags, 0) @@ -917,6 +919,42 @@ static void test_pack_MMIOINFO(void) TEST_FIELD_SIZE (MMIOINFO, wErrorRet, 4) TEST_FIELD_ALIGN (MMIOINFO, wErrorRet, 1) TEST_FIELD_OFFSET(MMIOINFO, wErrorRet, 16) + TEST_FIELD_SIZE (MMIOINFO, hTask, 8) + TEST_FIELD_ALIGN (MMIOINFO, hTask, 1) + TEST_FIELD_OFFSET(MMIOINFO, hTask, 20) + TEST_FIELD_SIZE (MMIOINFO, cchBuffer, 4) + TEST_FIELD_ALIGN (MMIOINFO, cchBuffer, 1) + TEST_FIELD_OFFSET(MMIOINFO, cchBuffer, 28) + TEST_FIELD_SIZE (MMIOINFO, pchBuffer, 8) + TEST_FIELD_ALIGN (MMIOINFO, pchBuffer, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchBuffer, 32) + TEST_FIELD_SIZE (MMIOINFO, pchNext, 8) + TEST_FIELD_ALIGN (MMIOINFO, pchNext, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchNext, 40) + TEST_FIELD_SIZE (MMIOINFO, pchEndRead, 8) + TEST_FIELD_ALIGN (MMIOINFO, pchEndRead, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchEndRead, 48) + TEST_FIELD_SIZE (MMIOINFO, pchEndWrite, 8) + TEST_FIELD_ALIGN (MMIOINFO, pchEndWrite, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchEndWrite, 56) + TEST_FIELD_SIZE (MMIOINFO, lBufOffset, 4) + TEST_FIELD_ALIGN (MMIOINFO, lBufOffset, 1) + TEST_FIELD_OFFSET(MMIOINFO, lBufOffset, 64) + TEST_FIELD_SIZE (MMIOINFO, lDiskOffset, 4) + TEST_FIELD_ALIGN (MMIOINFO, lDiskOffset, 1) + TEST_FIELD_OFFSET(MMIOINFO, lDiskOffset, 68) + TEST_FIELD_SIZE (MMIOINFO, adwInfo, 12) + TEST_FIELD_ALIGN (MMIOINFO, adwInfo, 1) + TEST_FIELD_OFFSET(MMIOINFO, adwInfo, 72) + TEST_FIELD_SIZE (MMIOINFO, dwReserved1, 4) + TEST_FIELD_ALIGN (MMIOINFO, dwReserved1, 1) + TEST_FIELD_OFFSET(MMIOINFO, dwReserved1, 84) + TEST_FIELD_SIZE (MMIOINFO, dwReserved2, 4) + TEST_FIELD_ALIGN (MMIOINFO, dwReserved2, 1) + TEST_FIELD_OFFSET(MMIOINFO, dwReserved2, 88) + TEST_FIELD_SIZE (MMIOINFO, hmmio, 8) + TEST_FIELD_ALIGN (MMIOINFO, hmmio, 1) + TEST_FIELD_OFFSET(MMIOINFO, hmmio, 92) } static void test_pack_MMCKINFO(void) @@ -3332,6 +3370,8 @@ static void test_pack_MIXERCONTROLDETAILS_UNSIGNED(void) static void test_pack_MMIOINFO(void) { /* MMIOINFO (pack 1) */ + TEST_TYPE_SIZE (MMIOINFO, 72) + TEST_TYPE_ALIGN (MMIOINFO, 1) TEST_FIELD_SIZE (MMIOINFO, dwFlags, 4) TEST_FIELD_ALIGN (MMIOINFO, dwFlags, 1) TEST_FIELD_OFFSET(MMIOINFO, dwFlags, 0) @@ -3344,6 +3384,42 @@ static void test_pack_MMIOINFO(void) TEST_FIELD_SIZE (MMIOINFO, wErrorRet, 4) TEST_FIELD_ALIGN (MMIOINFO, wErrorRet, 1) TEST_FIELD_OFFSET(MMIOINFO, wErrorRet, 12) + TEST_FIELD_SIZE (MMIOINFO, hTask, 4) + TEST_FIELD_ALIGN (MMIOINFO, hTask, 1) + TEST_FIELD_OFFSET(MMIOINFO, hTask, 16) + TEST_FIELD_SIZE (MMIOINFO, cchBuffer, 4) + TEST_FIELD_ALIGN (MMIOINFO, cchBuffer, 1) + TEST_FIELD_OFFSET(MMIOINFO, cchBuffer, 20) + TEST_FIELD_SIZE (MMIOINFO, pchBuffer, 4) + TEST_FIELD_ALIGN (MMIOINFO, pchBuffer, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchBuffer, 24) + TEST_FIELD_SIZE (MMIOINFO, pchNext, 4) + TEST_FIELD_ALIGN (MMIOINFO, pchNext, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchNext, 28) + TEST_FIELD_SIZE (MMIOINFO, pchEndRead, 4) + TEST_FIELD_ALIGN (MMIOINFO, pchEndRead, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchEndRead, 32) + TEST_FIELD_SIZE (MMIOINFO, pchEndWrite, 4) + TEST_FIELD_ALIGN (MMIOINFO, pchEndWrite, 1) + TEST_FIELD_OFFSET(MMIOINFO, pchEndWrite, 36) + TEST_FIELD_SIZE (MMIOINFO, lBufOffset, 4) + TEST_FIELD_ALIGN (MMIOINFO, lBufOffset, 1) + TEST_FIELD_OFFSET(MMIOINFO, lBufOffset, 40) + TEST_FIELD_SIZE (MMIOINFO, lDiskOffset, 4) + TEST_FIELD_ALIGN (MMIOINFO, lDiskOffset, 1) + TEST_FIELD_OFFSET(MMIOINFO, lDiskOffset, 44) + TEST_FIELD_SIZE (MMIOINFO, adwInfo, 12) + TEST_FIELD_ALIGN (MMIOINFO, adwInfo, 1) + TEST_FIELD_OFFSET(MMIOINFO, adwInfo, 48) + TEST_FIELD_SIZE (MMIOINFO, dwReserved1, 4) + TEST_FIELD_ALIGN (MMIOINFO, dwReserved1, 1) + TEST_FIELD_OFFSET(MMIOINFO, dwReserved1, 60) + TEST_FIELD_SIZE (MMIOINFO, dwReserved2, 4) + TEST_FIELD_ALIGN (MMIOINFO, dwReserved2, 1) + TEST_FIELD_OFFSET(MMIOINFO, dwReserved2, 64) + TEST_FIELD_SIZE (MMIOINFO, hmmio, 4) + TEST_FIELD_ALIGN (MMIOINFO, hmmio, 1) + TEST_FIELD_OFFSET(MMIOINFO, hmmio, 68) } static void test_pack_MMCKINFO(void) -- 2.10.0.windows.1

1 0

[PATCH 2/8] kernel32: Set PEB console handle in AllocConsole.
by Jacek Caban Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-)

2 1

[PATCH 1/8] kernelbase: Close PEB ConsoleHandle in FreeConsole.
by Jacek Caban Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 12 ++++++++++++ dlls/kernelbase/console.c | 3 +++ 2 files changed, 15 insertions(+)

2 1