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

Francois Gouget : ntoskrnl.exe: Remove a space before a '\n'.
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: e464d48054e74930eba1d587e9f4bbbc9434e36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e464d48054e74930eba1d587e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 26 10:55:04 2009 +0200 ntoskrnl.exe: Remove a space before a '\n'. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 85efdfe..d95dc31 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -725,7 +725,7 @@ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_o ULONG drv_size, PDRIVER_OBJECT dev_obj, PCM_RESOURCE_LIST dev_list, ULONG dev_size, BOOLEAN overwrite, PBOOLEAN detected) { - FIXME("(%s %p %p %u %p %p %u %d %p) stub \n", debugstr_w(name? name->Buffer : NULL), + FIXME("(%s %p %p %u %p %p %u %d %p) stub\n", debugstr_w(name? name->Buffer : NULL), drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected); return STATUS_NOT_IMPLEMENTED; }

1 0

Francois Gouget : wrc: Add a '\n' to a parser_warning() call.
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: b4e7155c1ae35fa2ed4f012c26be3765f7f20d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e7155c1ae35fa2ed4f012c2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 26 10:54:45 2009 +0200 wrc: Add a '\n' to a parser_warning() call. --- tools/wrc/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 8ed0445..3ea04de 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -638,7 +638,7 @@ static string_t *get_buffered_cstring(void) parser_error("String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead", str->str.cstr, current_codepage ); if (check_valid_utf8( str, current_codepage )) - parser_warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.", + parser_warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.\n", str->str.cstr, current_codepage ); free_string( str ); return str_w;

1 0

Alexandre Julliard : comctl32/tests: Fix tooltips test failures on older Windows versions.
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: 6369d7a08ba81ee6d2f036d13dab9a17a23a9c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6369d7a08ba81ee6d2f036d13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 26 13:09:11 2009 +0200 comctl32/tests: Fix tooltips test failures on older Windows versions. --- dlls/comctl32/tests/tooltips.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 6a927aa..b8c46cb 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -42,7 +42,8 @@ static void test_create_tooltip(void) trace("style = %08x\n", style); exp_style = 0x7fffffff | WS_POPUP; exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); - ok(style == exp_style,"wrong style %08x/%08x\n", style, exp_style); + ok(style == exp_style || broken(style == (exp_style | WS_BORDER)), /* nt4 */ + "wrong style %08x/%08x\n", style, exp_style); DestroyWindow(hwnd); @@ -142,7 +143,6 @@ static void test_customdraw(void) { /* Invalid notification responses */ {CDRF_NOTIFYITEMDRAW, TEST_CDDS_PREPAINT}, {CDRF_NOTIFYPOSTERASE, TEST_CDDS_PREPAINT}, - {CDRF_NOTIFYSUBITEMDRAW, TEST_CDDS_PREPAINT}, {CDRF_NEWFONT, TEST_CDDS_PREPAINT} }; @@ -168,6 +168,7 @@ static void test_customdraw(void) { iterationNumber++) { HWND parent, hwndTip; + RECT rect; TOOLINFO toolInfo = { 0 }; /* Create a main window */ @@ -201,7 +202,7 @@ static void test_customdraw(void) { SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); /* Create a tool */ - toolInfo.cbSize = sizeof(TOOLINFO); + toolInfo.cbSize = TTTOOLINFO_V1_SIZE; toolInfo.hwnd = parent; toolInfo.hinst = GetModuleHandleA(NULL); toolInfo.uFlags = TTF_SUBCLASS; @@ -216,13 +217,18 @@ static void test_customdraw(void) { SendMessage(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); /* Put cursor inside window, tooltip will appear immediately */ - SetCursorPos(100, 100); + GetWindowRect( parent, &rect ); + SetCursorPos( (rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2 ); flush_events(200); - /* Check CustomDraw results */ - ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls, - "CustomDraw run %d stages %x, expected %x\n", iterationNumber, CD_Stages, - expectedResults[iterationNumber].ExpectedCalls); + if (CD_Stages) + { + /* Check CustomDraw results */ + ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls || + broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */ + "CustomDraw run %d stages %x, expected %x\n", iterationNumber, CD_Stages, + expectedResults[iterationNumber].ExpectedCalls); + } /* Clean up */ DestroyWindow(hwndTip); @@ -296,6 +302,8 @@ static void test_gettext(void) NULL, NULL, NULL, 0); assert(hwnd); + /* use sizeof(TTTOOLINFOA) instead of TTTOOLINFOA_V1_SIZE so that adding it fails on Win9x */ + /* otherwise it crashes on the NULL lpszText */ toolinfoA.cbSize = sizeof(TTTOOLINFOA); toolinfoA.hwnd = NULL; toolinfoA.hinst = GetModuleHandleA(NULL); @@ -305,7 +313,6 @@ static void test_gettext(void) toolinfoA.lParam = 0xdeadbeef; GetClientRect(hwnd, &toolinfoA.rect); r = SendMessageA(hwnd, TTM_ADDTOOL, 0, (LPARAM)&toolinfoA); - ok(r, "Adding the tool to the tooltip failed\n"); if (r) { toolinfoA.hwnd = NULL; @@ -314,6 +321,12 @@ static void test_gettext(void) SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); } + else + { + win_skip( "Old comctl32, not testing NULL text\n" ); + DestroyWindow( hwnd ); + return; + } /* add another tool with text */ toolinfoA.cbSize = sizeof(TTTOOLINFOA);

