May 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : riched20: Support ITextFont instances detached from a range.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 0cf3c2f3a1c2bd64b22b3a01b2bb7ef62283ffe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf3c2f3a1c2bd64b22b3a01b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 09:12:58 2015 +0300 riched20: Support ITextFont instances detached from a range. --- dlls/riched20/richole.c | 364 +++++++++++++++++++++++++++++------------- dlls/riched20/tests/richole.c | 291 +++++++++++++++++++++++++++++++-- 2 files changed, 527 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cf3c2f3a1c2bd64b22b3…

1 0

Mark Harmstone : include: Add GetFileMUIPath to winnls.h.
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 8d42c76e889f0f66150d46482bfe9b6435c51909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d42c76e889f0f66150d46482… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon May 25 18:19:04 2015 +0100 include: Add GetFileMUIPath to winnls.h. --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 7e9bfa5..693cb30 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -877,6 +877,7 @@ WINBASEAPI INT WINAPI GetDateFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LP WINBASEAPI INT WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetDateFormat WINELIB_NAME_AW(GetDateFormat) WINBASEAPI BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*); +WINBASEAPI BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PULONG,PULONGLONG); WINBASEAPI INT WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,INT,LANGID); WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); #define GetGeoInfo WINELIB_NAME_AW(GetGeoInfo)

1 0

Austin English : version: Move GetFileVersionInfo(A/W) implementation to GetFileVersionInfoEx(A/W).
by Alexandre Julliard May 26, 2015

May 26, 2015

