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

Qian Hong : imm32/tests: Added tests for ImmDestroyIMCC.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 1448d95fa416de1c75909044c75b19f4b4c62875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1448d95fa416de1c75909044c… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:10 2013 +0800 imm32/tests: Added tests for ImmDestroyIMCC. --- dlls/imm32/tests/imm32.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 2cdc662..308b3d3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -757,6 +757,38 @@ static void test_ImmGetIMCCLockCount(void) ImmDestroyIMCC(imcc); } +static void test_ImmDestroyIMCC(void) +{ + HIMCC imcc; + DWORD ret, count, size; + VOID *p; + + imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + p = ImmLockIMCC(imcc); + ok(p != NULL, "ImmLockIMCC failed!\n"); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + size = ImmGetIMCCSize(imcc); + ok(size == sizeof(CANDIDATEINFO), "returned %d\n", size); + p = ImmDestroyIMCC(imcc); + ok(p == NULL, "Destroy a locked IMCC should success!\n"); + p = ImmLockIMCC(imcc); + todo_wine ok(p == NULL, "Lock a destroyed IMCC should fail!\n"); + ret = ImmUnlockIMCC(imcc); + todo_wine ok(ret == FALSE, "Unlock a destroyed IMCC should return FALSE!\n"); + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == 0, "Get lock count of a destroyed IMCC should return 0!\n"); + size = ImmGetIMCCSize(imcc); + todo_wine ok(size == 0, "Get size of a destroyed IMCC should return 0!\n"); + SetLastError(0xdeadbeef); + p = ImmDestroyIMCC(imcc); + todo_wine ok(p != NULL, "returned NULL\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -918,6 +950,7 @@ START_TEST(imm32) { test_ImmDefaultHwnd(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); + test_ImmDestroyIMCC(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

Henri Verbeet : d3drm/tests: Avoid LPDIRECT3DRMWINDEVICE.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: d7e052f8f13607fc6dbf40e346fe59044df3f87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e052f8f13607fc6dbf40e34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:33 2013 +0200 d3drm/tests: Avoid LPDIRECT3DRMWINDEVICE. --- dlls/d3drm/tests/d3drm.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7e59050..26b06f6 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1476,7 +1476,7 @@ static void test_Device(void) HRESULT hr; IDirect3DRM *d3drm; IDirect3DRMDevice *device; - LPDIRECT3DRMWINDEVICE pWinDevice; + IDirect3DRMWinDevice *win_device; GUID driver; HWND window; RECT rc; @@ -1513,27 +1513,26 @@ static void test_Device(void) ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); /* WinDevice */ - hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (LPVOID*)&pWinDevice); - if (FAILED(hr)) + if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device))) { win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr); goto cleanup; } - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, cname); + hr = IDirect3DRMWinDevice_GetClassName(win_device, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, NULL); + hr = IDirect3DRMWinDevice_GetClassName(win_device, NULL, NULL); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = 1; - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + hr = IDirect3DRMWinDevice_GetClassName(win_device, &size, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + hr = IDirect3DRMWinDevice_GetClassName(win_device, &size, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); ok(size == sizeof("Device"), "wrong size: %u\n", size); ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); - IDirect3DRMWinDevice_Release(pWinDevice); + IDirect3DRMWinDevice_Release(win_device); cleanup: IDirect3DRMDevice_Release(device);

1 0

