wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

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

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

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

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 + +@MAKE_TEST_RULES@ + +@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

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: 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 : quartz: Data may be incomplete at the end of file so do not assert if we have less data than expected .
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 74c07a141ec9d760f209cf6976e0406d4123ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c07a141ec9d760f209cf697… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 13 10:07:29 2009 +0200 quartz: Data may be incomplete at the end of file so do not assert if we have less data than expected. --- dlls/quartz/mpegsplit.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 373e537..14d01a1 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -176,7 +176,6 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) /* Find the next valid header.. it <SHOULD> be right here */ assert(parse_header(fbuf, &length, &This->position) == S_OK); - assert(length == len || length + 4 == len); IMediaSample_SetActualDataLength(pCurrentSample, length); /* Queue the next sample */

1 0

Kai Blin : secur32: Work around ntlm_auth in Samba 3.0. 28a being broken for cached credentials.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 7788c8ed0d84be2537280c188fb07fb7118b3883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7788c8ed0d84be2537280c188… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 13 22:39:39 2009 +0200 secur32: Work around ntlm_auth in Samba 3.0.28a being broken for cached credentials. Samba 3.0.28a (as shipped with Ubuntu 8.04) seems to break when using cached credentials backed by winbindd, returning a BH error in our test if we still need to provide a password. Handle this and report a more correct error. --- dlls/secur32/ntlm.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7e44dd7..5e2450a 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -662,8 +662,20 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_NO_CREDENTIALS; goto isc_end; } - else /* Just do a noop on the next run */ + else + { + /* Some versions of Samba have a broken ntlm_auth that can + * return "BH" here. Catch this and abort. */ + if(!strncmp(buffer, "BH", 2)) + { + ERR("ntlm_auth replied 'BH'. This should not happen. " + "Please fix your ntlm_auth install and try again.\n"); + ret = SEC_E_INTERNAL_ERROR; + goto isc_end; + } + /* Otherwise, just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); + } } else {

1 0

Dmitry Timoshkov : oleaut32: Add some additional tests for QueryPathOfRegTypeLib, make them pass under Wine.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 69ec6b4c6d74926a2182c5bf9f1ac9e4562f4f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec6b4c6d74926a2182c5bf9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 13 15:14:08 2009 +0900 oleaut32: Add some additional tests for QueryPathOfRegTypeLib, make them pass under Wine. --- dlls/oleaut32/tests/typelib.c | 5 +++++ dlls/oleaut32/typelib.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7c0e2c5..93920c5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -638,6 +638,10 @@ static void test_QueryPathOfRegTypeLib(void) { 3, 22, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, { 3, 37, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, { 3, 40, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, + { 0xffff, 0xffff, S_OK, {'f','a','k','e','_','5','_','3','7','.','d','l','l',0 } }, + { 0xffff, 0, TYPE_E_LIBNOTREGISTERED, { 0 } }, + { 3, 0xffff, TYPE_E_LIBNOTREGISTERED, { 0 } }, + { 5, 0xffff, TYPE_E_LIBNOTREGISTERED, { 0 } }, { 4, 0, TYPE_E_LIBNOTREGISTERED, { 0 } } }; static const WCHAR base[] = {'f','a','k','e',0}; @@ -657,6 +661,7 @@ static void test_QueryPathOfRegTypeLib(void) if (!do_typelib_reg_key(&uid, 3, 0, base, 0)) return; if (!do_typelib_reg_key(&uid, 3, 1, base, 0)) return; if (!do_typelib_reg_key(&uid, 3, 37, base, 0)) return; + if (!do_typelib_reg_key(&uid, 5, 37, base, 0)) return; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 75a30d2..a0af847 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -168,13 +168,13 @@ static void FromLEDWords(void *p_Val, int p_iSize) /* * Find a typelib key which matches a requested maj.min version. */ -static BOOL find_typelib_key( REFGUID guid, WORD wMaj, WORD *wMin ) +static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) { static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; WCHAR buffer[60]; char key_name[16]; DWORD len, i; - INT best_min = -1; + INT best_maj = -1, best_min = -1; HKEY hkey; memcpy( buffer, typelibW, sizeof(typelibW) ); @@ -193,20 +193,40 @@ static BOOL find_typelib_key( REFGUID guid, WORD wMaj, WORD *wMin ) { TRACE("found %s: %x.%x\n", debugstr_w(buffer), v_maj, v_min); - if (wMaj == v_maj) + if (*wMaj == 0xffff && *wMin == 0xffff) { + if (v_maj > best_maj) best_maj = v_maj; + if (v_min > best_min) best_min = v_min; + } + else if (*wMaj == v_maj) + { + best_maj = v_maj; + if (*wMin == v_min) { best_min = v_min; break; /* exact match */ } - if (v_min > best_min) best_min = v_min; + if (*wMin != 0xffff && v_min > best_min) best_min = v_min; } } len = sizeof(key_name); } RegCloseKey( hkey ); - if (best_min >= 0) + + TRACE("found best_maj %d, best_min %d\n", best_maj, best_min); + + if (*wMaj == 0xffff && *wMin == 0xffff) + { + if (best_maj >= 0 && best_min >= 0) + { + *wMaj = best_maj; + *wMin = best_min; + return TRUE; + } + } + + if (*wMaj == best_maj && best_min >= 0) { *wMin = best_min; return TRUE; @@ -295,7 +315,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib( TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); - if (!find_typelib_key( guid, wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; + if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; get_typelib_key( guid, wMaj, wMin, buffer ); res = RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey );

1 0

Roderick Colenbrander : wined3d: Report the driver description as reported by the Windows drivers when a device string is entered in our device table .
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: f2e2e3e49947490368900ef06a92e1df1bc52820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e2e3e49947490368900ef06… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 13 00:09:56 2009 +0200 wined3d: Report the driver description as reported by the Windows drivers when a device string is entered in our device table. --- dlls/wined3d/directx.c | 79 ++++++++++++++++++++++++--------------------- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d9d6b1b..3b46965 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1708,7 +1708,10 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad /* Return the information requested */ TRACE_(d3d_caps)("device/Vendor Name and Version detection using FillGLCaps\n"); strcpy(pIdentifier->Driver, This->adapters[Adapter].driver); - strcpy(pIdentifier->Description, This->adapters[Adapter].description); + if(This->adapters[Adapter].gl_info.driver_description) + strcpy(pIdentifier->Description, This->adapters[Adapter].gl_info.driver_description); + else /* Copy default description "Direct3D HAL" */ + strcpy(pIdentifier->Description, This->adapters[Adapter].description); /* Note dx8 doesn't supply a DeviceName */ if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ @@ -3944,6 +3947,7 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { struct driver_version_information { WORD vendor; /* reported PCI card vendor ID */ WORD card; /* reported PCI card device ID */ + const char *description; /* Description of the card e.g. NVIDIA RIVA TNT */ WORD hipart_hi, hipart_lo; /* driver hiword to report */ WORD lopart_hi, lopart_lo; /* driver loword to report */ }; @@ -3956,44 +3960,44 @@ static const struct driver_version_information driver_version_table[] = { * * All version numbers used below are from the Linux nvidia drivers. */ - {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT2, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT, "NVIDIA RIVA TNT", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT2, "NVIDIA RIVA TNT2/TNT2 Pro", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, "NVIDIA GeForce 256", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, "NVIDIA GeForce2 MX/MX 400", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, "NVIDIA GeForce2 GTS/GeForce2 Pro", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8044 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode */ - {VENDOR_ATI, CARD_ATI_RADEON_9500, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_X700, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_X1600, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_HD2300, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_HD2600, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_HD2900, 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_X700, "ATI Radeon X700 SE", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_X1600, "ATI Radeon X1600 Series", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2300, "ATI Mobility Radeon HD 2300", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2600, "ATI Mobility Radeon HD 2600", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2900, "ATI Radeon HD 2900 XT", 6, 14, 10, 6764 }, /* TODO: Add information about legacy ATI hardware, Intel and other cards */ }; @@ -4097,6 +4101,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { driver_version_table[i].lopart_lo); gl_info->driver_version_hipart = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, driver_version_table[i].hipart_lo); + strcpy(gl_info->driver_description, driver_version_table[i].description); break; } } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 6fc02dd..cc76035 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3908,6 +3908,7 @@ typedef struct _WineD3D_GL_Info { UINT vidmem; DWORD driver_version; DWORD driver_version_hipart; + CHAR driver_description[255]; CHAR gl_renderer[255]; /** * CAPS Constants

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009