July 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : comctl32: Avoid using memset on RECTs.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 2ea72e87174f6db962ab079e37b8269a72952477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea72e87174f6db962ab079e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 15:39:57 2016 +0200 comctl32: Avoid using memset on RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 4 ++-- dlls/comctl32/tab.c | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 738c33b..08ca158 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -127,8 +127,8 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) * textHeight pixels large */ HDC hdc = GetDC(infoPtr->Self); RECT r; - memset (&r, 0, sizeof (r)); - r.bottom = max(infoPtr->minHeight, tm.tmHeight); + + SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) { height = r.bottom - r.top; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0ed9152..f8a5493 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -371,14 +371,8 @@ static BOOL TAB_InternalGetItemRect( (itemIndex < infoPtr->leftmostVisible))) { TRACE("Not Visible\n"); - /* need to initialize these to empty rects */ - if (itemRect) - { - memset(itemRect,0,sizeof(RECT)); - itemRect->bottom = infoPtr->tabHeight; - } - if (selectedRect) - memset(selectedRect,0,sizeof(RECT)); + SetRect(itemRect, 0, 0, 0, infoPtr->tabHeight); + SetRectEmpty(selectedRect); return FALSE; }

1 0

Piotr Caban : ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: f333bf47a8077ecf634163c8a67dc2502ca8295c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f333bf47a8077ecf634163c8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 28 14:24:05 2016 +0200 ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- dlls/ntdll/tests/path.c | 9 +++++---- dlls/shell32/tests/shelllink.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ae0646a..ac4807f 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -625,7 +625,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) case ABSOLUTE_DRIVE_PATH: /* c:\foo */ reqsize = sizeof(WCHAR); - tmp[0] = toupperW(name[0]); + tmp[0] = name[0]; ins_str = tmp; dep = 1; mark = 3; diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index cc7259e..c19189d 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -265,7 +265,7 @@ static void test_RtlGetFullPathName_U(void) { "c:/test/ .... .. ", "c:\\test\\", NULL}, { "c:/test/..", "c:\\", NULL}, { "c:/test/.. ", "c:\\test\\", NULL}, - { "c:/TEST", "c:\\test", "test"}, + { "c:/TEST", "c:\\TEST", "TEST"}, { "c:/test/file", "c:\\test\\file", "file"}, { "c:/test./file", "c:\\test\\file", "file"}, { "c:/test.. /file", "c:\\test.. \\file","file"}, @@ -279,6 +279,7 @@ static void test_RtlGetFullPathName_U(void) { "c:///test\\..\\file\\..\\//", "c:\\", NULL}, { "c:/test../file", "c:\\test.\\file", "file", "c:\\test..\\file", "file"}, /* vista */ + { "c:\\test", "c:\\test", "test"}, { NULL, NULL, NULL} }; @@ -325,14 +326,14 @@ static void test_RtlGetFullPathName_U(void) "Wrong result %d/%d for \"%s\"\n", ret, len, test->path ); ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok(!lstrcmpiA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpiA(rbufferA,test->alt_rname)), + ok(!lstrcmpA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpA(rbufferA,test->alt_rname)), "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname); if (file_part) { ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,(lstrlenW(file_part) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok((test->rfile && !lstrcmpiA(rfileA,test->rfile)) || - (test->alt_rfile && !lstrcmpiA(rfileA,test->alt_rfile)), + ok((test->rfile && !lstrcmpA(rfileA,test->rfile)) || + (test->alt_rfile && !lstrcmpA(rfileA,test->alt_rfile)), "Got \"%s\" expected \"%s\"\n",rfileA,test->rfile); } else diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f7c091e..8af3c97 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -248,7 +248,7 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); - ok(!strcmp(buffer, "C:\\nonexistent\\file") || + todo_wine ok(!strcmp(buffer, "C:\\nonexistent\\file") || broken(!strcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */ "case doesn't match\n"); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 82b13f7..67e75e0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -980,7 +980,7 @@ a d a C r foo bar baz -(a)todo_wine@c:\ +c:\ ------ skip option c no output

1 0

Henri Verbeet : wined3d: Get rid of struct wined3d_volume.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 50af9acb48190cdd4bf9efaf0c6c417ce4586dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50af9acb48190cdd4bf9efaf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:30 2016 +0200 wined3d: Get rid of struct wined3d_volume. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 26 +++++--------------------- dlls/wined3d/wined3d_private.h | 8 -------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5b9f69..9feb108 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2320,12 +2320,10 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi { for (i = 0; i < sub_count; ++i) { - struct wined3d_volume *volume = texture->sub_resources[i].u.volume; - - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, internal, - wined3d_texture_get_level_width(texture, volume->texture_level), - wined3d_texture_get_level_height(texture, volume->texture_level), - wined3d_texture_get_level_depth(texture, volume->texture_level), + GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, i, internal, + wined3d_texture_get_level_width(texture, i), + wined3d_texture_get_level_height(texture, i), + wined3d_texture_get_level_depth(texture, i), 0, format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); } @@ -2334,7 +2332,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) { - HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.volume); } static const struct wined3d_texture_ops texture3d_ops = @@ -2380,7 +2377,6 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct { struct wined3d_device_parent *device_parent = device->device_parent; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_volume *volumes; unsigned int i; HRESULT hr; @@ -2474,25 +2470,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->resource.map_binding = WINED3D_LOCATION_BUFFER; } - if (!(volumes = wined3d_calloc(level_count, sizeof(*volumes)))) - { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; - } - /* Generate all the surfaces. */ for (i = 0; i < texture->level_count; ++i) { struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_volume *volume; - - volume = &volumes[i]; - volume->container = texture; - volume->texture_level = i; sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - sub_resource->u.volume = volume; if (FAILED(hr = device_parent->ops->volume_created(device_parent, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) @@ -2505,7 +2489,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct TRACE("parent %p, parent_ops %p.\n", parent, parent_ops); - TRACE("Created volume level %u @ %p.\n", i, volume); + TRACE("Created volume level %u.\n", i); } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3acbbd..e5793d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2688,7 +2688,6 @@ struct wined3d_texture union { struct wined3d_surface *surface; - struct wined3d_volume *volume; } u; unsigned int offset; unsigned int size; @@ -2783,13 +2782,6 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; -struct wined3d_volume -{ - struct wined3d_texture *container; - - GLint texture_level; -}; - void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLParser GetParserState.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: a9115b36c62924e31d361cee2af6007435f27d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9115b36c62924e31d361cee2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 29 09:43:15 2016 +0000 msxml3: Implement IXMLParser GetParserState. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlparser.c | 3 +++ dlls/msxml3/xmlparser.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c index 51f2a27..32514e3 100644 --- a/dlls/msxml3/tests/xmlparser.c +++ b/dlls/msxml3/tests/xmlparser.c @@ -144,6 +144,9 @@ static void create_test(void) hr = IXMLParser_SetFlags(parser, 0); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_GetParserState(parser); + ok(hr == XMLPARSER_IDLE, "got 0x%08x\n", hr); + IXMLParser_Release(parser); } diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index ca40b22..6fcdb82 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -51,6 +51,7 @@ typedef struct _xmlparser LONG ref; int flags; + XML_PARSER_STATE state; } xmlparser; static inline xmlparser *impl_from_IXMLParser( IXMLParser *iface ) @@ -345,9 +346,9 @@ static HRESULT WINAPI xmlparser_GetParserState(IXMLParser *iface) { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p)\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + return This->state; } static HRESULT WINAPI xmlparser_Suspend(IXMLParser *iface) @@ -447,6 +448,7 @@ HRESULT XMLParser_create(void **ppObj) This->nodefactory = NULL; This->input = NULL; This->flags = 0; + This->state = XMLPARSER_IDLE; This->ref = 1; *ppObj = &This->IXMLParser_iface;