Rico Schüller : d3dx9: Introduce a helper function for the annotations.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: e5a9dcf945913215d1393fb8afdc9ca0672f2c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a9dcf945913215d1393fb8a… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 13 21:39:40 2013 +0200 d3dx9: Introduce a helper function for the annotations. --- dlls/d3dx9_36/effect.c | 77 ++++++++++++++++++++---------------------------- 1 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7334718..1938b59 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1381,36 +1381,44 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetFunctionByName(ID3DXBaseEffect * return NULL; } -static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *iface, D3DXHANDLE object, UINT index) +static UINT get_annotation_from_object(struct ID3DXBaseEffectImpl *base, D3DXHANDLE object, + struct d3dx_parameter **annotations) { - struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(This, object); - struct d3dx_pass *pass = get_valid_pass(This, object); - struct d3dx_technique *technique = get_valid_technique(This, object); - UINT annotation_count = 0; - struct d3dx_parameter *annotations = NULL; - - TRACE("iface %p, object %p, index %u\n", This, object, index); + struct d3dx_parameter *param = get_valid_parameter(base, object); + struct d3dx_pass *pass = get_valid_pass(base, object); + struct d3dx_technique *technique = get_valid_technique(base, object); if (pass) { - annotation_count = pass->annotation_count; - annotations = pass->annotations; + *annotations = pass->annotations; + return pass->annotation_count; } else if (technique) { - annotation_count = technique->annotation_count; - annotations = technique->annotations; + *annotations = technique->annotations; + return technique->annotation_count; } else if (param) { - annotation_count = param->annotation_count; - annotations = param->annotations; + *annotations = param->annotations; + return param->annotation_count; } else { FIXME("Functions are not handled, yet!\n"); + return 0; } +} + +static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *iface, D3DXHANDLE object, UINT index) +{ + struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *annotations = NULL; + UINT annotation_count = 0; + + TRACE("iface %p, object %p, index %u\n", iface, object, index); + + annotation_count = get_annotation_from_object(base, object, &annotations); if (index < annotation_count) { @@ -1425,15 +1433,12 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect *iface, D3DXHANDLE object, LPCSTR name) { - struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(This, object); - struct d3dx_pass *pass = get_valid_pass(This, object); - struct d3dx_technique *technique = get_valid_technique(This, object); - struct d3dx_parameter *anno = NULL; - UINT annotation_count = 0; + struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *annotation = NULL; struct d3dx_parameter *annotations = NULL; + UINT annotation_count = 0; - TRACE("iface %p, object %p, name %s\n", This, object, debugstr_a(name)); + TRACE("iface %p, object %p, name %s\n", iface, object, debugstr_a(name)); if (!name) { @@ -1441,31 +1446,13 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect return NULL; } - if (pass) - { - annotation_count = pass->annotation_count; - annotations = pass->annotations; - } - else if (technique) - { - annotation_count = technique->annotation_count; - annotations = technique->annotations; - } - else if (param) - { - annotation_count = param->annotation_count; - annotations = param->annotations; - } - else - { - FIXME("Functions are not handled, yet!\n"); - } + annotation_count = get_annotation_from_object(base, object, &annotations); - anno = get_annotation_by_name(annotation_count, annotations, name); - if (anno) + annotation = get_annotation_by_name(annotation_count, annotations, name); + if (annotation) { - TRACE("Returning parameter %p\n", anno); - return get_parameter_handle(anno); + TRACE("Returning parameter %p\n", annotation); + return get_parameter_handle(annotation); } WARN("Invalid argument specified\n");

1 0

André Hentschel : include/ddk: Add USB_HUB_DESCRIPTOR.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 545bbb13155eae97b79981ed655f33b25158237d URL: http://source.winehq.org/git/wine.git/?a=commit;h=545bbb13155eae97b79981ed6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 7 00:01:40 2013 +0200 include/ddk: Add USB_HUB_DESCRIPTOR. --- include/ddk/usb100.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/ddk/usb100.h b/include/ddk/usb100.h index b013f21..7ec7493 100644 --- a/include/ddk/usb100.h +++ b/include/ddk/usb100.h @@ -102,6 +102,17 @@ typedef struct _USB_COMMON_DESCRIPTOR { } USB_COMMON_DESCRIPTOR; typedef struct _USB_COMMON_DESCRIPTOR *PUSB_COMMON_DESCRIPTOR; +typedef struct _USB_HUB_DESCRIPTOR { + UCHAR bDescriptorLength; + UCHAR bDescriptorType; + UCHAR bNumberOfPorts; + USHORT wHubCharacteristics; + UCHAR bPowerOnToPowerGood; + UCHAR bHubControlCurrent; + UCHAR bRemoveAndPowerMask[64]; +} USB_HUB_DESCRIPTOR; +typedef struct _USB_HUB_DESCRIPTOR *PUSB_HUB_DESCRIPTOR; + #include <poppack.h> #endif

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMPROGRESSIVEMESH.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: c635b2fc7da3ffe98afe8654a33020d991db65ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c635b2fc7da3ffe98afe8654a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:32 2013 +0200 d3drm: Avoid LPDIRECT3DRMPROGRESSIVEMESH. --- dlls/d3drm/d3drm.c | 14 ++++---------- include/d3drm.h | 4 ++-- include/d3drmobj.h | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index bd7155d..3b653de 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -803,12 +803,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_Tick(IDirect3DRM2* iface, D3DVALUE tick) return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateProgressiveMesh(IDirect3DRM2* iface, - LPDIRECT3DRMPROGRESSIVEMESH * ppMesh) +static HRESULT WINAPI IDirect3DRM2Impl_CreateProgressiveMesh(IDirect3DRM2 *iface, IDirect3DRMProgressiveMesh **mesh) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); + FIXME("iface %p, mesh %p stub!\n", iface, mesh); return E_NOTIMPL; } @@ -1478,12 +1475,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_Tick(IDirect3DRM3* iface, D3DVALUE tick) return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateProgressiveMesh(IDirect3DRM3* iface, - LPDIRECT3DRMPROGRESSIVEMESH Mesh) +static HRESULT WINAPI IDirect3DRM3Impl_CreateProgressiveMesh(IDirect3DRM3 *iface, IDirect3DRMProgressiveMesh **mesh) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, Mesh); + FIXME("iface %p, mesh %p stub!\n", iface, mesh); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 7427d32..5633326 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -241,7 +241,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) D3DRMLOADCALLBACK load_cb, void *load_ctx, D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame *parent_frame) PURE; STDMETHOD(Tick)(THIS_ D3DVALUE) PURE; - STDMETHOD(CreateProgressiveMesh)(THIS_ LPDIRECT3DRMPROGRESSIVEMESH *) PURE; + STDMETHOD(CreateProgressiveMesh)(THIS_ IDirect3DRMProgressiveMesh **mesh) PURE; }; #undef INTERFACE @@ -384,7 +384,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) D3DRMLOADCALLBACK load_cb, void *load_ctx, D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame3 *parent_frame) PURE; STDMETHOD(Tick)(THIS_ D3DVALUE) PURE; - STDMETHOD(CreateProgressiveMesh)(THIS_ LPDIRECT3DRMPROGRESSIVEMESH) PURE; + STDMETHOD(CreateProgressiveMesh)(THIS_ IDirect3DRMProgressiveMesh **mesh) PURE; STDMETHOD(RegisterClient)(THIS_ REFGUID rguid, LPDWORD lpdwID) PURE; STDMETHOD(UnregisterClient)(THIS_ REFGUID rguid) PURE; STDMETHOD(CreateClippedVisual)(THIS_ IDirect3DRMVisual *visual, IDirect3DRMClippedVisual **clipped_visual) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index e1c2da9..dfce54a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2039,7 +2039,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(SetDetail) (THIS_ D3DVALUE d3dVal) PURE; STDMETHOD(RegisterEvents) (THIS_ HANDLE event, DWORD flags, DWORD reserved) PURE; STDMETHOD(CreateMesh) (THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(Duplicate) (THIS_ LPDIRECT3DRMPROGRESSIVEMESH *ppD3DRMPMesh) PURE; + STDMETHOD(Duplicate) (THIS_ IDirect3DRMProgressiveMesh **mesh) PURE; STDMETHOD(GetBox) (THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetQuality) (THIS_ D3DRMRENDERQUALITY quality) PURE; STDMETHOD(GetQuality) (THIS_ D3DRMRENDERQUALITY *quality) PURE;

