January 2014 - Wine-Commits

Nikolay Sivov : scrrun: Implement Reset() for file collection.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 6dbc8195a0e4ae5fcb9751437e400e6473c0c2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dbc8195a0e4ae5fcb9751437… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:20 2014 +0400 scrrun: Implement Reset() for file collection. --- dlls/scrrun/filesystem.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index eb75a1f..a2562ef 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -705,8 +705,13 @@ static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + FindClose(This->data.u.filecoll.find); + This->data.u.filecoll.find = NULL; + + return S_OK; } static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone)

1 0

Frédéric Delanoy : wmiutils/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 50629d7ca9e31589f2ad726a7fd7f29cea848a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50629d7ca9e31589f2ad726a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 7 00:14:37 2014 +0100 wmiutils/tests: Use BOOL type where appropriate. --- dlls/wmiutils/tests/path.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index ffc3d46..56bebb3 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -94,7 +94,7 @@ static void test_IWbemPath_SetText(void) const WCHAR *path; ULONG mode; HRESULT ret; - int todo; + BOOL todo; } test[] = { { path1, 0, WBEM_E_INVALID_PARAMETER }, @@ -113,15 +113,15 @@ static void test_IWbemPath_SetText(void) { path7, WBEMPATH_CREATE_ACCEPT_RELATIVE, S_OK }, { path7, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, { path7, WBEMPATH_CREATE_ACCEPT_ALL, S_OK }, - { path7, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, 1 }, + { path7, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, TRUE }, { path7, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS + 1, S_OK }, { path8, WBEMPATH_CREATE_ACCEPT_RELATIVE, S_OK }, - { path8, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, 1 }, + { path8, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, TRUE }, { path8, WBEMPATH_CREATE_ACCEPT_ALL, S_OK }, - { path8, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, 1 }, + { path8, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS, WBEM_E_INVALID_PARAMETER, TRUE }, { path8, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS + 1, S_OK }, { path9, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, - { path10, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, 1 }, + { path10, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, TRUE }, { path11, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, { path15, WBEMPATH_CREATE_ACCEPT_ALL, S_OK } };

1 0

Frédéric Delanoy : wbemprox/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: aa0eceb554a35e7d53ffe4e0c8acd6a580246750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0eceb554a35e7d53ffe4e0c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 7 00:14:36 2014 +0100 wbemprox/tests: Use BOOL type where appropriate. --- dlls/wbemprox/tests/services.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 7f8a7a2..b36748e 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -115,7 +115,7 @@ static void test_IWbemLocator(void) { const WCHAR *path; HRESULT result; - int todo; + BOOL todo; HRESULT result_broken; } test[] = @@ -124,10 +124,10 @@ static void test_IWbemLocator(void) { path1W, WBEM_E_INVALID_NAMESPACE }, { path2W, WBEM_E_INVALID_NAMESPACE }, { path3W, WBEM_E_INVALID_NAMESPACE }, - { path4W, WBEM_E_INVALID_NAMESPACE, 0, WBEM_E_INVALID_PARAMETER }, + { path4W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { path5W, WBEM_E_INVALID_NAMESPACE }, - { path6W, 0x800706ba, 1 }, - { path7W, 0x800706ba, 1 }, + { path6W, 0x800706ba, TRUE }, + { path7W, 0x800706ba, TRUE }, { path8W, WBEM_E_INVALID_NAMESPACE }, { path9W, S_OK }, { path10W, WBEM_E_INVALID_PARAMETER },

1 0

Piotr Caban : msvcr90: Add _is_exception_typeof implementation.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 32858d1811c0b939e348f1ca3de91581ef574d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32858d1811c0b939e348f1ca3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 6 17:54:26 2014 +0100 msvcr90: Add _is_exception_typeof implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcr90/tests/msvcr90.c | 119 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/cpp.c | 85 ++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 7 files changed, 212 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32858d1811c0b939e348f…

1 0

Jactry Zeng : riched20: Use CP_UNICODE instead of 1200.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 51936be04dc9245d17051f6e5b6b247cfa5aa466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51936be04dc9245d17051f6e5… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Jan 5 19:10:58 2014 +0800 riched20: Use CP_UNICODE instead of 1200. --- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/editor.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 66dec2d..119061f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1968,7 +1968,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) ME_SetCursorToStart(editor, &start); nChars = INT_MAX; } - if (ex->codepage == 1200) + if (ex->codepage == CP_UNICODE) { return ME_GetTextW(editor, (LPWSTR)pText, ex->cb / sizeof(WCHAR) - 1, &start, nChars, ex->flags & GT_USECRLF); @@ -3338,7 +3338,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, * we know it isn't unicode. */ bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf", 6))); - bUnicode = !bRtf && pStruct->codepage == 1200; + bUnicode = !bRtf && pStruct->codepage == CP_UNICODE; TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", bUnicode ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), @@ -3691,7 +3691,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* CR/LF conversion required in 2.0 mode, verbatim in 1.0 mode */ how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; - how.codepage = unicode ? 1200 : CP_ACP; + how.codepage = unicode ? CP_UNICODE : CP_ACP; return ME_GetTextLengthEx(editor, &how); } case EM_GETTEXTLENGTHEX: @@ -3701,7 +3701,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, GETTEXTEX ex; ex.cb = wParam * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); ex.flags = GT_USECRLF; - ex.codepage = unicode ? 1200 : CP_ACP; + ex.codepage = unicode ? CP_UNICODE : CP_ACP; ex.lpDefaultChar = NULL; ex.lpUsedDefChar = NULL; return ME_GetTextEx(editor, &ex, lParam); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2f2dc96..40bf04c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -108,6 +108,8 @@ int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSPEC_HIDDEN; +#define CP_UNICODE 1200 + /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) DECLSPEC_HIDDEN; void ME_EndToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : ws2_32: handle error return from get_sock_fd (Coverity).
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 54dc91547d79f0b76a11672f41648e81f331efcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=54dc91547d79f0b76a11672f4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 4 17:49:40 2014 +0100 ws2_32: handle error return from get_sock_fd (Coverity). --- dlls/ws2_32/socket.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b027d7a..a855285 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1178,6 +1178,8 @@ static int set_ipx_packettype(int sock, int ptype) int fd = get_sock_fd( sock, 0, NULL ), ret = 0; TRACE("trying to set IPX_PTYPE: %d (fd: %d)\n", ptype, fd); + if (fd == -1) return SOCKET_ERROR; + /* We try to set the ipx type on ipx socket level. */ #ifdef SOL_IPX if(setsockopt(fd, SOL_IPX, IPX_TYPE, &ptype, sizeof(ptype)) == -1)

1 0

Stefan Dösinger : d3dx9_36: Improve error handling in remap_faces_for_attrsort.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 86e88f51b88f99514d1a00f9ee60c0a60232c7b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e88f51b88f99514d1a00f9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:18 2014 +0100 d3dx9_36: Improve error handling in remap_faces_for_attrsort. --- dlls/d3dx9_36/mesh.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 133f14d..b713079 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1615,12 +1615,17 @@ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *in DWORD **sorted_attrib_ptr_buffer = NULL; DWORD i; - *face_remap = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(**face_remap)); sorted_attrib_ptr_buffer = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(*sorted_attrib_ptr_buffer)); - if (!*face_remap || !sorted_attrib_ptr_buffer) { + if (!sorted_attrib_ptr_buffer) + return E_OUTOFMEMORY; + + *face_remap = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(**face_remap)); + if (!*face_remap) + { HeapFree(GetProcessHeap(), 0, sorted_attrib_ptr_buffer); return E_OUTOFMEMORY; } + for (i = 0; i < This->numfaces; i++) sorted_attrib_ptr_buffer[i] = &attrib_buffer[i]; qsort(sorted_attrib_ptr_buffer, This->numfaces, sizeof(*sorted_attrib_ptr_buffer),

1 0

Stefan Dösinger : d3dx9_36: Don' t make the input parameter to remap_faces_for_attrsort const.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 303a5f05f71d0250f02acff8bb9635006c850c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=303a5f05f71d0250f02acff8b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:17 2014 +0100 d3dx9_36: Don't make the input parameter to remap_faces_for_attrsort const. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index aa20119..133f14d 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1610,9 +1610,9 @@ static int attrib_entry_compare(const DWORD **a, const DWORD **b) /* Create face_remap, a new attribute buffer for attribute sort optimization. */ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *indices, - const DWORD *attrib_buffer, DWORD **sorted_attrib_buffer, DWORD **face_remap) + DWORD *attrib_buffer, DWORD **sorted_attrib_buffer, DWORD **face_remap) { - const DWORD **sorted_attrib_ptr_buffer = NULL; + DWORD **sorted_attrib_ptr_buffer = NULL; DWORD i; *face_remap = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(**face_remap));