1 0

Ken Thomases : ntdll: For Mac 64-bit, poke NtCurrentTeb()-> ThreadLocalStoragePointer to the corresponding offset from %gs.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 3d8efb238808a519902e047d8673237debb0f0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8efb238808a519902e047d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jul 28 16:33:25 2016 -0500 ntdll: For Mac 64-bit, poke NtCurrentTeb()->ThreadLocalStoragePointer to the corresponding offset from %gs. 64-bit Windows apps have hard-coded accesses to %gs:0x58 baked into them. They need to find the ThreadLocalStoragePointer there. Technically, the gsbase register and the memory it points to belong to the pthread implementation on macOS. It's used for the pthread TLS implementation. Slot 11 (offset 0x58) is currently used for the implementation of the ttyname() system library function. We do not anticipate that Wine or any of the system libraries or frameworks it uses will call ttyname(). Furthermore, Apple has made it so that future releases of macOS will no longer use that slot. So, we hijack it for our purposes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 ++++++ dlls/ntdll/signal_x86_64.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d9176d7..f1ef7ab 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -818,6 +818,10 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) if (!new) return -1; if (old) memcpy( new, old, tls_module_count * sizeof(*new) ); teb->ThreadLocalStoragePointer = new; +#if defined(__APPLE__) && defined(__x86_64__) + if (teb->Reserved5[0]) + ((TEB*)teb->Reserved5[0])->ThreadLocalStoragePointer = new; +#endif TRACE( "thread %04lx tls block %p -> %p\n", (ULONG_PTR)teb->ClientId.UniqueThread, old, new ); /* FIXME: can't free old block here, should be freed at thread exit */ } @@ -1017,6 +1021,11 @@ static NTSTATUS alloc_thread_tls(void) GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, pointers[i] ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; +#if defined(__APPLE__) && defined(__x86_64__) + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" + : + : "r" (pointers), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); +#endif return STATUS_SUCCESS; } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 10faaea..decae5c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2832,6 +2832,69 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } +#ifdef __APPLE__ +/********************************************************************** + * mac_thread_gsbase + */ +static void *mac_thread_gsbase(void) +{ + static int gsbase_offset = -1; + void *ret; + + if (gsbase_offset < 0) + { + /* Search for the array of TLS slots within the pthread data structure. + That's what the macOS pthread implementation uses for gsbase. */ + const void* const sentinel1 = (const void*)0x2bffb6b4f11228ae; + const void* const sentinel2 = (const void*)0x0845a7ff6ab76707; + int rc; + pthread_key_t key; + const void** p = (const void**)pthread_self(); + int i; + + gsbase_offset = 0; + if ((rc = pthread_key_create(&key, NULL))) + { + ERR("failed to create sentinel key for gsbase search: %d\n", rc); + return NULL; + } + + pthread_setspecific(key, sentinel1); + + for (i = key + 1; i < 2000; i++) /* arbitrary limit */ + { + if (p[i] == sentinel1) + { + pthread_setspecific(key, sentinel2); + + if (p[i] == sentinel2) + { + gsbase_offset = (i - key) * sizeof(*p); + break; + } + + pthread_setspecific(key, sentinel1); + } + } + + pthread_key_delete(key); + } + + if (gsbase_offset) + { + ret = (char*)pthread_self() + gsbase_offset; + TRACE("pthread_self() %p + offset 0x%08x -> gsbase %p\n", pthread_self(), gsbase_offset, ret); + } + else + { + ret = NULL; + ERR("failed to locate gsbase; won't be able to poke ThreadLocalStoragePointer into pthread TLS; expect crashes\n"); + } + + return ret; +} +#endif + /********************************************************************** * signal_init_thread */ @@ -2850,6 +2913,14 @@ void signal_init_thread( TEB *teb ) __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" : : "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" + : + : "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); + + /* alloc_tls_slot() needs to poke a value to an address relative to each + thread's gsbase. Have each thread record its gsbase pointer into its + TEB so alloc_tls_slot() can find it. */ + teb->Reserved5[0] = mac_thread_gsbase(); #else # error Please define setting %gs for your architecture #endif