1 0

Charles Davis : winex11.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: d8cd28057906ccf45d278afce9dab3b0056eaa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cd28057906ccf45d278afce… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 12 15:07:05 2013 -0600 winex11.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string. --- dlls/winex11.drv/opengl.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9d58861..6bed2c0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -396,9 +396,11 @@ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, /* Standard OpenGL */ static void (*pglFinish)(void); static void (*pglFlush)(void); +static const GLubyte *(*pglGetString)(GLenum name); static void wglFinish(void); static void wglFlush(void); +static const GLubyte *wglGetString(GLenum name); /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext ) @@ -422,6 +424,8 @@ static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) static BOOL X11DRV_WineGL_InitOpenglInfo(void) { + static const char legacy_extensions[] = " WGL_EXT_extensions_string WGL_EXT_swap_control"; + int screen = DefaultScreen(gdi_display); Window win = 0, root = 0; const char *gl_renderer; @@ -473,8 +477,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER); WineGLInfo.glVersion = (const char *) opengl_funcs.gl.p_glGetString(GL_VERSION); str = (const char *) opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); - WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); + WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+sizeof(legacy_extensions)); strcpy(WineGLInfo.glExtensions, str); + strcat(WineGLInfo.glExtensions, legacy_extensions); /* Get the common GLX version supported by GLX client and server ( major/minor) */ pglXQueryVersion(gdi_display, &WineGLInfo.glxVersion[0], &WineGLInfo.glxVersion[1]); @@ -581,6 +586,7 @@ static BOOL has_opengl(void) do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = w##func; } while(0) REDIRECT( glFinish ); REDIRECT( glFlush ); + REDIRECT( glGetString ); #undef REDIRECT pglXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0); @@ -1927,6 +1933,13 @@ static void wglFlush(void) if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } +static const GLubyte *wglGetString(GLenum name) +{ + if (name == GL_EXTENSIONS && WineGLInfo.glExtensions) + return (const GLubyte *)WineGLInfo.glExtensions; + return pglGetString(name); +} + /*********************************************************************** * X11DRV_wglCreateContextAttribsARB */

