January 2016 - Wine-Commits

Henri Verbeet : wined3d: Require non-NULL rectangles in wined3d_texture_blt().
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 535873cc00bc53bbe0c4dc70799ad094db66b595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535873cc00bc53bbe0c4dc707… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 18:40:23 2016 +0100 wined3d: Require non-NULL rectangles in wined3d_texture_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7ea1b63..fa948ff 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1410,7 +1410,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) { struct wined3d_resource *dst_resource, *src_resource = NULL; - RECT d, s; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " "src_sub_resource_idx %u, src_rect %s, flags %#x, fx %p, filter %s.\n", @@ -1420,22 +1419,12 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned if (!(dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx)) || dst_resource->type != WINED3D_RTYPE_SURFACE) return WINED3DERR_INVALIDCALL; - if (!dst_rect) - { - SetRect(&d, 0, 0, dst_resource->width, dst_resource->height); - dst_rect = &d; - } if (src_texture) { if (!(src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx)) || src_resource->type != WINED3D_RTYPE_SURFACE) return WINED3DERR_INVALIDCALL; - if (!src_rect) - { - SetRect(&s, 0, 0, src_resource->width, src_resource->height); - src_rect = &s; - } } return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect,

1 0

Alexandre Julliard : include: Update stdcall and cdecl definitions in crtdefs.h.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 206e8b147bc8670621d8dfaaa03834fb1fc02082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=206e8b147bc8670621d8dfaaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 18:05:46 2016 +0900 include: Update stdcall and cdecl definitions in crtdefs.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdefs.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index f2600ad..dde5ea1 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -44,7 +44,7 @@ #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ -# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) # else # define __stdcall __attribute__((__stdcall__)) @@ -55,21 +55,29 @@ # error You need to define __stdcall for your compiler # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __stdcall __attribute__((ms_abi)) -# else +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __stdcall __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((ms_abi)) +# endif +# else /* __i386__ */ # define __stdcall -# endif +# endif /* __i386__ */ #endif /* __stdcall */ #ifndef __cdecl # if defined(__i386__) && defined(__GNUC__) -# ifdef __APPLE__ /* Mac OS X uses 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__)) # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __cdecl __attribute__((ms_abi)) +# endif # elif !defined(_MSC_VER) # define __cdecl # endif

1 0

Francois Gouget : shell32/tests: Check the child process exit code and close the process handle.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 30230fae5f74bf0f2233f4b6eb9b09f086a21bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30230fae5f74bf0f2233f4b6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:42 2016 +0100 shell32/tests: Check the child process exit code and close the process handle. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index a950cde..0630815 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -26,8 +26,6 @@ * - ShellExecute("foo.shlexec") with no path should work if foo.shlexec is * in the PATH * - test associations that use %l, %L or "%1" instead of %1 - * - we may want to test ShellExecuteEx() instead of ShellExecute() - * and then we could also check its return value * - ShellExecuteEx() also calls SetLastError() with meaningful values which * we could check */ @@ -597,13 +595,20 @@ static INT_PTR shell_execute_ex_(const char* file, int line, if (rc > 32) { - int wait_rc; + DWORD wait_rc, rc; if (sei.hProcess!=NULL) { wait_rc=WaitForSingleObject(sei.hProcess, 5000); okShell_(file, line)(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); + wait_rc = GetExitCodeProcess(sei.hProcess, &rc); + okShell_(file, line)(wait_rc, "GetExitCodeProcess() failed le=%u\n", GetLastError()); + if (!_todo_wait) + okShell_(file, line)(rc == 0, "child returned %u\n", rc); + else todo_wine + okShell_(file, line)(rc == 0, "child returned %u\n", rc); + CloseHandle(sei.hProcess); } wait_rc=WaitForSingleObject(hEvent, 5000); if (!_todo_wait)

1 0

Francois Gouget : shell32/tests: Declare childPrintf() as a printf-style function.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 3a9b09aa7d2ea75bf37dca92347a4d4d2ba369ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9b09aa7d2ea75bf37dca923… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:39 2016 +0100 shell32/tests: Declare childPrintf() as a printf-style function. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0b687d0..a950cde 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -117,7 +117,7 @@ static char* decodeA(const char* str) return ptr; } -static void childPrintf(HANDLE h, const char* fmt, ...) +static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { va_list valist; char buffer[1024];

1 0

Henri Verbeet : ddraw: Use wined3d_texture_blt() in ddraw_surface7_BltFast ().
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: d6e7f18c84c0df934942e6570ab0818199c8c009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e7f18c84c0df934942e6570… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 18:40:25 2016 +0100 ddraw: Use wined3d_texture_blt() in ddraw_surface7_BltFast(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 4 +++- dlls/ddraw/surface.c | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a3c9465..d7bf099 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4765,7 +4765,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent return DDERR_OUTOFVIDEOMEMORY; } - ddraw_surface_init(ddraw_surface, ddraw, wined3d_texture, surface, parent_ops); + ddraw_surface_init(ddraw_surface, ddraw, wined3d_texture, sub_resource_idx, surface, parent_ops); *parent = ddraw_surface; ddraw_update_lost_surfaces(ddraw); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1966a3e..4fb1820 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -163,6 +163,7 @@ struct ddraw_surface struct ddraw *ddraw; struct wined3d_surface *wined3d_surface; struct wined3d_texture *wined3d_texture; + unsigned int sub_resource_idx; struct wined3d_rendertarget_view *wined3d_rtv; struct wined3d_private_store private_store; struct d3d_device *device1; @@ -209,7 +210,8 @@ struct ddraw_texture HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface) DECLSPEC_HIDDEN; -void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, +void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e8f547..1296e59 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4132,8 +4132,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac if (src_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(dst_impl->wined3d_surface, &dst_rect, - src_impl->wined3d_surface, src_rect, flags, NULL, WINED3D_TEXF_POINT); + hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect, + src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, flags, NULL, WINED3D_TEXF_POINT); if (SUCCEEDED(hr) && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE); wined3d_mutex_unlock(); @@ -6215,7 +6215,8 @@ fail: return hr; } -void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, +void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture); @@ -6277,6 +6278,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru surface->wined3d_surface = wined3d_surface; wined3d_texture_incref(surface->wined3d_texture = wined3d_texture); + surface->sub_resource_idx = sub_resource_idx; *parent_ops = &ddraw_surface_wined3d_parent_ops; wined3d_private_store_init(&surface->private_store);