1 0

Alexandre Julliard : comctl32/tests: Fix tab control test failures on older Windows versions.
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: 454a7fde33955fa448cf4fe02f04547428b971f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454a7fde33955fa448cf4fe02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 26 13:09:05 2009 +0200 comctl32/tests: Fix tab control test failures on older Windows versions. --- dlls/comctl32/tests/tab.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 0361d32..f017b13 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -776,7 +776,8 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) tcItem.dwStateMask = TCIS_BUTTONPRESSED; selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0); SendMessage(hTab, TCM_GETITEM, selectionIndex, (LPARAM) &tcItem); - ok (tcItem.dwState & TCIS_BUTTONPRESSED, "Selected item should have TCIS_BUTTONPRESSED\n"); + ok (tcItem.dwState & TCIS_BUTTONPRESSED || broken(tcItem.dwState == 0), /* older comctl32 */ + "Selected item should have TCIS_BUTTONPRESSED\n"); } /* Testing ExtendedStyle */ @@ -838,10 +839,6 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) DWORD ret; char szText[32] = "New Label"; - /* TCM_GETITEM with null dest pointer */ - ret = SendMessage(hTab, TCM_GETITEM, 0, (LPARAM)NULL); - expect(FALSE, ret); - /* passing invalid index should result in initialization to zero for members mentioned in mask requested */ @@ -920,20 +917,24 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); tcItem.dwState = 0; ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); - ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); - /* next highlight item, test that dwStateMask actually masks */ - tcItem.mask = TCIF_STATE; - tcItem.dwStateMask = TCIS_HIGHLIGHTED; - tcItem.dwState = TCIS_HIGHLIGHTED; - ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); - tcItem.dwState = 0; - ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); - ok (tcItem.dwState == TCIS_HIGHLIGHTED, "TCIS_HIGHLIGHTED should be set.\n"); - tcItem.mask = TCIF_STATE; - tcItem.dwStateMask = TCIS_BUTTONPRESSED; - tcItem.dwState = 0; - ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); - ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); + if (tcItem.dwState) + { + ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); + /* next highlight item, test that dwStateMask actually masks */ + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_HIGHLIGHTED; + tcItem.dwState = TCIS_HIGHLIGHTED; + ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); + tcItem.dwState = 0; + ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); + ok (tcItem.dwState == TCIS_HIGHLIGHTED, "TCIS_HIGHLIGHTED should be set.\n"); + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_BUTTONPRESSED; + tcItem.dwState = 0; + ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); + ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); + } + else win_skip( "Item state mask not supported\n" ); } /* Testing GetSet ToolTip */

1 0

