winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2009
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
910 discussions
Start a n
N
ew thread
Jörg Höhle : mciwave: Stop must not reset current position.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: c4b5bd44c0c83b7667686aa922535af8a80d36c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c4b5bd44c0c83b7667686aa92…
Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 22 09:26:28 2009 +0200 mciwave: Stop must not reset current position. --- dlls/mciwave/mciwave.c | 2 -- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index b8f394e..266fa1b 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -614,8 +614,6 @@ static DWORD WAVE_mciStop(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS break; } - wmw->dwPosition = 0; - /* sanity resets */ wmw->dwStatus = MCI_MODE_STOP; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index e5c7815..f5bdba0 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -446,7 +446,7 @@ static void test_asyncWAVE(HWND hwnd) trace("position once stopped: %sms\n",buf); p2 = atoi(buf); /* An XP machine let the position increase slightly after pause. */ - todo_wine ok(p2>=p1 && p2<=p1+16,"position changed from %ums to %ums\n",p1,p2); + ok(p2>=p1 && p2<=p1+16,"position changed from %ums to %ums\n",p1,p2); /* No Resume once stopped (waveaudio, sequencer and cdaudio differ). */ err = mciSendString("resume mysound wait", NULL, 0, NULL);
1
0
0
0
Jörg Höhle : mciwave: Return on error in Seek.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: c75d1cba15e704c6c8739a6ebaf49cb95f1bdcb6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c75d1cba15e704c6c8739a6eb…
Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 7 08:34:16 2009 +0100 mciwave: Return on error in Seek. --- dlls/mciwave/mciwave.c | 42 +++++++++++++++++++----------------------- 1 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index e7afab7..b8f394e 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1202,37 +1202,33 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR */ static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { - DWORD ret = 0; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) { - ret = MCIERR_NULL_PARAMETER_BLOCK; - } else if (wmw == NULL) { - ret = MCIERR_INVALID_DEVICE_ID; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; + + WAVE_mciStop(wDevID, MCI_WAIT, 0); + + if (dwFlags & MCI_SEEK_TO_START) { + wmw->dwPosition = 0; + } else if (dwFlags & MCI_SEEK_TO_END) { + wmw->dwPosition = wmw->ckWaveData.cksize; + } else if (dwFlags & MCI_TO) { + wmw->dwPosition = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo); } else { - WAVE_mciStop(wDevID, MCI_WAIT, 0); - - if (dwFlags & MCI_SEEK_TO_START) { - wmw->dwPosition = 0; - } else if (dwFlags & MCI_SEEK_TO_END) { - wmw->dwPosition = wmw->ckWaveData.cksize; - } else if (dwFlags & MCI_TO) { - wmw->dwPosition = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo); - } else { - WARN("dwFlag doesn't tell where to seek to...\n"); - return MCIERR_MISSING_PARAMETER; - } + WARN("dwFlag doesn't tell where to seek to...\n"); + return MCIERR_MISSING_PARAMETER; + } - TRACE("Seeking to position=%u bytes\n", wmw->dwPosition); + TRACE("Seeking to position=%u bytes\n", wmw->dwPosition); - if (dwFlags & MCI_NOTIFY) { - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL); - } + if (dwFlags & MCI_NOTIFY) { + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL); } - return ret; + return MMSYSERR_NOERROR; } /**************************************************************************
1
0
0
0
Jörg Höhle : winmm/tests: Fix MCI test failure on Win9x/WinME.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: d0e1a4f96fcb924da1b08e9d4f7945ade60d007c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d0e1a4f96fcb924da1b08e9d4…
Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 7 23:57:24 2009 +0100 winmm/tests: Fix MCI test failure on Win9x/WinME. --- dlls/winmm/tests/mci.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index f783cd6..e5c7815 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include "windows.h" #include "mmsystem.h" #include "mmreg.h" @@ -523,8 +524,8 @@ static void test_AutoOpenWAVE(HWND hwnd) * fixme:winmm:MMDRV_Exit Closing while ll-driver open */ MCIERROR err; - char buf[1024]; - memset(buf, 0, sizeof(buf)); + char buf[512], path[300], command[330]; + memset(buf, 0, sizeof(buf)); memset(path, 0, sizeof(path)); /* Do not crash on NULL buffer pointer */ err = mciSendString("sysinfo waveaudio quantity open", NULL, 0, NULL); @@ -559,9 +560,18 @@ static void test_AutoOpenWAVE(HWND hwnd) /* This is the alias, not necessarily a file name. */ if(!err) ok(!strcmp(buf,"tempfile.wav"), "sysinfo name 1 open returned: %s\n", buf); + /* Save the full pathname to the file. */ + err = mciSendString("info tempfile.wav file", path, sizeof(path), NULL); + ok(!err,"mci info tempfile.wav file returned error: %d\n", err); + if(err) strcpy(path,"tempfile.wav"); + err = mciSendString("status tempfile.wav mode", NULL, 0, hwnd); ok(!err,"mci status tempfile.wav mode without buffer returned error: %d\n", err); + sprintf(command,"status \"%s\" mode",path); + err = mciSendString(command, buf, sizeof(buf), hwnd); + ok(!err,"mci status full-path-to-tempfile.wav mode returned error: %d\n", err); + buf[0]=0; err = mciSendString("status tempfile.wav mode", buf, sizeof(buf), hwnd); ok(!err,"mci status tempfile.wav mode returned error: %d\n", err); @@ -613,7 +623,11 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci sysinfo waveaudio quantity open after close returned error: %d\n", err); if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0 after auto-close, got: %s\n", buf); - err = mciSendString("status tempfile.wav mode wait", buf, sizeof(buf), hwnd); + /* w95-WinME (not w2k/XP) switch to C:\ after auto-playing once. Prevent + * MCIERR_FILE_NOT_FOUND by using the full path name from the Info file command. + */ + sprintf(command,"status \"%s\" mode wait",path); + err = mciSendString(command, buf, sizeof(buf), hwnd); ok(!err,"mci re-auto-open status mode returned error: %d\n", err); if(!err) ok(!strcmp(buf,"stopped"), "mci re-auto-open status mode, got: %s\n", buf); @@ -622,7 +636,8 @@ static void test_AutoOpenWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"waveaudio"), "mci capability device type response: %s\n", buf); /* waveaudio forbids Pause without Play. */ - err = mciSendString("pause tempfile.wav", NULL, 0, hwnd); + sprintf(command,"pause \"%s\"",path); + err = mciSendString(command, NULL, 0, hwnd); ok(err==MCIERR_NONAPPLICABLE_FUNCTION,"mci auto-open pause returned error: %d\n", err); }
1
0
0
0
Henri Verbeet : d3d8/tests: Only run the vertex/ pixel shader constant apply tests when the implementation supports them.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: d72c9ffbf50c5c55ef2c564f949c90c2bfd1a3d7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d72c9ffbf50c5c55ef2c564f9…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 10 10:16:29 2009 +0100 d3d8/tests: Only run the vertex/pixel shader constant apply tests when the implementation supports them. --- dlls/d3d8/tests/stateblock.c | 191 ++++++++++++++++++++++++----------------- 1 files changed, 112 insertions(+), 79 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=d72c9ffbf50c5c55ef2c5…
1
0
0
0
Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: 7acbe7c933f29dca9f5e28cb604a96cfa1ef4788 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7acbe7c933f29dca9f5e28cb6…
Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Nov 9 23:25:39 2009 +0200 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index 4d39895..a7b451e 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -44,6 +44,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Tikėtasi loginio objekto" IDS_JSCRIPT_EXPECTED "Tikėtasi JScript objekto" IDS_REGEXP_SYNTAX_ERROR "Sintaksės klaida reguliariajame reiškinyje" + IDS_URI_INVALID_CHAR "Koduotiname URI yra netinkamų simbolių" IDS_INVALID_LENGTH "Masyvo dydis turi būti teigiamas sveikasis skaičius" IDS_ARRAY_EXPECTED "Tikėtasi masyvo objekto" }
1
0
0
0
Marcus Meissner : rpcrt4: Compare network options correctly (Coverity).
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: 860c87bb1ca338c91a55d52e401a3f98be254d87 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=860c87bb1ca338c91a55d52e4…
Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Nov 8 10:08:56 2009 +0100 rpcrt4: Compare network options correctly (Coverity). --- dlls/rpcrt4/rpc_assoc.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 117301f..4030d3d 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -84,6 +84,15 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, return RPC_S_OK; } +static BOOL compare_networkoptions(LPCWSTR opts1, LPCWSTR opts2) +{ + if ((opts1 == NULL) && (opts2 == NULL)) + return TRUE; + if ((opts1 == NULL) || (opts2 == NULL)) + return FALSE; + return !strcmpW(opts1, opts2); +} + RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc_out) @@ -97,7 +106,7 @@ RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, if (!strcmp(Protseq, assoc->Protseq) && !strcmp(NetworkAddr, assoc->NetworkAddr) && !strcmp(Endpoint, assoc->Endpoint) && - ((!assoc->NetworkOptions && !NetworkOptions) || !strcmpW(NetworkOptions, assoc->NetworkOptions))) + compare_networkoptions(NetworkOptions, assoc->NetworkOptions)) { assoc->refs++; *assoc_out = assoc;
1
0
0
0
Juan Lang : crypt32: Correct error when a constrained, permitted name type isn't found in the subject name.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: ee02d43731e945ac8045b81d44898786144874af URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee02d43731e945ac8045b81d4…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:52:00 2009 -0800 crypt32: Correct error when a constrained, permitted name type isn't found in the subject name. --- dlls/crypt32/chain.c | 4 +++- dlls/crypt32/tests/chain.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index eab7f00..c6eaaec 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -699,7 +699,8 @@ static void CRYPT_CheckNameConstraints( CRYPT_FindMatchingNameEntry( &nameConstraints->rgPermittedSubtree[i].Base, subjectName, trustErrorStatus, - 0, CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); LocalFree(subjectName); } else @@ -711,6 +712,7 @@ static void CRYPT_CheckNameConstraints( { if (nameConstraints->cPermittedSubtree) *trustErrorStatus |= + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; if (nameConstraints->cExcludedSubtree) *trustErrorStatus |= diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 1994d85..2209e1f 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2731,7 +2731,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, 1, simpleStatus19 }, - TODO_ERROR }, + 0 }, { { sizeof(chain20) / sizeof(chain20[0]), chain20 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, @@ -2746,7 +2746,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, 1, simpleStatus21 }, - TODO_ERROR }, + 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER },
1
0
0
0
Juan Lang : crypt32: Use helper function to find the subject alternate name extension wherever it 's needed.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: 2503e9ec73de03f3777fbab13cbf04bd79a87c9b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2503e9ec73de03f3777fbab13…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:43:32 2009 -0800 crypt32: Use helper function to find the subject alternate name extension wherever it's needed. --- dlls/crypt32/chain.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b1f230f..eab7f00 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -657,6 +657,18 @@ static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, *trustErrorStatus |= match ? errorIfFound : errorIfNotFound; } +static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) +{ + PCERT_EXTENSION ext; + + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, + cert->cExtension, cert->rgExtension); + if (!ext) + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, + cert->cExtension, cert->rgExtension); + return ext; +} + static void CRYPT_CheckNameConstraints( const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, DWORD *trustErrorStatus) @@ -664,13 +676,8 @@ static void CRYPT_CheckNameConstraints( /* If there aren't any existing constraints, don't bother checking */ if (nameConstraints->cPermittedSubtree || nameConstraints->cExcludedSubtree) { - CERT_EXTENSION *ext; + CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, cert->cExtension, - cert->rgExtension); - if (!ext) - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, cert->cExtension, - cert->rgExtension); if (ext) { CERT_ALT_NAME_INFO *subjectName; @@ -2346,18 +2353,6 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, return TRUE; } -static inline PCERT_EXTENSION get_subject_alt_name_ext(PCCERT_CONTEXT cert) -{ - PCERT_EXTENSION ext; - - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); - if (!ext) - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); - return ext; -} - static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, LPCWSTR server_name) { @@ -2545,7 +2540,7 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, BOOL matches; cert = pChainContext->rgpChain[0]->rgpElement[0]->pCertContext; - altNameExt = get_subject_alt_name_ext(cert); + altNameExt = get_subject_alt_name_ext(cert->pCertInfo); /* If the alternate name extension exists, the name it contains * is bound to the certificate, so make sure the name matches * it. Otherwise, look for the server name in the subject
1
0
0
0
Juan Lang : crypt32: Correct error when the subject alternate name can' t be decoded.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: ae6e884142e734a5538a3de7f90975c636d2b6b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ae6e884142e734a5538a3de7f…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:47:54 2009 -0800 crypt32: Correct error when the subject alternate name can't be decoded. --- dlls/crypt32/chain.c | 4 ++++ dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c93e148..b1f230f 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -695,6 +695,10 @@ static void CRYPT_CheckNameConstraints( 0, CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); LocalFree(subjectName); } + else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | + CERT_TRUST_INVALID_NAME_CONSTRAINTS; } else { diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 70dc3d2..1994d85 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2793,7 +2793,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_NAME_CONSTRAINTS | CERT_TRUST_INVALID_EXTENSION, 0 }, 1, simpleStatus27 }, - TODO_ERROR }, + 0 }, { { sizeof(chain28) / sizeof(chain28[0]), chain28 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER },
1
0
0
0
Juan Lang : crypt32: Check the issued certificate for name constraint violations, not the issuing certificate.
by Alexandre Julliard
10 Nov '09
10 Nov '09
Module: wine Branch: master Commit: 865f3df35b102585dba79862a5c26c99529d13d9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=865f3df35b102585dba79862a…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:35:43 2009 -0800 crypt32: Check the issued certificate for name constraint violations, not the issuing certificate. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 26627e2..c93e148 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -801,7 +801,7 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) chain->rgpElement[j]->pCertContext)) { CRYPT_CheckNameConstraints(nameConstraints, - chain->rgpElement[i]->pCertContext->pCertInfo, + chain->rgpElement[j]->pCertContext->pCertInfo, &errorStatus); chain->rgpElement[i]->TrustStatus.dwErrorStatus |= errorStatus;
1
0
0
0
← Newer
1
...
66
67
68
69
70
71
72
...
91
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
Results per page:
10
25
50
100
200