Module: wine Branch: master Commit: 324acd5f1e30b6bbe4f02fe7f9230469b2aa0f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324acd5f1e30b6bbe4f02fe7f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 18:32:17 2015 -0700 version: Move GetFileVersionInfo(A/W) implementation to GetFileVersionInfoEx(A/W). --- dlls/version/version.c | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index bcc6d01..e1295a0 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -722,10 +722,9 @@ DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD ha } /*********************************************************************** - * GetFileVersionInfoW [VERSION.@] + * GetFileVersionInfoExW [VERSION.@] */ -BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, - DWORD datasize, LPVOID data ) +BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { static const char signature[4] = "FE2X"; DWORD len, offset, magic = 1; @@ -734,6 +733,13 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, HMODULE hModule; VS_VERSION_INFO_STRUCT32* vvis = data; + if (flags) + { + FIXME("stub: %x %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, datasize, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + TRACE("(%s,%d,size=%d,data=%p)\n", debugstr_w(filename), handle, datasize, data ); @@ -797,10 +803,9 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, } /*********************************************************************** - * GetFileVersionInfoA [VERSION.@] + * GetFileVersionInfoExA [VERSION.@] */ -BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, - DWORD datasize, LPVOID data ) +BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { UNICODE_STRING filenameW; BOOL retval; @@ -813,7 +818,7 @@ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, else filenameW.Buffer = NULL; - retval = GetFileVersionInfoW(filenameW.Buffer, handle, datasize, data); + retval = GetFileVersionInfoExW(flags, filenameW.Buffer, handle, datasize, data); RtlFreeUnicodeString(&filenameW); @@ -821,6 +826,22 @@ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, } /*********************************************************************** + * GetFileVersionInfoW [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) +{ + return GetFileVersionInfoExW(0, filename, handle, datasize, data); +} + +/*********************************************************************** + * GetFileVersionInfoA [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) +{ + return GetFileVersionInfoExA(0, filename, handle, datasize, data); +} + +/*********************************************************************** * VersionInfo16_FindChild [internal] */ static const VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( const VS_VERSION_INFO_STRUCT16 *info, @@ -1636,23 +1657,3 @@ DWORD WINAPI VerInstallFileW( HeapFree( GetProcessHeap(), 0, wcurd ); return ret; } - -/****************************************************************************** - * GetFileVersionInfoExA [VERSION.@] - */ -BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data) -{ - FIXME("stub: %u %s %u %u %p\n", flags, wine_dbgstr_a(filename), handle, len, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/****************************************************************************** - * GetFileVersionInfoExW [VERSION.@] - */ -BOOL WINAPI GetFileVersionInfoExW(DWORD flags, LPCWSTR filename, DWORD handle, DWORD len, LPVOID data) -{ - FIXME("stub: %u %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, len, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -}

1 0

Nikolay Sivov : dxdiagn: Silence some fixmes from class factory QI.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 0491ad58737ddbd458260690911a5b5811826c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0491ad58737ddbd4582606909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 11:24:15 2015 +0300 dxdiagn: Silence some fixmes from class factory QI. --- dlls/dxdiagn/dxdiag_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 0745df6..e034b4e 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -67,6 +67,12 @@ static HRESULT WINAPI DXDiagCF_QueryInterface(IClassFactory *iface, REFIID riid, TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); else if (IsEqualGUID(&IID_IClassFactory, riid)) TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IExternalConnection, riid) || + IsEqualGUID(&IID_IMarshal, riid)) { + TRACE("(%p)->(%s) ignoring\n", iface, debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } else { FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL;

1 0

Francois Gouget : msvcp120/tests: Make call_once(_ex)?_thread() static.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 13595fd35f53fdf90ddc9b9b7e350327e5f87790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13595fd35f53fdf90ddc9b9b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:04:50 2015 +0200 msvcp120/tests: Make call_once(_ex)?_thread() static. --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index b5b4301..5db2fa0 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -213,13 +213,13 @@ static void __cdecl call_once_ex_func(void *arg) (*i)++; } -DWORD WINAPI call_once_thread(void *arg) +static DWORD WINAPI call_once_thread(void *arg) { p__Call_once(&once, call_once_func); return 0; } -DWORD WINAPI call_once_ex_thread(void *arg) +static DWORD WINAPI call_once_ex_thread(void *arg) { p__Call_onceEx(&once, call_once_ex_func, &cnt); return 0;

1 0

Francois Gouget : include: Add more interfaces to ctfutb.idl.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 7da2416e77cb9c9466887a1575759d835ce16b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da2416e77cb9c9466887a157… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:17:55 2015 +0200 include: Add more interfaces to ctfutb.idl. --- include/ctfutb.idl | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/include/ctfutb.idl b/include/ctfutb.idl index 6d80b38..1a4125b 100644 --- a/include/ctfutb.idl +++ b/include/ctfutb.idl @@ -24,6 +24,128 @@ interface ITfLangBarEventSink; interface ITfLangBarItemMgr; interface ITfInputProcessorProfiles; +const ULONG TF_LBI_DESC_MAXLEN = 32; + +typedef [uuid(12a1d29f-a065-440c-9746-eb2002c8bd19)] struct TF_LANGBARITEMINFO +{ + CLSID clsidService; + GUID guidItem; + DWORD dwStyle; + ULONG ulSort; + WCHAR szDescription[TF_LBI_DESC_MAXLEN]; +} TF_LANGBARITEMINFO; + +[ + object, + uuid(73540d69-edeb-4ee9-96c9-23aa30b25916), + pointer_default(unique), +] +interface ITfLangBarItem : IUnknown +{ + HRESULT GetInfo( + [out] TF_LANGBARITEMINFO *pInfo); + + HRESULT GetStatus( + [out] DWORD *pdwStatus); + + HRESULT Show( + [in] BOOL fShow); + + HRESULT GetTooltipString( + [out] BSTR *pbstrToolTip); +} + +[ + object, + uuid(583f34d0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface IEnumTfLangBarItems : IUnknown +{ + HRESULT Clone( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount)] ITfLangBarItem **ppItem, + [in, out, unique] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(57dbe1a0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface ITfLangBarItemSink : IUnknown +{ + HRESULT OnUpdate( + [in] DWORD dwFlags); +} + +[ + object, + uuid(ba468c55-9956-4fb1-a59d-52a7dd7cc6aa), + pointer_default(unique), +] +interface ITfLangBarItemMgr : IUnknown +{ + HRESULT EnumItems( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT GetItem( + [in] REFGUID rguid, + [out] ITfLangBarItem **ppItem); + + HRESULT AddItem( + [in] ITfLangBarItem *punk); + + HRESULT RemoveItem( + [in] ITfLangBarItem *punk); + + HRESULT AdviseItemSink( + [in] ITfLangBarItemSink *punk, + [out] DWORD *pdwCookie, + [in] REFGUID rguidItem); + + HRESULT UnadviseItemSink( + [in] DWORD dwCookie); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); + + HRESULT GetItemsStatus( + [in] ULONG ulCount, + [in, size_is(ulCount)] const GUID *prgguid, + [out, size_is(ulCount)] DWORD *pdwStatus); + + HRESULT GetItemNum( + [out] ULONG *pulCount); + + HRESULT GetItems( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfLangBarItem **ppItem, + [out, size_is(ulCount), length_is(*pcFetched)] TF_LANGBARITEMINFO *pInfo, + [out, size_is(ulCount), length_is(*pcFetched)] DWORD *pdwStatus, + [in, out, unique] ULONG *pcFetched); + + HRESULT AdviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] ITfLangBarItemSink **ppunk, + [in, size_is(ulCount)] const GUID *pguidItem, + [out, size_is(ulCount)] DWORD *pdwCookie); + + HRESULT UnadviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] DWORD *pdwCookie); +} + [ object, uuid(87955690-e627-11d2-8ddb-00105a2799b5), @@ -70,4 +192,35 @@ interface ITfLangBarMgr: IUnknown HRESULT GetShowFloatingStatus( [out] DWORD *pdwFlags); -}; +} + +[ + object, + uuid(18a4e900-e0ae-11d2-afdd-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarEventSink: IUnknown +{ + HRESULT OnSetFocus( + [in] DWORD dwThreadId); + + HRESULT OnThreadTerminate( + [in] DWORD dwThreadId); + + HRESULT OnThreadItemChange( + [in] DWORD dwThreadId); + + HRESULT OnModalInput( + [in] DWORD dwThreadId, + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT ShowFloating( + [in] DWORD dwFlags); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); +}

1 0

Mark Harmstone : comctl32: Use DPI settings for checkbox size.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: bae599092a3d2ab473d2a61a38d1abf0cf84dd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae599092a3d2ab473d2a61a3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat May 23 01:46:59 2015 +0100 comctl32: Use DPI settings for checkbox size. --- dlls/comctl32/theme_button.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index bdeba93..327c76b 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -155,8 +155,7 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } }; - static const int cb_size = 13; - + SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); @@ -186,15 +185,18 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); } + if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) + sz.cx = sz.cy = 13; + GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ - bgRect.top = bgRect.top + (textRect.bottom - textRect.top - cb_size) / 2; + bgRect.top = bgRect.top + (textRect.bottom - textRect.top - sz.cy) / 2; /* adjust for the check/radio marker */ - bgRect.bottom = bgRect.top + cb_size; - bgRect.right = bgRect.left + cb_size; + bgRect.bottom = bgRect.top + sz.cy; + bgRect.right = bgRect.left + sz.cx; textRect.left = bgRect.right + 6; DrawThemeParentBackground(hwnd, hDC, NULL);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 1812df71b816ff6fa399ca98468e8118ec11aa2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1812df71b816ff6fa399ca984… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 14:04:07 2015 +0300 po: Update Russian translation. --- po/ru.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index fc9f580..08b2479 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-18 19:06+0300\n" +"PO-Revision-Date: 2015-05-22 14:01+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -7454,10 +7454,8 @@ msgid "Add Control" msgstr "Добавить элемент управления" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Шрифт..." +msgstr "&Конвертировать..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9206,24 +9204,20 @@ msgstr "" "места, или проверьте сетевое подключение." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Установка Wine Mono" +msgstr "Wine Sound Mapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "столбец" +msgstr "Громкость" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Общая громкость" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Отключить" #: winspool.rc:37 msgid "Print to File"

