April 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Work around mouse "pausing" after CGWarpMouseCursorPosition().
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: a6722029e5e5fa5c44cde09138eb61dd88e16604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6722029e5e5fa5c44cde0913… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Apr 26 04:06:08 2013 -0500 winemac: Work around mouse "pausing" after CGWarpMouseCursorPosition(). --- dlls/winemac.drv/cocoa_app.m | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4e38e3b..cde93d8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1049,7 +1049,20 @@ int macdrv_err_on; { ret = (CGWarpMouseCursorPosition(pos) == kCGErrorSuccess); if (ret) + { lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + + // Annoyingly, CGWarpMouseCursorPosition() effectively disassociates + // the mouse from the cursor position for 0.25 seconds. This means + // that mouse movement during that interval doesn't move the cursor + // and events carry a constant location (the warped-to position) + // even though they have delta values. This screws us up because + // the accumulated deltas we send to Wine don't match any eventual + // absolute position we send (like with a button press). We can + // work around this by simply forcibly reassociating the mouse and + // cursor position. + CGAssociateMouseAndMouseCursorPosition(true); + } } if (ret)

1 0

Ken Thomases : winemac: For SetCursorPos(), reset positions of pending mouse button and scroll events.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: 51129752bc0ef5c4b2f90c1af09ed2c63d79e119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51129752bc0ef5c4b2f90c1af… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Apr 26 04:06:12 2013 -0500 winemac: For SetCursorPos(), reset positions of pending mouse button and scroll events. They are effectively deemed to have happened after the SetCursorPos(). --- dlls/winemac.drv/cocoa_app.m | 3 ++- dlls/winemac.drv/cocoa_event.h | 2 ++ dlls/winemac.drv/cocoa_event.m | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index cde93d8..7a304a8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1032,8 +1032,8 @@ int macdrv_err_on; { [self clipCursorLocation:&pos]; + ret = [self warpCursorTo:&pos from:NULL]; synthesizedLocation = pos; - ret = [self warpCursorTo:&synthesizedLocation from:NULL]; if (ret) { // We want to discard mouse-move events that have already been @@ -1076,6 +1076,7 @@ int macdrv_err_on; [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) | event_mask_for_type(MOUSE_MOVED_ABSOLUTE) forWindow:nil]; + [queue resetMouseEventPositions:pos]; } [eventQueuesLock unlock]; } diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index c1afc73..4e6bf84 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -42,6 +42,8 @@ - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout; + - (void) resetMouseEventPositions:(CGPoint)pos; + @end void OnMainThread(dispatch_block_t block); diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 1cbd5fb..7c41d26 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -280,6 +280,29 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea return [self query:query timeout:timeout processEvents:FALSE]; } + - (void) resetMouseEventPositions:(CGPoint)pos + { + MacDrvEvent* event; + + [eventsLock lock]; + + for (event in events) + { + if (event->event->type == MOUSE_BUTTON) + { + event->event->mouse_button.x = pos.x; + event->event->mouse_button.y = pos.y; + } + else if (event->event->type == MOUSE_SCROLL) + { + event->event->mouse_scroll.x = pos.x; + event->event->mouse_scroll.y = pos.y; + } + } + + [eventsLock unlock]; + } + /*********************************************************************** * OnMainThread

1 0

Christian Costa : shdocvw: Don't set res variable since it' s not ckecked after the call.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: 0fa2eddca29dc613c6e52fb6526becb8a55d5cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa2eddca29dc613c6e52fb65… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 26 01:03:47 2013 +0200 shdocvw: Don't set res variable since it's not ckecked after the call. --- dlls/shdocvw/shdocvw_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index be1588c..fa89051 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -442,7 +442,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD } len = sizeof(buffer) / sizeof(buffer[0]); - res = ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); + ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); HeapFree(GetProcessHeap(), 0, urlW); needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL);

1 0

