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
May 2006
----- 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
863 discussions
Start a n
N
ew thread
Dmitry Timoshkov : comctl32: psInfo->proppage[index]. pszText is always initialized to a
by Alexandre Julliard
08 May '06
08 May '06
Module: wine Branch: refs/heads/master Commit: 34cf29efbb1d71c2fc59988bb1c25a7a5ee8f49c URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=34cf29efbb1d71c2fc59988…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 5 22:58:26 2006 +0900 comctl32: psInfo->proppage[index].pszText is always initialized to a proper value regardless of PSP_USETITLE, use it unconditionally. --- dlls/comctl32/propsheet.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 141b794..f9d5a48 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1606,8 +1606,7 @@ static BOOL PROPSHEET_ShowPage(HWND hwnd PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage); } - if ((psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) && - (ppshpage->dwFlags & PSP_USETITLE)) + if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) { PROPSHEET_SetTitleW(hwndDlg, psInfo->ppshheader.dwFlags, psInfo->proppage[index].pszText);
1
0
0
0
James Hawkins : advpack: DelDirs should only remove a directory if it' s empty.
by Alexandre Julliard
08 May '06
08 May '06
Module: wine Branch: refs/heads/master Commit: 5f875b09123342d230d3db47251661084655d067 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=5f875b09123342d230d3db4…
Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 4 00:23:17 2006 -0500 advpack: DelDirs should only remove a directory if it's empty. --- dlls/advpack/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 544915d..2feadee 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -87,7 +87,7 @@ static HRESULT del_dirs_callback(HINF hi MAX_INF_STRING_LENGTH, &size)) continue; - if (DelNodeW(directory, 0)) + if (DelNodeW(directory, ADN_DEL_IF_EMPTY)) hr = E_FAIL; }
1
0
0
0
James Hawkins : advpack: The only flag we don' t handle is RSC_FLAG_UPDHLPDLLS.
by Alexandre Julliard
08 May '06
08 May '06
Module: wine Branch: refs/heads/master Commit: 8e111502ade2d655b4e0fe0d53f60e9a4c4a0ff5 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=8e111502ade2d655b4e0fe0…
Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 4 00:22:45 2006 -0500 advpack: The only flag we don't handle is RSC_FLAG_UPDHLPDLLS. --- dlls/advpack/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index efbf185..544915d 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -871,8 +871,8 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); - if (dwFlags) - FIXME("Unhandled flags: 0x%08lx\n", dwFlags); + if (dwFlags & RSC_FLAG_UPDHLPDLLS) + FIXME("Unhandled flag: RSC_FLAG_UPDHLPDLLS\n"); if (!szCmdName || !szDir) return E_INVALIDARG;
1
0
0
0
Mike Hearn : ntdll: Fix heap corruption in RtlDeleteAce.
by Alexandre Julliard
08 May '06
08 May '06
Module: wine Branch: refs/heads/master Commit: 0154704f9f8a2f13d2e654c074391ab008c7573f URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=0154704f9f8a2f13d2e654c…
Author: Mike Hearn <mike(a)plan99.net> Date: Mon May 1 09:08:58 2006 +0100 ntdll: Fix heap corruption in RtlDeleteAce. --- dlls/ntdll/sec.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 8fd21f7..620588b 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1132,15 +1132,20 @@ NTSTATUS WINAPI RtlDeleteAce(PACL pAcl, PACE_HEADER pcAce; DWORD len = 0; + /* skip over the ACE we are deleting */ pcAce = (PACE_HEADER)(((BYTE*)pAce)+pAce->AceSize); + dwAceIndex++; + + /* calculate the length of the rest */ for (; dwAceIndex < pAcl->AceCount; dwAceIndex++) { len += pcAce->AceSize; pcAce = (PACE_HEADER)(((BYTE*)pcAce) + pcAce->AceSize); } - memcpy(pAce, ((BYTE*)pAce)+pAce->AceSize, len); - pAcl->AceCount--; + /* slide them all backwards */ + memmove(pAce, ((BYTE*)pAce)+pAce->AceSize, len); + pAcl->AceCount--; } TRACE("pAcl=%p dwAceIndex=%ld status=0x%08lx\n", pAcl, dwAceIndex, status);
1
0
0
0
Ivan Gyurdiev : wined3d: Separate pshader/vshader tables.
by Alexandre Julliard
08 May '06
08 May '06
Module: wine Branch: refs/heads/master Commit: aea0b5d0f81630549eb63d65aecdc2d9c217edbf URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=aea0b5d0f81630549eb63d6…
Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed Apr 26 22:24:07 2006 -0400 wined3d: Separate pshader/vshader tables. --- dlls/wined3d/pixelshader.c | 25 -------- dlls/wined3d/vertexshader.c | 140 ------------------------------------------- 2 files changed, 1 insertions(+), 164 deletions(-) Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=aea0b5d0f81630549eb…
1
0
0
0
Detlef Riekenberg : winspool/tests: Fix failures in test_DEVMODE.
by Alexandre Julliard
07 May '06
07 May '06
Module: wine Branch: refs/heads/master Commit: 72d6d425270d995dea1d48361e293768b1b2489f URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=72d6d425270d995dea1d483…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 2 00:03:51 2006 +0200 winspool/tests: Fix failures in test_DEVMODE. --- dlls/winspool/tests/info.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index b6b15a1..aaeba2a 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -1096,8 +1096,16 @@ static void test_GetPrinterDriver(void) static void test_DEVMODE(const DEVMODE *dm, LONG dmSize, LPCSTR exp_prn_name) { - ok(!strcmp(exp_prn_name, (LPCSTR)dm->dmDeviceName), "expected %s, got %s\n", exp_prn_name, dm->dmDeviceName); - ok(dm->dmSize + dm->dmDriverExtra == dmSize, "%u != %ld\n", dm->dmSize + dm->dmDriverExtra, dmSize); + /* On NT3.51, some fields in DEVMODE are empty/zero + (dmDeviceName, dmSpecVersion, dmDriverVersion and dmDriverExtra) + We skip the Tests on this Platform */ + if (dm->dmSpecVersion || dm->dmDriverVersion || dm->dmDriverExtra) { + /* The Printername can be larger (MAX_PATH) than CCHDEVICENAME */ + ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME), + "expected '%s', got '%s'\n", exp_prn_name, dm->dmDeviceName); + ok(dm->dmSize + dm->dmDriverExtra == dmSize, + "%u != %ld\n", dm->dmSize + dm->dmDriverExtra, dmSize); + } trace("dmFields %08lx\n", dm->dmFields); }
1
0
0
0
Huw Davies : oleaut32: Fix VARIANT_UserFree.
by Alexandre Julliard
07 May '06
07 May '06
Module: wine Branch: refs/heads/master Commit: 3abd27c624cfbdcb480d4a7ebc711e6c0b9339ae URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=3abd27c624cfbdcb480d4a7…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 15:49:57 2006 +0100 oleaut32: Fix VARIANT_UserFree. --- dlls/oleaut32/usrmarshal.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 3177e0b..a26b93d 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -646,23 +646,26 @@ void WINAPI VARIANT_UserFree(unsigned lo VariantClear(pvar); if (!ref) return; - switch (vt) { - case VT_BSTR | VT_BYREF: - BSTR_UserFree(pFlags, ref); - break; - case VT_VARIANT | VT_BYREF: - VARIANT_UserFree(pFlags, ref); - break; - case VT_RECORD | VT_BYREF: - FIXME("handle BRECORD by ref\n"); - break; - case VT_UNKNOWN: - case VT_DISPATCH: - IUnknown_Release(V_UNKNOWN(pvar)); - break; - default: - FIXME("handle unknown complex type\n"); - break; + if(vt & VT_ARRAY) + LPSAFEARRAY_UserFree(pFlags, V_ARRAYREF(pvar)); + else + { + switch (vt) + { + case VT_BSTR | VT_BYREF: + BSTR_UserFree(pFlags, V_BSTRREF(pvar)); + break; + case VT_VARIANT | VT_BYREF: + VARIANT_UserFree(pFlags, V_VARIANTREF(pvar)); + break; + case VT_RECORD | VT_BYREF: + FIXME("handle BRECORD by ref\n"); + break; + case VT_UNKNOWN | VT_BYREF: + case VT_DISPATCH | VT_BYREF: + IUnknown_Release(*V_UNKNOWNREF(pvar)); + break; + } } CoTaskMemFree(ref);
1
0
0
0
Huw Davies : oleaut32: Remove weird attempt to clear VT_VARIANT.
by Alexandre Julliard
07 May '06
07 May '06
Module: wine Branch: refs/heads/master Commit: 2898b5d9ad886c0e9077e5ed91b16cd9a8988943 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=2898b5d9ad886c0e9077e5e…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 15:28:22 2006 +0100 oleaut32: Remove weird attempt to clear VT_VARIANT. Add some tests. --- dlls/oleaut32/tests/vartest.c | 111 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 5 -- 2 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2d60b86..2b6cf1c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -273,11 +273,49 @@ static int IsValidVariantClearVT(VARTYPE return ret; } +typedef struct +{ + const IUnknownVtbl *lpVtbl; + LONG ref; + LONG events; +} test_VariantClearImpl; + +static HRESULT WINAPI VC_QueryInterface(LPUNKNOWN iface,REFIID riid,LPVOID *ppobj) +{ + test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + This->events |= 0x1; + return E_NOINTERFACE; +} + +static ULONG WINAPI VC_AddRef(LPUNKNOWN iface) { + test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + This->events |= 0x2; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI VC_Release(LPUNKNOWN iface) { + test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + /* static class, won't be freed */ + This->events |= 0x4; + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl test_VariantClear_vtbl = { + VC_QueryInterface, + VC_AddRef, + VC_Release, +}; + +static test_VariantClearImpl test_myVariantClearImpl = {&test_VariantClear_vtbl, 1, 0}; + static void test_VariantClear(void) { HRESULT hres; VARIANTARG v; + VARIANT v2; size_t i; + long i4; + IUnknown *punk; #if 0 /* Crashes: Native does not test input for NULL, so neither does Wine */ @@ -319,6 +357,79 @@ #endif hExpected, hres, vt, ExtraFlags[i]); } } + + /* Some BYREF tests with non-NULL ptrs */ + + /* VARIANT BYREF */ + V_VT(&v2) = VT_I4; + V_I4(&v2) = 0x1234; + V_VT(&v) = VT_VARIANT | VT_BYREF; + V_VARIANTREF(&v) = &v2; + + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_VARIANTREF(&v) == &v2, "variant ref %p\n", V_VARIANTREF(&v2)); + ok(V_VT(&v2) == VT_I4, "vt %04x\n", V_VT(&v2)); + ok(V_I4(&v2) == 0x1234, "i4 %04lx\n", V_I4(&v2)); + + /* I4 BYREF */ + i4 = 0x4321; + V_VT(&v) = VT_I4 | VT_BYREF; + V_I4REF(&v) = &i4; + + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_I4REF(&v) == &i4, "i4 ref %p\n", V_I4REF(&v2)); + ok(i4 == 0x4321, "i4 changed %08lx\n", i4); + + + /* UNKNOWN */ + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)&test_myVariantClearImpl; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_UNKNOWN(&v) == (IUnknown*)&test_myVariantClearImpl, "unknown %p\n", V_UNKNOWN(&v)); + /* Check that Release got called, but nothing else */ + ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); + + /* UNKNOWN BYREF */ + punk = (IUnknown*)&test_myVariantClearImpl; + V_VT(&v) = VT_UNKNOWN | VT_BYREF; + V_UNKNOWNREF(&v) = &punk; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_UNKNOWNREF(&v) == &punk, "unknown ref %p\n", V_UNKNOWNREF(&v)); + /* Check that nothing got called */ + ok(test_myVariantClearImpl.events == 0, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); + + /* DISPATCH */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&test_myVariantClearImpl; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&test_myVariantClearImpl, "dispatch %p\n", V_DISPATCH(&v)); + /* Check that Release got called, but nothing else */ + ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); + + /* DISPATCH BYREF */ + punk = (IUnknown*)&test_myVariantClearImpl; + V_VT(&v) = VT_DISPATCH | VT_BYREF; + V_DISPATCHREF(&v) = (IDispatch**)&punk; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_DISPATCHREF(&v) == (IDispatch**)&punk, "dispatch ref %p\n", V_DISPATCHREF(&v)); + /* Check that nothing got called */ + ok(test_myVariantClearImpl.events == 0, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); } static void test_VariantCopy(void) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a40f3d0..a21a2b6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -625,11 +625,6 @@ HRESULT WINAPI VariantClear(VARIANTARG* if (V_UNKNOWN(pVarg)) IUnknown_Release(V_UNKNOWN(pVarg)); } - else if (V_VT(pVarg) == VT_VARIANT) - { - if (V_VARIANTREF(pVarg)) - VariantClear(V_VARIANTREF(pVarg)); - } } V_VT(pVarg) = VT_EMPTY; }
1
0
0
0
Huw Davies : oleaut32: Rewrite VARIANT user marshaling.
by Alexandre Julliard
07 May '06
07 May '06
Module: wine Branch: refs/heads/master Commit: 696f73a7f5d3d6df095f63ea7577949165e0b091 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=696f73a7f5d3d6df095f63e…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 12:18:41 2006 +0100 oleaut32: Rewrite VARIANT user marshaling. --- dlls/oleaut32/tests/usrmarshal.c | 669 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 457 +++++++++++++++----------- 2 files changed, 934 insertions(+), 192 deletions(-) Diff:
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=696f73a7f5d3d6df095…
1
0
0
0
Hans Leidekker : dnsapi: Implement DnsValidateName_{A,UTF8,W}.
by Alexandre Julliard
07 May '06
07 May '06
Module: wine Branch: refs/heads/master Commit: b2c4b2cff6e77376af7ddfa6742f711851a8b333 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=b2c4b2cff6e77376af7ddfa…
Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 2 16:37:18 2006 +0200 dnsapi: Implement DnsValidateName_{A,UTF8,W}. --- dlls/dnsapi/dnsapi.spec | 6 +- dlls/dnsapi/name.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 19c37c2..a2502b8 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -117,9 +117,9 @@ @ stub DnsUpdateTest_UTF8 @ stub DnsUpdateTest_W @ stub DnsUtf8ToUnicode -@ stub DnsValidateName_A -@ stub DnsValidateName_UTF8 -@ stub DnsValidateName_W +@ stdcall DnsValidateName_A(str long) +@ stdcall DnsValidateName_UTF8(str long) +@ stdcall DnsValidateName_W(wstr long) @ stub DnsValidateUtf8Byte @ stub DnsWinsRecordFlagForString @ stub DnsWinsRecordFlagString diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index c4da728..49b2ef5 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -19,10 +19,22 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include "wine/debug.h" #include "wine/unicode.h" #include <stdarg.h> +#include <sys/types.h> + +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> +#endif +#ifdef HAVE_RESOLV_H +# include <resolv.h> +#endif #include "windef.h" #include "winbase.h" @@ -87,3 +99,168 @@ BOOL WINAPI DnsNameCompare_W( LPWSTR nam } return TRUE; } + +/****************************************************************************** + * DnsValidateName_A [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsValidateName_A( LPCSTR name, DNS_NAME_FORMAT format ) +{ + LPWSTR nameW; + DNS_STATUS ret; + + TRACE( "(%s, %d)\n", debugstr_a(name), format ); + + nameW = dns_strdup_aw( name ); + ret = DnsValidateName_W( nameW, format ); + + dns_free( nameW ); + return ret; +} + +/****************************************************************************** + * DnsValidateName_UTF8 [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsValidateName_UTF8( LPCSTR name, DNS_NAME_FORMAT format ) +{ + LPWSTR nameW; + DNS_STATUS ret; + + TRACE( "(%s, %d)\n", debugstr_a(name), format ); + + nameW = dns_strdup_uw( name ); + ret = DnsValidateName_W( nameW, format ); + + dns_free( nameW ); + return ret; +} + +#define HAS_EXTENDED 0x0001 +#define HAS_NUMERIC 0x0002 +#define HAS_NON_NUMERIC 0x0004 +#define HAS_DOT 0x0008 +#define HAS_DOT_DOT 0x0010 +#define HAS_SPACE 0x0020 +#define HAS_INVALID 0x0040 +#define HAS_ASTERISK 0x0080 +#define HAS_UNDERSCORE 0x0100 +#define HAS_LONG_LABEL 0x0200 + +/****************************************************************************** + * DnsValidateName_W [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsValidateName_W( LPCWSTR name, DNS_NAME_FORMAT format ) +{ + const WCHAR *p; + unsigned int i, j, state = 0; + static const WCHAR invalid[] = { + '{','|','}','~','[','\\',']','^','\'',':',';','<','=','>', + '?','@','!','\"','#','$','%','^','`','(',')','+','/',',',0 }; + + TRACE( "(%s, %d)\n", debugstr_w(name), format ); + + if (!name) return ERROR_INVALID_NAME; + + for (p = name, i = 0, j = 0; *p; p++, i++, j++) + { + if (*p == '.') + { + j = 0; + state |= HAS_DOT; + if (p[1] == '.') state |= HAS_DOT_DOT; + } + else if (*p < '0' || *p > '9') state |= HAS_NON_NUMERIC; + else state |= HAS_NUMERIC; + + if (j > 62) state |= HAS_LONG_LABEL; + + if (strchrW( invalid, *p )) state |= HAS_INVALID; + else if ((unsigned)*p > 127) state |= HAS_EXTENDED; + else if (*p == ' ') state |= HAS_SPACE; + else if (*p == '_') state |= HAS_UNDERSCORE; + else if (*p == '*') state |= HAS_ASTERISK; + } + + if (i == 0 || i > 255 || + (state & HAS_LONG_LABEL) || + (state & HAS_DOT_DOT) || + (name[0] == '.' && name[1])) return ERROR_INVALID_NAME; + + switch (format) + { + case DnsNameDomain: + { + if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) + return DNS_ERROR_NUMERIC_NAME; + if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) + return DNS_ERROR_NON_RFC_NAME; + if ((state & HAS_SPACE) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + case DnsNameDomainLabel: + { + if (state & HAS_DOT) return ERROR_INVALID_NAME; + if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) + return DNS_ERROR_NON_RFC_NAME; + if ((state & HAS_SPACE) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + case DnsNameHostnameFull: + { + if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) + return DNS_ERROR_NUMERIC_NAME; + if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) + return DNS_ERROR_NON_RFC_NAME; + if ((state & HAS_SPACE) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + case DnsNameHostnameLabel: + { + if (state & HAS_DOT) return ERROR_INVALID_NAME; + if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) + return DNS_ERROR_NUMERIC_NAME; + if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) + return DNS_ERROR_NON_RFC_NAME; + if ((state & HAS_SPACE) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + case DnsNameWildcard: + { + if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) + return ERROR_INVALID_NAME; + if (name[0] != '*') return ERROR_INVALID_NAME; + if (name[1] && name[1] != '.') + return DNS_ERROR_INVALID_NAME_CHAR; + if ((state & HAS_EXTENDED) || + (state & HAS_SPACE) || + (state & HAS_INVALID)) return ERROR_INVALID_NAME; + break; + } + case DnsNameSrvRecord: + { + if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) + return ERROR_INVALID_NAME; + if (name[0] != '_') return ERROR_INVALID_NAME; + if ((state & HAS_UNDERSCORE) && !name[1]) + return DNS_ERROR_NON_RFC_NAME; + if ((state & HAS_EXTENDED) || + (state & HAS_SPACE) || + (state & HAS_INVALID)) return ERROR_INVALID_NAME; + break; + } + default: + WARN( "unknown format: %d\n", format ); + break; + } + return ERROR_SUCCESS; +}
1
0
0
0
← Newer
1
...
72
73
74
75
76
77
78
...
87
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
Results per page:
10
25
50
100
200