1 0

Stefan Dösinger : d3dx9_36: Cast UINTs to FLOATs in d3dx9_line_Begin.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: b054fe94ee0bc34652b147e1b42228cfb5f056a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b054fe94ee0bc34652b147e1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:20 2014 +0100 d3dx9_36: Cast UINTs to FLOATs in d3dx9_line_Begin. --- dlls/d3dx9_36/line.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 0b3e88f..5de44f4 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -113,7 +113,7 @@ static HRESULT WINAPI d3dx9_line_Begin(ID3DXLine *iface) goto failed; D3DXMatrixIdentity(&identity); - D3DXMatrixOrthoOffCenterLH(&projection, 0.0, vp.Width, vp.Height, 0.0, 0.0, 1.0); + D3DXMatrixOrthoOffCenterLH(&projection, 0.0, (FLOAT)vp.Width, (FLOAT)vp.Height, 0.0, 0.0, 1.0); if (FAILED(IDirect3DDevice9_SetTransform(line->device, D3DTS_WORLD, &identity))) goto failed;

1 0

Marcus Meissner : msvcp90: Return on error (Coverity).
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: eddc91f6e7b2e5f417603100d781acba48f0a713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc91f6e7b2e5f417603100d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 4 18:48:42 2014 +0100 msvcp90: Return on error (Coverity). --- dlls/msvcp90/locale.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b37ead4..5a5e39c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9704,6 +9704,7 @@ size_t __cdecl mbsrtowcs(wchar_t *dst, const char **pstr, size_t n, mbstate_t *s { *_errno() = EINVAL; _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + return -1; } src = *pstr; if (!state) state = &local_state; @@ -9747,6 +9748,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s { *_errno() = EINVAL; _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + return -1; } src = *pstr;

1 0