November 2019 - Wine-Commits

Francois Gouget : rsaenh: A spelling fix in a comment.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: ca61bbcc8854a9783f2e6677567b4abb81c7ac76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca61bbcc8854a9783f2e6677… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:05 2019 +0100 rsaenh: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/mpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 3fbca42a8c..77c3fcaf74 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1009,7 +1009,7 @@ mp_add_d (mp_int * a, mp_digit b, mp_int * c) /* trim unused digits * * This is used to ensure that leading zero digits are - * trimed and the leading "used" digit will be non-zero + * trimmed and the leading "used" digit will be non-zero * Typically very fast. Also fixes the sign if there * are no more leading digits */

1 0

Francois Gouget : gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 40f5cffadde76fa1a6adc065f7d46b9411379180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f5cffadde76fa1a6adc065… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:08:46 2019 +0100 gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc. Windows 10 1507 still deleted it but 1607 no longer does. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ca433b33c0..231d6a4d35 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2082,7 +2082,9 @@ static void test_mf_Blank(void) ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hMetafile); ok(type == OBJ_METAFILE, "CloseMetaFile created object with type %d\n", type); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) @@ -2249,6 +2251,7 @@ static void test_mf_Graphics(void) HDC hdcMetafile; HMETAFILE hMetafile; POINT oldpoint; + INT type; BOOL ret; hdcMetafile = CreateMetaFileA(NULL); @@ -2275,7 +2278,9 @@ static void test_mf_Graphics(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2296,6 +2301,7 @@ static void test_mf_PatternBrush(void) LOGBRUSH *orig_lb; HBRUSH hBrush; BOOL ret; + INT type; orig_lb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGBRUSH)); @@ -2316,7 +2322,9 @@ static void test_mf_PatternBrush(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_PATTERN_BRUSH_BITS, sizeof(MF_PATTERN_BRUSH_BITS), "mf_Pattern_Brush") != 0)

1 0

Sven Baars : schannel: Update SECPKG_FUNCTION_TABLE to SECPKG_INTERFACE_VERSION_8.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 01de4d33999eb1bcebbcac5ff4cfde42307b2455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01de4d33999eb1bcebbcac5f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Nov 28 00:07:54 2019 +0100 schannel: Update SECPKG_FUNCTION_TABLE to SECPKG_INTERFACE_VERSION_8. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/lsamode.c | 6 +++++- dlls/schannel/tests/main.c | 6 +++++- include/ntsecpkg.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index 96ca240c08..372c5800b3 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -116,6 +116,8 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ NULL, /* PostLogonUser */ + NULL, /* GetRemoteCredGuardLogonBuffer */ + NULL, /* GetRemoteCredGuardSupplementalCreds */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -153,6 +155,8 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ NULL, /* PostLogonUser */ + NULL, /* GetRemoteCredGuardLogonBuffer */ + NULL, /* GetRemoteCredGuardSupplementalCreds */ } }; @@ -164,7 +168,7 @@ NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_7; + *PackageVersion = SECPKG_INTERFACE_VERSION_8; *pcTables = 2; *ppTables = secPkgFunctionTable; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index fc913c14a9..81a723c799 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -45,7 +45,9 @@ ValidateTargetInfo) #define SECPKG_FUNCTION_TABLE_SIZE_6 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ PostLogonUser) -#define SECPKG_FUNCTION_TABLE_SIZE_7 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_7 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + GetRemoteCredGuardLogonBuffer) +#define SECPKG_FUNCTION_TABLE_SIZE_8 sizeof(SECPKG_FUNCTION_TABLE) #define LSA_BASE_CAPS ( \ SECPKG_FLAG_INTEGRITY | \ @@ -156,6 +158,8 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, size = SECPKG_FUNCTION_TABLE_SIZE_6; else if (Version == SECPKG_INTERFACE_VERSION_7) size = SECPKG_FUNCTION_TABLE_SIZE_7; + else if (Version == SECPKG_INTERFACE_VERSION_8) + size = SECPKG_FUNCTION_TABLE_SIZE_8; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL; diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 08373a2635..99b9ec7d40 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -38,6 +38,7 @@ extern "C" { #define SECPKG_INTERFACE_VERSION_5 0x100000 #define SECPKG_INTERFACE_VERSION_6 0x200000 #define SECPKG_INTERFACE_VERSION_7 0x400000 +#define SECPKG_INTERFACE_VERSION_8 0x800000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -305,6 +306,28 @@ typedef struct _LSA_SECPKG_FUNCTION_TABLE { } LSA_SECPKG_FUNCTION_TABLE, *PLSA_SECPKG_FUNCTION_TABLE; +/* Functions for redirected credentials */ +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_INIT)(HANDLE, + const UNICODE_STRING *, ULONG, const LUID *); +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_CALLBACK)(HANDLE, PVOID, ULONG, + PVOID *, ULONG *); +typedef VOID (NTAPI *PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK)(HANDLE); +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_GET_LOGON_CREDS)(HANDLE, PBYTE *, + PULONG); +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_GET_SUPP_CREDS)(HANDLE, + PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); + +typedef struct _SECPKG_REDIRECTED_LOGON_BUFFER { + GUID RedirectedLogonGuid; + HANDLE RedirectedLogonHandle; + PLSA_REDIRECTED_LOGON_INIT Init; + PLSA_REDIRECTED_LOGON_CALLBACK Callback; + PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK CleanupCallback; + PLSA_REDIRECTED_LOGON_GET_LOGON_CREDS GetLogonCreds; + PLSA_REDIRECTED_LOGON_GET_SUPP_CREDS GetSupplementalCreds; +} SECPKG_REDIRECTED_LOGON_BUFFER, + *PSECPKG_REDIRECTED_LOGON_BUFFER; + /* LSA-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); @@ -374,6 +397,12 @@ typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PSECPKG_TARGETINFO); typedef NTSTATUS (NTAPI LSA_AP_POST_LOGON_USER)(PSECPKG_POST_LOGON_USER_INFO); +typedef NTSTATUS (NTAPI SpGetRemoteCredGuardLogonBufferFn)(LSA_SEC_HANDLE, + const UNICODE_STRING *, PHANDLE, PLSA_REDIRECTED_LOGON_CALLBACK *, + PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK *, PULONG, PVOID *); +typedef NTSTATUS (NTAPI SpGetRemoteCredGuardSupplementalCredsFn)(LSA_SEC_HANDLE, + const UNICODE_STRING *, PHANDLE, PLSA_REDIRECTED_LOGON_CALLBACK *, + PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK *, PULONG, PVOID *); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -446,6 +475,9 @@ typedef struct SECPKG_FUNCTION_TABLE { /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ LSA_AP_POST_LOGON_USER* PostLogonUser; /* Packages with version SECPKG_INTERFACE_VERSION_7 end here */ + SpGetRemoteCredGuardLogonBufferFn* GetRemoteCredGuardLogonBuffer; + SpGetRemoteCredGuardSupplementalCredsFn* GetRemoteCredGuardSupplementalCreds; + /* Packages with version SECPKG_INTERFACE_VERSION_8 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