Detlef Riekenberg : shell32: Add a semi-stub for SHGetStockIconInfo.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: eafc9e84a6a2662066a77470635c90aeb63d42ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafc9e84a6a2662066a774706… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 25 20:22:05 2013 +0200 shell32: Add a semi-stub for SHGetStockIconInfo. --- dlls/shell32/iconcache.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 637dbca..0c21214 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -876,3 +876,44 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) return -1; } + +/**************************************************************************** + * SHGetStockIconInfo [SHELL32.@] + * + * Receive informations for builtin icons + * + * PARAMS + * id [I] selected icon-id to get informations + * flags [I] select informations to receive + * sii [IO] SHSTOCKICONINFO structure to fill + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT failure code + * + */ +HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO *sii) +{ + static const WCHAR shell32dll[] = {'\\','s','h','e','l','l','3','2','.','d','l','l',0}; + + FIXME("(%d, 0x%x, %p) semi-stub\n", id, flags, sii); + if ((id < 0) || (id >= SIID_MAX_ICONS) || !sii || (sii->cbSize != sizeof(SHSTOCKICONINFO))) { + return E_INVALIDARG; + } + + GetSystemDirectoryW(sii->szPath, MAX_PATH); + + /* no icons defined: use default */ + sii->iIcon = -IDI_SHELL_DOCUMENT, + lstrcatW(sii->szPath, shell32dll); + + if (flags) + FIXME("flags 0x%x not implemented\n", flags); + + sii->hIcon = NULL; + sii->iSysImageIndex = -1; + + TRACE("%3d: returning %s (%d)\n", id, debugstr_w(sii->szPath), sii->iIcon); + + return S_OK; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 0f991a4..5044479 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -388,6 +388,7 @@ @ stdcall SHGetSpecialFolderLocation(long long ptr) @ stdcall SHGetSpecialFolderPathA(long ptr long long) @ stdcall SHGetSpecialFolderPathW(long ptr long long) +@ stdcall SHGetStockIconInfo(long long ptr) @ stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA @ stdcall SHHelpShortcuts_RunDLLA(long long long long) @ stdcall SHHelpShortcuts_RunDLLW(long long long long)

1 0

Detlef Riekenberg : shell32/tests: Add tests for SHGetStockIconInfo.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: 710555cf9105f18627176bb6b3d553ae80ed063a URL: http://source.winehq.org/git/wine.git/?a=commit;h=710555cf9105f18627176bb6b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 25 20:22:06 2013 +0200 shell32/tests: Add tests for SHGetStockIconInfo. --- dlls/shell32/tests/shelllink.c | 108 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index b22079c..a3301d8 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -38,7 +38,7 @@ static void (WINAPI *pILFree)(LPITEMIDLIST); static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); - +static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); @@ -991,6 +991,109 @@ static void test_GetIconLocation(void) IShellLinkA_Release(sl); } +static void test_SHGetStockIconInfo(void) +{ + BYTE buffer[sizeof(SHSTOCKICONINFO) + 16]; + SHSTOCKICONINFO *sii = (SHSTOCKICONINFO *) buffer; + BOOL atleast_win7; + HRESULT hr; + INT i; + + /* not present before vista */ + if (!pSHGetStockIconInfo) + { + win_skip("SHGetStockIconInfo not available\n"); + return; + } + + /* negative values are handled */ + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(-1, SHGSI_ICONLOCATION, sii); + ok(hr == E_INVALIDARG, "-1: got 0x%x (expected E_INVALIDARG)\n", hr); + + /* max. id for vista is 140 (no definition exists for this value) */ + for (i = 0; i <= 140; i++) + { + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(i, SHGSI_ICONLOCATION, sii); + + ok(hr == S_OK, + "%3d: got 0x%x, iSysImageIndex: 0x%x, iIcon: 0x%x (expected S_OK)\n", + i, hr, sii->iSysImageIndex, sii->iIcon); + + if ((hr == S_OK) && (winetest_debug > 1)) + trace("%3d: got iSysImageIndex %3d, iIcon %3d and %s\n", i, sii->iSysImageIndex, + sii->iIcon, wine_dbgstr_w(sii->szPath)); + } + + /* there are more icons since win7 */ + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(i, SHGSI_ICONLOCATION, sii); + atleast_win7 = (!hr); + + for (; i < (SIID_MAX_ICONS + 25) ; i++) + { + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(i, SHGSI_ICONLOCATION, sii); + + if (atleast_win7 && (i == (SIID_MAX_ICONS - 1)) && broken(hr == E_INVALIDARG)) + { + /* off by one windows bug: there are SIID_MAX_ICONS icons from 0 upto + SIID_MAX_ICONS-1 on win8, but the last one is missing on win7 */ + trace("%3d: got E_INVALIDARG (windows bug: off by one)\n", i); + } + else if (atleast_win7 && (i < (SIID_MAX_ICONS))) + { + ok(hr == S_OK, + "%3d: got 0x%x, iSysImageIndex: 0x%x, iIcon: 0x%x (expected S_OK)\n", + i, hr, sii->iSysImageIndex, sii->iIcon); + + if ((hr == S_OK) && (winetest_debug > 1)) + trace("%3d: got iSysImageIndex %3d, iIcon %3d and %s\n", i, sii->iSysImageIndex, + sii->iIcon, wine_dbgstr_w(sii->szPath)); + } + else + ok(hr == E_INVALIDARG, "%3d: got 0x%x (expected E_INVALIDARG)\n", i, hr); + } + + /* test more returned SHSTOCKICONINFO elements without extra flags */ + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, sii); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok(!sii->hIcon, "got %p (expected NULL)\n", sii->hIcon); + ok(sii->iSysImageIndex == -1, "got %d (expected -1)\n", sii->iSysImageIndex); + + /* the exact size is required of the struct */ + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO) + 2; + hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, sii); + ok(hr == E_INVALIDARG, "+2: got 0x%x, iSysImageIndex: 0x%x, iIcon: 0x%x\n", hr, sii->iSysImageIndex, sii->iIcon); + + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO) + 1; + hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, sii); + ok(hr == E_INVALIDARG, "+1: got 0x%x, iSysImageIndex: 0x%x, iIcon: 0x%x\n", hr, sii->iSysImageIndex, sii->iIcon); + + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO) - 1; + hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, sii); + ok(hr == E_INVALIDARG, "-1: got 0x%x, iSysImageIndex: 0x%x, iIcon: 0x%x\n", hr, sii->iSysImageIndex, sii->iIcon); + + memset(buffer, '#', sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO) - 2; + hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, sii); + ok(hr == E_INVALIDARG, "-2: got 0x%x, iSysImageIndex: 0x%x, iIcon: 0x%x\n", hr, sii->iSysImageIndex, sii->iIcon); + + /* there is a NULL check for the struct */ + hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, NULL); + ok(hr == E_INVALIDARG, "NULL: got 0x%x\n", hr); +} + START_TEST(shelllink) { HRESULT r; @@ -1001,7 +1104,7 @@ START_TEST(shelllink) pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28); pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); - + pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); @@ -1015,6 +1118,7 @@ START_TEST(shelllink) test_datalink(); test_shdefextracticon(); test_GetIconLocation(); + test_SHGetStockIconInfo(); CoUninitialize(); }

1 0

Christian Costa : d3dx9_36: Use more appropriate function names.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: 9d18b3de1473b8ae43a1f19b7f8f99d6d2d45eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d18b3de1473b8ae43a1f19b7… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 25 22:24:55 2013 +0200 d3dx9_36: Use more appropriate function names. --- dlls/d3dx9_36/effect.c | 47 +++++++++++++++++++---------------------------- 1 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7c1e1ae..3295020 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -462,7 +462,7 @@ static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl * return NULL; } -static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) +static struct d3dx_technique *get_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) { struct d3dx_technique *tech = NULL; unsigned int i; @@ -481,7 +481,7 @@ static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *bas return tech; } -static struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) +static struct d3dx_pass *get_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) { unsigned int i, k; @@ -501,7 +501,7 @@ static struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHAN return NULL; } -static struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) +static struct d3dx_parameter *get_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) { unsigned int i, count; struct d3dx_parameter *p; @@ -513,7 +513,7 @@ static struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *para return get_parameter_struct(parameter); } - p = is_valid_sub_parameter(get_parameter_struct(param->annotation_handles[i]), parameter); + p = get_valid_sub_parameter(get_parameter_struct(param->annotation_handles[i]), parameter); if (p) return p; } @@ -527,14 +527,14 @@ static struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *para return get_parameter_struct(parameter); } - p = is_valid_sub_parameter(get_parameter_struct(param->member_handles[i]), parameter); + p = get_valid_sub_parameter(get_parameter_struct(param->member_handles[i]), parameter); if (p) return p; } return NULL; } -static struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) +static struct d3dx_parameter *get_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) { unsigned int i, k, m; struct d3dx_parameter *p; @@ -546,7 +546,7 @@ static struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *bas return get_parameter_struct(parameter); } - p = is_valid_sub_parameter(get_parameter_struct(base->parameter_handles[i]), parameter); + p = get_valid_sub_parameter(get_parameter_struct(base->parameter_handles[i]), parameter); if (p) return p; } @@ -565,7 +565,7 @@ static struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *bas return get_parameter_struct(parameter); } - p = is_valid_sub_parameter(get_parameter_struct(pass->annotation_handles[m]), parameter); + p = get_valid_sub_parameter(get_parameter_struct(pass->annotation_handles[m]), parameter); if (p) return p; } } @@ -577,21 +577,12 @@ static struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *bas return get_parameter_struct(parameter); } - p = is_valid_sub_parameter(get_parameter_struct(technique->annotation_handles[k]), parameter); + p = get_valid_sub_parameter(get_parameter_struct(technique->annotation_handles[k]), parameter); if (p) return p; } } - return NULL; -} - -static inline struct d3dx_parameter *get_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) -{ - struct d3dx_parameter *param = is_valid_parameter(base, parameter); - - if (!param) param = get_parameter_by_name(base, NULL, parameter); - - return param; + return get_parameter_by_name(base, NULL, parameter); } static void free_state(struct d3dx_state *state) @@ -1150,7 +1141,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetParameterDesc(ID3DXBaseEffect *ifac static HRESULT WINAPI ID3DXBaseEffectImpl_GetTechniqueDesc(ID3DXBaseEffect *iface, D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_technique *tech = technique ? is_valid_technique(This, technique) : get_technique_struct(This->technique_handles[0]); + struct d3dx_technique *tech = technique ? get_valid_technique(This, technique) : get_technique_struct(This->technique_handles[0]); TRACE("iface %p, technique %p, desc %p\n", This, technique, desc); @@ -1170,7 +1161,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetTechniqueDesc(ID3DXBaseEffect *ifac static HRESULT WINAPI ID3DXBaseEffectImpl_GetPassDesc(ID3DXBaseEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_pass *p = is_valid_pass(This, pass); + struct d3dx_pass *p = get_valid_pass(This, pass); TRACE("iface %p, pass %p, desc %p\n", This, pass, desc); @@ -1378,7 +1369,7 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3DXHANDLE technique, UINT index) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_technique *tech = is_valid_technique(This, technique); + struct d3dx_technique *tech = get_valid_technique(This, technique); TRACE("iface %p, technique %p, index %u\n", This, technique, index); @@ -1396,7 +1387,7 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3D static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPassByName(ID3DXBaseEffect *iface, D3DXHANDLE technique, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_technique *tech = is_valid_technique(This, technique); + struct d3dx_technique *tech = get_valid_technique(This, technique); TRACE("iface %p, technique %p, name %s\n", This, technique, debugstr_a(name)); @@ -1443,8 +1434,8 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, object); - struct d3dx_pass *pass = is_valid_pass(This, object); - struct d3dx_technique *technique = is_valid_technique(This, object); + struct d3dx_pass *pass = get_valid_pass(This, object); + struct d3dx_technique *technique = get_valid_technique(This, object); UINT annotation_count = 0; D3DXHANDLE *annotation_handles = NULL; @@ -1485,8 +1476,8 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, object); - struct d3dx_pass *pass = is_valid_pass(This, object); - struct d3dx_technique *technique = is_valid_technique(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; D3DXHANDLE *annotation_handles = NULL; @@ -3434,7 +3425,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(This->base_effect); - struct d3dx_technique *tech = is_valid_technique(base, technique); + struct d3dx_technique *tech = get_valid_technique(base, technique); TRACE("iface %p, technique %p\n", This, technique);

1 0

Christian Costa : d3dcompiler_43: Turn FIXME into TRACE as D3DCompiler is no longer a stub.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: 896ff5377447507528bf4805c61f6b37291b8355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896ff5377447507528bf4805c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 25 22:25:13 2013 +0200 d3dcompiler_43: Turn FIXME into TRACE as D3DCompiler is no longer a stub. --- dlls/d3dcompiler_43/compiler.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 86e8b44..4942985 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -605,8 +605,8 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena { HRESULT hr; - FIXME("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" - "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p stub!\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" + "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages);

1 0

Matteo Bruni : wined3d: Set GL_NONE for glReadBuffer / glDrawBuffer on FBO initialization.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: bda63dd4a9fe4fd483c6eb341a8504749660c130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda63dd4a9fe4fd483c6eb341… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 26 14:58:27 2013 +0200 wined3d: Set GL_NONE for glReadBuffer / glDrawBuffer on FBO initialization. --- dlls/wined3d/context.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 54e9e80..982df71 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -424,10 +424,17 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; + GLuint read_binding, draw_binding; - context_bind_fbo(context, target, &entry->id); + if (entry->attached) + { + context_bind_fbo(context, target, &entry->id); + return; + } - if (entry->attached) return; + read_binding = context->fbo_read_binding; + draw_binding = context->fbo_draw_binding; + context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id); /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) @@ -440,6 +447,18 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]); context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, entry->location); + /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility + * GL contexts requirements. */ + glReadBuffer(GL_NONE); + context_set_draw_buffer(context, GL_NONE); + if (target != GL_FRAMEBUFFER) + { + if (target == GL_READ_FRAMEBUFFER) + context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, draw_binding ? &draw_binding : NULL); + else + context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding ? &read_binding : NULL); + } + entry->attached = TRUE; }

