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

Henri Verbeet : winex11: Try XRandR 1.0 if 1.2 fails.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 28a9b39372ab05a4df42890f295a06306e4fb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a9b39372ab05a4df42890f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:06 2012 +0200 winex11: Try XRandR 1.0 if 1.2 fails. --- dlls/winex11.drv/xrandr.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9eef8f5..16b5d9a 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -344,24 +344,25 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_SUCCESSFUL; } -static void xrandr12_init_modes(void) +static int xrandr12_init_modes(void) { XRRScreenResources *resources; XRROutputInfo *output_info; XRRCrtcInfo *crtc_info; + int ret = -1; int i, j; if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); - return; + return ret; } if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) { pXRRFreeScreenResources( resources ); ERR("Failed to get CRTC info.\n"); - return; + return ret; } TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, @@ -372,7 +373,7 @@ static void xrandr12_init_modes(void) pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); ERR("Failed to get output info.\n"); - return; + return ret; } TRACE("OUTPUT 0: name %s.\n", debugstr_a(output_info->name)); @@ -415,11 +416,13 @@ static void xrandr12_init_modes(void) } X11DRV_Settings_AddDepthModes(); + ret = 0; done: pXRRFreeOutputInfo( output_info ); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); + return ret; } #endif /* HAVE_XRRGETSCREENRESOURCES */ @@ -452,9 +455,7 @@ void X11DRV_XRandR_Init(void) xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 ); } - if (xrandr_get_screen_resources) - xrandr12_init_modes(); - else + if (!xrandr_get_screen_resources || xrandr12_init_modes() < 0) #endif xrandr10_init_modes(); }

1 0

Henri Verbeet : wined3d: Use a slightly shorter timeout in wined3d_event_query_finish().
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 54976a033b85f5ad37813dd739ea8ec990e410f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54976a033b85f5ad37813dd73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:08 2012 +0200 wined3d: Use a slightly shorter timeout in wined3d_event_query_finish(). --- dlls/wined3d/query.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 4a3d7a7..2ee14a3 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -141,7 +141,10 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ ENTER_GL(); if (gl_info->supported[ARB_SYNC]) { - GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, 0, ~(GLuint64)0)); + /* Apple seems to be into arbitrary limits, and timeouts larger than + * 0xfffffffffffffbff immediately return GL_TIMEOUT_EXPIRED. We don't + * really care and can live with waiting a few μs less. (OS X 10.7.4). */ + GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, GL_SYNC_FLUSH_COMMANDS_BIT, ~(GLuint64)0xffff)); checkGLcall("glClientWaitSync"); switch (gl_ret)

1 0

Marek Chmiel : dssenh/tests: Added signature tests on the DSSENH cryptographic service provider.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 681af11ee15c885f3698a69bde5fef1550667830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681af11ee15c885f3698a69bd… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Fri Aug 17 18:15:43 2012 -0500 dssenh/tests: Added signature tests on the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 251 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 251 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=681af11ee15c885f3698a…

1 0

