August 2014 - Wine-Commits - list.winehq.org

Austin English : wine.inf: Use full path to msiexec.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 12fd631fe1f1f4ec66a16f96f683ad42f10c0335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12fd631fe1f1f4ec66a16f96f… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Aug 3 18:52:27 2014 -0500 wine.inf: Use full path to msiexec. --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 25bc098..127c67c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -204,12 +204,12 @@ HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}, HKCR,MediaFoundation,,16 HKCR,Msi.Package,,2,"Windows Installer Package" HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" -HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i ""%1""" -HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f ""%1""" -HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x ""%1""" +HKCR,Msi.Package\shell\Open\command,,2,'%11%\msiexec.exe /i ""%1""' +HKCR,Msi.Package\shell\Repair\command,,2,'%11%\msiexec.exe /f ""%1""' +HKCR,Msi.Package\shell\Uninstall\command,,2,'%11%\msiexec.exe /x ""%1""' HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" -HKCR,Msi.Patch\shell\Open\command,,2,"msiexec /p ""%1""" +HKCR,Msi.Patch\shell\Open\command,,2,'%11%\msiexec.exe /p ""%1""' HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1"

1 0

Jacek Caban : mshtml: Added IHTMLElement:scrollIntoView implementation.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: bf10dd3ee4d5df7c19245bbdbee68cb6327bd133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf10dd3ee4d5df7c19245bbdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 31 20:54:23 2014 +0200 mshtml: Added IHTMLElement:scrollIntoView implementation. --- dlls/mshtml/htmlelem.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8378d74..a02baa7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -851,8 +851,31 @@ static HRESULT WINAPI HTMLElement_get_onselectstart(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_scrollIntoView(IHTMLElement *iface, VARIANT varargStart) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&varargStart)); - return E_NOTIMPL; + cpp_bool start = TRUE; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&varargStart)); + + switch(V_VT(&varargStart)) { + case VT_EMPTY: + case VT_ERROR: + break; + case VT_BOOL: + start = V_BOOL(&varargStart) != VARIANT_FALSE; + break; + default: + FIXME("Unsupported argument %s\n", debugstr_variant(&varargStart)); + } + + if(!This->nselem) { + FIXME("Unsupported for comments\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLElement_ScrollIntoView(This->nselem, start, 1); + assert(nsres == NS_OK); + + return S_OK; } static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pChild,

1 0

Nikolay Sivov : dwrite/tests: Added some tests for inline object and ranges handling.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: edf74c0b0d822c746d52054aaf04a265759eda0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf74c0b0d822c746d52054aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 30 21:16:34 2014 +0400 dwrite/tests: Added some tests for inline object and ranges handling. --- dlls/dwrite/tests/layout.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8305c77..5ed2bf5 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -322,7 +322,7 @@ static void test_SetInlineObject(void) static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR ruW[] = {'r','u',0}; - IDWriteInlineObject *inlineobj, *inlineobj2; + IDWriteInlineObject *inlineobj, *inlineobj2, *inlinetest; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; @@ -341,18 +341,54 @@ static void test_SetInlineObject(void) hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj2); ok(hr == S_OK, "got 0x%08x\n", hr); + inlinetest = (void*)0x1; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inlinetest == NULL, "got %p\n", inlineobj); +} range.startPosition = 0; range.length = 2; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + inlinetest = (void*)0x1; + hr = IDWriteTextLayout_GetInlineObject(layout, 2, &inlinetest, NULL); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inlinetest == NULL, "got %p\n", inlinetest); +} + inlinetest = NULL; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + ok(inlinetest == inlineobj, "got %p\n", inlinetest); + IDWriteInlineObject_Release(inlinetest); +} range.startPosition = 1; range.length = 1; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj2, range); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + inlinetest = NULL; + hr = IDWriteTextLayout_GetInlineObject(layout, 1, &inlinetest, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + ok(inlinetest == inlineobj2, "got %p\n", inlinetest); + IDWriteInlineObject_Release(inlinetest); +} + inlinetest = NULL; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + ok(inlinetest == inlineobj, "got %p\n", inlinetest); + IDWriteInlineObject_Release(inlinetest); +} range.startPosition = 1; range.length = 1; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range);

1 0

Michael Müller : shell32: Create profile directories available in Vista and above.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: e38d1c9aa1ff39d5fae25ec64d895396afd31835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38d1c9aa1ff39d5fae25ec64… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 28 01:21:04 2014 +0200 shell32: Create profile directories available in Vista and above. --- dlls/shell32/shellpath.c | 65 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 158b1d1..e361483 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -868,6 +868,13 @@ typedef enum _CSIDL_Type { CSIDL_Type_SystemX86Path, } CSIDL_Type; +#define CSIDL_CONTACTS 0x0043 +#define CSIDL_DOWNLOADS 0x0047 +#define CSIDL_LINKS 0x004d +#define CSIDL_APPDATA_LOCALLOW 0x004e +#define CSIDL_SAVED_GAMES 0x0062 +#define CSIDL_SEARCHES 0x0063 + typedef struct { const KNOWNFOLDERID *id; @@ -1280,10 +1287,10 @@ static const CSIDL_DATA CSIDL_Data[] = NULL, NULL }, - { /* 0x43 */ + { /* 0x43 - CSIDL_CONTACTS */ &FOLDERID_Contacts, CSIDL_Type_User, - ContactsW, + NULL, ContactsW }, { /* 0x44 */ @@ -1304,7 +1311,7 @@ static const CSIDL_DATA CSIDL_Data[] = NULL, NULL }, - { /* 0x47 */ + { /* 0x47 - CSIDL_DOWNLOADS */ &FOLDERID_Downloads, CSIDL_Type_User, NULL, @@ -1340,13 +1347,13 @@ static const CSIDL_DATA CSIDL_Data[] = NULL, NULL }, - { /* 0x4d */ + { /* 0x4d - CSIDL_LINKS */ &FOLDERID_Links, CSIDL_Type_User, NULL, LinksW }, - { /* 0x4e */ + { /* 0x4e - CSIDL_APPDATA_LOCALLOW */ &FOLDERID_LocalAppDataLow, CSIDL_Type_User, NULL, @@ -1466,13 +1473,13 @@ static const CSIDL_DATA CSIDL_Data[] = NULL, Videos_Sample_VideosW }, - { /* 0x62 */ + { /* 0x62 - CSIDL_SAVED_GAMES */ &FOLDERID_SavedGames, CSIDL_Type_User, NULL, Saved_GamesW }, - { /* 0x63 */ + { /* 0x63 - CSIDL_SEARCHES */ &FOLDERID_SavedSearches, CSIDL_Type_User, NULL, @@ -1855,6 +1862,8 @@ static LPWSTR _GetUserSidStringFromToken(HANDLE Token) static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, LPWSTR pszPath) { + const WCHAR *szValueName; + WCHAR buffer[40]; HRESULT hr; TRACE("%p,0x%08x,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); @@ -1897,11 +1906,18 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, goto error; } } - hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, - CSIDL_Data[folder].szValueName, pszPath); + + /* For CSIDL_Type_User we also use the GUID if no szValueName is provided */ + szValueName = CSIDL_Data[folder].szValueName; + if (!szValueName) + { + StringFromGUID2( CSIDL_Data[folder].id, buffer, 39 ); + szValueName = &buffer[0]; + } + + hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, szValueName, pszPath); if (FAILED(hr) && hRootKey != HKEY_LOCAL_MACHINE) - hr = _SHGetUserShellFolderPath(HKEY_LOCAL_MACHINE, NULL, - CSIDL_Data[folder].szValueName, pszPath); + hr = _SHGetUserShellFolderPath(HKEY_LOCAL_MACHINE, NULL, szValueName, pszPath); if (FAILED(hr)) hr = _SHGetDefaultValue(folder, pszPath); if (userPrefix != NULL && userPrefix != DefaultW) @@ -2361,6 +2377,8 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, LPCWSTR szUserShellFolderPath, LPCWSTR szShellFolderPath, const UINT folders[], UINT foldersLen) { + const WCHAR *szValueName; + WCHAR buffer[40]; UINT i; WCHAR path[MAX_PATH]; HRESULT hr = S_OK; @@ -2383,7 +2401,16 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, for (i = 0; SUCCEEDED(hr) && i < foldersLen; i++) { dwPathLen = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW(hUserKey, CSIDL_Data[folders[i]].szValueName, NULL, + + /* For CSIDL_Type_User we also use the GUID if no szValueName is provided */ + szValueName = CSIDL_Data[folders[i]].szValueName; + if (!szValueName && CSIDL_Data[folders[i]].type == CSIDL_Type_User) + { + StringFromGUID2( CSIDL_Data[folders[i]].id, buffer, 39 ); + szValueName = &buffer[0]; + } + + if (RegQueryValueExW(hUserKey, szValueName, NULL, &dwType, (LPBYTE)path, &dwPathLen) || (dwType != REG_SZ && dwType != REG_EXPAND_SZ)) { @@ -2407,8 +2434,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, hr = E_FAIL; if (*path) { - ret = RegSetValueExW(hUserKey, - CSIDL_Data[folders[i]].szValueName, 0, REG_EXPAND_SZ, + ret = RegSetValueExW(hUserKey, szValueName, 0, REG_EXPAND_SZ, (LPBYTE)path, (strlenW(path) + 1) * sizeof(WCHAR)); if (ret) hr = HRESULT_FROM_WIN32(ret); @@ -2416,8 +2442,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, { hr = SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, hToken, SHGFP_TYPE_DEFAULT, path); - ret = RegSetValueExW(hKey, - CSIDL_Data[folders[i]].szValueName, 0, REG_SZ, + ret = RegSetValueExW(hKey, szValueName, 0, REG_SZ, (LPBYTE)path, (strlenW(path) + 1) * sizeof(WCHAR)); if (ret) hr = HRESULT_FROM_WIN32(ret); @@ -2457,7 +2482,13 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) CSIDL_HISTORY, CSIDL_MYPICTURES, CSIDL_FONTS, - CSIDL_ADMINTOOLS + CSIDL_ADMINTOOLS, + CSIDL_CONTACTS, + CSIDL_DOWNLOADS, + CSIDL_LINKS, + CSIDL_APPDATA_LOCALLOW, + CSIDL_SAVED_GAMES, + CSIDL_SEARCHES }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath;

1 0

Nikolay Sivov : dwrite: Store maximum width/height for text layout.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 289043f4de77e4769a732c49d6a4c2074509392b URL: http://source.winehq.org/git/wine.git/?a=commit;h=289043f4de77e4769a732c49d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 30 19:59:07 2014 +0400 dwrite: Store maximum width/height for text layout. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 24 +++++++++++++++--------- dlls/dwrite/main.c | 4 ++-- dlls/dwrite/tests/layout.c | 9 ++++++++- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 99fcca3..8db35a3 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -81,7 +81,7 @@ extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; -extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_trimmingsign(IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT get_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2ed328b..57538f5 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -64,6 +64,8 @@ struct dwrite_textlayout { WCHAR *str; UINT32 len; struct dwrite_textformat_data format; + FLOAT maxwidth; + FLOAT maxheight; }; struct dwrite_textformat { @@ -338,15 +340,17 @@ static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout *iface, W static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout *iface, FLOAT maxWidth) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%f): stub\n", This, maxWidth); - return E_NOTIMPL; + TRACE("(%p)->(%.1f)\n", This, maxWidth); + This->maxwidth = maxWidth; + return S_OK; } static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout *iface, FLOAT maxHeight) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%f): stub\n", This, maxHeight); - return E_NOTIMPL; + TRACE("(%p)->(%.1f)\n", This, maxHeight); + This->maxheight = maxHeight; + return S_OK; } static HRESULT WINAPI dwritetextlayout_SetFontCollection(IDWriteTextLayout *iface, IDWriteFontCollection* collection, DWRITE_TEXT_RANGE range) @@ -436,15 +440,15 @@ static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout *iface, W static FLOAT WINAPI dwritetextlayout_GetMaxWidth(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->maxwidth; } static FLOAT WINAPI dwritetextlayout_GetMaxHeight(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->maxheight; } static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayout *iface, UINT32 pos, @@ -750,7 +754,7 @@ static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWr IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } -HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, IDWriteTextLayout **layout) +HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; @@ -763,6 +767,8 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma This->ref = 1; This->str = heap_strdupnW(str, len); This->len = len; + This->maxwidth = maxwidth; + This->maxheight = maxheight; layout_format_from_textformat(This, format); *layout = &This->IDWriteTextLayout_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index cf3b530..357b41f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -510,7 +510,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory *iface, WCHA TRACE("(%s %u %p %f %f %p)\n", debugstr_w(string), len, format, max_width, max_height, layout); if (!format) return E_INVALIDARG; - return create_textlayout(string, len, format, layout); + return create_textlayout(string, len, format, max_width, max_height, layout); } static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory *iface, WCHAR const* string, @@ -521,7 +521,7 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory pixels_per_dip, transform, use_gdi_natural, layout); if (!format) return E_INVALIDARG; - return create_textlayout(string, len, format, layout); + return create_textlayout(string, len, format, layout_width, layout_height, layout); } static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory *iface, IDWriteTextFormat *format, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 07e5e20..8305c77 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -65,6 +65,7 @@ static void test_CreateGdiCompatibleTextLayout(void) static const WCHAR strW[] = {'s','t','r','i','n','g',0}; IDWriteTextLayout *layout; IDWriteTextFormat *format; + FLOAT dimension; HRESULT hr; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, 0.0, NULL, FALSE, &layout); @@ -102,8 +103,14 @@ static void test_CreateGdiCompatibleTextLayout(void) /* zero length string is okay */ hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteTextLayout_Release(layout); + dimension = IDWriteTextLayout_GetMaxWidth(layout); + ok(dimension == 100.0, "got %f\n", dimension); + + dimension = IDWriteTextLayout_GetMaxHeight(layout); + ok(dimension == 100.0, "got %f\n", dimension); + + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); }

1 0

Piotr Caban : msvcrt: Only check for flag presence in isatty function.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: d3a48ee3427fa458de2d3830d567c8f6ee0c682c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a48ee3427fa458de2d3830d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 31 09:51:52 2014 -0500 msvcrt: Only check for flag presence in isatty function. --- dlls/msvcrt/file.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0e5deba..7ce8b59 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -65,7 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_PIPE 0x08 #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 -#define WX_NOSEEK 0x40 +#define WX_TTY 0x40 #define WX_TEXT 0x80 /* values for exflag - it's used differently in msvcr90.dll*/ @@ -376,7 +376,7 @@ static int msvcrt_set_fd(HANDLE hand, int flag, int fd) } fdinfo->handle = hand; - fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_NOSEEK)); + fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_TTY)); fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; @@ -550,7 +550,7 @@ void msvcrt_init_io(void) HANDLE h = GetStdHandle(STD_INPUT_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDIN_FILENO); } @@ -559,7 +559,7 @@ void msvcrt_init_io(void) HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDOUT_FILENO); } @@ -568,7 +568,7 @@ void msvcrt_init_io(void) HANDLE h = GetStdHandle(STD_ERROR_HANDLE); DWORD type = GetFileType(h); - msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0) |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDERR_FILENO); } @@ -607,13 +607,9 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) */ int CDECL MSVCRT__isatty(int fd) { - HANDLE hand = msvcrt_fdtoh(fd); + TRACE(":fd (%d)\n",fd); - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return 0; - - return GetFileType(hand) == FILE_TYPE_CHAR? 1 : 0; + return msvcrt_get_ioinfo(fd)->wxflag & WX_TTY; } /* INTERNAL: Allocate stdio file buffer */ @@ -2006,7 +2002,7 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int { DWORD access = 0, creation = 0, attrib; SECURITY_ATTRIBUTES sa; - DWORD sharing; + DWORD sharing, type; int wxflag; HANDLE hand; @@ -2139,6 +2135,12 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int oflags = check_bom(hand, oflags, TRUE); } + type = GetFileType(hand); + if (type == FILE_TYPE_CHAR) + wxflag |= WX_TTY; + else if (type == FILE_TYPE_PIPE) + wxflag |= WX_PIPE; + *fd = msvcrt_alloc_fd(hand, wxflag); if (*fd == -1) return *MSVCRT__errno(); @@ -2300,7 +2302,7 @@ int CDECL MSVCRT__open_osfhandle(MSVCRT_intptr_t handle, int oflags) } if (flags == FILE_TYPE_CHAR) - flags = WX_NOSEEK; + flags = WX_TTY; else if (flags == FILE_TYPE_PIPE) flags = WX_PIPE; else @@ -2424,7 +2426,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) buf[0] = '\n'; else { buf[0] = '\r'; - if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) + if(fdinfo->wxflag & (WX_PIPE | WX_TTY)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2472,7 +2474,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(char_len+i <= pos) i += char_len; - if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { + if(fdinfo->wxflag & (WX_PIPE | WX_TTY)) { if(i < pos) fdinfo->lookahead[0] = readbuf[i]; if(i+1 < pos) @@ -2500,7 +2502,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(lookahead != '\n') readbuf[j++] = '\r'; - if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) + if(fdinfo->wxflag & (WX_PIPE | WX_TTY)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2634,7 +2636,7 @@ static int read_i(int fd, void *buf, unsigned int count) if(utf16) bufstart[j++] = 0; } - if (fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) + if (fdinfo->wxflag & (WX_PIPE | WX_TTY)) { if (lookahead[0]=='\n' && (!utf16 || !lookahead[1])) {

1 0

David Hedberg : comdlg32: Support browsing for folders.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 3cf2fb3a9c83a1326e4c5a623f2d85e0aad76876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf2fb3a9c83a1326e4c5a623… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 30 20:43:26 2014 +0200 comdlg32: Support browsing for folders. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/comdlg32.rc | 2 + dlls/comdlg32/filedlgbrowser.h | 1 + dlls/comdlg32/itemdlg.c | 46 ++++- po/ar.po | 378 ++++++++++++++++++++-------------------- po/bg.po | 381 +++++++++++++++++++++-------------------- po/ca.po | 378 ++++++++++++++++++++-------------------- po/cs.po | 378 ++++++++++++++++++++-------------------- po/da.po | 378 ++++++++++++++++++++-------------------- po/de.po | 378 ++++++++++++++++++++-------------------- po/el.po | 377 ++++++++++++++++++++-------------------- po/en.po | 376 ++++++++++++++++++++-------------------- po/en_US.po | 376 ++++++++++++++++++++-------------------- po/eo.po | 378 ++++++++++++++++++++-------------------- po/es.po | 378 ++++++++++++++++++++-------------------- po/fa.po | 377 ++++++++++++++++++++-------------------- po/fi.po | 378 ++++++++++++++++++++-------------------- po/fr.po | 378 ++++++++++++++++++++-------------------- po/he.po | 378 ++++++++++++++++++++-------------------- po/hi.po | 376 ++++++++++++++++++++-------------------- po/hr.po | 378 ++++++++++++++++++++-------------------- po/hu.po | 378 ++++++++++++++++++++-------------------- po/it.po | 378 ++++++++++++++++++++-------------------- po/ja.po | 378 ++++++++++++++++++++-------------------- po/ko.po | 378 ++++++++++++++++++++-------------------- po/lt.po | 378 ++++++++++++++++++++-------------------- po/ml.po | 376 ++++++++++++++++++++-------------------- po/nb_NO.po | 378 ++++++++++++++++++++-------------------- po/nl.po | 378 ++++++++++++++++++++-------------------- po/or.po | 376 ++++++++++++++++++++-------------------- po/pa.po | 376 ++++++++++++++++++++-------------------- po/pl.po | 378 ++++++++++++++++++++-------------------- po/pt_BR.po | 378 ++++++++++++++++++++-------------------- po/pt_PT.po | 378 ++++++++++++++++++++-------------------- po/rm.po | 376 ++++++++++++++++++++-------------------- po/ro.po | 378 ++++++++++++++++++++-------------------- po/ru.po | 378 ++++++++++++++++++++-------------------- po/sk.po | 378 ++++++++++++++++++++-------------------- po/sl.po | 378 ++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 378 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 378 ++++++++++++++++++++-------------------- po/sv.po | 378 ++++++++++++++++++++-------------------- po/te.po | 376 ++++++++++++++++++++-------------------- po/th.po | 377 ++++++++++++++++++++-------------------- po/tr.po | 378 ++++++++++++++++++++-------------------- po/uk.po | 378 ++++++++++++++++++++-------------------- po/wa.po | 378 ++++++++++++++++++++-------------------- po/wine.pot | 376 ++++++++++++++++++++-------------------- po/zh_CN.po | 378 ++++++++++++++++++++-------------------- po/zh_TW.po | 378 ++++++++++++++++++++-------------------- 50 files changed, 8952 insertions(+), 8468 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cf2fb3a9c83a1326e4c5…

1 0

Nikolay Sivov : dwrite: Implement Resize() for bitmap render target.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: c9b8a31c24c6bf855e3bdbd18672c1d184cb1f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b8a31c24c6bf855e3bdbd18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 1 21:11:45 2014 +0400 dwrite: Implement Resize() for bitmap render target. --- dlls/dwrite/gdiinterop.c | 73 ++++++++++++++++++++++++++++++------------------ dlls/dwrite/tests/font.c | 52 ++++++++++++++++++++++++++++++++-- 2 files changed, 96 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index bb24305..4b26197 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -40,6 +40,28 @@ struct rendertarget { HDC hdc; }; +static HRESULT create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) +{ + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; + HBITMAP hbm; + + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + hbm = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + if (!hbm) + hbm = CreateBitmap(1, 1, 1, 1, NULL); + + DeleteObject(SelectObject(hdc, hbm)); + return S_OK; +} + static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget(IDWriteBitmapRenderTarget *iface) { return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget_iface); @@ -145,8 +167,13 @@ static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZ static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget *iface, UINT32 width, UINT32 height) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p)->(%u %u): stub\n", This, width, height); - return E_NOTIMPL; + + TRACE("(%p)->(%u %u)\n", This, width, height); + + if (This->size.cx == width && This->size.cy == height) + return S_OK; + + return create_target_dibsection(This->hdc, width, height); } static const IDWriteBitmapRenderTargetVtbl rendertargetvtbl = { @@ -163,38 +190,30 @@ static const IDWriteBitmapRenderTargetVtbl rendertargetvtbl = { rendertarget_Resize }; -static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) +static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) { - char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; - BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; - struct rendertarget *This; - HBITMAP dib; - - *target = NULL; - - This = heap_alloc(sizeof(struct rendertarget)); - if (!This) return E_OUTOFMEMORY; + struct rendertarget *target; + HRESULT hr; - This->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl; - This->ref = 1; + *ret = NULL; - This->size.cx = width; - This->size.cy = height; + target = heap_alloc(sizeof(struct rendertarget)); + if (!target) return E_OUTOFMEMORY; - This->hdc = CreateCompatibleDC(hdc); + target->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl; + target->ref = 1; - memset(bmi, 0, sizeof(bmibuf)); - bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); - bmi->bmiHeader.biHeight = height; - bmi->bmiHeader.biWidth = width; - bmi->bmiHeader.biBitCount = 32; - bmi->bmiHeader.biPlanes = 1; - bmi->bmiHeader.biCompression = BI_RGB; + target->size.cx = width; + target->size.cy = height; - dib = CreateDIBSection(This->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); - SelectObject(This->hdc, dib); + target->hdc = CreateCompatibleDC(hdc); + hr = create_target_dibsection(target->hdc, width, height); + if (FAILED(hr)) { + IDWriteBitmapRenderTarget_Release(&target->IDWriteBitmapRenderTarget_iface); + return hr; + } - *target = &This->IDWriteBitmapRenderTarget_iface; + *ret = &target->IDWriteBitmapRenderTarget_iface; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 1447c1c..8460f12 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -198,8 +198,8 @@ static void test_CreateBitmapRenderTarget(void) { IDWriteBitmapRenderTarget *target, *target2; IDWriteGdiInterop *interop; + HBITMAP hbm, hbm2; DIBSECTION ds; - HBITMAP hbm; HRESULT hr; SIZE size; HDC hdc; @@ -272,8 +272,56 @@ if (0) /* crashes on native */ ok(size.cx == 10, "got %d\n", size.cx); ok(size.cy == 5, "got %d\n", size.cy); - IDWriteBitmapRenderTarget_Release(target); + /* resize to same size */ + hr = IDWriteBitmapRenderTarget_Resize(target, 10, 5); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm2 == hbm, "got %p, %p\n", hbm2, hbm); + + /* shrink */ + hr = IDWriteBitmapRenderTarget_Resize(target, 5, 5); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm); + + hr = IDWriteBitmapRenderTarget_Resize(target, 20, 5); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm); + + hr = IDWriteBitmapRenderTarget_Resize(target, 1, 5); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm); + + ret = GetObjectW(hbm2, sizeof(ds), &ds); + ok(ret == sizeof(ds), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 1, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 5, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 32, "got %d\n", ds.dsBm.bmBitsPixel); + ok(ds.dsBm.bmBits != NULL, "got %p\n", ds.dsBm.bmBits); + /* empty rectangle */ + hr = IDWriteBitmapRenderTarget_Resize(target, 0, 5); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm); + + ret = GetObjectW(hbm2, sizeof(ds), &ds); + ok(ret == sizeof(BITMAP), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 1, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 1, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel); + ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits); + + IDWriteBitmapRenderTarget_Release(target); IDWriteGdiInterop_Release(interop); }

1 0

Nikolay Sivov : include: Added IDWriteLocalFontFileLoader.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: ece85fad226e132c8d227f318058d24b8299b790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece85fad226e132c8d227f318… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 1 18:56:14 2014 +0400 include: Added IDWriteLocalFontFileLoader. --- include/dwrite.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/dwrite.idl b/include/dwrite.idl index a8bac59..04c523c 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -548,6 +548,18 @@ interface IDWriteFontFileLoader : IUnknown [ local, object, +uuid(b2d9f3ec-c9fe-4a11-a2ec-d86208f7c0a2) +] +interface IDWriteLocalFontFileLoader : IDWriteFontFileLoader +{ + HRESULT GetFilePathLengthFromKey(void const *key, UINT32 key_size, UINT32 *length); + HRESULT GetFilePathFromKey(void const *key, UINT32 key_size, WCHAR *path, UINT32 length); + HRESULT GetLastWriteTimeFromKey(void const *key, UINT32 key_size, FILETIME *writetime); +} + +[ +local, +object, uuid(739d886a-cef5-47dc-8769-1a8b41bebbb0) ] interface IDWriteFontFile : IUnknown

1 0

Nikolay Sivov : msxml3/saxreader: Fix attributes array growing size.
by Alexandre Julliard Aug. 4, 2014

Aug. 4, 2014

Module: wine Branch: master Commit: 66b5dd71e9627a4f51e4239a809e68aaa3158693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b5dd71e9627a4f51e4239a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 31 23:07:10 2014 +0400 msxml3/saxreader: Fix attributes array growing size. --- dlls/msxml3/saxreader.c | 65 ++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0d58db3..a926fed 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -301,8 +301,8 @@ typedef struct struct list elements; BSTR namespaceUri; - int attributesSize; - int nb_attributes; + int attr_alloc_count; + int attr_count; struct _attributes { BSTR szLocalname; @@ -1106,11 +1106,16 @@ static HRESULT WINAPI isaxattributes_getLength( { saxlocator *This = impl_from_ISAXAttributes( iface ); - *length = This->nb_attributes; + *length = This->attr_count; TRACE("Length set to %d\n", *length); return S_OK; } +static inline BOOL is_valid_attr_index(const saxlocator *locator, int index) +{ + return index < locator->attr_count && index >= 0; +} + static HRESULT WINAPI isaxattributes_getURI( ISAXAttributes* iface, int index, @@ -1120,7 +1125,7 @@ static HRESULT WINAPI isaxattributes_getURI( saxlocator *This = impl_from_ISAXAttributes( iface ); TRACE("(%p)->(%d)\n", This, index); - if(index >= This->nb_attributes || index < 0) return E_INVALIDARG; + if(!is_valid_attr_index(This, index)) return E_INVALIDARG; if(!url || !size) return E_POINTER; *size = SysStringLen(This->attributes[index].szURI); @@ -1133,36 +1138,36 @@ static HRESULT WINAPI isaxattributes_getURI( static HRESULT WINAPI isaxattributes_getLocalName( ISAXAttributes* iface, - int nIndex, + int index, const WCHAR **pLocalName, int *pLocalNameLength) { saxlocator *This = impl_from_ISAXAttributes( iface ); - TRACE("(%p)->(%d)\n", This, nIndex); + TRACE("(%p)->(%d)\n", This, index); - if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; + if(!is_valid_attr_index(This, index)) return E_INVALIDARG; if(!pLocalName || !pLocalNameLength) return E_POINTER; - *pLocalNameLength = SysStringLen(This->attributes[nIndex].szLocalname); - *pLocalName = This->attributes[nIndex].szLocalname; + *pLocalNameLength = SysStringLen(This->attributes[index].szLocalname); + *pLocalName = This->attributes[index].szLocalname; return S_OK; } static HRESULT WINAPI isaxattributes_getQName( ISAXAttributes* iface, - int nIndex, + int index, const WCHAR **pQName, int *pQNameLength) { saxlocator *This = impl_from_ISAXAttributes( iface ); - TRACE("(%p)->(%d)\n", This, nIndex); + TRACE("(%p)->(%d)\n", This, index); - if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; + if(!is_valid_attr_index(This, index)) return E_INVALIDARG; if(!pQName || !pQNameLength) return E_POINTER; - *pQNameLength = SysStringLen(This->attributes[nIndex].szQName); - *pQName = This->attributes[nIndex].szQName; + *pQNameLength = SysStringLen(This->attributes[index].szQName); + *pQName = This->attributes[index].szQName; return S_OK; } @@ -1180,7 +1185,7 @@ static HRESULT WINAPI isaxattributes_getName( saxlocator *This = impl_from_ISAXAttributes( iface ); TRACE("(%p)->(%d)\n", This, index); - if(index>=This->nb_attributes || index<0) return E_INVALIDARG; + if(!is_valid_attr_index(This, index)) return E_INVALIDARG; if(!uri || !pUriLength || !localName || !pLocalNameSize || !QName || !pQNameLength) return E_POINTER; @@ -1211,7 +1216,7 @@ static HRESULT WINAPI isaxattributes_getIndexFromName( if(!pUri || !pLocalName || !index) return E_POINTER; - for(i=0; i<This->nb_attributes; i++) + for(i=0; i<This->attr_count; i++) { if(cUriLength!=SysStringLen(This->attributes[i].szURI) || cocalNameLength!=SysStringLen(This->attributes[i].szLocalname)) @@ -1243,7 +1248,7 @@ static HRESULT WINAPI isaxattributes_getIndexFromQName( if(!pQName || !index) return E_POINTER; if(!nQNameLength) return E_INVALIDARG; - for(i=0; i<This->nb_attributes; i++) + for(i=0; i<This->attr_count; i++) { if(nQNameLength!=SysStringLen(This->attributes[i].szQName)) continue; if(memcmp(pQName, This->attributes[i].szQName, sizeof(WCHAR)*nQNameLength)) continue; @@ -1305,7 +1310,7 @@ static HRESULT WINAPI isaxattributes_getValue( saxlocator *This = impl_from_ISAXAttributes( iface ); TRACE("(%p)->(%d)\n", This, index); - if(index>=This->nb_attributes || index<0) return E_INVALIDARG; + if(!is_valid_attr_index(This, index)) return E_INVALIDARG; if(!value || !nValue) return E_POINTER; *nValue = SysStringLen(This->attributes[index].szValue); @@ -1423,7 +1428,7 @@ static void free_attribute_values(saxlocator *locator) { int i; - for (i = 0; i < locator->nb_attributes; i++) + for (i = 0; i < locator->attr_count; i++) { SysFreeString(locator->attributes[i].szLocalname); locator->attributes[i].szLocalname = NULL; @@ -1450,19 +1455,19 @@ static HRESULT SAXAttributes_populate(saxlocator *locator, if ((locator->saxreader->features & NamespacePrefixes) == 0) nb_namespaces = 0; - locator->nb_attributes = nb_namespaces + nb_attributes; - if(locator->nb_attributes > locator->attributesSize) + locator->attr_count = nb_namespaces + nb_attributes; + if(locator->attr_count > locator->attr_alloc_count) { - int new_size = locator->attributesSize * 2; + int new_size = locator->attr_count * 2; attrs = heap_realloc_zero(locator->attributes, new_size * sizeof(struct _attributes)); if(!attrs) { free_attribute_values(locator); - locator->nb_attributes = 0; + locator->attr_count = 0; return E_OUTOFMEMORY; } locator->attributes = attrs; - locator->attributesSize = new_size; + locator->attr_alloc_count = new_size; } else { @@ -1706,7 +1711,7 @@ static void libxmlEndElementNS( if (!saxreader_has_handler(This, SAXContentHandler)) { free_attribute_values(This); - This->nb_attributes = 0; + This->attr_count = 0; free_element_entry(element); return; } @@ -1728,7 +1733,7 @@ static void libxmlEndElementNS( element->qname, SysStringLen(element->qname)); free_attribute_values(This); - This->nb_attributes = 0; + This->attr_count = 0; if (sax_callback_failed(This, hr)) { @@ -2326,7 +2331,7 @@ static ULONG WINAPI isaxlocator_Release( SysFreeString(This->systemId); SysFreeString(This->namespaceUri); - for(index=0; index<This->attributesSize; index++) + for(index = 0; index < This->attr_alloc_count; index++) { SysFreeString(This->attributes[index].szLocalname); SysFreeString(This->attributes[index].szValue); @@ -2462,9 +2467,9 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B return E_OUTOFMEMORY; } - locator->attributesSize = 8; - locator->nb_attributes = 0; - locator->attributes = heap_alloc_zero(sizeof(struct _attributes)*locator->attributesSize); + locator->attr_alloc_count = 8; + locator->attr_count = 0; + locator->attributes = heap_alloc_zero(sizeof(struct _attributes)*locator->attr_alloc_count); if(!locator->attributes) { ISAXXMLReader_Release(&reader->ISAXXMLReader_iface);

1 0