1 0

Matteo Bruni : wined3d: Remove some, now unnecessary, glReadBuffer(GL_NONE) calls.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: 58dc0346d6a41663d0df8b94d298480d14419c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58dc0346d6a41663d0df8b94d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 26 14:58:28 2013 +0200 wined3d: Remove some, now unnecessary, glReadBuffer(GL_NONE) calls. This reverts parts of e4efcea2232254b2cf1ad0a7de7c90f1c3ae8df2 and 8e12b2e61e8c6441ed25c116142c262efdf88b20. --- dlls/wined3d/context.c | 5 ----- dlls/wined3d/surface.c | 3 --- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 982df71..6d30f1c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2226,8 +2226,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, fb->depth_stencil, rt_count ? rts[0]->draw_binding : SFLAG_INTEXTURE); - gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); - checkGLcall("glReadBuffer"); } else { @@ -2320,7 +2318,6 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_device *device = context->swapchain->device; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; DWORD rt_mask = find_draw_buffers_mask(context, device); DWORD *cur_mask; @@ -2335,8 +2332,6 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat { context_apply_fbo_state(context, GL_FRAMEBUFFER, fb->render_targets, fb->depth_stencil, fb->render_targets[0]->draw_binding); - gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); - checkGLcall("glReadBuffer"); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e9c0b52..cdd744c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1100,8 +1100,6 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, gl_info = context->gl_info; context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location); - gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); - checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location); @@ -5742,7 +5740,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, NULL, surface, SFLAG_INTEXTURE); context_set_draw_buffer(context, GL_NONE); - gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); /* Do the actual blit */ surface_depth_blt(surface, context, device->depth_blt_texture, 0, 0, w, h, bind_target);

