February 2017 - Wine-Commits

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 71887af48ada91c3cc365da7619e903e77dbb67b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71887af48ada91c3cc365da76… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Feb 17 11:06:13 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 120b42c..08bb949 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9344,10 +9344,8 @@ msgid "Confidentiality Required" msgstr "Krever konfidensialitet" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Avslutting pågår.\n" +msgstr "SASL binding pågår" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11939,17 +11937,12 @@ msgstr "Kan ikke gi nytt navn til den valgte registerverdien." #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Nøklene og verdiene i %1 ble vellykket lagt til registeret." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"Kan ikke gi nytt navn til nøkkel \"%1\".\n" -"Det spesifiserte nøkkelnavnet finnes allerede." +"Kan ikke importere %1. Den spesifiserte filen er ikke en gyldig registerfil." #: regedit.rc:373 msgid ""

1 0

Michael Müller : ntdll: Implement RtlAddMandatoryAce.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 641ca44c9711cc468e721f1ee66f0af7c1329a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=641ca44c9711cc468e721f1ee… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 16 20:57:43 2017 +0100 ntdll: Implement RtlAddMandatoryAce. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/sec.c | 27 +++++++++++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 29 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6e99af9..66618fc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -423,6 +423,7 @@ @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub RtlAddCompoundAce +@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 3bc52ac..3f7aa79 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1379,6 +1379,33 @@ NTSTATUS WINAPI RtlAddAuditAccessObjectAce( return STATUS_NOT_IMPLEMENTED; } +/************************************************************************** + * RtlAddMandatoryAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddMandatoryAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwMandatoryFlags, + IN DWORD dwAceType, + IN PSID pSid) +{ + static const DWORD valid_flags = SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | + SYSTEM_MANDATORY_LABEL_NO_READ_UP | + SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP; + + TRACE("(%p, %u, 0x%08x, 0x%08x, %u, %p)\n", pAcl, dwAceRevision, dwAceFlags, + dwMandatoryFlags, dwAceType, pSid); + + if (dwAceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) + return STATUS_INVALID_PARAMETER; + + if (dwMandatoryFlags & ~valid_flags) + return STATUS_INVALID_PARAMETER; + + return add_access_ace(pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, pSid, dwAceType); +} + /****************************************************************************** * RtlValidAcl [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 2f2ea86..f6308f5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2421,6 +2421,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); +NTSYSAPI NTSTATUS WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Rodrigo Rivas Costa : user32: Fix error handling in EndDeferWindowPos.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: fbd9ed0dee968142227e0b0a320da0f81eee0ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd9ed0dee968142227e0b0a3… Author: Rodrigo Rivas Costa <rodrigorivascosta(a)gmail.com> Date: Thu Feb 16 21:59:39 2017 +0100 user32: Fix error handling in EndDeferWindowPos. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 - dlls/user32/winpos.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0046c7c..70c1370 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9539,7 +9539,6 @@ todo_wine DestroyWindow(hwnd); ret = EndDeferWindowPos(hdwp); -todo_wine ok(ret, "got %d\n", ret); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 2fa194f..d94f5a3 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2430,7 +2430,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) { DWP *pDWP; WINDOWPOS *winpos; - BOOL res = TRUE; int i; TRACE("%p\n", hdwp); @@ -2442,20 +2441,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) return FALSE; } - for (i = 0, winpos = pDWP->winPos; res && i < pDWP->actualCount; i++, winpos++) + for (i = 0, winpos = pDWP->winPos; i < pDWP->actualCount; i++, winpos++) { TRACE("hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); if (WIN_IsCurrentThread( winpos->hwnd )) - res = USER_SetWindowPos( winpos ); + USER_SetWindowPos( winpos ); else - res = SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); + SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); } HeapFree( GetProcessHeap(), 0, pDWP->winPos ); HeapFree( GetProcessHeap(), 0, pDWP ); - return res; + return TRUE; }

1 0

Michael Müller : advapi32/tests: Add tests for AddMandatoryAce.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: cca89314838290b3b1fd525de9d1fe68a82e1814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca89314838290b3b1fd525de… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 16 20:58:39 2017 +0100 advapi32/tests: Add tests for AddMandatoryAce. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c31dfbe..34bde87 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -65,6 +65,7 @@ static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); static BOOL (WINAPI *pAddAccessDeniedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); static BOOL (WINAPI *pAddAuditAccessAceEx)(PACL, DWORD, DWORD, DWORD, PSID, BOOL, BOOL); +static BOOL (WINAPI *pAddMandatoryAce)(PACL,DWORD,DWORD,DWORD,PSID); static VOID (WINAPI *pBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid ); static VOID (WINAPI *pBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName ); static VOID (WINAPI *pBuildTrusteeWithObjectsAndNameA)( PTRUSTEEA pTrustee, @@ -199,6 +200,7 @@ static void init(void) pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); pAddAccessDeniedAceEx = (void *)GetProcAddress(hmod, "AddAccessDeniedAceEx"); pAddAuditAccessAceEx = (void *)GetProcAddress(hmod, "AddAuditAccessAceEx"); + pAddMandatoryAce = (void *)GetProcAddress(hmod, "AddMandatoryAce"); pCheckTokenMembership = (void *)GetProcAddress(hmod, "CheckTokenMembership"); pConvertStringSecurityDescriptorToSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); @@ -6156,6 +6158,48 @@ static void test_AddAce(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); } +static void test_AddMandatoryAce(void) +{ + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; + SYSTEM_MANDATORY_LABEL_ACE *ace; + char buffer_acl[256]; + ACL *pAcl = (ACL *)&buffer_acl; + BOOL ret, found; + DWORD index; + + if (!pAddMandatoryAce) + { + win_skip("AddMandatoryAce not supported, skipping test\n"); + return; + } + + ret = InitializeAcl(pAcl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddMandatoryAce(pAcl, ACL_REVISION, 0, 0x1234, &low_level); + ok(!ret, "AddMandatoryAce succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER got %u\n", GetLastError()); + + ret = pAddMandatoryAce(pAcl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); + ok(ret, "AddMandatoryAce failed with %u\n", GetLastError()); + + index = 0; + found = FALSE; + while (pGetAce( pAcl, index++, (void **)&ace )) + { + if (ace->Header.AceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) continue; + ok(ace->Header.AceFlags == 0, "Expected flags 0, got %x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, + "Expected mask SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, got %x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &low_level), "Expected low integrity level\n"); + found = TRUE; + } + ok(found, "Could not find mandatory label ace\n"); +} + static void test_system_security_access(void) { static const WCHAR testkeyW[] = @@ -6495,6 +6539,7 @@ START_TEST(security) test_default_dacl_owner_sid(); test_AdjustTokenPrivileges(); test_AddAce(); + test_AddMandatoryAce(); test_system_security_access(); test_GetSidIdentifierAuthority(); test_pseudo_tokens();

1 0

Andrey Gusev : xinput1_3: Avoid spamming FIXME for XInputGetKeystroke.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 8936a841f58f5888dd8ffd122895f2291786aa02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8936a841f58f5888dd8ffd122… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 16 20:34:11 2017 +0200 xinput1_3: Avoid spamming FIXME for XInputGetKeystroke. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 6c559de..402bd2f 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -112,7 +112,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* st DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) { - FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); + static int warn_once; + + if (!warn_once++) + FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;

1 0

Lauri Kenttä : crypt32: CryptStringToBinary accepts any header.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: a2f2de1e960d37840bb0df541e31d64941e65197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f2de1e960d37840bb0df541… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 16:59:35 2017 +0200 crypt32: CryptStringToBinary accepts any header. For example, X509 CRL accepts -----BEGIN foo-----. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 22 ++++++++++++---------- dlls/crypt32/tests/base64.c | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 9084789..6c2e252 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -603,10 +603,12 @@ static LONG Base64ToBinaryA(LPCSTR pszString, DWORD cchString, } static LONG Base64WithHeaderAndTrailerToBinaryA(LPCSTR pszString, - DWORD cchString, LPCSTR header, LPCSTR trailer, BYTE *pbBinary, + DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) { LONG ret; + LPCSTR header = CERT_HEADER_START; + LPCSTR trailer = CERT_TRAILER_START; LPCSTR headerBegins; LPCSTR dataBegins; @@ -678,7 +680,7 @@ static LONG Base64HeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_HEADER_START, CERT_TRAILER_START, pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -689,7 +691,7 @@ static LONG Base64RequestHeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -700,7 +702,7 @@ static LONG Base64X509HeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - X509_HEADER, X509_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; @@ -835,10 +837,12 @@ static LONG Base64ToBinaryW(LPCWSTR pszString, DWORD cchString, } static LONG Base64WithHeaderAndTrailerToBinaryW(LPCWSTR pszString, - DWORD cchString, LPCWSTR header, LPCWSTR trailer, BYTE *pbBinary, + DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) { LONG ret; + LPCWSTR header = CERT_HEADER_START_W; + LPCWSTR trailer = CERT_TRAILER_START_W; LPCWSTR headerBegins; LPCWSTR dataBegins; @@ -910,8 +914,7 @@ static LONG Base64HeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_HEADER_START_W, CERT_TRAILER_START_W, pbBinary, pcbBinary, - pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -922,8 +925,7 @@ static LONG Base64RequestHeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_REQUEST_HEADER_W, CERT_REQUEST_TRAILER_W, pbBinary, pcbBinary, - pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -934,7 +936,7 @@ static LONG Base64X509HeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - X509_HEADER_W, X509_TRAILER_W, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip, FALSE); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index e0669d0..fb70ca0 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -419,7 +419,6 @@ static void testStringToBinaryA(void) decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64HEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64HEADER, "T", 0); decodeBase64WithFmt("-----BEGIN -----V-----END foo-----", CRYPT_STRING_BASE64HEADER, "T", 0); - todo_wine { decodeBase64WithFmt("-----BEGIN -----V-----END -----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); @@ -428,7 +427,6 @@ static void testStringToBinaryA(void) decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); decodeBase64WithFmt("-----BEGIN -----V-----END foo-----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); - } /* Too small buffer */ buf[0] = 0;