1 0

Nikolay Sivov : riched20: Added IDispatch support.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 81fc69d7e61e129d7de5c63fb773719e765e3b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fc69d7e61e129d7de5c63fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 24 14:01:38 2015 +0300 riched20: Added IDispatch support. --- dlls/riched20/editor.c | 1 + dlls/riched20/editor.h | 2 + dlls/riched20/richole.c | 300 ++++++++++++++++++++++++++++++++++-------- dlls/riched20/tests/richole.c | 20 ++- 4 files changed, 260 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81fc69d7e61e129d7de5c…

1 0

Jacek Caban : kernel32: Fixed buffer overflow in GetShortPathNameW.
by Alexandre Julliard May 25, 2015

May 25, 2015

Module: wine Branch: master Commit: 12a134fdc489f1ab23836eae99b500a072db3ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a134fdc489f1ab23836eae9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 24 20:16:20 2015 +0200 kernel32: Fixed buffer overflow in GetShortPathNameW. --- dlls/kernel32/path.c | 22 ++++++++++++++++++++-- dlls/kernel32/tests/path.c | 22 ++++++++++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index eae2ca9..f74b952 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -443,7 +443,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl WCHAR *tmpshortpath; LPCWSTR p; DWORD sp = 0, lp = 0; - DWORD tmplen; + DWORD tmplen, buf_len; WIN32_FIND_DATAW wfd; HANDLE goit; @@ -462,7 +462,8 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* code below only removes characters from string, never adds, so this is * the largest buffer that tmpshortpath will need to have */ - tmpshortpath = HeapAlloc(GetProcessHeap(), 0, (strlenW(longpath) + 1) * sizeof(WCHAR)); + buf_len = strlenW(longpath) + 1; + tmpshortpath = HeapAlloc(GetProcessHeap(), 0, buf_len * sizeof(WCHAR)); if (!tmpshortpath) { SetLastError(ERROR_OUTOFMEMORY); @@ -524,6 +525,23 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; FindClose(goit); + + /* In rare cases (like "a.abcd") short path may be longer than original path. + * Make sure we have enough space in temp buffer. */ + if (wfd.cAlternateFileName && tmplen < strlenW(wfd.cAlternateFileName)) + { + WCHAR *new_buf; + buf_len += strlenW(wfd.cAlternateFileName) - tmplen; + new_buf = HeapReAlloc(GetProcessHeap(), 0, tmpshortpath, buf_len * sizeof(WCHAR)); + if(!new_buf) + { + HeapFree(GetProcessHeap(), 0, tmpshortpath); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + tmpshortpath = new_buf; + } + strcpyW(tmpshortpath + sp, wfd.cAlternateFileName[0] ? wfd.cAlternateFileName : wfd.cFileName); sp += strlenW(tmpshortpath + sp); lp += tmplen; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3bf82fe..f8dfdc8 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1350,7 +1350,8 @@ static void test_GetShortPathNameW(void) static const WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; static const WCHAR backSlash[] = { '\\', 0 }; - WCHAR path[MAX_PATH], tmppath[MAX_PATH]; + static const WCHAR a_bcdeW[] = {'a','.','b','c','d','e',0}; + WCHAR path[MAX_PATH], tmppath[MAX_PATH], *ptr; WCHAR short_path[MAX_PATH]; DWORD length; HANDLE file; @@ -1387,7 +1388,7 @@ static void test_GetShortPathNameW(void) length = GetShortPathNameW( path, short_path, 0 ); ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length ); - ok( ret, "GetShortPathNameW returned 0.\n" ); + ok( ret && ret == length-1, "GetShortPathNameW returned 0.\n" ); lstrcatW( short_path, name ); @@ -1399,11 +1400,24 @@ static void test_GetShortPathNameW(void) file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" ); - - /* End test */ CloseHandle( file ); ret = DeleteFileW( short_path ); ok( ret, "Cannot delete file.\n" ); + + ptr = path + lstrlenW(path); + lstrcpyW( ptr, a_bcdeW); + file = CreateFileW( path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok( file != INVALID_HANDLE_VALUE, "File was not created.\n" ); + CloseHandle( file ); + + length = GetShortPathNameW( path, short_path, sizeof(short_path)/sizeof(*short_path) ); + ok( length, "GetShortPathNameW failed: %u.\n", GetLastError() ); + + ret = DeleteFileW( path ); + ok( ret, "Cannot delete file.\n" ); + *ptr = 0; + + /* End test */ ret = RemoveDirectoryW( path ); ok( ret, "Cannot delete directory.\n" ); }

1 0