Francois Gouget : dxerr8: Fix the spelling of some error messages.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 431a21d95e573eaf8cafdd041b7100b576143756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431a21d95e573eaf8cafdd04… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:40:53 2019 +0100 dxerr8: Fix the spelling of some error messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/errors.dat | 4 ++-- dlls/dxerr8/errors.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxerr8/errors.dat b/dlls/dxerr8/errors.dat index dd73561282..4ab288ccd4 100644 --- a/dlls/dxerr8/errors.dat +++ b/dlls/dxerr8/errors.dat @@ -202,7 +202,7 @@ DDERR_INVALIDPIXELFORMAT pixel format was invalid as specified DDERR_INVALIDRECT Rectangle provided was invalid. DDERR_LOCKEDSURFACES Operation could not be carried out because one or more surfaces are locked DDERR_NO3D There is no 3D present. -DDERR_NOALPHAHW Operation could not be carried out because there is no alpha accleration hardware present or available. +DDERR_NOALPHAHW Operation could not be carried out because there is no alpha acceleration hardware present or available. DDERR_NOSTEREOHARDWARE Operation could not be carried out because there is no stereo hardware present or available. DDERR_NOSURFACELEFT Operation could not be carried out because there is no hardware present which supports stereo surfaces DDERR_NOCLIPLIST no clip list available @@ -268,7 +268,7 @@ DDERR_NOBLTHW No blter. DDERR_NODDROPSHW No DirectDraw ROP hardware. DDERR_OVERLAYNOTVISIBLE returned when GetOverlayPosition is called on a hidden overlay DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination. -DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destionation. +DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destination. DDERR_NOTAOVERLAYSURFACE returned when an overlay member is called for a non-overlay surface DDERR_EXCLUSIVEMODEALREADYSET An attempt was made to set the cooperative level when it was already set to exclusive. DDERR_NOTFLIPPABLE An attempt has been made to flip a surface that is not flippable. diff --git a/dlls/dxerr8/errors.h b/dlls/dxerr8/errors.h index c46fda8b46..4f2711315f 100644 --- a/dlls/dxerr8/errors.h +++ b/dlls/dxerr8/errors.h @@ -613,8 +613,8 @@ static const WCHAR name204W[] = { 'D','D','E','R','R','_','N','O','3','D',0 }; static const CHAR description204A[] = "There is no 3D present."; static const WCHAR description204W[] = { 'T','h','e','r','e',' ','i','s',' ','n','o',' ','3','D',' ','p','r','e','s','e','n','t','.',0 }; static const WCHAR name205W[] = { 'D','D','E','R','R','_','N','O','A','L','P','H','A','H','W',0 }; -static const CHAR description205A[] = "Operation could not be carried out because there is no alpha accleration hardware present or available."; -static const WCHAR description205W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; +static const CHAR description205A[] = "Operation could not be carried out because there is no alpha acceleration hardware present or available."; +static const WCHAR description205W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','e','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; static const WCHAR name206W[] = { 'D','D','E','R','R','_','N','O','S','T','E','R','E','O','H','A','R','D','W','A','R','E',0 }; static const CHAR description206A[] = "Operation could not be carried out because there is no stereo hardware present or available."; static const WCHAR description206W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','s','t','e','r','e','o',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; @@ -809,10 +809,10 @@ static const CHAR description269A[] = "returned when GetOverlayPosition is calle static const WCHAR description269W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','h','i','d','d','e','n',' ','o','v','e','r','l','a','y',0 }; static const WCHAR name270W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R','L','A','Y','D','E','S','T',0 }; static const CHAR description270A[] = "returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination."; -static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 }; +static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name271W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 }; static const CHAR description271A[] = "returned when the position of the overlay on the destination is no longer legal for that destination."; -static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; +static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name272W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 }; static const CHAR description272A[] = "returned when an overlay member is called for a non-overlay surface"; static const WCHAR description272W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','m','e','m','b','e','r',' ','i','s',' ','c','a','l','l','e','d',' ','f','o','r',' ','a',' ','n','o','n','-','o','v','e','r','l','a','y',' ','s','u','r','f','a','c','e',0 };

