wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Rob Shearman : advapi32: EqualSid should set last error to ERROR_SUCCESS.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 1f3a14e7676c298f5c2de648da7af01a3bb8966e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3a14e7676c298f5c2de648d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 16:37:35 2009 +0000 advapi32: EqualSid should set last error to ERROR_SUCCESS. --- dlls/advapi32/security.c | 4 +++- dlls/advapi32/tests/security.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7dd39a4..3e79a61 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1055,7 +1055,9 @@ IsValidSid( PSID pSid ) BOOL WINAPI EqualSid( PSID pSid1, PSID pSid2 ) { - return RtlEqualSid( pSid1, pSid2 ); + BOOL ret = RtlEqualSid( pSid1, pSid2 ); + SetLastError(ERROR_SUCCESS); + return ret; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index df4b2e1..2986ef5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3296,7 +3296,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "World and domain admins sids shouldn't have been equal\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3315,7 +3314,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(ret, "Same sids should have been equal\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3324,7 +3322,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError());

1 0

Rob Shearman : advapi32: Add tests for EqualSid.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 3498a8817902842d05837422cc376670572e35ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3498a8817902842d05837422c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 16:37:05 2009 +0000 advapi32: Add tests for EqualSid. --- dlls/advapi32/tests/security.c | 69 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b71d64f..df4b2e1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1228,10 +1228,18 @@ static void test_token_attr(void) ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); /* groups */ + SetLastError(0xdeadbeef); ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation(TokenGroups) %s with error %d\n", + ret ? "succeeded" : "failed", GetLastError()); Groups = HeapAlloc(GetProcessHeap(), 0, Size); + SetLastError(0xdeadbeef); ret = GetTokenInformation(Token, TokenGroups, Groups, Size, &Size); ok(ret, "GetTokenInformation(TokenGroups) failed with error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "GetTokenInformation shouldn't have set last error to %d\n", + GetLastError()); trace("TokenGroups:\n"); for (i = 0; i < Groups->GroupCount; i++) { @@ -3266,6 +3274,66 @@ todo_wine { CloseHandle(process_token); } +static void test_EqualSid(void) +{ + PSID sid1, sid2; + BOOL ret; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + + SetLastError(0xdeadbeef); + ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid1); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "AllocateAndInitializeSid shouldn't have set last error to %d\n", + GetLastError()); + + ret = AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, + 0, 0, 0, 0, 0, 0, 0, &sid2); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(!ret, "World and domain admins sids shouldn't have been equal\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + sid2 = FreeSid(sid2); + ok(!sid2, "FreeSid should have returned NULL instead of %p\n", sid2); + ok(GetLastError() == 0xdeadbeef, + "FreeSid shouldn't have set last error to %d\n", + GetLastError()); + + ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid2); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(ret, "Same sids should have been equal\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + + ((SID *)sid2)->Revision = 2; + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + ((SID *)sid2)->Revision = SID_REVISION; + + FreeSid(sid1); + FreeSid(sid2); +} + START_TEST(security) { init(); @@ -3297,4 +3365,5 @@ START_TEST(security) test_GetSecurityInfo(); test_GetSidSubAuthority(); test_CheckTokenMembership(); + test_EqualSid(); }

1 0

Alexandre Julliard : kernel32: Null-terminate the buffer also on error in GetPrivateProfileString16.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 935e06c5c37e12405364e2ba65af0eedf44d4f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e06c5c37e12405364e2ba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 11:36:08 2009 +0100 kernel32: Null-terminate the buffer also on error in GetPrivateProfileString16. --- dlls/kernel32/file16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file16.c b/dlls/kernel32/file16.c index 30c7bdd..e4f703d 100644 --- a/dlls/kernel32/file16.c +++ b/dlls/kernel32/file16.c @@ -555,6 +555,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, ret = GetPrivateProfileSectionA( section, data, size, filename ); if (!ret) { + if (len) *buffer = 0; HeapFree( GetProcessHeap(), 0, data ); return 0; }

1 0

Damjan Jovanovic : winemenubuilder: Escape XML special characters in menus.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 03e9fbb515585fa7d42e04e1d96c5a10a14d006c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e9fbb515585fa7d42e04e1d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 14 09:10:30 2009 +0200 winemenubuilder: Escape XML special characters in menus. --- programs/winemenubuilder/winemenubuilder.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 7bcdd44..e14fe81 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -991,8 +991,12 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) struct stat st; name[i] = 0; fprintf(tempfile, " <Menu>\n"); - fprintf(tempfile, " <Name>%s%s</Name>\n", count ? "" : "wine-", name); - fprintf(tempfile, " <Directory>%s%s.directory</Directory>\n", count ? "" : "wine-", name); + fprintf(tempfile, " <Name>%s", count ? "" : "wine-"); + write_xml_text(tempfile, name); + fprintf(tempfile, "</Name>\n"); + fprintf(tempfile, " <Directory>%s", count ? "" : "wine-"); + write_xml_text(tempfile, name); + fprintf(tempfile, ".directory</Directory>\n"); dir_file_name = heap_printf("%s/desktop-directories/%s%s.directory", xdg_data_dir, count ? "" : "wine-", name); if (dir_file_name) @@ -1009,7 +1013,9 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) name[i] = 0; fprintf(tempfile, " <Include>\n"); - fprintf(tempfile, " <Filename>%s</Filename>\n", name); + fprintf(tempfile, " <Filename>"); + write_xml_text(tempfile, name); + fprintf(tempfile, "</Filename>\n"); fprintf(tempfile, " </Include>\n"); for (i = 0; i < count; i++) fprintf(tempfile, " </Menu>\n");