1 0

Francois Gouget : ntdll/tests: Fix an infinite loop on platforms where NtQuerySystemInformationEx() is not implemented.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 93988c503922095353a7c2da3bfacd8ab6fe2754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93988c503922095353a7c2da3… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 29 12:32:16 2016 +0100 ntdll/tests: Fix an infinite loop on platforms where NtQuerySystemInformationEx() is not implemented. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f590cfb..c9b6703 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -743,17 +743,21 @@ static void test_query_logicalprocex(void) status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(infoex->Size > 0, "got %u\n", infoex->Size); ret = pGetLogicalProcessorInformationEx(RelationAll, infoex2, &len2); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(!memcmp(infoex, infoex2, len), "returned info data mismatch\n"); - for(i = 0; i < len; ){ + for(i = 0; status == STATUS_SUCCESS && i < len; ){ SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *ex = (void*)(((char *)infoex) + i); ok(ex->Relationship >= RelationProcessorCore && ex->Relationship <= RelationGroup, "Got invalid relationship value: 0x%x\n", ex->Relationship); + if (!ex->Size) + { + ok(0, "got infoex[%u].Size=0\n", i); + break; + } trace("infoex[%u].Size: %u\n", i, ex->Size); switch(ex->Relationship){

1 0

Huw Davies : shell32: The attributes is not an array, so don' t label it as such.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: a77c0ebc806f38b618ae9efc07b10c660f42548e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77c0ebc806f38b618ae9efc0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 28 15:32:49 2016 +0000 shell32: The attributes is not an array, so don't label it as such. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 85383e8..2782157 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1123,24 +1123,24 @@ static HRESULT WINAPI ShellFolder2_CreateViewObject(IShellFolder2* iface, HWND h } static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT cidl, - LPCITEMIDLIST* apidl, SFGAOF* rgfInOut) + LPCITEMIDLIST* apidl, SFGAOF* attrs) { UnixFolder *This = impl_from_IShellFolder2(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%u %p %p)\n", This, cidl, apidl, rgfInOut); + TRACE("(%p)->(%u %p %p)\n", This, cidl, apidl, attrs); - if (!rgfInOut || (cidl && !apidl)) + if (!attrs || (cidl && !apidl)) return E_INVALIDARG; if (cidl == 0) { - *rgfInOut &= This->m_dwAttributes; + *attrs &= This->m_dwAttributes; } else { char szAbsolutePath[FILENAME_MAX], *pszRelativePath; UINT i; - *rgfInOut = SFGAO_CANCOPY|SFGAO_CANMOVE|SFGAO_CANLINK|SFGAO_CANRENAME|SFGAO_CANDELETE| - SFGAO_HASPROPSHEET|SFGAO_DROPTARGET|SFGAO_FILESYSTEM; + *attrs = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANLINK | SFGAO_CANRENAME | SFGAO_CANDELETE | + SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSTEM; lstrcpyA(szAbsolutePath, This->m_pszPath); pszRelativePath = szAbsolutePath + lstrlenA(szAbsolutePath); for (i=0; i<cidl; i++) { @@ -1149,12 +1149,12 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelativePath)) return E_INVALIDARG; if (!(dos_name = wine_get_dos_file_name( szAbsolutePath ))) - *rgfInOut &= ~SFGAO_FILESYSTEM; + *attrs &= ~SFGAO_FILESYSTEM; else HeapFree( GetProcessHeap(), 0, dos_name ); } if (_ILIsFolder(apidl[i])) - *rgfInOut |= SFGAO_FOLDER|SFGAO_HASSUBFOLDER|SFGAO_FILESYSANCESTOR; + *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; } }

1 0

Francois Gouget : shell32/tests: Check for failures in the child process.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: bdfaa8c807693ff033f2b8f4581ffc2d1ed38303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfaa8c807693ff033f2b8f45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:46 2016 +0100 shell32/tests: Check for failures in the child process. Return the number of failures through both the child result file and the process exit code. Also rename the child result file section to 'Child' since it no longer only contains 'Arguments'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0630815..ae91493 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -225,7 +225,7 @@ static void doChild(int argc, char** argv) return; /* Arguments */ - childPrintf(hFile, "[Arguments]\r\n"); + childPrintf(hFile, "[Child]\r\n"); if (winetest_debug > 2) { trace("cmdlineA='%s'\n", GetCommandLineA()); @@ -287,6 +287,7 @@ static void doChild(int argc, char** argv) childPrintf(hFile, "ddeExec=%s\r\n", encodeA(ddeExec)); } + childPrintf(hFile, "Failures=%d\r\n", winetest_get_failures()); CloseHandle(hFile); init_event(filename); @@ -302,16 +303,19 @@ static void dump_child_(const char* file, int line) char* str; int i, c; - str=getChildString("Arguments", "cmdlineA"); + str=getChildString("Child", "cmdlineA"); trace_(file, line)("cmdlineA='%s'\n", str); - c=GetPrivateProfileIntA("Arguments", "argcA", -1, child_file); + c=GetPrivateProfileIntA("Child", "argcA", -1, child_file); trace_(file, line)("argcA=%d\n",c); for (i=0;i<c;i++) { sprintf(key, "argvA%d", i); - str=getChildString("Arguments", key); + str=getChildString("Child", key); trace_(file, line)("%s='%s'\n", key, str); } + + c=GetPrivateProfileIntA("Child", "Failures", -1, child_file); + trace_(file, line)("Failures=%d\n", c); } } @@ -355,7 +359,7 @@ void reset_association_description(void) static void okChildString_(const char* file, int line, const char* key, const char* expected, const char* bad) { char* result; - result=getChildString("Arguments", key); + result=getChildString("Child", key); if (!result) { okShell_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); @@ -408,7 +412,7 @@ static int StrCmpPath(const char* s1, const char* s2) static void okChildPath_(const char* file, int line, const char* key, const char* expected) { char* result; - result=getChildString("Arguments", key); + result=getChildString("Child", key); if (!result) { okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); @@ -422,7 +426,7 @@ static void okChildPath_(const char* file, int line, const char* key, const char static void okChildInt_(const char* file, int line, const char* key, int expected) { INT result; - result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + result=GetPrivateProfileIntA("Child", key, expected, child_file); okShell_(file,line)(result == expected, "%s expected %d, but got %d\n", key, expected, result); } @@ -431,7 +435,7 @@ static void okChildInt_(const char* file, int line, const char* key, int expecte static void okChildIntBroken_(const char* file, int line, const char* key, int expected) { INT result; - result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + result=GetPrivateProfileIntA("Child", key, expected, child_file); okShell_(file,line)(result == expected || broken(result != expected), "%s expected %d, but got %d\n", key, expected, result); } @@ -521,8 +525,13 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc > 32) + if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + { + int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + if (c > 0) + winetest_add_failures(c); dump_child_(file, line); + } if(!verb) { @@ -626,8 +635,13 @@ static INT_PTR shell_execute_ex_(const char* file, int line, * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc > 32) + if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + { + int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + if (c > 0) + winetest_add_failures(c); dump_child_(file, line); + } return rc; } @@ -1551,7 +1565,7 @@ static void test_argify(void) else todo_wine okChildInt("argcA", 4 + count - 1); - cmd = getChildString("Arguments", "cmdlineA"); + cmd = getChildString("Child", "cmdlineA"); /* Our commands are such that the verb immediately precedes the * part we are interested in. */ @@ -2810,7 +2824,8 @@ START_TEST(shlexec) if (myARGC >= 3) { doChild(myARGC, myARGV); - exit(0); + /* Skip the tests/failures trace for child processes */ + ExitProcess(winetest_get_failures()); } init_test();

1 0

Riccardo Bortolato : wined3d: Get rid of the surface refcounting functions.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: a96abff8082d3c6ac7f1acb57727656a94a6bde9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96abff8082d3c6ac7f1acb57… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Jan 28 18:40:26 2016 +0100 wined3d: Get rid of the surface refcounting functions. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 ++++++++++---------------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a8cab70..7b1cf28 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1093,12 +1093,20 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win static ULONG surface_resource_incref(struct wined3d_resource *resource) { - return wined3d_surface_incref(surface_from_resource(resource)); + struct wined3d_surface *surface = surface_from_resource(resource); + + TRACE("surface %p, container %p.\n", surface, surface->container); + + return wined3d_texture_incref(surface->container); } static ULONG surface_resource_decref(struct wined3d_resource *resource) { - return wined3d_surface_decref(surface_from_resource(resource)); + struct wined3d_surface *surface = surface_from_resource(resource); + + TRACE("surface %p, container %p.\n", surface, surface->container); + + return wined3d_texture_decref(surface->container); } static void surface_unload(struct wined3d_resource *resource) @@ -1859,20 +1867,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -ULONG CDECL wined3d_surface_incref(struct wined3d_surface *surface) -{ - TRACE("surface %p, container %p.\n", surface, surface->container); - - return wined3d_texture_incref(surface->container); -} - -ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) -{ - TRACE("surface %p, container %p.\n", surface, surface->container); - - return wined3d_texture_decref(surface->container); -} - void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c09e0a6..cd8174c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,14 +223,12 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) -@ cdecl wined3d_surface_incref(ptr) @ cdecl wined3d_surface_map(ptr ptr ptr long) @ cdecl wined3d_surface_preload(ptr) @ cdecl wined3d_surface_releasedc(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 08cbf50..bd0a9c7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2475,14 +2475,12 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); -ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); -ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); void __cdecl wined3d_surface_preload(struct wined3d_surface *surface);