1 0

Nikolay Sivov : winetest: Initialize sin_zero field sockaddr_in structure (Coverity).
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 2e97facdd08fb4ed1bb134a2928a44869443a012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e97facdd08fb4ed1bb134a29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 18:29:24 2016 +0300 winetest: Initialize sin_zero field sockaddr_in structure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/send.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index d421e8b..a419b16 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -52,6 +52,7 @@ open_http (const char *server) sa.sin_family = AF_INET; sa.sin_port = htons (80); sa.sin_addr.s_addr = inet_addr (server); + memset (sa.sin_zero, 0, sizeof(sa.sin_zero)); if (sa.sin_addr.s_addr == INADDR_NONE) { struct hostent *host = gethostbyname (server); if (!host) {

1 0

Alistair Leslie-Hughes : d3dx10: Add D3DXCpuOptimizations stub.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: e09f404bd0f873b03f9c087bf6555c542a024359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09f404bd0f873b03f9c087bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 26 07:53:07 2016 +0000 d3dx10: Add D3DXCpuOptimizations stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 10 +++++++-- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10math.h | 45 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index ab696e8..f410be8 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -70,7 +70,7 @@ @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere -@ stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateMatrixStack(long ptr) d3dx9_36.D3DXCreateMatrixStack @ stdcall D3DXFloat16To32Array(ptr ptr long) d3dx9_36.D3DXFloat16To32Array @ stdcall D3DXFloat32To16Array(ptr ptr long) d3dx9_36.D3DXFloat32To16Array diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 0c1ff80..7308373 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -34,8 +34,7 @@ #include "objbase.h" #include "d3d10_1.h" -#include "d3dx10core.h" -#include "d3dx10tex.h" +#include "d3dx10.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -210,3 +209,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat return E_NOTIMPL; } + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("enable %#x stub.\n", enable); + + return D3DX_NOT_OPTIMIZED; +} diff --git a/include/Makefile.in b/include/Makefile.in index 9c20f28a..4aaefaf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -256,6 +256,7 @@ HEADER_SRCS = \ d3dvec.inl \ d3dx10.h \ d3dx10async.h \ + d3dx10math.h \ d3dx10tex.h \ d3dx11.h \ d3dx11async.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index dd423a5..fb48723 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -27,6 +27,7 @@ #define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) #include "d3d10.h" +#include "d3dx10math.h" #include "d3dx10core.h" #include "d3dx10async.h" #include "d3dx10tex.h" diff --git a/include/d3dx10math.h b/include/d3dx10math.h new file mode 100644 index 0000000..a96784b --- /dev/null +++ b/include/d3dx10math.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2016 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3dx10.h" + +/* This guard is the same as D3DX9 to prevent double-inclusion */ +#ifndef __D3DX9MATH_H__ +#define __D3DX9MATH_H__ + +#include <math.h> + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED, + D3DX_3DNOW_OPTIMIZED, + D3DX_SSE2_OPTIMIZED, + D3DX_SSE_OPTIMIZED +} D3DX_CPU_OPTIMIZATION; + +#ifdef __cplusplus +extern "C" { +#endif + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable); + +#ifdef __cplusplus +} +#endif + +#endif /* __D3DX9MATH_H__ */

1 0

Jacek Caban : jscript: Fixed potential leak in RegExp lastIndex setter.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 9fc2863ebd87f3ec06c238009a98672a42acc7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc2863ebd87f3ec06c238009… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 18:45:05 2016 +0200 jscript: Fixed potential leak in RegExp lastIndex setter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 9f74e50..a47da1f 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -335,6 +335,7 @@ static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t TRACE("\n"); + jsval_release(regexp->last_index_val); hres = jsval_copy(value, &regexp->last_index_val); if(FAILED(hres)) return hres;

1 0

Michael Stefaniuc : comctl32: Remove an always true conditional expression.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 302ae44d8b752ca470c3f5923a9012d04a52b6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302ae44d8b752ca470c3f5923… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 12:23:19 2016 +0200 comctl32: Remove an always true conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 58a7b67..9811da3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3469,7 +3469,9 @@ static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList2 *iface, int i, if (!ImageList_GetImageInfo(imgl, i, &info)) return E_FAIL; - return CopyRect(prc, &info.rcImage) ? S_OK : E_FAIL; + *prc = info.rcImage; + + return S_OK; } static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList2 *iface, int *cx,

1 0

Jacek Caban : jscipt: Use passed copy of arguments if they are alread at the top of the stack.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: b0dcbbdbee2bfa0d4d0fab1d6ff21cb04e5eb596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dcbbdbee2bfa0d4d0fab1d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 18:44:57 2016 +0200 jscipt: Use passed copy of arguments if they are alread at the top of the stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index acdeb85..2c44112 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2591,19 +2591,25 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc, jsval_t *argv) { + const unsigned orig_stack = ctx->stack_top; unsigned i; jsval_t v; HRESULT hres; - frame->arguments_off = ctx->stack_top; - - for(i = 0; i < argc; i++) { - hres = jsval_copy(argv[i], &v); - if(SUCCEEDED(hres)) - hres = stack_push(ctx, v); - if(FAILED(hres)) { - stack_popn(ctx, i); - return hres; + /* If arguments are already on the stack, we may use them. */ + if(argv + argc == ctx->stack + ctx->stack_top) { + frame->arguments_off = argv - ctx->stack; + i = argc; + }else { + frame->arguments_off = ctx->stack_top; + for(i = 0; i < argc; i++) { + hres = jsval_copy(argv[i], &v); + if(SUCCEEDED(hres)) + hres = stack_push(ctx, v); + if(FAILED(hres)) { + stack_popn(ctx, i); + return hres; + } } } @@ -2611,12 +2617,12 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc for(; i < frame->function->param_cnt; i++) { hres = stack_push(ctx, jsval_undefined()); if(FAILED(hres)) { - stack_popn(ctx, i); + stack_popn(ctx, ctx->stack_top - orig_stack); return hres; } } - frame->pop_locals = i; + frame->pop_locals = ctx->stack_top - orig_stack; frame->base_scope->frame = frame; return S_OK; }

1 0