1 0

Nikolay Sivov : comctl32/propsheet: Implement PSM_SETHEADERSUBTITLE.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 83cde0693704c18d370e0caae5132ef62b415ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cde0693704c18d370e0caae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 21:34:21 2017 +0300 comctl32/propsheet: Implement PSM_SETHEADERSUBTITLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 5fc1474..a3a6a5c 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -33,7 +33,6 @@ * - Enforcing of minimal wizard size * - Messages: * o PSM_RECALCPAGESIZES - * o PSM_SETHEADERSUBTITLE * o WM_HELP * o WM_CONTEXTMENU * - Notifications: @@ -2532,17 +2531,37 @@ static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, UINT page_index, const char /****************************************************************************** * PROPSHEET_SetHeaderSubTitleW */ -static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderSubTitle) +static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, UINT page_index, const WCHAR *subtitle) { - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_w(pszHeaderSubTitle)); + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PROPSHEETPAGEW *page; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(subtitle)); + + if (page_index >= psInfo->nPages) + return; + + page = (PROPSHEETPAGEW *)psInfo->proppage[page_index].hpage; + + if (!IS_INTRESOURCE(page->pszHeaderSubTitle)) + Free((void *)page->pszHeaderSubTitle); + + page->pszHeaderSubTitle = heap_strdupW(subtitle); + page->dwFlags |= PSP_USEHEADERSUBTITLE; } /****************************************************************************** * PROPSHEET_SetHeaderSubTitleA */ -static void PROPSHEET_SetHeaderSubTitleA(HWND hwndDlg, int iPageIndex, LPCSTR pszHeaderSubTitle) +static void PROPSHEET_SetHeaderSubTitleA(HWND hwndDlg, UINT page_index, const char *subtitle) { - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_a(pszHeaderSubTitle)); + WCHAR *subtitleW; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_a(subtitle)); + + subtitleW = heap_strdupAtoW(subtitle); + PROPSHEET_SetHeaderSubTitleW(hwndDlg, page_index, subtitleW); + Free(subtitleW); } /****************************************************************************** @@ -3750,11 +3769,11 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRUE; case PSM_SETHEADERSUBTITLEW: - PROPSHEET_SetHeaderSubTitleW(hwnd, (int)wParam, (LPCWSTR)lParam); + PROPSHEET_SetHeaderSubTitleW(hwnd, wParam, (LPCWSTR)lParam); return TRUE; case PSM_SETHEADERSUBTITLEA: - PROPSHEET_SetHeaderSubTitleA(hwnd, (int)wParam, (LPCSTR)lParam); + PROPSHEET_SetHeaderSubTitleA(hwnd, wParam, (LPCSTR)lParam); return TRUE; case PSM_HWNDTOINDEX:

1 0

Austin English : advapi32: Add missing function header to TreeResetNamedSecurityInfoW().
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: ee64c2e3577ff89ad32a12ed85508c166c0ed44b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee64c2e3577ff89ad32a12ed8… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 13 15:54:44 2017 -0600 advapi32: Add missing function header to TreeResetNamedSecurityInfoW(). Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7e41c0a..fcec270 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6055,6 +6055,9 @@ BOOL WINAPI SaferCloseLevel(SAFER_LEVEL_HANDLE handle) return TRUE; } +/****************************************************************************** + * TreeResetNamedSecurityInfoW [ADVAPI32.@] + */ DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSID pOwner, PSID pGroup, PACL pDacl, PACL pSacl,

