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

Christian Costa : amstream: Turn Initialize FIXME into a TRACE.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 81ebb0900de99161925c5024ff4f860147aa1f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ebb0900de99161925c5024f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 13 10:07:47 2009 +0200 amstream: Turn Initialize FIXME into a TRACE. --- dlls/amstream/amstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index a709c7b..2e0c581 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -214,7 +214,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; HRESULT hr = S_OK; - FIXME("(%p/%p)->(%x,%x,%p) partial stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); + TRACE("(%p/%p)->(%x,%x,%p)\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); if (pFilterGraph) {

1 0

Christian Costa : amstream: Initialize the stream in OpenFile if not done before.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 73eff344f089f4e711ad9aa32e467f2659d1ce11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73eff344f089f4e711ad9aa32… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 13 10:07:41 2009 +0200 amstream: Initialize the stream in OpenFile if not done before. --- dlls/amstream/amstream.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 2e0c581..81584d6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -349,6 +349,14 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac goto end; } + /* If Initialize was not called before, we do it here */ + if (!This->pFilterGraph) + { + ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); + if (FAILED(ret)) + goto end; + } + ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); if(ret != S_OK) {

1 0

Christian Costa : amstream/tests: Beginning of tests.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: b5dbbd4f3a16d074f0bdff39077973efdffe6c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5dbbd4f3a16d074f0bdff390… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 13 10:07:35 2009 +0200 amstream/tests: Beginning of tests. --- configure | 9 ++++ configure.ac | 1 + dlls/amstream/tests/Makefile.in | 13 ++++++ dlls/amstream/tests/amstream.c | 91 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ee42ce0..a98e04e 100755 --- a/configure +++ b/configure @@ -24363,6 +24363,14 @@ dlls/amstream/Makefile: dlls/amstream/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/amstream/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/amstream/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + amstream/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/amstream/tests/Makefile: dlls/amstream/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/amstream/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/appwiz.cpl/Makefile" test "x$enable_appwiz_cpl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ appwiz.cpl" @@ -28899,6 +28907,7 @@ do "dlls/advpack/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/Makefile" ;; "dlls/advpack/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/tests/Makefile" ;; "dlls/amstream/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/amstream/Makefile" ;; + "dlls/amstream/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/amstream/tests/Makefile" ;; "dlls/appwiz.cpl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/appwiz.cpl/Makefile" ;; "dlls/atl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/atl/Makefile" ;; "dlls/authz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/authz/Makefile" ;; diff --git a/configure.ac b/configure.ac index e6d9688..f156bbe 100644 --- a/configure.ac +++ b/configure.ac @@ -1874,6 +1874,7 @@ WINE_CONFIG_MAKEFILE([dlls/advapi32/tests/Makefile],[dlls/Maketest.rules],[dlls] WINE_CONFIG_MAKEFILE([dlls/advpack/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/amstream/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/amstream/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/appwiz.cpl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/authz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in new file mode 100644 index 0000000..07e98b4 --- /dev/null +++ b/dlls/amstream/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = amstream.dll +IMPORTS = kernel32 oleaut32 ole32 quartz strmiids + +CTESTS = \ + amstream.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c new file mode 100644 index 0000000..15b8a7b --- /dev/null +++ b/dlls/amstream/tests/amstream.c @@ -0,0 +1,91 @@ +/* + * Unit tests for MultiMedia Stream functions + * + * Copyright (C) 2009 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "amstream.h" + +#define FILE_LEN 9 +static const char fileA[FILE_LEN] = "test.avi"; + +IAMMultiMediaStream* pams; + +static int create_ammultimediastream(void) +{ + return S_OK == CoCreateInstance( + &CLSID_AMMultiMediaStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMultiMediaStream, (LPVOID*)&pams); +} + +static void release_ammultimediastream(void) +{ + IAMMultiMediaStream_Release(pams); +} + +static void renderfile(const char * fileA) +{ + HRESULT hr; + WCHAR fileW[FILE_LEN]; + IGraphBuilder* pgraph; + + MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); + + hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); + ok(hr==S_OK, "GetFilterGraph returned: %x\n", hr); + ok(pgraph==NULL, "Filtergraph should not be created yet\n"); + + if (pgraph) + IGraphBuilder_Release(pgraph); + + hr = IAMMultiMediaStream_OpenFile(pams, fileW, 0); + ok(hr==S_OK, "OpenFile returned: %x\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); + ok(hr==S_OK, "GetFilterGraph returned: %x\n", hr); + ok(pgraph!=NULL, "Filtergraph should be created\n"); + + if (pgraph) + IGraphBuilder_Release(pgraph); +} + +static void test_render(void) +{ + HANDLE h; + + if (!create_ammultimediastream()) + return; + + h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + if (h != INVALID_HANDLE_VALUE) { + CloseHandle(h); + renderfile(fileA); + } + + release_ammultimediastream(); +} + +START_TEST(amstream) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + test_render(); + CoUninitialize(); +}

