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 2014
----- 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
2 participants
394 discussions
Start a n
N
ew thread
Nikolay Sivov : dwrite/tests: Some tests for ReadFileFragment().
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: e6cd0f7d8c4ad51135e0d56161258beb90905fca URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e6cd0f7d8c4ad51135e0d5616…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 13:18:46 2014 +0300 dwrite/tests: Some tests for ReadFileFragment(). --- dlls/dwrite/tests/font.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba916a9..ed43839 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2412,6 +2412,77 @@ static void test_CreateStreamFromKey(void) DeleteFileW(test_fontfile); } +static void test_ReadFileFragment(void) +{ + IDWriteLocalFontFileLoader *localloader; + IDWriteFontFileStream *stream; + IDWriteFontFileLoader *loader; + IDWriteFactory *factory; + IDWriteFontFile *file; + const void *fragment, *fragment2; + void *key, *context, *context2; + UINT64 filesize; + UINT32 size; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + key = NULL; + size = 0; + hr = IDWriteFontFile_GetReferenceKey(file, (const void**)&key, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size != 0, "got %u\n", size); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFileStream_GetFileSize(stream, &filesize); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* reading past the end of the stream */ + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize+1, &context); +todo_wine { + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(context == NULL, "got %p\n", context); + ok(fragment == NULL, "got %p\n", fragment); +} + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize, &context); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(context == NULL, "got %p\n", context); + ok(fragment != NULL, "got %p\n", fragment); + + fragment2 = (void*)0xdeadbeef; + context2 = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment2, 0, filesize, &context2); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(context2 == NULL, "got %p\n", context2); + ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); +} + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFileStream_ReleaseFileFragment(stream, context2); + + IDWriteFontFileStream_Release(stream); + IDWriteLocalFontFileLoader_Release(localloader); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2444,6 +2515,7 @@ START_TEST(font) test_TryGetFontTable(); test_ConvertFontToLOGFONT(); test_CreateStreamFromKey(); + test_ReadFileFragment(); IDWriteFactory_Release(factory); }
1
0
0
0
Nikolay Sivov : dwrite: Implement GetLastWriteTime() for local stream.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: f16960aeb827037bd933e4d61e0fc9f3dc06c7d5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f16960aeb827037bd933e4d61…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 12:43:10 2014 +0300 dwrite: Implement GetLastWriteTime() for local stream. --- dlls/dwrite/font.c | 26 ++++++++++++++++---------- dlls/dwrite/tests/font.c | 7 +++++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 91aca96..ed38a6f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1973,11 +1973,17 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ +struct local_refkey +{ + FILETIME writetime; + WCHAR name[1]; +}; + struct local_cached_stream { struct list entry; IDWriteFontFileStream *stream; - void *key; + struct local_refkey *key; UINT32 key_size; }; @@ -1990,12 +1996,6 @@ struct dwrite_localfontfilestream HANDLE handle; }; -struct local_refkey -{ - FILETIME writetime; - WCHAR name[1]; -}; - struct dwrite_localfontfileloader { IDWriteLocalFontFileLoader IDWriteLocalFontFileLoader_iface; LONG ref; @@ -2106,9 +2106,15 @@ static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *ifa static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream *iface, UINT64 *last_writetime) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - FIXME("(%p)->(%p): stub\n",This, last_writetime); - *last_writetime = 0; - return E_NOTIMPL; + ULARGE_INTEGER li; + + TRACE("(%p)->(%p)\n", This, last_writetime); + + li.LowPart = This->entry->key->writetime.dwLowDateTime; + li.HighPart = This->entry->key->writetime.dwHighDateTime; + *last_writetime = li.QuadPart; + + return S_OK; } static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b8ff22d..ba916a9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2362,6 +2362,7 @@ static void test_CreateStreamFromKey(void) IDWriteFontFileLoader *loader; IDWriteFactory *factory; IDWriteFontFile *file; + UINT64 writetime; void *key; UINT32 size; HRESULT hr; @@ -2398,6 +2399,12 @@ static void test_CreateStreamFromKey(void) hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(stream, 1); + + writetime = 0; + hr = IDWriteFontFileStream_GetLastWriteTime(stream, &writetime); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(writetime != 0, "got %08x%08x\n", (UINT)(writetime >> 32), (UINT)writetime); + IDWriteFontFileStream_Release(stream); IDWriteLocalFontFileLoader_Release(localloader);
1
0
0
0
Nikolay Sivov : dwrite: Remove null pointer checks that can't fail.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: 65644170826d65f0f38eac779241481059bab9e1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=65644170826d65f0f38eac779…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 12:26:01 2014 +0300 dwrite: Remove null pointer checks that can't fail. --- dlls/dwrite/font.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a8d1efe..91aca96 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -179,10 +179,8 @@ static inline void* get_fontface_cmap(struct dwrite_fontface *fontface) static void release_font_data(struct dwrite_font_data *data) { int i; - if (!data) - return; - i = InterlockedDecrement(&data->ref); - if (i > 0) + + if (InterlockedDecrement(&data->ref) > 0) return; for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < sizeof(data->info_strings)/sizeof(data->info_strings[0]); i++) { @@ -196,14 +194,13 @@ static void release_font_data(struct dwrite_font_data *data) heap_free(data); } -static VOID _free_fontfamily_data(struct dwrite_fontfamily_data *data) +static void release_fontfamily_data(struct dwrite_fontfamily_data *data) { int i; - if (!data) - return; - i = InterlockedDecrement(&data->ref); - if (i > 0) + + if (InterlockedDecrement(&data->ref) > 0) return; + for (i = 0; i < data->font_count; i++) release_font_data(data->fonts[i]); heap_free(data->fonts); @@ -1060,7 +1057,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { IDWriteFontCollection_Release(This->collection); - _free_fontfamily_data(This->data); + release_fontfamily_data(This->data); heap_free(This); } @@ -1238,7 +1235,7 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) if (!ref) { for (i = 0; i < This->family_count; i++) - _free_fontfamily_data(This->family_data[i]); + release_fontfamily_data(This->family_data[i]); heap_free(This->family_data); heap_free(This); }
1
0
0
0
Michael Stefaniuc : regedit: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: a542a13a02ac0e7de3c2c9706333cb7366d9f669 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a542a13a02ac0e7de3c2c9706…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:25:22 2014 +0100 regedit: Simplify check for an empty string (PVS-Studio). --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 1635b50..0a56f94 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -286,7 +286,7 @@ static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, W BOOL export_branch = FALSE; WCHAR* path = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)path); - if (path && strlenW(path) > 0) + if (path && path[0]) export_branch = TRUE; HeapFree(GetProcessHeap(), 0, path); CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, export_branch ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL);
1
0
0
0
Michael Stefaniuc : winemapi: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: 2beb5518c5afd9ca0028c04ba74532b5f5687d85 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2beb5518c5afd9ca0028c04ba…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:23:53 2014 +0100 winemapi: Simplify check for an empty string (PVS-Studio). --- dlls/winemapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index 8cd6b6d..b627d49 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -100,7 +100,7 @@ ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, TRACE("(0x%08lx 0x%08lx %s 0x%08x 0x%08x %p)\n", session, uiparam, debugstr_a(name), flags, reserved, recip); - if (!name || !strlen(name)) + if (!name || !name[0]) return MAPI_E_FAILURE; scode = MAPIAllocateBuffer(sizeof(**recip) + sizeof(smtp) + strlen(name),
1
0
0
0
Michael Stefaniuc : comdlg32: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: b4b58a82e3ddddbc0bc5837b912bd85966501e1a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b4b58a82e3ddddbc0bc5837b9…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:18:20 2014 +0100 comdlg32: Simplify check for an empty string (PVS-Studio). --- dlls/comdlg32/filedlgbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 499ebb7..eed34f5 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -942,7 +942,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr return S_OK; /* Check if there is a mask to apply if not */ - if(!fodInfos->ShellInfos.lpstrCurrentFilter || !lstrlenW(fodInfos->ShellInfos.lpstrCurrentFilter)) + if(!fodInfos->ShellInfos.lpstrCurrentFilter || !fodInfos->ShellInfos.lpstrCurrentFilter[0]) return S_OK; if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str)))
1
0
0
0
Sebastian Lackner : comctl32: Fix invalid usage of CompareString in StrRStr functions.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: 194b7cd5ae69e8243f3fbd653b31417b45e23252 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=194b7cd5ae69e8243f3fbd653…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 06:51:00 2014 +0100 comctl32: Fix invalid usage of CompareString in StrRStr functions. --- dlls/comctl32/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 8d41508..5e28b8f 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -683,7 +683,7 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | lpszStr[1] : *lpszStr; if (!COMCTL32_ChrCmpIA(ch1, ch2)) @@ -716,7 +716,7 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) iLen = strlenW(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { if (!COMCTL32_ChrCmpIW(*lpszSearch, *lpszStr)) {
1
0
0
0
Sebastian Lackner : shlwapi: Fix invalid usage of CompareString in PathCreateFromUrlW.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: 132164423905c495785bd64f74867712c5fcec97 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=132164423905c495785bd64f7…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 07:11:39 2014 +0100 shlwapi: Fix invalid usage of CompareString in PathCreateFromUrlW. --- dlls/shlwapi/path.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 5c7a88a..a3b462c 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3313,6 +3313,9 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) return E_INVALIDARG; + if (lstrlenW(pszUrl) < 5) + return E_INVALIDARG; + if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, file_colon, 5) != CSTR_EQUAL) return E_INVALIDARG; @@ -3354,9 +3357,8 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, src -= 1; break; case 2: - if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, src, 9, - localhost, 9) == CSTR_EQUAL && - (src[9] == '/' || src[9] == '\\')) + if (lstrlenW(src) >= 10 && CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, + src, 9, localhost, 9) == CSTR_EQUAL && (src[9] == '/' || src[9] == '\\')) { /* 'file://localhost/' + escaped DOS path */ src += 10;
1
0
0
0
Sebastian Lackner : comctl32: Fix incorrect usage of CompareString in SYSLINK_ParseText.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: e2c0694901638c803aaa88d5c49164e8e4802f18 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e2c0694901638c803aaa88d5c…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 07:05:05 2014 +0100 comctl32: Fix incorrect usage of CompareString in SYSLINK_ParseText. --- dlls/comctl32/syslink.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index a5ba3dd..eeb46b9 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -184,6 +184,26 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) } /*********************************************************************** + * SYSLINK_StrCmpNIW + * Wrapper for StrCmpNIW to ensure 'len' is not too big. + */ +static INT SYSLINK_StrCmpNIW (LPCWSTR str, LPCWSTR comp, INT len) +{ + INT i; + + for(i = 0; i < len; i++) + { + if(!str[i]) + { + len = i + 1; + break; + } + } + + return StrCmpNIW(str, comp, len); +} + +/*********************************************************************** * SYSLINK_ParseText * Parses the window text string and creates a document. Returns the * number of document items created. @@ -203,7 +223,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { if(*current == '<') { - if(!StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) + if(!SYSLINK_StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -231,14 +251,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) CheckParameter: /* compare the current position with all known parameters */ - if(!StrCmpNIW(tmp, SL_HREF, 6)) + if(!SYSLINK_StrCmpNIW(tmp, SL_HREF, 6)) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!StrCmpNIW(tmp, SL_ID, 4)) + else if(!SYSLINK_StrCmpNIW(tmp, SL_ID, 4)) { taglen += 4; ValidParam = TRUE; @@ -312,7 +332,7 @@ CheckParameter: } } } - else if(!StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) + else if(!SYSLINK_StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart)
1
0
0
0
Sebastian Lackner : user32: Avoid sending window messages in FindWindowExW.
by Alexandre Julliard
18 Nov '14
18 Nov '14
Module: wine Branch: master Commit: d5ba7451a34bcdd1af5734cfc320f52abc957258 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d5ba7451a34bcdd1af5734cfc…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:15:52 2014 +0100 user32: Avoid sending window messages in FindWindowExW. --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5ed0a06..404017f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7055,7 +7055,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); num_gettext_msgs = 0; @@ -7066,7 +7065,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd ); @@ -7077,7 +7075,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); num_gettext_msgs = 0; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 73cad0c..0516193 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1941,7 +1941,7 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t { while (list[i]) { - if (GetWindowTextW( list[i], buffer, len + 1 )) + if (InternalGetWindowText( list[i], buffer, len + 1 )) { if (!strcmpiW( buffer, title )) break; }
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
40
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
Results per page:
10
25
50
100
200