1 0

Lauri Kenttä : crypt32: Test CryptStringToBinary with weird Base64.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 7d79140c4b97014a612d2ccd7fc828199698e8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d79140c4b97014a612d2ccd7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 16:59:32 2017 +0200 crypt32: Test CryptStringToBinary with weird Base64. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 48494b5..24e77e2 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -299,6 +299,44 @@ static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header, } } +static void decodeBase64WithLenFmt(LPCSTR str, int len, DWORD fmt, LPCSTR expected, int le, BOOL isBroken) +{ + BYTE buf[8] = {0}; + DWORD bufLen = sizeof(buf)-1, fmtUsed; + BOOL ret; + SetLastError(0xdeadbeef); + ret = pCryptStringToBinaryA(str, len, fmt, buf, &bufLen, NULL, &fmtUsed); + buf[bufLen] = 0; + if (expected) { + BOOL correct = ret && strcmp(expected, (char*)buf) == 0; + ok(correct || (isBroken && broken(!ret)), + "base64 \"%s\" len %d: expected \"%s\", got \"%s\" (ret %d, le %d)\n", + str, len, expected, (char*)buf, ret, GetLastError()); + if (correct) + ok(fmtUsed == fmt, "base64 \"%s\" len %d: expected fmt %d, used %d\n", + str, len, fmt, fmtUsed); + } else { + ok(!ret && GetLastError() == le, + "base64 \"%s\" len %d: expected failure, got \"%s\" (ret %d, le %d)\n", + str, len, (char*)buf, ret, GetLastError()); + } +} + +static void decodeBase64WithLenBroken(LPCSTR str, int len, LPCSTR expected, int le) +{ + decodeBase64WithLenFmt(str, len, CRYPT_STRING_BASE64, expected, le, TRUE); +} + +static void decodeBase64WithLen(LPCSTR str, int len, LPCSTR expected, int le) +{ + decodeBase64WithLenFmt(str, len, CRYPT_STRING_BASE64, expected, le, FALSE); +} + +static void decodeBase64WithFmt(LPCSTR str, DWORD fmt, LPCSTR expected, int le) +{ + decodeBase64WithLenFmt(str, 0, fmt, expected, le, FALSE); +} + struct BadString { const char *str; @@ -313,6 +351,7 @@ static void testStringToBinaryA(void) { BOOL ret; DWORD bufLen = 0, i; + BYTE buf[8]; ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, @@ -339,6 +378,71 @@ static void testStringToBinaryA(void) ok(!ret && GetLastError() == ERROR_INVALID_DATA, "%d: Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", i, ret, GetLastError()); } + /* Weird base64 strings (invalid padding, extra white-space etc.) */ + decodeBase64WithLen("V=", 0, 0, ERROR_INVALID_DATA); + decodeBase64WithLen("VV=", 0, 0, ERROR_INVALID_DATA); + decodeBase64WithLen("V==", 0, 0, ERROR_INVALID_DATA); + decodeBase64WithLen("V=", 2, 0, ERROR_INVALID_DATA); + decodeBase64WithLen("VV=", 3, 0, ERROR_INVALID_DATA); + decodeBase64WithLen("V==", 3, 0, ERROR_INVALID_DATA); + todo_wine { + decodeBase64WithLenBroken("V", 0, "T", 0); + decodeBase64WithLenBroken("VV", 0, "U", 0); + decodeBase64WithLenBroken("VVV", 0, "UU", 0); + decodeBase64WithLen("V", 1, "T", 0); + decodeBase64WithLen("VV", 2, "U", 0); + decodeBase64WithLen("VVV", 3, "UU", 0); + decodeBase64WithLen("V===", 0, "T", 0); + decodeBase64WithLen("V========", 0, "T", 0); + decodeBase64WithLen("V===", 4, "T", 0); + decodeBase64WithLen("V\nVVV", 0, "UUU", 0); + decodeBase64WithLen("VV\nVV", 0, "UUU", 0); + decodeBase64WithLen("VVV\nV", 0, "UUU", 0); + decodeBase64WithLen("V\nVVV", 5, "UUU", 0); + decodeBase64WithLen("VV\nVV", 5, "UUU", 0); + decodeBase64WithLen("VVV\nV", 5, "UUU", 0); + decodeBase64WithLen("VV VV", 0, "UUU", 0); + decodeBase64WithLen("V===VVVV", 0, "T", 0); + decodeBase64WithLen("VV==VVVV", 0, "U", 0); + decodeBase64WithLen("VVV=VVVV", 0, "UU", 0); + decodeBase64WithLen("VVVV=VVVV", 0, "UUU", 0); + decodeBase64WithLen("V===VVVV", 8, "T", 0); + decodeBase64WithLen("VV==VVVV", 8, "U", 0); + decodeBase64WithLen("VVV=VVVV", 8, "UU", 0); + decodeBase64WithLen("VVVV=VVVV", 8, "UUU", 0); + } + + todo_wine { + decodeBase64WithFmt("-----BEGIN-----VVVV-----END-----", CRYPT_STRING_BASE64HEADER, 0, ERROR_INVALID_DATA); + decodeBase64WithFmt("-----BEGIN-----VVVV-----END -----", CRYPT_STRING_BASE64HEADER, 0, ERROR_INVALID_DATA); + decodeBase64WithFmt("-----BEGIN -----VVVV-----END-----", CRYPT_STRING_BASE64HEADER, 0, ERROR_INVALID_DATA); + } + decodeBase64WithFmt("-----BEGIN -----VVVV-----END -----", CRYPT_STRING_BASE64HEADER, "UUU", 0); + + todo_wine { + decodeBase64WithFmt("-----BEGIN -----V-----END -----", CRYPT_STRING_BASE64HEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64HEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64HEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN -----V-----END foo-----", CRYPT_STRING_BASE64HEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN -----V-----END -----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN -----V-----END foo-----", CRYPT_STRING_BASE64X509CRLHEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN -----V-----END -----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN foo-----V-----END -----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN foo-----V-----END foo-----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); + decodeBase64WithFmt("-----BEGIN -----V-----END foo-----", CRYPT_STRING_BASE64REQUESTHEADER, "T", 0); + } + + /* Too small buffer */ + buf[0] = 0; + bufLen = 4; + ret = pCryptStringToBinaryA("VVVVVVVV", 8, CRYPT_STRING_BASE64, (BYTE*)buf, &bufLen, NULL, NULL); + todo_wine + ok(!ret && bufLen == 4 && buf[0] == 0, + "Expected ret 0, bufLen 4, buf[0] '\\0', got ret %d, bufLen %d, buf[0] '%c'\n", + ret, bufLen, buf[0]); + /* Good strings */ for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {

1 0

Lauri Kenttä : crypt32: Base64 header requires a space.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: e353ab6d307dcad121477948fb8e4826e6321a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e353ab6d307dcad121477948f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 16:59:33 2017 +0200 crypt32: Base64 header requires a space. -----BEGIN----- is not accepted, -----BEGIN ----- is. Same for END. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 8 ++++---- dlls/crypt32/tests/base64.c | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 9d6dcb4..9b93bc6 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -30,10 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define CERT_HEADER "-----BEGIN CERTIFICATE-----" -#define CERT_HEADER_START "-----BEGIN" +#define CERT_HEADER_START "-----BEGIN " #define CERT_DELIMITER "-----" #define CERT_TRAILER "-----END CERTIFICATE-----" -#define CERT_TRAILER_START "-----END" +#define CERT_TRAILER_START "-----END " #define CERT_REQUEST_HEADER "-----BEGIN NEW CERTIFICATE REQUEST-----" #define CERT_REQUEST_TRAILER "-----END NEW CERTIFICATE REQUEST-----" #define X509_HEADER "-----BEGIN X509 CRL-----" @@ -43,11 +43,11 @@ static const WCHAR CERT_HEADER_W[] = { '-','-','-','-','-','B','E','G','I','N',' ','C','E','R','T','I','F','I','C', 'A','T','E','-','-','-','-','-',0 }; static const WCHAR CERT_HEADER_START_W[] = { -'-','-','-','-','-','B','E','G','I','N',0 }; +'-','-','-','-','-','B','E','G','I','N',' ',0 }; static const WCHAR CERT_DELIMITER_W[] = { '-','-','-','-','-',0 }; static const WCHAR CERT_TRAILER_W[] = { -'-','-','-','-','-','E','N','D',0 }; +'-','-','-','-','-','E','N','D',' ',0 }; static const WCHAR CERT_TRAILER_START_W[] = { '-','-','-','-','-','E','N','D',' ','C','E','R','T','I','F','I','C','A','T', 'E','-','-','-','-','-',0 }; diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 24e77e2..fd46930 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -412,11 +412,9 @@ static void testStringToBinaryA(void) decodeBase64WithLen("VVVV=VVVV", 8, "UUU", 0); } - todo_wine { decodeBase64WithFmt("-----BEGIN-----VVVV-----END-----", CRYPT_STRING_BASE64HEADER, 0, ERROR_INVALID_DATA); decodeBase64WithFmt("-----BEGIN-----VVVV-----END -----", CRYPT_STRING_BASE64HEADER, 0, ERROR_INVALID_DATA); decodeBase64WithFmt("-----BEGIN -----VVVV-----END-----", CRYPT_STRING_BASE64HEADER, 0, ERROR_INVALID_DATA); - } decodeBase64WithFmt("-----BEGIN -----VVVV-----END -----", CRYPT_STRING_BASE64HEADER, "UUU", 0); todo_wine {

1 0