1 0

Hans Leidekker : webservices: Add support for structure types in WsWriteType.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 98d19212e7a8c0ed4625941f415a42cc34a62cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d19212e7a8c0ed4625941f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 29 13:27:25 2016 +0100 webservices: Add support for structure types in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 86 +++++++++++++++++++++++++++ dlls/webservices/writer.c | 126 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 8394f7a..fdddceb 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -636,6 +636,91 @@ static void test_basic_type(void) WsFreeWriter( writer ); } +static void test_simple_struct_type(void) +{ + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_XML_STRING localname = {6, (BYTE *)"struct"}, ns = {0, NULL}; + struct test + { + const WCHAR *field; + } *test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + + test = HeapAlloc( GetProcessHeap(), 0, sizeof(*test) ); + test->field = valueW; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct>value</struct>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct>value</struct>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct struct=\"value\"/>", __LINE__ ); + + HeapFree( GetProcessHeap(), 0, test ); + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -646,4 +731,5 @@ START_TEST(writer) test_WsWriteStartAttribute(); test_WsWriteType(); test_basic_type(); + test_simple_struct_type(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 00fd310..5efd62e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1113,12 +1113,138 @@ static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, return hr; } +static HRESULT write_type_struct( struct writer *, WS_TYPE_MAPPING, const WS_STRUCT_DESCRIPTION *, + const void * ); + +static HRESULT write_type_struct_field( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_FIELD_DESCRIPTION *desc, const void *value ) +{ + HRESULT hr; + + if (desc->options && desc->options != WS_FIELD_POINTER && + desc->options != WS_FIELD_OPTIONAL && + desc->options != (WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) + { + FIXME( "options 0x%x not supported\n", desc->options ); + return E_NOTIMPL; + } + + switch (desc->type) + { + case WS_STRUCT_TYPE: + { + const void * const *ptr = value; + if ((hr = write_type_struct( writer, mapping, desc->typeDescription, *ptr )) != S_OK) return hr; + break; + } + case WS_BOOL_TYPE: + { + const BOOL *ptr = value; + if ((hr = write_type_bool( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT8_TYPE: + { + const INT8 *ptr = value; + if ((hr = write_type_int8( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT16_TYPE: + { + const INT16 *ptr = value; + if ((hr = write_type_int16( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT32_TYPE: + { + const INT32 *ptr = value; + if ((hr = write_type_int32( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT64_TYPE: + { + const INT64 *ptr = value; + if ((hr = write_type_int64( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT8_TYPE: + { + const UINT8 *ptr = value; + if ((hr = write_type_uint8( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT16_TYPE: + { + const UINT16 *ptr = value; + if ((hr = write_type_uint16( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT32_TYPE: + { + const UINT32 *ptr = value; + if ((hr = write_type_uint32( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT64_TYPE: + { + const UINT64 *ptr = value; + if ((hr = write_type_uint64( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_WSZ_TYPE: + { + const WCHAR * const *ptr = value; + if ((hr = write_type_wsz( writer, mapping, desc->typeDescription, *ptr )) != S_OK) return hr; + break; + } + default: + FIXME( "type %u not implemented\n", desc->type ); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_STRUCT_DESCRIPTION *desc, const void *value ) +{ + ULONG i; + HRESULT hr; + const char *ptr; + + if (!desc) return E_INVALIDARG; + + if (desc->structOptions) + { + FIXME( "struct options 0x%x not supported\n", desc->structOptions ); + return E_NOTIMPL; + } + + for (i = 0; i < desc->fieldCount; i++) + { + ptr = (const char *)value + desc->fields[i]->offset; + if ((hr = write_type_struct_field( writer, mapping, desc->fields[i], ptr )) != S_OK) + return hr; + } + + return S_OK; +} + static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { switch (type) { + case WS_STRUCT_TYPE: + { + const void * const *ptr = value; + + if (!desc || option != WS_WRITE_REQUIRED_POINTER || size != sizeof(*ptr)) + return E_INVALIDARG; + + return write_type_struct( writer, mapping, desc, *ptr ); + } case WS_BOOL_TYPE: { const BOOL *ptr = value;

1 0