Rico Schüller : d3dx9: Return NULL if name is not given.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 07ae14ad4c2acf8fe2d1250dd0faa4cad464bc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ae14ad4c2acf8fe2d1250dd… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:58:40 2012 +0200 d3dx9: Return NULL if name is not given. --- dlls/d3dx9_36/effect.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 80f7549..2a0b01c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -970,7 +970,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); - if (!name || !*name) return parameter; + if (!name || !*name) return NULL; element = atoi(name); part = strchr(name, ']') + 1; @@ -1009,7 +1009,7 @@ static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_param TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); - if (!name || !*name) return parameter; + if (!name || !*name) return NULL; length = strcspn( name, "[.@" ); part = name + length; @@ -1054,7 +1054,7 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl * TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); - if (!name || !*name) return parameter; + if (!name || !*name) return NULL; if (!parameter) {

1 0

Rico Schüller : d3dx9: Silence missing function handling in the effect interface.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 9c1c96413942f75dd69c73a7ff8ff715c155fcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1c96413942f75dd69c73a7f… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:05 2012 +0200 d3dx9: Silence missing function handling in the effect interface. --- dlls/d3dx9_36/effect.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f4a3b86..13c7f8a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1522,7 +1522,7 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac UINT annotation_count = 0; D3DXHANDLE *annotation_handles = NULL; - FIXME("iface %p, object %p, index %u partial stub\n", This, object, index); + TRACE("iface %p, object %p, index %u\n", This, object, index); if (pass) { @@ -1539,7 +1539,10 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac annotation_count = param->annotation_count; annotation_handles = param->annotation_handles; } - /* Todo: add funcs */ + else + { + FIXME("Functions are not handled, yet!\n"); + } if (index < annotation_count) { @@ -1562,7 +1565,7 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect UINT annotation_count = 0; D3DXHANDLE *annotation_handles = NULL; - FIXME("iface %p, object %p, name %s partial stub\n", This, object, debugstr_a(name)); + TRACE("iface %p, object %p, name %s\n", This, object, debugstr_a(name)); if (!name) { @@ -1585,7 +1588,10 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect annotation_count = param->annotation_count; annotation_handles = param->annotation_handles; } - /* Todo: add funcs */ + else + { + FIXME("Functions are not handled, yet!\n"); + } anno = get_annotation_by_name(annotation_count, annotation_handles, name); if (anno)

1 0

Rico Schüller : d3dx9: Use a separate function for the technique name.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 05818a3056468553f968122576450f3770178c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05818a3056468553f96812257… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:16 2012 +0200 d3dx9: Use a separate function for the technique name. --- dlls/d3dx9_36/effect.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 13c7f8a..2ae8bd2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -447,6 +447,26 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE) pass; } +static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl *base, LPCSTR name) +{ + UINT i; + + if (!name) return NULL; + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *tech = get_technique_struct(base->technique_handles[i]); + + if (!strcmp(tech->name, name)) + { + TRACE("Returning technique %p\n", tech); + return tech; + } + } + + return NULL; +} + static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) { unsigned int i; @@ -1419,25 +1439,15 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - unsigned int i; + struct d3dx_technique *tech = get_technique_by_name(This, name); TRACE("iface %p, name %s stub\n", This, debugstr_a(name)); - if (!name) - { - WARN("Invalid argument specified.\n"); - return NULL; - } - - for (i = 0; i < This->technique_count; ++i) + if (tech) { - struct d3dx_technique *tech = get_technique_struct(This->technique_handles[i]); - - if (!strcmp(tech->name, name)) - { - TRACE("Returning technique %p\n", This->technique_handles[i]); - return This->technique_handles[i]; - } + D3DXHANDLE t = get_technique_handle(tech); + TRACE("Returning technique %p\n", t); + return t; } WARN("Invalid argument specified.\n");

1 0

Lucas Zawacki : dinput/tests: Test for keyboard GetCapabilities.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 5b3ccdf04ab7283f03455bbc921f9066abb11db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3ccdf04ab7283f03455bbc9… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 20 03:52:16 2012 -0300 dinput/tests: Test for keyboard GetCapabilities. --- dlls/dinput/tests/keyboard.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 4b46a61..6aab8a7 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -170,6 +170,29 @@ static void test_get_prop(LPDIRECTINPUT pDI, HWND hwnd) if (pKeyboard) IUnknown_Release(pKeyboard); } +static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard = NULL; + DIDEVCAPS caps; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + caps.dwSize = sizeof(caps); + hr = IDirectInputDevice_GetCapabilities(pKeyboard, &caps); + + ok (SUCCEEDED(hr), "GetCapabilites failed: 0x%08x\n", hr); + ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilites dwFlags: 0x%08x\n", caps.dwFlags); + ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, + "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); + todo_wine ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); + + if (pKeyboard) IUnknown_Release(pKeyboard); +} + static void keyboard_tests(DWORD version) { HRESULT hr; @@ -196,6 +219,7 @@ static void keyboard_tests(DWORD version) acquire_tests(pDI, hwnd); test_set_coop(pDI, hwnd); test_get_prop(pDI, hwnd); + test_capabilities(pDI, hwnd); } DestroyWindow(hwnd);

1 0

Rico Schüller : d3dx9/tests: Add variable name test.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 98d196a808a7ecc828fee256988711f766953352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d196a808a7ecc828fee2569… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:35 2012 +0200 d3dx9/tests: Add variable name test. --- dlls/d3dx9_36/tests/effect.c | 284 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 284 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98d196a808a7ecc828fee…

1 0

Lucas Zawacki : dinput: Return a valid keyboard type in keyboard GetCapabilities.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: ac9a10f81563419836a9c734c3027d976067d9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9a10f81563419836a9c734c… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 20 03:52:17 2012 -0300 dinput: Return a valid keyboard type in keyboard GetCapabilities. --- dlls/dinput/keyboard.c | 4 ++-- dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3ca7d97..8e1d1a4 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -375,9 +375,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) - devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_PCENH << 8); else - devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_PCENH << 8); devcaps.dwAxes = 0; devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 6aab8a7..5d32abe 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -187,7 +187,7 @@ static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd) ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilites dwFlags: 0x%08x\n", caps.dwFlags); ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); - todo_wine ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, + ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); if (pKeyboard) IUnknown_Release(pKeyboard);

1 0

Rico Schüller : d3dx9: Improve check for empty braces for elements.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 607c76a165c7c948f87c33052abb16c146b7ae65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=607c76a165c7c948f87c33052… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:58:52 2012 +0200 d3dx9: Improve check for empty braces for elements. --- dlls/d3dx9_36/effect.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2a0b01c..dec2f77 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -975,7 +975,8 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete element = atoi(name); part = strchr(name, ']') + 1; - if (parameter->element_count > element) + /* check for empty [] && element range */ + if ((part - name) > 1 && parameter->element_count > element) { temp_parameter = get_parameter_struct(parameter->member_handles[element]);

1 0