1 0

Francois Gouget : msvcp120/tests: Tweak two ok() messages and fix their spelling.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 842aa6bae74f79d470cb89a8afb984c4bd95e32b URL: https://source.winehq.org/git/wine.git/?a=commit;h=842aa6bae74f79d470cb89a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:47 2019 +0100 msvcp120/tests: Tweak two ok() messages and fix their spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d484cdd7ed..9c3f22a367 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1444,7 +1444,7 @@ static void test_tr2_sys__Copy_file(void) ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), - "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); + "test_tr2_sys__Copy_file(): test %d failed, mismatched file sizes\n", i+1); } ret = p_tr2_sys__Copy_file_wchar(testW, testW2, TRUE); ok(ret == ERROR_SUCCESS, "test_tr2_sys__Copy_file_wchar() expect ERROR_SUCCESS, got %d\n", ret); @@ -1886,7 +1886,7 @@ static void test_tr2_sys__Link(void) ok(errno == 0xdeadbeef, "tr2_sys__Link(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].existing_path) == p_tr2_sys__File_size(tests[i].new_path), - "tr2_sys__Link(): test %d failed, two files' size are not equal\n", i+1); + "tr2_sys__Link(): test %d failed, mismatched file sizes\n", i+1); } ok(DeleteFileA("f1"), "expect f1 to exist\n");

1 0

Francois Gouget : wmp/tests: Fix the spelling of an unused parameter name.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: c5e4a5345e4df28c12c64a8b867c2a7d1bf16af7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5e4a5345e4df28c12c64a8b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:14 2019 +0100 wmp/tests: Fix the spelling of an unused parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index db466bf6d4..aaeb2aa82d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -124,7 +124,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL;

1 0

Francois Gouget : d3dx9_36: Fix the spelling of a TRACE() message.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 0611e27caf5105795cb94e60dec5ff0561e8ec44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0611e27caf5105795cb94e60… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:27:56 2019 +0100 d3dx9_36: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b0bf8e3c38..88168df1e1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4254,7 +4254,7 @@ static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHA struct d3dx_parameter_block *block = get_valid_parameter_block(parameter_block); struct d3dx_recorded_parameter *record; - TRACE("iface %p, paramater_block %p.\n", iface, parameter_block); + TRACE("iface %p, parameter_block %p.\n", iface, parameter_block); if (!block || !block->offset) return D3DERR_INVALIDCALL;

1 0