1 0

Michael Stefaniuc : opengl32: Remove superfluous pointer casts.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: d2fdc2d10b77bf1ae09ffaba762e9d1bcf4f7434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fdc2d10b77bf1ae09ffaba7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 14 09:55:39 2009 +0200 opengl32: Remove superfluous pointer casts. --- dlls/opengl32/wgl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b73cf60..34f7f07 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -102,8 +102,8 @@ typedef struct wine_glcontext { void enter_gl(void) { - Wine_GLContext *curctx = (Wine_GLContext *) NtCurrentTeb()->glContext; - + Wine_GLContext *curctx = NtCurrentTeb()->glContext; + if (curctx && curctx->do_escape) { enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP; @@ -230,8 +230,8 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { /* After that, search in the thunks to find the real name of the extension */ ext.name = lpszProc; - ext_ret = (const OpenGL_extension *) bsearch(&ext, extension_registry, - extension_registry_size, sizeof(OpenGL_extension), compar); + ext_ret = bsearch(&ext, extension_registry, extension_registry_size, + sizeof(OpenGL_extension), compar); /* If nothing was found, we are looking for a WGL extension or an unknown GL extension. */ if (ext_ret == NULL) {

1 0

Nikolay Sivov : comctl32/listview: Fix selection handling in LVM_SORTITEMS (with some tests).
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 9c1a0e468f5cfbe9d863852ed5a42390f2cbfeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1a0e468f5cfbe9d863852ed… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 12 15:05:22 2009 -0400 comctl32/listview: Fix selection handling in LVM_SORTITEMS (with some tests). --- dlls/comctl32/listview.c | 71 +++++++++++++++++++++------------------- dlls/comctl32/tests/listview.c | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e571f33..d26f7b0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -57,7 +57,6 @@ * -- LISTVIEW_[GS]etColumnOrderArray stubs * -- LISTVIEW_SetColumnWidth ignores header images & bitmap * -- LISTVIEW_SetIconSpacing is incomplete - * -- LISTVIEW_SortItems is broken * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -3575,21 +3574,38 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL { if (infoPtr->dwStyle & LVS_SINGLESEL) LISTVIEW_DeselectAllSkipItem(infoPtr, lpLVItem->iItem); ranges_additem(infoPtr->selectionRanges, lpLVItem->iItem); + lpItem->state |= LVIS_SELECTED; } else if (stateMask & LVIS_SELECTED) + { ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem); - + lpItem->state &= ~LVIS_SELECTED; + } /* if we are asked to change focus, and we manage it, do it */ if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) { if (lpLVItem->state & LVIS_FOCUSED) { - LISTVIEW_SetItemFocus(infoPtr, -1); + if (infoPtr->nFocusedItem != -1) + { + /* remove current focus */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = LVIS_FOCUSED; + + /* recurse with redrawing an item */ + LISTVIEW_SetItemState(infoPtr, infoPtr->nFocusedItem, &item); + } + + lpItem->state |= LVIS_FOCUSED; infoPtr->nFocusedItem = lpLVItem->iItem; LISTVIEW_EnsureVisible(infoPtr, lpLVItem->iItem, uView == LVS_LIST); } else if (infoPtr->nFocusedItem == lpLVItem->iItem) - infoPtr->nFocusedItem = -1; + { + lpItem->state &= ~LVIS_FOCUSED; + infoPtr->nFocusedItem = -1; + } } } @@ -7487,7 +7503,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl ranges_del(infoPtr->selectionRanges, range); if (infoPtr->nFocusedItem >= nItems) { - infoPtr->nFocusedItem = -1; + LISTVIEW_SetItemFocus(infoPtr, -1); SetRectEmpty(&infoPtr->rcFocus); } } @@ -7855,8 +7871,8 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; HDPA hdpaSubItems; ITEM_INFO *lpItem; - LPVOID selectionMarkItem; - LVITEMW item; + LPVOID selectionMarkItem = NULL; + LPVOID focusedItem = NULL; int i; TRACE("(pfnCompare=%p, lParamSort=%lx)\n", pfnCompare, lParamSort); @@ -7869,45 +7885,32 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, /* if there are 0 or 1 items, there is no need to sort */ if (infoPtr->nItemCount < 2) return TRUE; + /* clear selection */ + ranges_clear(infoPtr->selectionRanges); + + /* save selection mark and focused item */ + if (infoPtr->nSelectionMark >= 0) + selectionMarkItem = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nSelectionMark); if (infoPtr->nFocusedItem >= 0) - { - hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem); - lpItem = DPA_GetPtr(hdpaSubItems, 0); - if (lpItem) lpItem->state |= LVIS_FOCUSED; - } - /* FIXME: go thorugh selected items and mark them so in lpItem->state */ - /* clear the lpItem->state for non-selected ones */ - /* remove the selection ranges */ - + focusedItem = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem); + infoPtr->pfnCompare = pfnCompare; infoPtr->lParamSort = lParamSort; DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr); - /* Adjust selections and indices so that they are the way they should - * be after the sort (otherwise, the list items move around, but - * whatever is at the item's previous original position will be - * selected instead) - */ - selectionMarkItem=(infoPtr->nSelectionMark>=0)?DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nSelectionMark):NULL; + /* restore selection ranges */ for (i=0; i < infoPtr->nItemCount; i++) { hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); lpItem = DPA_GetPtr(hdpaSubItems, 0); if (lpItem->state & LVIS_SELECTED) - { - item.state = LVIS_SELECTED; - item.stateMask = LVIS_SELECTED; - LISTVIEW_SetItemState(infoPtr, i, &item); - } - if (lpItem->state & LVIS_FOCUSED) - { - infoPtr->nFocusedItem = i; - lpItem->state &= ~LVIS_FOCUSED; - } + ranges_additem(infoPtr->selectionRanges, i); } - if (selectionMarkItem != NULL) - infoPtr->nSelectionMark = DPA_GetPtrIndex(infoPtr->hdpaItems, selectionMarkItem); + /* restore selection mark and focused item */ + infoPtr->nSelectionMark = DPA_GetPtrIndex(infoPtr->hdpaItems, selectionMarkItem); + infoPtr->nFocusedItem = DPA_GetPtrIndex(infoPtr->hdpaItems, focusedItem); + /* I believe nHotItem should be left alone, see LISTVIEW_ShiftIndices */ /* refresh the display */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 914be42..7f6a540 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1441,6 +1441,69 @@ todo_wine{ DestroyWindow(hwnd); } +/* comparison callback for test_sorting */ +static INT WINAPI test_CallBackCompare(LPARAM first, LPARAM second, LPARAM lParam) +{ + if (first == second) return 0; + return (first > second ? 1 : -1); +} + +static void test_sorting(void) +{ + HWND hwnd; + LVITEMA item = {0}; + DWORD r; + + hwnd = create_listview_control(); + ok(hwnd != NULL, "failed to create a listview window\n"); + + /* insert some items */ + item.mask = LVIF_PARAM | LVIF_STATE; + item.state = LVIS_SELECTED; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = 3; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(0, r); + + item.mask = LVIF_PARAM; + item.iItem = 1; + item.iSubItem = 0; + item.lParam = 2; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(1, r); + + item.mask = LVIF_STATE | LVIF_PARAM; + item.state = LVIS_SELECTED; + item.iItem = 2; + item.iSubItem = 0; + item.lParam = 4; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(2, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(-1, r); + + r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(2, r); + + r = SendMessage(hwnd, LVM_SORTITEMS, 0, (LPARAM)test_CallBackCompare); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(2, r); + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(-1, r); + r = SendMessage(hwnd, LVM_GETITEMSTATE, 0, LVIS_SELECTED); + expect(0, r); + r = SendMessage(hwnd, LVM_GETITEMSTATE, 1, LVIS_SELECTED); + expect(LVIS_SELECTED, r); + r = SendMessage(hwnd, LVM_GETITEMSTATE, 2, LVIS_SELECTED); + expect(LVIS_SELECTED, r); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -1479,4 +1542,5 @@ START_TEST(listview) test_getorigin(); test_multiselect(); test_subitem_rect(); + test_sorting(); }

1 0

Nikolay Sivov : comctl32/listview: Fix a regression caused by 59148d0bb549ff8690f15f14571a715e3fdd43a5.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: e014484a4365a49cbd2e62f7df0a4b513e779d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e014484a4365a49cbd2e62f7d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 13 18:42:57 2009 -0400 comctl32/listview: Fix a regression caused by 59148d0bb549ff8690f15f14571a715e3fdd43a5. --- dlls/comctl32/listview.c | 7 +++++-- dlls/comctl32/tests/listview.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d26f7b0..94ab7c9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1398,6 +1398,8 @@ static INT LISTVIEW_CreateHeader(LISTVIEW_INFO *infoPtr) /* set header font */ SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, (LPARAM)TRUE); + LISTVIEW_UpdateSize(infoPtr); + return 0; } @@ -1673,6 +1675,8 @@ static void LISTVIEW_UpdateHeaderSize(const LISTVIEW_INFO *infoPtr, INT nNewScro TRACE("nNewScrollPos=%d\n", nNewScrollPos); + if (!infoPtr->hwndHeader) return; + GetWindowRect(infoPtr->hwndHeader, &winRect); point[0].x = winRect.left; point[0].y = winRect.top; @@ -8143,7 +8147,6 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL); } - LISTVIEW_UpdateSize(infoPtr); LISTVIEW_UpdateScroll(infoPtr); } @@ -9127,7 +9130,7 @@ static LRESULT LISTVIEW_Paint(LISTVIEW_INFO *infoPtr, HDC hdc) LISTVIEW_UpdateScroll(infoPtr); } - UpdateWindow(infoPtr->hwndHeader); + if (infoPtr->hwndHeader) UpdateWindow(infoPtr->hwndHeader); if (hdc) LISTVIEW_Refresh(infoPtr, hdc, NULL); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 7f6a540..d08ca2f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -903,14 +903,14 @@ static void test_create(void) (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_LIST) | LVS_REPORT); ok(((ret & WS_VISIBLE) && (ret & LVS_LIST)), "Style wrong, should have WS_VISIBLE|LVS_LIST\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header shouldn't be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); ret = SetWindowLongPtr(hList, GWL_STYLE, (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_REPORT) | LVS_LIST); ok(((ret & WS_VISIBLE) && (ret & LVS_REPORT)), "Style wrong, should have WS_VISIBLE|LVS_REPORT\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header shouldn't be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); /* LVS_REPORT without WS_VISIBLE */ @@ -941,6 +941,16 @@ static void test_create(void) ok(IsWindow(hHeader), "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + + /* LVS_REPORT with LVS_NOCOLUMNHEADER */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT|LVS_NOCOLUMNHEADER|WS_VISIBLE, + 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + /* HDS_DRAGDROP set by default */ + ok(GetWindowLongPtr(hHeader, GWL_STYLE) & HDS_DRAGDROP, "Expected header to have HDS_DRAGDROP\n"); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Rein Klazes : msvcrt: Correct implementation of _ecvt() with tests.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 1ab5f4191da001de527315eaf2f02c9e07990eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab5f4191da001de527315eaf… Author: Rein Klazes <wijn(a)online.nl> Date: Mon Apr 13 09:06:41 2009 +0200 msvcrt: Correct implementation of _ecvt() with tests. --- dlls/msvcrt/math.c | 38 ++++++++++++++++--- dlls/msvcrt/tests/printf.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0c6290c..3b026a3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -836,16 +836,42 @@ double CDECL _nextafter(double num, double next) */ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) { + int prec; thread_data_t *data = msvcrt_get_thread_data(); - char *dec; - + /* FIXME: check better for overflow (native supports over 300 chars's) */ + ndigits = min( ndigits, 80 - 7); /* 7 : space for dec point, 1 for "e", + * 4 for exponent and one for + * terminating '\0' */ if (!data->efcvt_buffer) data->efcvt_buffer = MSVCRT_malloc( 80 ); /* ought to be enough */ - snprintf(data->efcvt_buffer, 80, "%.*e", ndigits /* FIXME wrong */, number); - *sign = (number < 0); - dec = strchr(data->efcvt_buffer, '.'); - *decpt = (dec) ? dec - data->efcvt_buffer : -1; + if( number < 0) { + *sign = TRUE; + number = -number; + } else + *sign = FALSE; + /* handle cases with zero ndigits or less */ + prec = ndigits; + if( prec < 1) prec = 2; + snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number); + /* take the decimal "point away */ + if( prec != 1) + strcpy( data->efcvt_buffer + 1, data->efcvt_buffer + 2); + /* take the exponential "e" out */ + data->efcvt_buffer[ prec] = '\0'; + /* read the exponent */ + sscanf( data->efcvt_buffer + prec + 1, "%d", decpt); + (*decpt)++; + /* adjust for some border cases */ + if( data->efcvt_buffer[0] == '0')/* value is zero */ + *decpt = 0; + /* handle cases with zero ndigits or less */ + if( ndigits < 1){ + if( data->efcvt_buffer[ 0] >= '5') + (*decpt)++; + data->efcvt_buffer[ 0] = '\0'; + } + TRACE("out=\"%s\"\n",data->efcvt_buffer); return data->efcvt_buffer; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 5f72b47..66bab15 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -698,6 +698,90 @@ static void test_fcvt(void) ok( 0 == sign, "sign wrong\n"); } +static struct { + double value; + int nrdigits; + const char *expstr_e; + const char *expstr_f; + int expdecpt_e; + int expdecpt_f; + int expsign; +} test_cvt_testcases[] = { + { 45.0, 2, "45", "4500", 2, 2, 0 }, + /* Numbers less than 1.0 with different precisions */ + { 0.0001, 1, "1", "", -3, -3, 0 }, + { 0.0001, -10, "", "", -3, -3, 0 }, + { 0.0001, 10,"1000000000", "1000000", -3, -3, 0 }, + /* Basic sign test */ + { -111.0001, 5, "11100", "11100010", 3, 3, 1 }, + { 111.0001, 5, "11100", "11100010", 3, 3, 0 }, + /* big numbers with low precision */ + { 3333.3, 2, "33", "333330", 4, 4, 0 }, + {999999999999.9, 3, "100","999999999999900", 13, 12, 0 }, + /* 0.0 with different precisions */ + { 0.0, 5, "00000", "00000", 0, 0, 0 }, + { 0.0, 0, "", "", 0, 0, 0 }, + { 0.0, -1, "", "", 0, 0, 0 }, + /* Numbers > 1.0 with 0 or -ve precision */ + { -123.0001, 0, "", "123", 3, 3, 1 }, + { -123.0001, -1, "", "12", 3, 3, 1 }, + { -123.0001, -2, "", "1", 3, 3, 1 }, + { -123.0001, -3, "", "", 3, 3, 1 }, + /* Numbers > 1.0, but with rounding at the point of precision */ + { 99.99, 1, "1", "1000", 3, 3, 0 }, + /* Numbers < 1.0 where rounding occurs at the point of precision */ + { 0.0063, 2, "63", "1", -2, -1, 0 }, + { 0.0063, 3, "630", "6", -2, -2, 0 }, + { 0.09999999996, 2, "10", "10", 0, 0, 0 }, + { 0.6, 1, "6", "6", 0, 0, 0 }, + { 0.6, 0, "", "1", 1, 1, 0 }, + { 0.4, 0, "", "", 0, 0, 0 }, + { 0.49, 0, "", "", 0, 0, 0 }, + { 0.51, 0, "", "1", 1, 1, 0 }, + /* ask ridiculous amunt of precision, ruin formatting this table */ + { 1.0, 30, "100000000000000000000000000000", + "1000000000000000000000000000000", 1, 1, 0}, + { 123456789012345678901.0, 30, "123456789012345680000000000000", + "123456789012345680000000000000000000000000000000000", 21, 21, 0}, + /* end marker */ + { 0, 0, "END"} +}; + +static void test_xcvt(void) +{ + char *str; + int i, decpt, sign; + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ + decpt = sign = 100; + str = _ecvt( test_cvt_testcases[i].value, + test_cvt_testcases[i].nrdigits, + &decpt, + &sign); + ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_e, 15), + "_ecvt() bad return, got \n'%s' expected \n'%s'\n", str, + test_cvt_testcases[i].expstr_e); + ok( decpt == test_cvt_testcases[i].expdecpt_e, + "_ecvt() decimal point wrong, got %d expected %d\n", decpt, + test_cvt_testcases[i].expdecpt_e); + } + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ + decpt = sign = 100; + str = _fcvt( test_cvt_testcases[i].value, + test_cvt_testcases[i].nrdigits, + &decpt, + &sign); + ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), + "_fcvt() bad return, got \n'%s' expected \n'%s'\n", str, + test_cvt_testcases[i].expstr_f); + ok( decpt == test_cvt_testcases[i].expdecpt_f, + "_fcvt() decimal point wrong, got %d expected %d\n", decpt, + test_cvt_testcases[i].expdecpt_f); + ok( sign == test_cvt_testcases[i].expsign, + "_ecvt() sign wrong, got %d expected %d\n", sign, + test_cvt_testcases[i].expsign); + } +} + static int _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) { int ret; @@ -774,6 +858,7 @@ START_TEST(printf) test_swprintf(); test_snprintf(); test_fcvt(); + test_xcvt(); test_vsnwprintf(); p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf");

1 0

Tobias Jakobi : wined3d: Rename some NP2 fixup variables and update comments.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 0c2514bd8fbf59641972755be0f9582d42c59f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2514bd8fbf59641972755be… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Apr 9 19:14:03 2009 +0200 wined3d: Rename some NP2 fixup variables and update comments. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 42 ++++++++++++++++++------------------ dlls/wined3d/pixelshader.c | 4 +- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e2b234..abc30bf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -672,7 +672,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } if(shader_is_pshader_version(ins->reg_maps->shader_version)) { const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; - if(ps->cur_args->texrect_fixup & (1 << sampler_idx)) { + if(ps->cur_args->np2_fixup & (1 << sampler_idx)) { FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5fa9915..44e5e80 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -100,7 +100,7 @@ struct glsl_shader_prog_link { GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; GLint posFixup_location; - GLint rectFixup_location[MAX_FRAGMENT_SAMPLERS]; + GLint np2Fixup_location[MAX_FRAGMENT_SAMPLERS]; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; @@ -503,21 +503,21 @@ static void shader_glsl_load_np2fixup_constants( return; } - if (prog->ps_args.texrect_fixup) { + if (prog->ps_args.np2_fixup) { UINT i; - UINT fixup = prog->ps_args.texrect_fixup; + UINT fixup = prog->ps_args.np2_fixup; const WineD3D_GL_Info* gl_info = &deviceImpl->adapter->gl_info; const IWineD3DStateBlockImpl* stateBlock = (const IWineD3DStateBlockImpl*) deviceImpl->stateBlock; for (i = 0; fixup; fixup >>= 1, ++i) { - if (-1 != prog->rectFixup_location[i]) { + if (-1 != prog->np2Fixup_location[i]) { const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i]; if (!tex) { FIXME("Non-existant texture is flagged for NP2 texcoord fixup\n"); continue; } else { const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]}; - GL_EXTCALL(glUniform2fvARB(prog->rectFixup_location[i], 1, tex_dim)); + GL_EXTCALL(glUniform2fvARB(prog->np2Fixup_location[i], 1, tex_dim)); } } } @@ -825,12 +825,12 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } - if(ps_args->texrect_fixup & (1 << i)) { - /* RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] + if(ps_args->np2_fixup & (1 << i)) { + /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] * while D3D has them in the (normalized) [0,1]x[0,1] range. - * samplerRectFixup stores texture dimensions and is updated through - * shader_glsl_load_constants when the sampler changes. */ - shader_addline(buffer, "uniform vec2 %csamplerRectFixup%u;\n", prefix, i); + * samplerNP2Fixup stores texture dimensions and is updated through + * shader_glsl_load_np2fixup_constants when the sampler changes. */ + shader_addline(buffer, "uniform vec2 %csamplerNP2Fixup%u;\n", prefix, i); } break; case WINED3DSTT_CUBE: @@ -1549,7 +1549,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s const char *sampler_base; char dst_swizzle[6]; struct color_fixup_desc fixup; - BOOL rect_fixup = FALSE; + BOOL np2_fixup = FALSE; va_list args; shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); @@ -1560,11 +1560,11 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s fixup = This->cur_args->color_fixup[sampler]; sampler_base = "Psampler"; - if(This->cur_args->texrect_fixup & (1 << sampler)) { + if(This->cur_args->np2_fixup & (1 << sampler)) { if(bias) { - FIXME("Biased sampling from RECT textures is unsupported\n"); + FIXME("Biased sampling from NP2 textures is unsupported\n"); } else { - rect_fixup = TRUE; + np2_fixup = TRUE; } } } else { @@ -1583,8 +1583,8 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s if(bias) { shader_addline(ins->buffer, ", %s)%s);\n", bias, dst_swizzle); } else { - if (rect_fixup) { - shader_addline(ins->buffer, " * PsamplerRectFixup%u)%s);\n", sampler, dst_swizzle); + if (np2_fixup) { + shader_addline(ins->buffer, " * PsamplerNP2Fixup%u)%s);\n", sampler, dst_swizzle); } else { shader_addline(ins->buffer, ")%s);\n", dst_swizzle); } @@ -3595,14 +3595,14 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use } } - if (use_ps && ps_compile_args.texrect_fixup) { + if (use_ps && ps_compile_args.np2_fixup) { char name[32]; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { - if (ps_compile_args.texrect_fixup & (1 << i)) { - sprintf(name, "PsamplerRectFixup%u", i); - entry->rectFixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); + if (ps_compile_args.np2_fixup & (1 << i)) { + sprintf(name, "PsamplerNP2Fixup%u", i); + entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } else { - entry->rectFixup_location[i] = -1; + entry->np2Fixup_location[i] = -1; } } } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index de609a7..d1701f5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -460,7 +460,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */ args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; - args->texrect_fixup = 0; + args->np2_fixup = 0; for(i = 0; i < MAX_FRAGMENT_SAMPLERS; i++) { if(shader->baseShader.reg_maps.samplers[i] == 0) continue; @@ -473,7 +473,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp /* Flag samplers that need NP2 texcoord fixup. */ if(!tex->baseTexture.pow2Matrix_identity) { - args->texrect_fixup |= (1 << i); + args->np2_fixup |= (1 << i); } } if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5ae466..429e2bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -538,8 +538,8 @@ struct ps_compile_args { /* Projected textures(ps 1.0-1.3) */ /* Texture types(2D, Cube, 3D) in ps 1.x */ BOOL srgb_correction; - WORD texrect_fixup; - /* Bitmap for texture rect coord fixups (16 samplers max currently). + WORD np2_fixup; + /* Bitmap for NP2 texcoord fixups (16 samplers max currently). D3D9 has a limit of 16 samplers and the fixup is superfluous in D3D10 (unconditional NP2 support mandatory). */ };

1 0

Ken Thomases : winecoreaudio: Eliminate some unnecessary code.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: ff0ff663c33da632ff6327ec67f5bd31f528981b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0ff663c33da632ff6327ec6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:10 2009 -0500 winecoreaudio: Eliminate some unnecessary code. The WAVE_DIRECTSOUND bit of dwFlags isn't examined, so no point in correcting it. --- dlls/winecoreaudio.drv/audio.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index b6f55b8..2735fb7 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -826,11 +826,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ERROR; } - if ((dwFlags & WAVE_DIRECTSOUND) && - !(wwo->caps.dwSupport & WAVECAPS_DIRECTSOUND)) - /* not supported, ignore it */ - dwFlags &= ~WAVE_DIRECTSOUND; - streamFormat.mFormatID = kAudioFormatLinearPCM; streamFormat.mFormatFlags = kLinearPCMFormatFlagIsPacked; /* FIXME check for 32bits float -> kLinearPCMFormatFlagIsFloat */

1 0

Ken Thomases : winecoreaudio: Avoid potential deadlock in wodOpen.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 1f8d743c764db13e82a1629854c531548d6ee498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8d743c764db13e82a162985… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:18 2009 -0500 winecoreaudio: Avoid potential deadlock in wodOpen. --- dlls/winecoreaudio.drv/audio.c | 82 ++++++++++++++++++++++++++++++--------- 1 files changed, 63 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 2735fb7..e81aa3e 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -32,6 +32,7 @@ # include <unistd.h> #endif #include <fcntl.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -103,6 +104,7 @@ AudioUnitRender( AudioUnit ci, #define WINE_WS_PAUSED 1 #define WINE_WS_STOPPED 2 #define WINE_WS_CLOSED 3 +#define WINE_WS_OPENING 4 typedef struct tagCoreAudio_Device { char dev_name[32]; @@ -771,9 +773,10 @@ static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { WINE_WAVEOUT* wwo; - DWORD retval; DWORD ret; AudioStreamBasicDescription streamFormat; + AudioUnit audioUnit = NULL; + BOOL auInited = FALSE; TRACE("(%u, %p, %08x);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) @@ -808,7 +811,15 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) lpDesc->lpFormat->nSamplesPerSec); return MMSYSERR_NOERROR; } - + + /* We proceed in three phases: + * o Reserve the device for us, marking it as unavailable (not closed) + * o Create, configure, and start the Audio Unit. To avoid deadlock, + * this has to be done without holding wwo->lock. + * o If that was successful, finish setting up our device info and + * mark the device as ready. + * Otherwise, clean up and mark the device as available. + */ wwo = &WOutDev[wDevID]; if (!OSSpinLockTry(&wwo->lock)) return MMSYSERR_ALLOCATED; @@ -819,11 +830,16 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_ALLOCATED; } - if (!AudioUnit_CreateDefaultAudioUnit((void *) wwo, &wwo->audioUnit)) + wwo->state = WINE_WS_OPENING; + wwo->audioUnit = NULL; + OSSpinLockUnlock(&wwo->lock); + + + if (!AudioUnit_CreateDefaultAudioUnit((void *) wwo, &audioUnit)) { ERR("CoreAudio_CreateDefaultAudioUnit(%p) failed\n", wwo); - OSSpinLockUnlock(&wwo->lock); - return MMSYSERR_ERROR; + ret = MMSYSERR_ERROR; + goto error; } streamFormat.mFormatID = kAudioFormatLinearPCM; @@ -842,25 +858,35 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) streamFormat.mBytesPerFrame = streamFormat.mBitsPerChannel * streamFormat.mChannelsPerFrame / 8; streamFormat.mBytesPerPacket = streamFormat.mBytesPerFrame * streamFormat.mFramesPerPacket; - ret = AudioUnit_InitializeWithStreamDescription(wwo->audioUnit, &streamFormat); + ret = AudioUnit_InitializeWithStreamDescription(audioUnit, &streamFormat); if (!ret) { - AudioUnit_CloseAudioUnit(wwo->audioUnit); - OSSpinLockUnlock(&wwo->lock); - return WAVERR_BADFORMAT; /* FIXME return an error based on the OSStatus */ + ret = WAVERR_BADFORMAT; /* FIXME return an error based on the OSStatus */ + goto error; } - wwo->streamDescription = streamFormat; + auInited = TRUE; - ret = AudioOutputUnitStart(wwo->audioUnit); + /* Our render callback CoreAudio_woAudioUnitIOProc may be called before + * AudioOutputUnitStart returns. Core Audio will grab its own internal + * lock before calling it and the callback grabs wwo->lock. This would + * deadlock if we were holding wwo->lock. + * Also, the callback has to safely do nothing in that case, because + * wwo hasn't been completely filled out, yet. */ + ret = AudioOutputUnitStart(audioUnit); if (ret) { ERR("AudioOutputUnitStart failed: %08x\n", ret); - AudioUnitUninitialize(wwo->audioUnit); - AudioUnit_CloseAudioUnit(wwo->audioUnit); - OSSpinLockUnlock(&wwo->lock); - return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ + ret = MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ + goto error; } + + OSSpinLockLock(&wwo->lock); + assert(wwo->state == WINE_WS_OPENING); + + wwo->audioUnit = audioUnit; + wwo->streamDescription = streamFormat; + wwo->state = WINE_WS_STOPPED; wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); @@ -885,9 +911,24 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) OSSpinLockUnlock(&wwo->lock); - retval = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + ret = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); - return retval; + return ret; + +error: + if (audioUnit) + { + if (auInited) + AudioUnitUninitialize(audioUnit); + AudioUnit_CloseAudioUnit(audioUnit); + } + + OSSpinLockLock(&wwo->lock); + assert(wwo->state == WINE_WS_OPENING); + wwo->state = WINE_WS_CLOSED; + OSSpinLockUnlock(&wwo->lock); + + return ret; } /************************************************************************** @@ -1291,7 +1332,7 @@ static DWORD wodReset(WORD wDevID) OSSpinLockLock(&wwo->lock); - if (wwo->state == WINE_WS_CLOSED) + if (wwo->state == WINE_WS_CLOSED || wwo->state == WINE_WS_OPENING) { OSSpinLockUnlock(&wwo->lock); WARN("resetting a closed device\n"); @@ -1589,6 +1630,9 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, OSSpinLockLock(&wwo->lock); + /* We might have been called before wwo has been completely filled out by + * wodOpen. We have to do nothing in that case. The check of wwo->state + * below ensures that. */ while (dataNeeded > 0 && wwo->state == WINE_WS_PLAYING && wwo->lpPlayPtr) { unsigned int available = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset;

1 0