wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Alexandre Julliard : msvcr120: Avoid duplicate spec file entry for creal() .
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 7f72332d6cd2a9e091f0cf7aeb0379fa3c84d91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f72332d6cd2a9e091f0cf7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 13:36:53 2018 +0200 msvcr120: Avoid duplicate spec file entry for creal(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 3 +-- dlls/msvcr120/msvcr120.spec | 3 +-- dlls/msvcr120_app/msvcr120_app.spec | 3 +-- dlls/ucrtbase/ucrtbase.spec | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index e7f3c98..0d645e5 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -202,8 +202,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) ucrtbase.creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) ucrtbase.creal +@ cdecl creal(int128) ucrtbase.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c94947c..2725e01 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2103,8 +2103,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) MSVCR120_creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal +@ cdecl creal(int128) MSVCR120_creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f385f6c..22539e1 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1769,8 +1769,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) msvcr120.creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) msvcr120.creal +@ cdecl creal(int128) msvcr120.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 084bea8..422315b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2246,8 +2246,7 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ cdecl -arch=i386 creal(double double) MSVCR120_creal -@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal +@ cdecl creal(int128) MSVCR120_creal @ stub crealf @ stub creall @ stub csin

1 0

Alexandre Julliard : user32: Use height from font metrics for empty text runs in TabbedTextOut().
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 5d282ec64d1ad815586adcd57ff494b524ed1064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d282ec64d1ad815586adcd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 13:20:36 2018 +0200 user32: Use height from font metrics for empty text runs in TabbedTextOut(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39051 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 118dbeb..9601c60 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1385,7 +1385,9 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, } } else x += extent.cx; - + + if (!extent.cy) extent.cy = tm.tmHeight; + if (fDisplayText) { r.top = y; @@ -1398,9 +1400,6 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, lpstr += j; } - if(!extent.cy) - extent.cy = tm.tmHeight; - return MAKELONG(x - start, extent.cy); }

1 0

Zebediah Figura : rpcrt4: Handle absense of RPC flags in call_stubless_func() thunk.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: ccb89fc67ac87eadc514393a1255898fa9b1455b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb89fc67ac87eadc514393a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 5 16:44:08 2018 -0500 rpcrt4: Handle absense of RPC flags in call_stubless_func() thunk. If Oi_HAS_RPCFLAGS is not set, then the stack size is at offset 4, not 8. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 7513b19..71ae560 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -79,7 +79,10 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "movl 8(%ecx),%edx\n\t" /* info->FormatStringOffset */ "movzwl (%edx,%eax,2),%edx\n\t" /* FormatStringOffset[index] */ "addl 4(%ecx),%edx\n\t" /* info->ProcFormatString + offset */ - "movzwl 8(%edx),%eax\n\t" /* arguments size */ + "movzbl 1(%edx),%eax\n\t" /* Oi_flags */ + "andl $0x08,%eax\n\t" /* Oi_HAS_RPCFLAGS */ + "shrl $1,%eax\n\t" + "movzwl 4(%edx,%eax),%eax\n\t" /* arguments size */ "pushl %eax\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "leal 8(%esp),%eax\n\t" /* &This */

1 0

Michael Stefaniuc : gdi32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: fb7a8d92fddbf1291f4d290aa92ce9f96d1b9ed8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb7a8d92fddbf1291f4d290a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 5 21:35:35 2018 +0200 gdi32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 6 +++--- dlls/gdi32/dibdrv/opengl.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 46 +++++++++++++++++++++--------------------- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/enhmfdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 5 ++--- dlls/gdi32/freetype.c | 18 ++++++++--------- dlls/gdi32/gdiobj.c | 6 +++--- 11 files changed, 46 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb7a8d92fddbf1291f4d…

1 0