Chip Davis : ntdll: Fix tick count calculation on Mac.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 289d456dd617c164047b6562b993a7c1a7955232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=289d456dd617c164047b6562… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Nov 27 09:54:09 2019 -0600 ntdll: Fix tick count calculation on Mac. Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/kernel32/time.c | 4 ++++ dlls/ntdll/time.c | 4 ++++ include/config.h.in | 3 +++ server/request.c | 4 ++++ 6 files changed, 17 insertions(+) diff --git a/configure b/configure index dc23826900..90ff22fc7e 100755 --- a/configure +++ b/configure @@ -17696,6 +17696,7 @@ for ac_func in \ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/configure.ac b/configure.ac index fe2816ca7b..7f2c3cda23 100644 --- a/configure.ac +++ b/configure.ac @@ -2171,6 +2171,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 817a830518..716230aa7a 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -78,6 +78,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b87..4e3d5583c7 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/include/config.h.in b/include/config.h.in index 41a7cde553..63396e9250 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -554,6 +554,9 @@ /* Define to 1 if you have the <machine/sysarch.h> header file. */ #undef HAVE_MACHINE_SYSARCH_H +/* Define to 1 if you have the `mach_continuous_time' function. */ +#undef HAVE_MACH_CONTINUOUS_TIME + /* Define to 1 if you have the <mach/machine.h> header file. */ #undef HAVE_MACH_MACHINE_H diff --git a/server/request.c b/server/request.c index d2adb08a18..5610d392cf 100644 --- a/server/request.c +++ b/server/request.c @@ -529,6 +529,10 @@ unsigned int get_tick_count(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 1000000; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts;

1 0

Jeff Smith : ucrtbase: Add support for strftime format %r.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: c6bafaa6d92b78c82be5b955cae455f581750a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6bafaa6d92b78c82be5b955… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 28 01:57:42 2019 -0600 ucrtbase: Add support for strftime format %r. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 28 ++++++++++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4283566102..ef4f228554 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1386,6 +1386,34 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; #if _MSVCR_VER>=140 + case 'r': + if(time_data == MSVCRT_locale->locinfo->lc_time_curr) + { + if(!MSVCRT_CHECK_PMT(mstm->tm_hour>=0 && mstm->tm_hour<=23)) + goto einval_error; + if(!strftime_int(str, &ret, max, (mstm->tm_hour + 11) % 12 + 1, + alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS)) + return 0; + if(ret < max) + str[ret++] = ' '; + if(!strftime_str(str, &ret, max, mstm->tm_hour<12 ? + STRFTIME_TD(time_data, am) : STRFTIME_TD(time_data, pm))) + return 0; + } + else + { + if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) + return 0; + } + break; case 'R': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c1ab7f216a..083be42f42 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -974,8 +974,10 @@ static void test_strftime(void) {"%I", "11", { 0, 0, 23, 1, 0, 70, 4, 0, 0 }}, {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }}, {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, - {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE, TRUE}, + {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, + {"%#r", "12:0:0 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#r", "2:0:0 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, {"%t", "\t", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 3, 364, 0 }}, @@ -1077,6 +1079,7 @@ static void test_strftime(void) { "%#x", "y70", 0, L"yyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "1970", 0, L"yyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "y1970", 0, L"yyyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%r", "z", L"x", L"y", L"z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, }; const struct {

1 0

Vijay Kiran Kamuju : include: Add definitions for ShellLinkDataBlocks in shlobj.h.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 0af4323e41b020d81a2aaf944bb87b31603ed45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af4323e41b020d81a2aaf94… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 27 20:09:20 2019 +0100 include: Add definitions for ShellLinkDataBlocks in shlobj.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index e963578d6c..9a7741a193 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1397,7 +1397,13 @@ typedef enum { SLDF_FORCE_NO_LINKTRACK = 0x00040000, SLDF_ENABLE_TARGET_METADATA = 0x00080000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SLDF_VALID = 0x003ff7ff, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; @@ -1407,6 +1413,35 @@ typedef struct tagDATABLOCKHEADER DWORD dwSignature; } DATABLOCK_HEADER, *LPDATABLOCK_HEADER, *LPDBLIST; +typedef struct { + DATABLOCK_HEADER dbh; + WORD wFillAttribute; + WORD wPopupFillAttribute; + COORD dwScreenBufferSize; + COORD dwWindowSize; + COORD dwWindowOrigin; + DWORD nFont; + DWORD nInputBufferSize; + COORD dwFontSize; + UINT uFontFamily; + UINT uFontWeight; + WCHAR FaceName[LF_FACESIZE]; + UINT uCursorSize; + BOOL bFullScreen; + BOOL bQuickEdit; + BOOL bInsertMode; + BOOL bAutoPosition; + UINT uHistoryBufferSize; + UINT uNumberOfHistoryBuffers; + BOOL bHistoryNoDup; + COLORREF ColorTable[16]; +} NT_CONSOLE_PROPS, *LPNT_CONSOLE_PROPS; + +typedef struct { + DATABLOCK_HEADER dbh; + UINT uCodePage; +} NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS; + typedef struct { DATABLOCK_HEADER dbh; CHAR szDarwinID[MAX_PATH];

1 0