Henri Verbeet : d3d9: Use the wined3d cs for wined3d locking.
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: 5f9f079d71d267a08661e6873edd63b966253665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9f079d71d267a08661e6873… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 10:18:09 2009 +0200 d3d9: Use the wined3d cs for wined3d locking. --- dlls/d3d9/cubetexture.c | 101 ++++++----- dlls/d3d9/d3d9_main.c | 14 +- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 405 ++++++++++++++++++++++++----------------- dlls/d3d9/directx.c | 75 +++++--- dlls/d3d9/indexbuffer.c | 59 ++++--- dlls/d3d9/pixelshader.c | 61 ++++--- dlls/d3d9/query.c | 40 +++-- dlls/d3d9/stateblock.c | 41 +++-- dlls/d3d9/surface.c | 69 ++++--- dlls/d3d9/swapchain.c | 51 +++--- dlls/d3d9/texture.c | 106 +++++++----- dlls/d3d9/vertexbuffer.c | 60 ++++--- dlls/d3d9/vertexdeclaration.c | 26 ++- dlls/d3d9/vertexshader.c | 62 ++++--- dlls/d3d9/volume.c | 33 ++-- dlls/d3d9/volumetexture.c | 85 +++++----- 17 files changed, 746 insertions(+), 543 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f9f079d71d267a08661e…

1 0