Michael Stefaniuc : gdi32: Avoid a variable holding an ARRAY_SIZE.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 02b7f00a11efe365a946e2e8c815e31c36139b17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02b7f00a11efe365a946e2e8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 5 21:35:34 2018 +0200 gdi32: Avoid a variable holding an ARRAY_SIZE. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index dba5db0..7c6043c 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -94,7 +94,6 @@ static const struct { OSMESA_RGB_565, 16, 5, 0, 6, 5, 5, 11, 0, 0, 16, 32, 8 }, { OSMESA_RGB_565, 16, 5, 0, 6, 5, 5, 11, 0, 0, 16, 16, 8 }, }; -static const int nb_formats = sizeof(pixel_formats) / sizeof(pixel_formats[0]); static BOOL init_opengl(void) { @@ -148,7 +147,7 @@ failed: */ static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr ) { - int ret = sizeof(pixel_formats) / sizeof(pixel_formats[0]); + int ret = ARRAY_SIZE( pixel_formats ); if (!descr) return ret; if (fmt <= 0 || fmt > ret) return 0; @@ -198,7 +197,7 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc ) if (!(context = HeapAlloc( GetProcessHeap(), 0, sizeof( *context )))) return NULL; context->format = GetPixelFormat( hdc ); - if (!context->format || context->format > nb_formats) context->format = 1; + if (!context->format || context->format > ARRAY_SIZE( pixel_formats )) context->format = 1; if (!(context->context = pOSMesaCreateContextExt( pixel_formats[context->format - 1].mesa, pixel_formats[context->format - 1].depth_bits, @@ -306,7 +305,7 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) */ static BOOL dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr ) { - if (fmt <= 0 || fmt > nb_formats) return FALSE; + if (fmt <= 0 || fmt > ARRAY_SIZE( pixel_formats )) return FALSE; return GdiSetPixelFormat( hdc, fmt, descr ); }

1 0

Alex Henrie : user32: Add stub for SetWindowCompositionAttribute.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 67a33fce6f35f61d763880f42db71a75b511eb0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a33fce6f35f61d763880f4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 8 00:36:21 2018 -0600 user32: Add stub for SetWindowCompositionAttribute. Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44787 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ntuser-private-l1-1-1.spec | 2 +- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec b/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec index 958837b..d75425c 100644 --- a/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec @@ -15,7 +15,7 @@ @ stub RecordShutdownReason @ stdcall RegisterLogonProcess(long long) user32.RegisterLogonProcess @ stub SetThreadInputBlocked -@ stub SetWindowCompositionAttribute +@ stdcall SetWindowCompositionAttribute(ptr ptr) user32.SetWindowCompositionAttribute @ stdcall SetWindowStationUser(long long) user32.SetWindowStationUser @ stub SwitchDesktopWithFade @ stub UnlockWindowStation diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 61e0e4e..a340e02 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -711,6 +711,7 @@ @ stdcall SetUserObjectInformationW(long long ptr long) @ stdcall SetUserObjectSecurity(long ptr ptr) @ stdcall SetWinEventHook(long long long ptr long long long) +@ stdcall SetWindowCompositionAttribute(ptr ptr) @ stdcall SetWindowContextHelpId(long long) @ stdcall SetWindowDisplayAffinity(long long) @ stub SetWindowFullScreenState diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2a55ab4..95f5ac7 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4183,3 +4183,13 @@ BOOL WINAPI SetWindowDisplayAffinity(HWND hwnd, DWORD affinity) SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + +/********************************************************************** + * SetWindowCompositionAttribute (USER32.@) + */ +BOOL WINAPI SetWindowCompositionAttribute(HWND hwnd, void *data) +{ + FIXME("(%p, %p): stub\n", hwnd, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Nikolay Sivov : advapi32: Add a name for WinBuiltinAnyPackageSid.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: afaada7e5f454a428795d9ddc8fc8f53870d9615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afaada7e5f454a428795d9dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 8 08:06:29 2018 +0300 advapi32: Add a name for WinBuiltinAnyPackageSid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 12a446e..d010d4c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -128,7 +128,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, - { {0,0}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, + { {'A','C'}, WinBuiltinAnyPackageSid, { SID_REVISION, 2, { SECURITY_APP_PACKAGE_AUTHORITY }, { SECURITY_APP_PACKAGE_BASE_RID, SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE } } }, }; /* these SIDs must be constructed as relative to some domain - only the RID is well-known */ diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cb89213..344f660 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -310,7 +310,7 @@ static void test_sid(void) { "WD", "S-1-1-0" }, { "CO", "S-1-3-0" }, { "CG", "S-1-3-1" }, - { "OW", "S-1-3-4", 1 }, + { "OW", "S-1-3-4", 1 }, /* Vista+ */ { "NU", "S-1-5-2" }, { "IU", "S-1-5-4" }, { "SU", "S-1-5-6" }, @@ -336,6 +336,7 @@ static void test_sid(void) { "RU", "S-1-5-32-554" }, { "RD", "S-1-5-32-555" }, { "NO", "S-1-5-32-556" }, + { "AC", "S-1-15-2-1", 1 }, /* Win8+ */ { "CA", "", 1 }, { "DA", "", 1 }, { "DC", "", 1 },

1 0

Nikolay Sivov : advapi32: Add WinCreatorOwnerRightsSid to wellknown list.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 7c0cd8c7401230ef8a23c5df58c7db0e9c0cfbbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0cd8c7401230ef8a23c5df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 8 08:06:28 2018 +0300 advapi32: Add WinCreatorOwnerRightsSid to wellknown list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 1 + dlls/advapi32/tests/security.c | 1 + include/winnt.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c03baa7..12a446e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -79,6 +79,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinLocalSid, { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } } }, { {'C','O'}, WinCreatorOwnerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RID } } }, { {'C','G'}, WinCreatorGroupSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_RID } } }, + { {'O','W'}, WinCreatorOwnerRightsSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_RIGHTS_RID } } }, { {0,0}, WinCreatorOwnerServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_SERVER_RID } } }, { {0,0}, WinCreatorGroupServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_SERVER_RID } } }, { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { SECURITY_NULL_RID } } }, diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b9ef802..cb89213 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -310,6 +310,7 @@ static void test_sid(void) { "WD", "S-1-1-0" }, { "CO", "S-1-3-0" }, { "CG", "S-1-3-1" }, + { "OW", "S-1-3-4", 1 }, { "NU", "S-1-5-2" }, { "IU", "S-1-5-4" }, { "SU", "S-1-5-6" }, diff --git a/include/winnt.h b/include/winnt.h index c9248a4..b8a630e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4325,6 +4325,7 @@ typedef struct _SID_AND_ATTRIBUTES { #define SECURITY_CREATOR_GROUP_RID __MSABI_LONG(0x00000001) #define SECURITY_CREATOR_OWNER_SERVER_RID __MSABI_LONG(0x00000002) #define SECURITY_CREATOR_GROUP_SERVER_RID __MSABI_LONG(0x00000003) +#define SECURITY_CREATOR_OWNER_RIGHTS_RID __MSABI_LONG(0x00000004) /* S-1-4 */ #define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4}

1 0

Nikolay Sivov : advapi32/tests: Test return SIDs for wellknown two-character names.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 7f30ad1e47f5a5ce8920efedee04a3d475279966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f30ad1e47f5a5ce8920efed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 8 08:06:27 2018 +0300 advapi32/tests: Test return SIDs for wellknown two-character names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 113 +++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cf96369..b9ef802 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -139,14 +139,6 @@ static HMODULE hmod; static int myARGC; static char** myARGV; -struct strsid_entry -{ - const char *str; - DWORD flags; -}; -#define STRSID_OK 0 -#define STRSID_OPT 1 - #define SID_SLOTS 4 static char debugsid_str[SID_SLOTS][256]; static int debugsid_index = 0; @@ -307,23 +299,59 @@ static void test_sid(void) { { {0x00,0x00,0x00,0x00,0x00,0x02} }, "S-1-2-1" }, { { {0x00,0x00,0x00,0x00,0x00,0x0c} }, "S-1-12-1" }, }; - struct strsid_entry strsid_table[] = { - {"AO", STRSID_OK}, {"RU", STRSID_OK}, {"AN", STRSID_OK}, {"AU", STRSID_OK}, - {"BA", STRSID_OK}, {"BG", STRSID_OK}, {"BO", STRSID_OK}, {"BU", STRSID_OK}, - {"CA", STRSID_OPT}, {"CG", STRSID_OK}, {"CO", STRSID_OK}, {"DA", STRSID_OPT}, - {"DC", STRSID_OPT}, {"DD", STRSID_OPT}, {"DG", STRSID_OPT}, {"DU", STRSID_OPT}, - {"EA", STRSID_OPT}, {"ED", STRSID_OK}, {"WD", STRSID_OK}, {"PA", STRSID_OPT}, - {"IU", STRSID_OK}, {"LA", STRSID_OK}, {"LG", STRSID_OK}, {"LS", STRSID_OK}, - {"SY", STRSID_OK}, {"NU", STRSID_OK}, {"NO", STRSID_OK}, {"NS", STRSID_OK}, - {"PO", STRSID_OK}, {"PS", STRSID_OK}, {"PU", STRSID_OK}, {"RS", STRSID_OPT}, - {"RD", STRSID_OK}, {"RE", STRSID_OK}, {"RC", STRSID_OK}, {"SA", STRSID_OPT}, - {"SO", STRSID_OK}, {"SU", STRSID_OK}}; + static const struct + { + const char *name; + const char *sid; + unsigned int optional; + } + str_to_sid_tests[] = + { + { "WD", "S-1-1-0" }, + { "CO", "S-1-3-0" }, + { "CG", "S-1-3-1" }, + { "NU", "S-1-5-2" }, + { "IU", "S-1-5-4" }, + { "SU", "S-1-5-6" }, + { "AN", "S-1-5-7" }, + { "ED", "S-1-5-9" }, + { "PS", "S-1-5-10" }, + { "AU", "S-1-5-11" }, + { "RC", "S-1-5-12" }, + { "SY", "S-1-5-18" }, + { "LS", "S-1-5-19" }, + { "NS", "S-1-5-20" }, + { "LA", "S-1-5-21-*-*-*-500" }, + { "LG", "S-1-5-21-*-*-*-501" }, + { "BO", "S-1-5-32-551" }, + { "BA", "S-1-5-32-544" }, + { "BU", "S-1-5-32-545" }, + { "BG", "S-1-5-32-546" }, + { "PU", "S-1-5-32-547" }, + { "AO", "S-1-5-32-548" }, + { "SO", "S-1-5-32-549" }, + { "PO", "S-1-5-32-550" }, + { "RE", "S-1-5-32-552" }, + { "RU", "S-1-5-32-554" }, + { "RD", "S-1-5-32-555" }, + { "NO", "S-1-5-32-556" }, + { "CA", "", 1 }, + { "DA", "", 1 }, + { "DC", "", 1 }, + { "DD", "", 1 }, + { "DG", "", 1 }, + { "DU", "", 1 }, + { "EA", "", 1 }, + { "PA", "", 1 }, + { "RS", "", 1 }, + { "SA", "", 1 }, + }; const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; SID *pisid; - BOOL r; + BOOL r, ret; LPSTR str = NULL; if( !pConvertStringSidToSidA ) @@ -403,43 +431,30 @@ static void test_sid(void) LocalFree( psid ); } - /* string constant format not supported before XP */ - r = pConvertStringSidToSidA(strsid_table[0].str, &psid); - if(!r) + for (i = 0; i < ARRAY_SIZE(str_to_sid_tests); i++) { - win_skip("String constant format not supported\n"); - return; - } - LocalFree(psid); - - for(i = 0; i < ARRAY_SIZE(strsid_table); i++) - { - char *temp; - - SetLastError(0xdeadbeef); - r = pConvertStringSidToSidA(strsid_table[i].str, &psid); + char *str; - if (!(strsid_table[i].flags & STRSID_OPT)) + ret = ConvertStringSidToSidA(str_to_sid_tests[i].name, &psid); + if (!ret && str_to_sid_tests[i].optional) { - ok(r, "%s: got %u\n", strsid_table[i].str, GetLastError()); + skip("%u: failed to convert %s.\n", i, str_to_sid_tests[i].name); + continue; } + ok(ret, "%u: failed to convert string to sid.\n", i); - if (r) + if (str_to_sid_tests[i].optional || !strcmp(str_to_sid_tests[i].name, "LA") || + !strcmp(str_to_sid_tests[i].name, "LG")) { - if ((winetest_debug > 1) && (ConvertSidToStringSidA(psid, &temp))) - { - trace(" %s: %s\n", strsid_table[i].str, temp); - LocalFree(temp); - } LocalFree(psid); + continue; } - else - { - if (GetLastError() != ERROR_INVALID_SID) - trace(" %s: couldn't be converted, returned %d\n", strsid_table[i].str, GetLastError()); - else - trace(" %s: couldn't be converted\n", strsid_table[i].str); - } + + ret = ConvertSidToStringSidA(psid, &str); + ok(ret, "%u: failed to convert SID to string.\n", i); + ok(!strcmp(str, str_to_sid_tests[i].sid), "%u: unexpected sid %s.\n", i, str); + LocalFree(psid); + LocalFree(str); } }

1 0

Zebediah Figura : quartz/filtergraph: Don' t prevent the same filter from being used multiple times in IGraphBuilder_Connect ().
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: fb6c88e260ee0c2257efde04b02282e91c0887ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb6c88e260ee0c2257efde04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 7 17:18:29 2018 -0500 quartz/filtergraph: Don't prevent the same filter from being used multiple times in IGraphBuilder_Connect(). This reverts part of 6301fec0ef1ad61c82619e8c8e5a737f7871b035. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 25 ------------------------- dlls/quartz/tests/filtergraph.c | 1 + 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c859564..07d40db 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1091,7 +1091,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, GUID tab[2]; IMoniker* pMoniker; PIN_INFO PinInfo; - CLSID FilterCLSID; PIN_DIRECTION dir; IFilterMapper2 *pFilterMapper2 = NULL; @@ -1184,15 +1183,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IEnumPins_Release(penumpins); } - hr = IPin_QueryPinInfo(ppinIn, &PinInfo); - if (FAILED(hr)) - goto out; - - hr = IBaseFilter_GetClassID(PinInfo.pFilter, &FilterCLSID); - IBaseFilter_Release(PinInfo.pFilter); - if (FAILED(hr)) - goto out; - /* Find the appropriate transform filter than can transform the minor media type of output pin of the upstream * filter to the minor mediatype of input pin of the renderer */ hr = IPin_EnumMediaTypes(ppinOut, &penummt); @@ -1236,7 +1226,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, NULL) == S_OK) { VARIANT var; - GUID clsid; IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; @@ -1254,20 +1243,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IBaseFilter_GetClassID(pfilter, &clsid); - if (FAILED(hr)) - { - IBaseFilter_Release(pfilter); - goto error; - } - - if (IsEqualGUID(&clsid, &FilterCLSID)) { - /* Skip filter (same as the one the output pin belongs to) */ - IBaseFilter_Release(pfilter); - pfilter = NULL; - goto error; - } - if (This->pSite) { IUnknown_QueryInterface(This->pSite, &IID_IAMGraphBuilderCallback, (LPVOID*)&callback); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e64a9fa..897ba3a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1271,6 +1271,7 @@ static ULONG WINAPI testfilter_Release(IBaseFilter *iface) static HRESULT WINAPI testfilter_GetClassID(IBaseFilter *iface, CLSID *clsid) { if (winetest_debug > 1) trace("%p->GetClassID()\n", iface); + memset(clsid, 0xde, sizeof(*clsid)); return S_OK; }

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018