April 2020 - Wine-commits - list.winehq.org

Dmitry Timoshkov : adsldp: Add support for ADS_SEARCHPREF_ATTRIBTYPES_ONLY to IDirectorySearch::SetSearchPreference().
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: f94d6f72b37b81878004d9c1e9365701ca4b2ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94d6f72b37b81878004d9c1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 8 17:41:41 2020 +0800 adsldp: Add support for ADS_SEARCHPREF_ATTRIBTYPES_ONLY to IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e5310a9f4b..03fef55f9f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -402,6 +402,7 @@ typedef struct ADS_SCOPEENUM scope; int pagesize; BOOL cache_results; + BOOL attribtypes_only; } search; } LDAP_namespace; @@ -1242,6 +1243,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S prefs[i].dwStatus = ADS_STATUS_S_OK; break; + case ADS_SEARCHPREF_ATTRIBTYPES_ONLY: + if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) + { + FIXME("ADS_SEARCHPREF_ATTRIBTYPES_ONLY: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("ATTRIBTYPES_ONLY: %d\n", prefs[i].vValue.u.Boolean); + ldap->search.attribtypes_only = prefs[i].vValue.u.Boolean; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1289,7 +1303,7 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props[count] = NULL; } - err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, FALSE, &ldap_ctx->res); + err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, ldap->search.attribtypes_only, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { @@ -1872,6 +1886,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->search.scope = ADS_SCOPE_SUBTREE; ldap->search.pagesize = 0; ldap->search.cache_results = TRUE; + ldap->search.attribtypes_only = FALSE; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0;

1 0

Dmitry Timoshkov : include/winnt.h: Update ACE types list.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 12584f6952e17fe9bbe5e66b0e6c906f0f20e7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12584f6952e17fe9bbe5e66b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 8 11:55:46 2020 +0800 include/winnt.h: Update ACE types list. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 7a5b8aafc1..a948ad001a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5080,7 +5080,10 @@ typedef struct _ACE_HEADER { #define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE 0xf #define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE 0x10 #define SYSTEM_MANDATORY_LABEL_ACE_TYPE 0x11 -#define ACCESS_MAX_MS_V5_ACE_TYPE 0x11 +#define SYSTEM_RESOURCE_ATTRIBUTE_ACE_TYPE 0x12 +#define SYSTEM_SCOPED_POLICY_ID_ACE_TYPE 0x13 +#define SYSTEM_PROCESS_TRUST_LABEL_ACE_TYPE 0x14 +#define ACCESS_MAX_MS_V5_ACE_TYPE 0x14 /* inherit AceFlags */ #define OBJECT_INHERIT_ACE 0x01

1 0

Dmitry Timoshkov : advapi32: Properly skip not supported parts of the object ACE.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 4ccb06435514a3d52fbe5d59209594c910d0f97d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccb06435514a3d52fbe5d59… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 8 11:55:50 2020 +0800 advapi32: Properly skip not supported parts of the object ACE. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 700ee7d8ea..4bea26d155 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3518,20 +3518,40 @@ static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) DumpString(AceRightBitNames[i], -1, pwptr, plen); } +static inline BOOL is_object_ace(BYTE AceType) +{ + switch (AceType) + { + case ACCESS_ALLOWED_OBJECT_ACE_TYPE: + case ACCESS_DENIED_OBJECT_ACE_TYPE: + case ACCESS_AUDIT_OBJECT_ACE_TYPE: + case ACCESS_ALARM_OBJECT_ACE_TYPE: + case ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE: + case ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE: + case SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE: + case SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE: + return TRUE; + + default: return FALSE; + } +} + static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) { ACCESS_ALLOWED_ACE *piace; /* all the supported ACEs have the same memory layout */ static const WCHAR openbr = '('; static const WCHAR closebr = ')'; static const WCHAR semicolon = ';'; + DWORD *SidStart; - if (((PACE_HEADER)pace)->AceType > SYSTEM_ALARM_ACE_TYPE || ((PACE_HEADER)pace)->AceSize < sizeof(ACCESS_ALLOWED_ACE)) + piace = pace; + + if (piace->Header.AceType > ACCESS_MAX_MS_V5_ACE_TYPE || piace->Header.AceSize < sizeof(ACCESS_ALLOWED_ACE)) { SetLastError(ERROR_INVALID_ACL); return FALSE; } - piace = pace; DumpString(&openbr, 1, pwptr, plen); switch (piace->Header.AceType) { @@ -3567,11 +3587,22 @@ static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) DumpString(&semicolon, 1, pwptr, plen); DumpRights(piace->Mask, pwptr, plen); DumpString(&semicolon, 1, pwptr, plen); + SidStart = &piace->SidStart; + if (is_object_ace(piace->Header.AceType)) + { + ACCESS_ALLOWED_OBJECT_ACE *objace = pace; + + SidStart++; /* Flags */ + if (objace->Flags & ACE_OBJECT_TYPE_PRESENT) + SidStart += sizeof(GUID) / sizeof(*SidStart); /* ObjectType */ + if (objace->Flags & ACE_INHERITED_OBJECT_TYPE_PRESENT) + SidStart += sizeof(GUID) / sizeof(*SidStart); /* InheritedObjectType */ + } /* objects not supported */ DumpString(&semicolon, 1, pwptr, plen); /* objects not supported */ DumpString(&semicolon, 1, pwptr, plen); - if (!DumpSid(&piace->SidStart, pwptr, plen)) + if (!DumpSid(SidStart, pwptr, plen)) return FALSE; DumpString(&closebr, 1, pwptr, plen); return TRUE;

1 0

Chip Davis : winemac.drv: Build with GL_SILENCE_DEPRECATION.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: e5895164322002784eac51c4c037f211cf097897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5895164322002784eac51c4… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 01:10:01 2020 -0500 winemac.drv: Build with GL_SILENCE_DEPRECATION. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 80a766cbda..96e27b76e5 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define GL_SILENCE_DEPRECATION #include <OpenGL/gl.h> #import "cocoa_opengl.h"

1 0

Alexandre Julliard : winecrt0: Rebuild the argv array instead of getting it from libwine.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 036f4dca3c7f9ee8964bb4ae0c4bcd106a347c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=036f4dca3c7f9ee8964bb4ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 15:09:00 2020 +0200 winecrt0: Rebuild the argv array instead of getting it from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exe_entry.c | 78 +++++++++++++++++++++++++++++++++++----------- dlls/winecrt0/exe_wentry.c | 68 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 21 deletions(-) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 9ae45f9f04..803d56e10e 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -25,43 +25,83 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winternl.h" -#include "wine/library.h" #include "crt0_private.h" extern int __cdecl main( int argc, char *argv[] ); -static char **build_argv( WCHAR **wargv ) +static char **build_argv( const char *src, int *ret_argc ) { - int argc; - char *p, **argv; - DWORD total = 0; - - for (argc = 0; wargv[argc]; argc++) - total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); + char **argv, *arg, *dst; + int argc, in_quotes = 0, bcount = 0, len = strlen(src) + 1; - argv = HeapAlloc( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); - p = (char *)(argv + argc + 1); - for (argc = 0; wargv[argc]; argc++) + argc = 2 + len / 2; + argv = HeapAlloc( GetProcessHeap(), 0, argc * sizeof(*argv) + len ); + arg = dst = (char *)(argv + argc); + argc = 0; + while (*src) { - DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); - argv[argc] = p; - p += reslen; - total -= reslen; + if ((*src == ' ' || *src == '\t') && !in_quotes) + { + /* skip the remaining spaces */ + while (*src == ' ' || *src == '\t') src++; + if (!*src) break; + /* close the argument and copy it */ + *dst++ = 0; + argv[argc++] = arg; + /* start with a new argument */ + arg = dst; + bcount = 0; + } + else if (*src == '\\') + { + *dst++ = *src++; + bcount++; + } + else if (*src == '"') + { + if ((bcount & 1) == 0) + { + /* Preceded by an even number of '\', this is half that + * number of '\', plus a '"' which we discard. + */ + dst -= bcount / 2; + src++; + if (in_quotes && *src == '"') *dst++ = *src++; + else in_quotes = !in_quotes; + } + else + { + /* Preceded by an odd number of '\', this is half that + * number of '\' followed by a '"' + */ + dst -= bcount / 2 + 1; + *dst++ = *src++; + } + bcount = 0; + } + else /* a regular character */ + { + *dst++ = *src++; + bcount = 0; + } } + *dst = 0; + argv[argc++] = arg; argv[argc] = NULL; + *ret_argc = argc; return argv; } DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) { + int argc; BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); - char **argv = build_argv( __wine_main_wargv ); + char **argv = build_argv( GetCommandLineA(), &argc ); DWORD ret; - if (needs_init) _init( __wine_main_argc, argv, NULL ); - ret = main( __wine_main_argc, argv ); + if (needs_init) _init( argc, argv, NULL ); + ret = main( argc, argv ); if (needs_init) _fini(); ExitProcess( ret ); } diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index b889e5a102..b01bfd6210 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -26,18 +26,82 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "wine/library.h" #include "crt0_private.h" extern int __cdecl wmain( int argc, WCHAR *argv[] ); +static WCHAR **build_argv( const WCHAR *src, int *ret_argc ) +{ + WCHAR **argv, *arg, *dst; + int argc, in_quotes = 0, bcount = 0, len = lstrlenW(src) + 1; + + argc = 2 + len / 2; + argv = HeapAlloc( GetProcessHeap(), 0, argc * sizeof(*argv) + len * sizeof(WCHAR) ); + arg = dst = (WCHAR *)(argv + argc); + argc = 0; + while (*src) + { + if ((*src == ' ' || *src == '\t') && !in_quotes) + { + /* skip the remaining spaces */ + while (*src == ' ' || *src == '\t') src++; + if (!*src) break; + /* close the argument and copy it */ + *dst++ = 0; + argv[argc++] = arg; + /* start with a new argument */ + arg = dst; + bcount = 0; + } + else if (*src == '\\') + { + *dst++ = *src++; + bcount++; + } + else if (*src == '"') + { + if ((bcount & 1) == 0) + { + /* Preceded by an even number of '\', this is half that + * number of '\', plus a '"' which we discard. + */ + dst -= bcount / 2; + src++; + if (in_quotes && *src == '"') *dst++ = *src++; + else in_quotes = !in_quotes; + } + else + { + /* Preceded by an odd number of '\', this is half that + * number of '\' followed by a '"' + */ + dst -= bcount / 2 + 1; + *dst++ = *src++; + } + bcount = 0; + } + else /* a regular character */ + { + *dst++ = *src++; + bcount = 0; + } + } + *dst = 0; + argv[argc++] = arg; + argv[argc] = NULL; + *ret_argc = argc; + return argv; +} + DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) { + int argc; BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); + WCHAR **argv = build_argv( GetCommandLineW(), &argc ); DWORD ret; if (needs_init) _init( 0, NULL, NULL ); - ret = wmain( __wine_main_argc, __wine_main_wargv ); + ret = wmain( argc, argv ); if (needs_init) _fini(); ExitProcess( ret ); }

1 0

Alexandre Julliard : msvcrt: Rebuild the argv array instead of getting it from libwine.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: e9d2b31c87ef9195280ebaa6c21855e7ad19e747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9d2b31c87ef9195280ebaa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 15:09:26 2020 +0200 msvcrt: Rebuild the argv array instead of getting it from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 97 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 81 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 9cc380f74a..26fb4a4510 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -23,12 +23,13 @@ #include <math.h> #include "msvcrt.h" -#include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +static WCHAR **initial_wargv; +static int initial_argc; int MSVCRT___argc = 0; static int wargc_expand; unsigned int MSVCRT__commode = 0; @@ -159,6 +160,69 @@ static char **build_argv( WCHAR **wargv ) return argv; } +static WCHAR **cmdline_to_argv( const WCHAR *src, int *ret_argc ) +{ + WCHAR **argv, *arg, *dst; + int argc, in_quotes = 0, bcount = 0, len = lstrlenW(src) + 1; + + argc = 2 + len / 2; + argv = HeapAlloc( GetProcessHeap(), 0, argc * sizeof(*argv) + len * sizeof(WCHAR) ); + arg = dst = (WCHAR *)(argv + argc); + argc = 0; + while (*src) + { + if ((*src == ' ' || *src == '\t') && !in_quotes) + { + /* skip the remaining spaces */ + while (*src == ' ' || *src == '\t') src++; + if (!*src) break; + /* close the argument and copy it */ + *dst++ = 0; + argv[argc++] = arg; + /* start with a new argument */ + arg = dst; + bcount = 0; + } + else if (*src == '\\') + { + *dst++ = *src++; + bcount++; + } + else if (*src == '"') + { + if ((bcount & 1) == 0) + { + /* Preceded by an even number of '\', this is half that + * number of '\', plus a '"' which we discard. + */ + dst -= bcount / 2; + src++; + if (in_quotes && *src == '"') *dst++ = *src++; + else in_quotes = !in_quotes; + } + else + { + /* Preceded by an odd number of '\', this is half that + * number of '\' followed by a '"' + */ + dst -= bcount / 2 + 1; + *dst++ = *src++; + } + bcount = 0; + } + else /* a regular character */ + { + *dst++ = *src++; + bcount = 0; + } + } + *dst = 0; + argv[argc++] = arg; + argv[argc] = NULL; + *ret_argc = argc; + return argv; +} + typedef void (CDECL *_INITTERMFUN)(void); typedef int (CDECL *_INITTERM_E_FN)(void); @@ -348,9 +412,10 @@ void msvcrt_init_args(void) MSVCRT__acmdln = MSVCRT__strdup( GetCommandLineA() ); MSVCRT__wcmdln = MSVCRT__wcsdup( GetCommandLineW() ); - MSVCRT___argc = __wine_main_argc; - MSVCRT___wargv = __wine_main_wargv; - MSVCRT___argv = build_argv( MSVCRT___wargv ); + initial_wargv = cmdline_to_argv( GetCommandLineW(), &initial_argc ); + MSVCRT___argc = initial_argc; + MSVCRT___wargv = initial_wargv; + MSVCRT___argv = build_argv( initial_wargv ); TRACE("got %s, wide = %s argc=%d\n", debugstr_a(MSVCRT__acmdln), debugstr_w(MSVCRT__wcmdln),MSVCRT___argc); @@ -419,21 +484,21 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) HANDLE h; args_no = 0; - for(i=0; i<__wine_main_argc; i++) { + for(i=0; i < initial_argc; i++) { WIN32_FIND_DATAW data; int len = 0; is_expandable = FALSE; - for(path_len = strlenW(__wine_main_wargv[i])-1; path_len>=0; path_len--) { - if(__wine_main_wargv[i][path_len]=='*' || __wine_main_wargv[i][path_len]=='?') + for(path_len = strlenW(initial_wargv[i])-1; path_len>=0; path_len--) { + if(initial_wargv[i][path_len]=='*' || initial_wargv[i][path_len]=='?') is_expandable = TRUE; - else if(__wine_main_wargv[i][path_len]=='\\' || __wine_main_wargv[i][path_len]=='/') + else if(initial_wargv[i][path_len]=='\\' || initial_wargv[i][path_len]=='/') break; } path_len++; if(is_expandable) - h = FindFirstFileW(__wine_main_wargv[i], &data); + h = FindFirstFileW(initial_wargv[i], &data); else h = INVALID_HANDLE_VALUE; @@ -446,7 +511,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) len = strlenW(data.cFileName)+1; if(argv) { argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_wargv[i], path_len*sizeof(MSVCRT_wchar_t)); + memcpy(argv[args_no], initial_wargv[i], path_len*sizeof(MSVCRT_wchar_t)); memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(MSVCRT_wchar_t)); } args_no++; @@ -456,10 +521,10 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) } if(!len) { - len = strlenW(__wine_main_wargv[i])+1; + len = strlenW(initial_wargv[i])+1; if(argv) { argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_wargv[i], len*sizeof(MSVCRT_wchar_t)); + memcpy(argv[args_no], initial_wargv[i], len*sizeof(MSVCRT_wchar_t)); } args_no++; size += len; @@ -496,8 +561,8 @@ int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *w } } if (!expand_wildcards) { - MSVCRT___argc = __wine_main_argc; - MSVCRT___wargv = __wine_main_wargv; + MSVCRT___argc = initial_argc; + MSVCRT___wargv = initial_wargv; } /* Initialize the _wenviron array if it's not already created. */ @@ -533,8 +598,8 @@ int CDECL __getmainargs(int *argc, char** *argv, char** *envp, } } if (!expand_wildcards) { - MSVCRT___argc = __wine_main_argc; - MSVCRT___argv = build_argv( __wine_main_wargv ); + MSVCRT___argc = initial_argc; + MSVCRT___argv = build_argv( initial_wargv ); } *argc = MSVCRT___argc;

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 blend factors to D3D10.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: c939699dea3b4327697ea7b268f5aa330f201ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c939699dea3b4327697ea7b2… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 01:11:36 2020 -0500 d3d11: Introduce a function to convert D3D11 blend factors to D3D10. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index a4a3021db9..c76595752f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -240,6 +240,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 /* ID3D10BlendState methods */ +static D3D10_BLEND d3d10_blend_from_d3d11(D3D11_BLEND factor) +{ + return (D3D10_BLEND)factor; +} + static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface, D3D10_BLEND_DESC *desc) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -249,11 +254,11 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface TRACE("iface %p, desc %p.\n", iface, desc); desc->AlphaToCoverageEnable = d3d11_desc->AlphaToCoverageEnable; - desc->SrcBlend = d3d11_desc->RenderTarget[0].SrcBlend; - desc->DestBlend = d3d11_desc->RenderTarget[0].DestBlend; + desc->SrcBlend = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].SrcBlend); + desc->DestBlend = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].DestBlend); desc->BlendOp = d3d11_desc->RenderTarget[0].BlendOp; - desc->SrcBlendAlpha = d3d11_desc->RenderTarget[0].SrcBlendAlpha; - desc->DestBlendAlpha = d3d11_desc->RenderTarget[0].DestBlendAlpha; + desc->SrcBlendAlpha = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].SrcBlendAlpha); + desc->DestBlendAlpha = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].DestBlendAlpha); desc->BlendOpAlpha = d3d11_desc->RenderTarget[0].BlendOpAlpha; for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) {

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 blend ops to D3D10.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 3d336d43266b88bc6395f621c469207a42e03772 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d336d43266b88bc6395f621… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 01:11:37 2020 -0500 d3d11: Introduce a function to convert D3D11 blend ops to D3D10. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c76595752f..32ef44091c 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -245,6 +245,11 @@ static D3D10_BLEND d3d10_blend_from_d3d11(D3D11_BLEND factor) return (D3D10_BLEND)factor; } +static D3D10_BLEND_OP d3d10_blend_op_from_d3d11(D3D11_BLEND_OP op) +{ + return (D3D10_BLEND_OP)op; +} + static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface, D3D10_BLEND_DESC *desc) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -256,10 +261,10 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface desc->AlphaToCoverageEnable = d3d11_desc->AlphaToCoverageEnable; desc->SrcBlend = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].SrcBlend); desc->DestBlend = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].DestBlend); - desc->BlendOp = d3d11_desc->RenderTarget[0].BlendOp; + desc->BlendOp = d3d10_blend_op_from_d3d11(d3d11_desc->RenderTarget[0].BlendOp); desc->SrcBlendAlpha = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].SrcBlendAlpha); desc->DestBlendAlpha = d3d10_blend_from_d3d11(d3d11_desc->RenderTarget[0].DestBlendAlpha); - desc->BlendOpAlpha = d3d11_desc->RenderTarget[0].BlendOpAlpha; + desc->BlendOpAlpha = d3d10_blend_op_from_d3d11(d3d11_desc->RenderTarget[0].BlendOpAlpha); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { desc->BlendEnable[i] = d3d11_desc->RenderTarget[i].BlendEnable;

1 0

Zhiyi Zhang : dxgi/tests: Fix some test failures in test_find_closest_matching_mode().
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: ab59ed1a4cc908dee40ed296f1ce40d60a9eba7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab59ed1a4cc908dee40ed296… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 8 18:00:50 2020 +0800 dxgi/tests: Fix some test failures in test_find_closest_matching_mode(). DXGI_MODE_SCALING_CENTERED and DXGI_MODE_SCALING_STRETCHED modes may be supported by drivers. When these flags are specified, IDXGIOutput_FindClosestMatchingMode() will try to find a mode matching the scaling field first, which may not be the same as the original mode. So make sure such a mode exists before finding them. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e003b19d94..0fc0dc5d13 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1298,8 +1298,13 @@ static void test_output(void) static void test_find_closest_matching_mode(void) { + static const DXGI_MODE_SCALING scaling_tests[] = + { + DXGI_MODE_SCALING_CENTERED, + DXGI_MODE_SCALING_STRETCHED + }; DXGI_MODE_DESC *modes, mode, matching_mode; - unsigned int i, mode_count; + unsigned int i, j, mode_count; IDXGIAdapter *adapter; IDXGIDevice *device; IDXGIOutput *output; @@ -1451,23 +1456,25 @@ static void test_find_closest_matching_mode(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); - memset(&mode, 0, sizeof(mode)); - mode.Width = modes[0].Width; - mode.Height = modes[0].Height; - mode.Format = modes[0].Format; - mode.Scaling = DXGI_MODE_SCALING_CENTERED; - hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + for (i = 0; i < ARRAY_SIZE(scaling_tests); ++i) + { + for (j = 0; j < mode_count; ++j) + { + if (modes[j].Scaling != scaling_tests[i]) + continue; - memset(&mode, 0, sizeof(mode)); - mode.Width = modes[0].Width; - mode.Height = modes[0].Height; - mode.Format = modes[0].Format; - mode.Scaling = DXGI_MODE_SCALING_STRETCHED; - hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + memset(&mode, 0, sizeof(mode)); + mode.Width = modes[j].Width; + mode.Height = modes[j].Height; + mode.Format = modes[j].Format; + mode.Scaling = modes[j].Scaling; + hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + check_mode_desc(&matching_mode, &modes[j], + MODE_DESC_IGNORE_REFRESH_RATE | MODE_DESC_IGNORE_SCANLINE_ORDERING); + break; + } + } heap_free(modes);

1 0

Gabriel Ivăncescu : msscript.ocx: Fix the idl output parameters.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 03793f3a1f0b6ac775f2c8c9bc416b19d9752f07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03793f3a1f0b6ac775f2c8c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 8 15:52:48 2020 +0300 msscript.ocx: Fix the idl output parameters. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.idl | 6 +++--- dlls/msscript.ocx/tests/msscript.idl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.idl b/dlls/msscript.ocx/msscript.idl index efc00ffc50..715b257c7b 100644 --- a/dlls/msscript.ocx/msscript.idl +++ b/dlls/msscript.ocx/msscript.idl @@ -63,7 +63,7 @@ library MSScriptControl ] interface IScriptProcedureCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumProcedures); + HRESULT _NewEnum([out, retval] IUnknown **ppenumProcedures); [id(DISPID_VALUE), propget] HRESULT Item( @@ -87,7 +87,7 @@ library MSScriptControl HRESULT Name([out, retval] BSTR *pbstrName); [id(0x03e8), propget] - HRESULT CodeObject([out, retval] IDispatch *ppdispObject); + HRESULT CodeObject([out, retval] IDispatch **ppdispObject); [id(0x03e9), propget] HRESULT Procedures([out, retval] IScriptProcedureCollection **ppdispProcedures); @@ -120,7 +120,7 @@ library MSScriptControl ] interface IScriptModuleCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumContexts); + HRESULT _NewEnum([out, retval] IUnknown **ppenumContexts); [id(DISPID_VALUE), propget] HRESULT Item( diff --git a/dlls/msscript.ocx/tests/msscript.idl b/dlls/msscript.ocx/tests/msscript.idl index c8929be1c3..1f87f316a5 100644 --- a/dlls/msscript.ocx/tests/msscript.idl +++ b/dlls/msscript.ocx/tests/msscript.idl @@ -63,7 +63,7 @@ library MSScriptControl ] interface IScriptProcedureCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumProcedures); + HRESULT _NewEnum([out, retval] IUnknown **ppenumProcedures); [id(DISPID_VALUE), propget] HRESULT Item( @@ -87,7 +87,7 @@ library MSScriptControl HRESULT Name([out, retval] BSTR *pbstrName); [id(0x03e8), propget] - HRESULT CodeObject([out, retval] IDispatch *ppdispObject); + HRESULT CodeObject([out, retval] IDispatch **ppdispObject); [id(0x03e9), propget] HRESULT Procedures([out, retval] IScriptProcedureCollection **ppdispProcedures); @@ -120,7 +120,7 @@ library MSScriptControl ] interface IScriptModuleCollection : IDispatch { [id(DISPID_NEWENUM), propget] - HRESULT _NewEnum([out, retval] IUnknown *ppenumContexts); + HRESULT _NewEnum([out, retval] IUnknown **ppenumContexts); [id(DISPID_VALUE), propget] HRESULT Item(

1 0