Henri Verbeet : d3d9: Remove stray tabs.
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: ada3e059e8c38295d6275f1b796d6676b670b6da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada3e059e8c38295d6275f1b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 10:18:08 2009 +0200 d3d9: Remove stray tabs. --- dlls/d3d9/directx.c | 25 +++++++++++++------------ dlls/d3d9/tests/device.c | 10 +++++----- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 57039c5..166bfc2 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -176,9 +176,9 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9EX iface, return hr; } -static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(LPDIRECT3D9EX iface, - UINT Adapter, D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, - D3DFORMAT BackBufferFormat, BOOL Windowed) { +static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(IDirect3D9Ex *iface, UINT Adapter, + D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed) +{ IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; TRACE("(%p)->(%d, %d, %d, %d, %s\n", This, Adapter, CheckType, DisplayFormat, @@ -191,9 +191,9 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(LPDIRECT3D9EX iface, return hr; } -static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9EX iface, - UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, - DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) { +static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, + D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) +{ IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; WINED3DRESOURCETYPE WineD3DRType; @@ -229,9 +229,10 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9EX iface, return hr; } -static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D9EX iface, - UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, - BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD* pQualityLevels) { +static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT Adapter, + D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, + DWORD *pQualityLevels) +{ IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; TRACE("%p\n", This); @@ -243,9 +244,9 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D9EX if return hr; } -static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(LPDIRECT3D9EX iface, - UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, - D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { +static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(IDirect3D9Ex *iface, UINT Adapter, + D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) +{ IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; TRACE("%p\n", This); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f56e05e..8b578fd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -388,7 +388,7 @@ static void test_refcount(void) D3DVERTEXELEMENT9 decl[] = { - D3DDECL_END() + D3DDECL_END() }; static DWORD simple_ps[] = {0xFFFF0101, /* ps_1_1 */ 0x00000051, 0xA00F0001, 0x3F800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ @@ -1830,14 +1830,14 @@ static void test_null_stream(void) hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexDeclaration failed (0x%08x)\n", hr); if (FAILED(hr)) { - skip("Vertex declaration handling not possible.\n"); - goto cleanup; + skip("Vertex declaration handling not possible.\n"); + goto cleanup; } hr = IDirect3DDevice9_CreateVertexBuffer(device, 12 * sizeof(float), 0, 0, D3DPOOL_MANAGED, &buffer, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x)\n", hr); if (FAILED(hr)) { - skip("Vertex buffer handling not possible.\n"); - goto cleanup; + skip("Vertex buffer handling not possible.\n"); + goto cleanup; } hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(float) * 3);

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in remove_vbos().
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: d4e167dfbcee27c0e0aafd159a42861289eee698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e167dfbcee27c0e0aafd159… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 10:18:07 2009 +0200 wined3d: Properly check if an attribute is used in remove_vbos(). --- dlls/wined3d/drawprim.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2b82cca..6103ff3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -558,7 +558,11 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, struct wined3d_stream_i for (i = 0; i < (sizeof(s->elements) / sizeof(*s->elements)); ++i) { - struct wined3d_stream_info_element *e = &s->elements[i]; + struct wined3d_stream_info_element *e; + + if (!(s->use_map & (1 << i))) continue; + + e = &s->elements[i]; if (e->buffer_object) { struct wined3d_buffer *vb = (struct wined3d_buffer *)This->stateBlock->streamSource[e->stream_idx];

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in state_normalize().
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: 59c017c8bd3844f4bf638efc0062db3800975c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c017c8bd3844f4bf638efc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 10:18:06 2009 +0200 wined3d: Properly check if an attribute is used in state_normalize(). --- dlls/wined3d/state.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e6963c4..8ddfd28 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1344,8 +1344,7 @@ static void state_normalize(DWORD state, IWineD3DStateBlockImpl *stateblock, str * by zero and is not properly defined in opengl, so avoid it */ if (stateblock->renderState[WINED3DRS_NORMALIZENORMALS] - && (stateblock->wineD3DDevice->strided_streams.elements[WINED3D_FFP_NORMAL].data - || stateblock->wineD3DDevice->strided_streams.elements[WINED3D_FFP_NORMAL].buffer_object)) + && (stateblock->wineD3DDevice->strided_streams.use_map & (1 << WINED3D_FFP_NORMAL))) { glEnable(GL_NORMALIZE); checkGLcall("glEnable(GL_NORMALIZE);");

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in transform_texture().
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: 6ef17134d22062cb4553177ff78263ba8aefc569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef17134d22062cb4553177ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 10:18:05 2009 +0200 wined3d: Properly check if an attribute is used in transform_texture(). --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8e05464..e6963c4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3099,7 +3099,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, s set_texture_matrix(&stateblock->transforms[WINED3DTS_TEXTURE0 + texUnit].u.m[0][0], stateblock->textureState[texUnit][WINED3DTSS_TEXTURETRANSFORMFLAGS], generated, context->last_was_rhw, - stateblock->wineD3DDevice->strided_streams.elements[WINED3D_FFP_TEXCOORD0 + coordIdx].stride + stateblock->wineD3DDevice->strided_streams.use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)) ? stateblock->wineD3DDevice->strided_streams.elements[WINED3D_FFP_TEXCOORD0 + coordIdx].format_desc->format : WINED3DFMT_UNKNOWN, stateblock->wineD3DDevice->frag_pipe->ffp_proj_control);

1 0

Chris Robinson : winemp3.acm: Fix reading/decoding loop.
by Alexandre Julliard Aug. 26, 2009

Aug. 26, 2009

Module: wine Branch: master Commit: 3dc677cc631038c924a7bda511bce94f4fc3e0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc677cc631038c924a7bda51… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Aug 25 23:27:57 2009 -0700 winemp3.acm: Fix reading/decoding loop. --- dlls/winemp3.acm/mpegl3.c | 49 +++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index eb97e75..2d291cf 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -151,39 +151,40 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, DWORD dpos = 0; - ret = mpg123_feed(amd->mh, src, *nsrc); - if (ret != MPG123_OK) + if (*nsrc > 0) { - ERR("Error feeding data\n"); - *ndst = *nsrc = 0; - return; - } - - ret = mpg123_read(amd->mh, NULL, 0, &size); - if (ret == MPG123_NEW_FORMAT) - { - if TRACE_ON(mpeg3) + ret = mpg123_feed(amd->mh, src, *nsrc); + if (ret != MPG123_OK) { - long rate; - int channels, enc; - mpg123_getformat(amd->mh, &rate, &channels, &enc); - TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); + ERR("Error feeding data\n"); + *ndst = *nsrc = 0; + return; } } - else if (ret == MPG123_ERR) - { - FIXME("Error occurred during decoding!\n"); - *ndst = *nsrc = 0; - return; - } do { - dpos += size; - if (*ndst - dpos < 4608) break; + size = 0; ret = mpg123_read(amd->mh, dst + dpos, *ndst - dpos, &size); + if (ret == MPG123_ERR) + { + FIXME("Error occurred during decoding!\n"); + *ndst = *nsrc = 0; + return; + } + + if (ret == MPG123_NEW_FORMAT) + { + if TRACE_ON(mpeg3) + { + long rate; + int channels, enc; + mpg123_getformat(amd->mh, &rate, &channels, &enc); + TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); + } + } + dpos += size; } while (ret == MPG123_OK); *ndst = dpos; - *nsrc = 0; } /***********************************************************************

1 0