1 0

Rob Shearman : rpcrt4: Fix potential NULL pointer access in process_bind_packet.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: eb0d2828b243a751628dd4b5467d1dace9f32767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0d2828b243a751628dd4b54… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Nov 13 22:47:10 2009 +0000 rpcrt4: Fix potential NULL pointer access in process_bind_packet. Upon failure to allocate results in process_bind_packet, build nack packet and send right away, instead of falling into the normal path and potentially dereferencing the NULL pointer. --- dlls/rpcrt4/rpc_server.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 1bd1235..84e8854 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -203,6 +203,7 @@ static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, R response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, RPC_VER_MAJOR, RPC_VER_MINOR, REJECT_LOCAL_LIMIT_EXCEEDED); + goto send; } for (i = 0, ctxt_elem = (RpcContextElement *)msg->Buffer;

1 0

André Hentschel : mshtml: Update German Gecko installer dialog.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 79307e596ee0c0e1cf9cbd9e0b1f11f80ad39f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79307e596ee0c0e1cf9cbd9e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 13 22:27:23 2009 +0100 mshtml: Update German Gecko installer dialog. --- dlls/mshtml/De.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 2b58b41..50d519d 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -37,9 +37,11 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Wine-Gecko-Installation" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit eingebettetem HTML benötigt, " \ + "damit diese richtig funktionieren.\n" \ + "Wine kann das Paket für Sie herunterladen und installieren.\n\n" \ + "Hinweis: Es wird empfohlen das Paket ihrer Distribution zu verwenden. " \ + "Weitere Hinweise finden Sie unter http://wiki.winehq.org/Gecko", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Aurimas Fišeras : mshtml: Update Lithuanain translation.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: fdd99387544e1341649aec7cb09ddae707ab80b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd99387544e1341649aec7cb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Nov 13 22:03:56 2009 +0200 mshtml: Update Lithuanain translation. --- dlls/mshtml/Lt.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc index 9883bb4..8f7e772 100644 --- a/dlls/mshtml/Lt.rc +++ b/dlls/mshtml/Lt.rc @@ -31,18 +31,18 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "Įdiegiama..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 105 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko diegimo programa" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine nepavyko rasti Gecko paketo reikalingo programoms įterpiančioms HTML " \ + "teisingai veikti. Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n\n" \ + "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT - CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 + DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 80, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65

1 0

Juan Lang : crypt32: Fix more test failures.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 8adc75b3ec630219f609913f1ae943f09626c421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adc75b3ec630219f609913f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 10:58:50 2009 -0800 crypt32: Fix more test failures. --- dlls/crypt32/tests/chain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e48dba3..bfdf203 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3034,8 +3034,7 @@ static const SimpleChainStatusCheck simpleStatus27[] = { static const CERT_TRUST_STATUS elementStatus27Broken[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | - CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus27Broken[] = { { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), @@ -3408,7 +3407,8 @@ static ChainCheck chainCheckEmbeddedNullBroken = { { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + 0 }, 1, simpleStatus27Broken }, 0 };

1 0

Detlef Riekenberg : commdlg: Fix a copy&paste typo.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: c49606e8a04a6bda2f0822ef7d57b785516ddf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49606e8a04a6bda2f0822ef7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 13 18:08:56 2009 +0100 commdlg: Fix a copy&paste typo. --- dlls/commdlg.dll16/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index a01411f..64bb395 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -126,7 +126,7 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lppd ) if (lppd->Flags & PD_ENABLEPRINTHOOK) FIXME( "custom print hook %p no longer supported\n", lppd->lpfnPrintHook ); if (lppd->Flags & PD_ENABLESETUPHOOK) - FIXME( "custom print hook %p no longer supported\n", lppd->lpfnSetupHook ); + FIXME( "custom setup hook %p no longer supported\n", lppd->lpfnSetupHook ); if ((ret = PrintDlgA( &pd32 ))) {

1 0

Juan Lang : crypt32: Update a comment.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: f6c482467593ed936996706ddc18a6d4f0737312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c482467593ed936996706dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 08:33:34 2009 -0800 crypt32: Update a comment. --- dlls/crypt32/chain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 17471d5..c508c25 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2382,8 +2382,8 @@ static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, * in section 4.2.1.6: * "Multiple name forms, and multiple instances of each name form, * MAY be included." - * It doesn't specify the behavior in such cases, but common usage is - * to accept a certificate if any name matches. + * It doesn't specify the behavior in such cases, but both RFC 2818 + * and RFC 2595 explicitly accept a certificate if any name matches. */ for (i = 0; !matches && i < subjectName->cAltEntry; i++) {

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009