1 0

André Hentschel : msvcrt/tests: Fix dynamically loaded functions for ARM.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 3d6ebecedbe46746dff1c3e0c1787db7e7ceadbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ebecedbe46746dff1c3e0c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 6 00:16:19 2013 +0200 msvcrt/tests: Fix dynamically loaded functions for ARM. --- dlls/msvcrt/tests/cpp.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fc223c5..3693014 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -238,6 +238,55 @@ static BOOL InitFunctionPtrs(void) } else { +#ifdef __arm__ + SETNOFAIL(poperator_new, "??_U(a)YAPAXI@Z"); + SETNOFAIL(poperator_delete, "??_V(a)YAXPAX@Z"); + + SET(pexception_ctor, "??0exception(a)std@@QAA(a)ABQBD@Z"); + SET(pexception_copy_ctor, "??0exception(a)std@@QAA(a)ABV01@@Z"); + SET(pexception_default_ctor, "??0exception(a)std@@QAA(a)XZ"); + SET(pexception_dtor, "??1exception(a)std@@UAA(a)XZ"); + SET(pexception_opequals, "??4exception(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(pexception_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(pexception_vector_dtor, "??_Eexception@@UAEPAXI(a)Z");/**/ + SET(pexception_scalar_dtor, "??_Gexception@@UAEPAXI(a)Z");/**/ + + SET(pbad_typeid_ctor, "??0bad_typeid(a)std@@QAA(a)PBD@Z"); + SETNOFAIL(pbad_typeid_ctor_closure, "??_Fbad_typeid(a)std@@QAAXXZ"); + SET(pbad_typeid_copy_ctor, "??0bad_typeid(a)std@@QAA(a)ABV01@@Z"); + SET(pbad_typeid_dtor, "??1bad_typeid(a)std@@UAA(a)XZ"); + SET(pbad_typeid_opequals, "??4bad_typeid(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(pbad_typeid_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(pbad_typeid_vector_dtor, "??_Ebad_cast@@UAEPAXI(a)Z"); + SET(pbad_typeid_scalar_dtor, "??_Gbad_cast@@UAEPAXI(a)Z"); + + SETNOFAIL(pbad_cast_ctor, "??0bad_cast@@QAE(a)ABQBD@Z"); + if (!pbad_cast_ctor) + SET(pbad_cast_ctor, "??0bad_cast(a)std@@AAA(a)PBQBD@Z"); + SETNOFAIL(pbad_cast_ctor2, "??0bad_cast(a)std@@QAA(a)PBD@Z"); + SETNOFAIL(pbad_cast_ctor_closure, "??_Fbad_cast(a)std@@QAAXXZ"); + /* FIXME: No ARM equivalent for "??0bad_cast@@QAE(a)ABV0@@Z" */ + SET(pbad_cast_dtor, "??1bad_cast(a)std@@UAA(a)XZ"); + SET(pbad_cast_opequals, "??4bad_cast(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(pbad_cast_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(pbad_cast_vector_dtor, "??_Ebad_cast@@UAEPAXI(a)Z"); + SET(pbad_cast_scalar_dtor, "??_Gbad_cast@@UAEPAXI(a)Z"); + + SET(p__non_rtti_object_ctor, "??0__non_rtti_object(a)std@@QAA(a)PBD@Z"); + SET(p__non_rtti_object_copy_ctor, "??0__non_rtti_object(a)std@@QAA(a)ABV01@@Z"); + SET(p__non_rtti_object_dtor, "??1__non_rtti_object(a)std@@UAA(a)XZ"); + SET(p__non_rtti_object_opequals, "??4__non_rtti_object(a)std@@QAAAAV01(a)ABV01@@Z"); + SET(p__non_rtti_object_what, "?what(a)exception@std@@UBAPBDXZ"); + SET(p__non_rtti_object_vector_dtor, "??_E__non_rtti_object@@UAEPAXI(a)Z"); + SET(p__non_rtti_object_scalar_dtor, "??_G__non_rtti_object@@UAEPAXI(a)Z"); + + SET(ptype_info_dtor, "??1type_info@@UAA(a)XZ"); + SET(ptype_info_raw_name, "?raw_name(a)type_info@@QBAPBDXZ"); + SET(ptype_info_name, "?name(a)type_info@@QBEPBDXZ"); + SET(ptype_info_before, "?before(a)type_info@@QBEHABV1@@Z"); + SET(ptype_info_opequals_equals, "??8type_info@@QBA_NABV0@@Z"); + SET(ptype_info_opnot_equals, "??9type_info@@QBA_NABV0@@Z"); +#else SETNOFAIL(poperator_new, "??_U(a)YAPAXI@Z"); SETNOFAIL(poperator_delete, "??_V(a)YAXPAX@Z"); @@ -285,6 +334,7 @@ static BOOL InitFunctionPtrs(void) SET(ptype_info_before, "?before(a)type_info@@QBEHABV1@@Z"); SET(ptype_info_opequals_equals, "??8type_info@@QBEHABV0@@Z"); SET(ptype_info_opnot_equals, "??9type_info@@QBEHABV0@@Z"); +#endif /* __arm__ */ } if (!poperator_new)

1 0

Nikolay Sivov : shell32: Forward to IShellLinkW methods.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 5c4f23748627f6ddc0d421dadbe90b6dc17c3709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4f23748627f6ddc0d421dad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:32:41 2013 +0400 shell32: Forward to IShellLinkW methods. --- dlls/shell32/shelllink.c | 219 +++++++++++++++++++--------------------------- 1 files changed, 91 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4f23748627f6ddc0d42…

1 0

Henri Verbeet : wined3d: Try to avoid redundant constant updates.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 37d1e8b79cfc2c4ca7b947589574179470a06c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d1e8b79cfc2c4ca7b947589… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:30 2013 +0200 wined3d: Try to avoid redundant constant updates. This gives a minor performance improvement. For example, in 3DMark03 Game Test 1 this gives about a 4% improvement, in the Counter Strike: Source stress test it's about 1%. (NVIDIA GF9600M, Intel T9550, 1024x768). --- dlls/wined3d/arb_program_shader.c | 65 +++++---- dlls/wined3d/ati_fragment_shader.c | 1 - dlls/wined3d/context.c | 8 +- dlls/wined3d/device.c | 24 ++-- dlls/wined3d/glsl_shader.c | 248 ++++++++++++++++++------------------ dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 65 +++------- dlls/wined3d/utils.c | 4 - dlls/wined3d/wined3d_private.h | 29 +++-- 9 files changed, 214 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37d1e8b79cfc2c4ca7b94…

1 0

Henri Verbeet : wined3d: Only set fragment pipe uniforms if they' re needed by the shader.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: c1af40505402ea4e5e4233a4ac739117a00429c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1af40505402ea4e5e4233a4a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:29 2013 +0200 wined3d: Only set fragment pipe uniforms if they're needed by the shader. In principle the GL driver also checks the location, but it turns out to be slightly faster to do it ourselves. --- dlls/wined3d/glsl_shader.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cbf2c60..e61b479 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -908,16 +908,26 @@ static void shader_glsl_load_constants(void *shader_priv, const struct wined3d_c for (i = 0; i < MAX_TEXTURES; ++i) { + if (prog->ps.bumpenv_mat_location[i] == -1) + continue; + GL_EXTCALL(glUniformMatrix2fvARB(prog->ps.bumpenv_mat_location[i], 1, 0, - (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00])); - GL_EXTCALL(glUniform1fARB(prog->ps.bumpenv_lum_scale_location[i], - *(const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE])); - GL_EXTCALL(glUniform1fARB(prog->ps.bumpenv_lum_offset_location[i], - *(const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET])); + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00])); + + if (prog->ps.bumpenv_lum_scale_location[i] != -1) + { + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_scale_location[i], 1, + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE])); + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_offset_location[i], 1, + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET])); + } } - D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_TEXTUREFACTOR], col); - GL_EXTCALL(glUniform4fARB(prog->ps.tex_factor_location, col[0], col[1], col[2], col[3])); + if (prog->ps.tex_factor_location != -1) + { + D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_TEXTUREFACTOR], col); + GL_EXTCALL(glUniform4fvARB(prog->ps.tex_factor_location, 1, col)); + } if (state->render_states[WINED3D_RS_SPECULARENABLE]) GL_EXTCALL(glUniform4fARB(prog->ps.specular_enable_location, 1.0f, 1.0f, 1.0f, 0.0f));

1 0