1 0

Piotr Caban : mshtml: Limit number of tasks processed in process_timer.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: a6fbf560e9d05256a0b2ba5b5c17cc65fb51e00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fbf560e9d05256a0b2ba5b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 26 15:47:36 2013 +0200 mshtml: Limit number of tasks processed in process_timer. --- dlls/mshtml/task.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index bb8b4e0..f9f12d5 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -255,17 +255,29 @@ static LRESULT process_timer(void) thread_data_t *thread_data; IDispatch *disp; DWORD tc; - task_timer_t *timer; + task_timer_t *timer=NULL, *last_timer; TRACE("\n"); thread_data = get_thread_data(FALSE); assert(thread_data != NULL); - while(!list_empty(&thread_data->timer_list)) { - timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); + if(list_empty(&thread_data->timer_list)) { + KillTimer(thread_data->thread_hwnd, TIMER_ID); + return 0; + } + last_timer = LIST_ENTRY(list_tail(&thread_data->timer_list), task_timer_t, entry); + do { tc = GetTickCount(); + if(timer == last_timer) { + timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); + SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time>tc ? timer->time-tc : 0, NULL); + return 0; + } + + timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); + if(timer->time > tc) { SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time-tc, NULL); return 0; @@ -284,7 +296,7 @@ static LRESULT process_timer(void) call_timer_disp(disp); IDispatch_Release(disp); - } + }while(!list_empty(&thread_data->timer_list)); KillTimer(thread_data->thread_hwnd, TIMER_ID); return 0;

1 0