February 2008 - Wine-commits

Andrew Riedi : user32: Test destroying the cursor of a parent process.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 7df3ed5f44fefc906add5b56c9c5abebb18ba0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df3ed5f44fefc906add5b56c… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Thu Jan 24 01:01:54 2008 -0800 user32: Test destroying the cursor of a parent process. --- dlls/user32/tests/cursoricon.c | 194 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 194 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 781282c..f65aa5e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -32,6 +32,182 @@ #include "wingdi.h" #include "winuser.h" +static char **test_argv; +static int test_argc; +static HWND child = 0; +static HWND parent = 0; +static HANDLE child_process; + +#define PROC_INIT (WM_USER+1) + +static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + BOOL ret; + DWORD error; + + switch (msg) + { + /* Destroy the cursor. */ + case WM_USER+1: + SetLastError(0xdeadbeef); + ret = DestroyCursor((HCURSOR) lParam); + error = GetLastError(); + todo_wine { + ok(!ret, "DestroyCursor on the active cursor succeeded.\n"); + ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD, + "Last error: %u\n", error); + } + return TRUE; + case WM_DESTROY: + PostQuitMessage(0); + return 0; + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +static LRESULT CALLBACK callback_parent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == PROC_INIT) + { + child = (HWND) wParam; + return TRUE; + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +static void do_child(void) +{ + WNDCLASS class; + MSG msg; + BOOL ret; + + /* Register a new class. */ + class.style = CS_GLOBALCLASS; + class.lpfnWndProc = callback_child; + class.cbClsExtra = 0; + class.cbWndExtra = 0; + class.hInstance = GetModuleHandle(NULL); + class.hIcon = NULL; + class.hCursor = NULL; + class.hbrBackground = NULL; + class.lpszMenuName = NULL; + class.lpszClassName = "cursor_child"; + + SetLastError(0xdeadbeef); + ret = RegisterClass(&class); + ok(ret, "Failed to register window class. Error: %u\n", GetLastError()); + + /* Create a window. */ + child = CreateWindowA("cursor_child", "cursor_child", WS_POPUP | WS_VISIBLE, + 0, 0, 200, 200, 0, 0, 0, NULL); + ok(child != 0, "CreateWindowA failed. Error: %u\n", GetLastError()); + + /* Let the parent know our HWND. */ + PostMessage(parent, PROC_INIT, (WPARAM) child, 0); + + /* Receive messages. */ + while ((ret = GetMessage(&msg, child, 0, 0))) + { + ok(ret != -1, "GetMessage failed. Error: %u\n", GetLastError()); + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + +static void do_parent(void) +{ + char path_name[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + WNDCLASS class; + MSG msg; + BOOL ret; + + /* Register a new class. */ + class.style = CS_GLOBALCLASS; + class.lpfnWndProc = callback_parent; + class.cbClsExtra = 0; + class.cbWndExtra = 0; + class.hInstance = GetModuleHandle(NULL); + class.hIcon = NULL; + class.hCursor = NULL; + class.hbrBackground = NULL; + class.lpszMenuName = NULL; + class.lpszClassName = "cursor_parent"; + + SetLastError(0xdeadbeef); + ret = RegisterClass(&class); + ok(ret, "Failed to register window class. Error: %u\n", GetLastError()); + + /* Create a window. */ + parent = CreateWindowA("cursor_parent", "cursor_parent", WS_POPUP | WS_VISIBLE, + 0, 0, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "CreateWindowA failed. Error: %u\n", GetLastError()); + + /* Start child process. */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(path_name, "%s cursoricon %x", test_argv[0], (unsigned int) parent); + ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed.\n"); + child_process = info.hProcess; + + /* Wait for child window handle. */ + while ((child == 0) && (ret = GetMessage(&msg, parent, 0, 0))) + { + ok(ret != -1, "GetMessage failed. Error: %u\n", GetLastError()); + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + +static void finish_child_process(void) +{ + DWORD exit_code; + BOOL ret; + + SendMessage(child, WM_CLOSE, 0, 0); + ok(WaitForSingleObject(child_process, 30000) == WAIT_OBJECT_0, "Child process termination failed.\n"); + + ret = GetExitCodeProcess(child_process, &exit_code); + ok(ret, "GetExitCodeProcess() failed. Error: %u\n", GetLastError()); + ok(exit_code == 0, "Exit code == %u.\n", exit_code); + + CloseHandle(child_process); +} + +static void test_child_process(void) +{ + static const BYTE bmp_bits[4096]; + HCURSOR cursor; + ICONINFO cursorInfo; + UINT display_bpp; + HDC hdc; + + /* Create and set a dummy cursor. */ + hdc = GetDC(0); + display_bpp = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + + cursorInfo.fIcon = FALSE; + cursorInfo.xHotspot = 0; + cursorInfo.yHotspot = 0; + cursorInfo.hbmMask = CreateBitmap(32, 32, 1, 1, bmp_bits); + cursorInfo.hbmColor = CreateBitmap(32, 32, 1, display_bpp, bmp_bits); + + cursor = CreateIconIndirect(&cursorInfo); + ok(cursor != NULL, "CreateIconIndirect returned %p.\n", cursor); + + SetCursor(cursor); + + /* Destroy the cursor. */ + SendMessage(child, WM_USER+1, 0, (LPARAM) cursor); +} + static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, INT copyWidth, INT copyHeight, INT expectedWidth, INT expectedHeight, WORD expectedDepth, BOOL dibExpected) { @@ -471,6 +647,21 @@ static void test_DestroyCursor(void) START_TEST(cursoricon) { + test_argc = winetest_get_mainargs(&test_argv); + + if (test_argc >= 3) + { + /* Child process. */ + sscanf (test_argv[2], "%x", (unsigned int *) &parent); + + ok(parent != NULL, "Parent not found.\n"); + if (parent == NULL) + ExitProcess(1); + + do_child(); + return; + } + test_CopyImage_Bitmap(1); test_CopyImage_Bitmap(4); test_CopyImage_Bitmap(8); @@ -480,4 +671,7 @@ START_TEST(cursoricon) test_initial_cursor(); test_CreateIcon(); test_DestroyCursor(); + do_parent(); + test_child_process(); + finish_child_process(); }

1 0

Kirill K. Smirnov : systray: Properly track errors.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: b391b8af58befd263ff4fba2c72e39c18e1d76a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b391b8af58befd263ff4fba2c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Tue Feb 5 14:17:49 2008 +0000 systray: Properly track errors. --- dlls/shell32/systray.c | 5 +++-- dlls/shell32/tests/systray.c | 6 ++---- programs/explorer/systray.c | 41 +++++++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index cb67fd8..7743ce9 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -104,6 +104,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) HWND tray; COPYDATASTRUCT cds; char *buffer = NULL; + BOOL ret; TRACE("dwMessage = %d, nid->cbSize=%d\n", dwMessage, nid->cbSize); @@ -185,11 +186,11 @@ noicon: cds.lpData = nid; } - SendMessageW(tray, WM_COPYDATA, (WPARAM)nid->hWnd, (LPARAM)&cds); + ret = SendMessageW(tray, WM_COPYDATA, (WPARAM)nid->hWnd, (LPARAM)&cds); /* FIXME: if statement only needed because we don't support interprocess * icon handles */ HeapFree(GetProcessHeap(), 0, buffer); - return TRUE; + return ret; } diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 35a59ad..23e1ba3 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -52,8 +52,7 @@ void test_cbsize(void) ok(pShell_NotifyIconW(NIM_DELETE, &nidW), "NIM_DELETE failed!\n"); /* as icon doesn't exist anymore - now there will be an error */ nidW.cbSize = sizeof(nidW); - /* wine currently doesn't return error code put prints an ERR(...) */ - todo_wine ok(!pShell_NotifyIconW(NIM_DELETE, &nidW), "The icon was not deleted\n"); + ok(!pShell_NotifyIconW(NIM_DELETE, &nidW), "The icon was not deleted\n"); } /* same for Shell_NotifyIconA */ @@ -73,8 +72,7 @@ void test_cbsize(void) ok(Shell_NotifyIconA(NIM_DELETE, &nidA), "NIM_DELETE failed!\n"); /* as icon doesn't exist anymore - now there will be an error */ nidA.cbSize = sizeof(nidA); - /* wine currently doesn't return error code put prints an ERR(...) */ - todo_wine ok(!Shell_NotifyIconA(NIM_DELETE, &nidA), "The icon was not deleted\n"); + ok(!Shell_NotifyIconA(NIM_DELETE, &nidA), "The icon was not deleted\n"); } START_TEST(systray) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 06347d4..75872b0 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -182,7 +182,7 @@ static void set_tooltip(struct icon *icon, WCHAR *szTip, BOOL modify) SendMessageW(icon->tooltip, TTM_ADDTOOLW, 0, (LPARAM)&ti); } -static void modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) +static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) { struct icon *icon; @@ -193,7 +193,7 @@ static void modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) if (!icon) { WINE_WARN("Invalid icon ID (0x%x) for HWND %p\n", nid->uID, nid->hWnd); - return; + return FALSE; } if (nid->uFlags & NIF_ICON) @@ -216,9 +216,10 @@ static void modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) { WINE_FIXME("balloon tip title %s, message %s\n", wine_dbgstr_w(nid->szInfoTitle), wine_dbgstr_w(nid->szInfo)); } + return TRUE; } -static void add_icon(NOTIFYICONDATAW *nid) +static BOOL add_icon(NOTIFYICONDATAW *nid) { HMODULE x11drv = GetModuleHandleA( "winex11.drv" ); RECT rect; @@ -231,13 +232,13 @@ static void add_icon(NOTIFYICONDATAW *nid) if ((icon = get_icon(nid->hWnd, nid->uID))) { WINE_WARN("duplicate tray icon add, buggy app?\n"); - return; + return FALSE; } if (!(icon = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*icon)))) { WINE_ERR("out of memory\n"); - return; + return FALSE; } icon->id = nid->uID; @@ -289,10 +290,10 @@ static void add_icon(NOTIFYICONDATAW *nid) list_add_tail(&tray.icons, &icon->entry); - modify_icon(nid, FALSE); + return modify_icon(nid, FALSE); } -static void delete_icon(const NOTIFYICONDATAW *nid) +static BOOL delete_icon(const NOTIFYICONDATAW *nid) { struct icon *icon = get_icon(nid->hWnd, nid->uID); @@ -300,22 +301,24 @@ static void delete_icon(const NOTIFYICONDATAW *nid) if (!icon) { - WINE_ERR("invalid tray icon ID specified: %u\n", nid->uID); - return; + WINE_WARN("invalid tray icon ID specified: %u\n", nid->uID); + return FALSE; } DestroyWindow(icon->tooltip); DestroyWindow(icon->window); + return TRUE; } -static void handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) +static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) { NOTIFYICONDATAW nid; DWORD cbSize; + BOOL ret = FALSE; - if (cds->cbData < NOTIFYICONDATAW_V1_SIZE) return; + if (cds->cbData < NOTIFYICONDATAW_V1_SIZE) return FALSE; cbSize = ((PNOTIFYICONDATA)cds->lpData)->cbSize; - if (cbSize < NOTIFYICONDATAW_V1_SIZE) return; + if (cbSize < NOTIFYICONDATAW_V1_SIZE) return FALSE; ZeroMemory(&nid, sizeof(nid)); memcpy(&nid, cds->lpData, min(sizeof(nid), cbSize)); @@ -343,14 +346,14 @@ static void handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) if (cds->cbData < nid.cbSize + 2 * sizeof(BITMAP) + cbMaskBits + cbColourBits) { WINE_ERR("buffer underflow\n"); - return; + return FALSE; } /* sanity check */ if ((bmColour.bmWidth != bmMask.bmWidth) || (bmColour.bmHeight != bmMask.bmHeight)) { WINE_ERR("colour and mask bitmaps aren't consistent\n"); - return; + return FALSE; } nid.hIcon = CreateIcon(NULL, bmColour.bmWidth, bmColour.bmHeight, @@ -361,13 +364,13 @@ static void handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) switch (cds->dwData) { case NIM_ADD: - add_icon(&nid); + ret = add_icon(&nid); break; case NIM_DELETE: - delete_icon(&nid); + ret = delete_icon(&nid); break; case NIM_MODIFY: - modify_icon(&nid, TRUE); + ret = modify_icon(&nid, TRUE); break; default: WINE_FIXME("unhandled tray message: %ld\n", cds->dwData); @@ -378,13 +381,15 @@ static void handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) * icon handles */ if (nid.uFlags & NIF_ICON) DestroyIcon(nid.hIcon); + + return ret; } static LRESULT WINAPI listener_wndproc(HWND window, UINT msg, WPARAM wparam, LPARAM lparam) { if (msg == WM_COPYDATA) - handle_incoming((HWND)wparam, (COPYDATASTRUCT *)lparam); + return handle_incoming((HWND)wparam, (COPYDATASTRUCT *)lparam); return DefWindowProc(window, msg, wparam, lparam); }

1 0

Stefan Dösinger : wined3d: Separate OpenGL and driver version.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 74db14728e25d645d76d28fe9a83f7ef0f5a62ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=74db14728e25d645d76d28fe9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 5 22:49:14 2008 +0100 wined3d: Separate OpenGL and driver version. --- dlls/wined3d/directx.c | 37 ++++++++++++++++++++++++++++--------- include/wine/wined3d_gl.h | 3 ++- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d5edb6..d7d4c58 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -512,6 +512,25 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_string = (const char *) glGetString(GL_VERSION); if (gl_string != NULL) { + /* First, parse the generic opengl version. This is supposed not to be convoluted with + * driver specific information + */ + gl_string_cursor = gl_string; + major = atoi(gl_string_cursor); + if(major <= 0) { + ERR("Invalid opengl major version: %d\n", major); + } + while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') { + ++gl_string_cursor; + } + if (*gl_string_cursor++ != '.') { + ERR_(d3d_caps)("Invalid opengl version string: %s\n", debugstr_a(gl_string)); + } + minor = atoi(gl_string_cursor); + TRACE_(d3d_caps)("Found OpenGL version: %d.%d\n", major, minor); + gl_info->gl_version = MAKEDWORD_VERSION(major, minor); + + /* Now parse the driver specific string which we'll report to the app */ switch (gl_info->gl_vendor) { case VENDOR_NVIDIA: gl_string_cursor = strstr(gl_string, "NVIDIA"); @@ -635,14 +654,14 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { major = 0; minor = 9; } - gl_info->gl_driver_version = MAKEDWORD_VERSION(major, minor); - TRACE_(d3d_caps)("found GL_VERSION (%s)->%i.%i->(0x%08x)\n", debugstr_a(gl_string), major, minor, gl_info->gl_driver_version); + gl_info->driver_version = MAKEDWORD_VERSION(major, minor); + TRACE_(d3d_caps)("found driver version (%s)->%i.%i->(0x%08x)\n", debugstr_a(gl_string), major, minor, gl_info->driver_version); /* Current Windows drivers have versions like 6.14.... (some older have an earlier version) */ - gl_info->gl_driver_version_hipart = MAKEDWORD_VERSION(6, 14); + gl_info->driver_version_hipart = MAKEDWORD_VERSION(6, 14); } else { FIXME("OpenGL driver did not return version information\n"); - gl_info->gl_driver_version = MAKEDWORD_VERSION(0, 0); - gl_info->gl_driver_version_hipart = MAKEDWORD_VERSION(6, 14); + gl_info->driver_version = MAKEDWORD_VERSION(0, 0); + gl_info->driver_version_hipart = MAKEDWORD_VERSION(6, 14); } TRACE_(d3d_caps)("found GL_RENDERER (%s)->(0x%04x)\n", debugstr_a(gl_info->gl_renderer), gl_info->gl_card); @@ -732,7 +751,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { #define USE_GL_FUNC(type, pfn, ext, replace) { \ DWORD ver = ver_for_ext(ext); \ if(gl_info->supported[ext]) gl_info->pfn = (type) pwglGetProcAddress(#pfn); \ - else if(ver && ver <= gl_info->gl_driver_version) gl_info->pfn = (type) pwglGetProcAddress(#replace); \ + else if(ver && ver <= gl_info->gl_version) gl_info->pfn = (type) pwglGetProcAddress(#replace); \ else gl_info->pfn = NULL; \ } GL_EXT_FUNCS_GEN; @@ -748,7 +767,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { */ for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { if (gl_info->supported[EXTENSION_MAP[i].extension] == FALSE && - EXTENSION_MAP[i].version <= gl_info->gl_driver_version && EXTENSION_MAP[i].version) { + EXTENSION_MAP[i].version <= gl_info->gl_version && EXTENSION_MAP[i].version) { TRACE_(d3d_caps)(" GL CORE: %s support\n", EXTENSION_MAP[i].extension_string); gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; } @@ -1537,8 +1556,8 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad /* Note dx8 doesn't supply a DeviceName */ if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ - pIdentifier->DriverVersion->u.HighPart = Adapters[Adapter].gl_info.gl_driver_version_hipart; - pIdentifier->DriverVersion->u.LowPart = Adapters[Adapter].gl_info.gl_driver_version; + pIdentifier->DriverVersion->u.HighPart = Adapters[Adapter].gl_info.driver_version_hipart; + pIdentifier->DriverVersion->u.LowPart = Adapters[Adapter].gl_info.driver_version; *(pIdentifier->VendorId) = Adapters[Adapter].gl_info.gl_vendor; *(pIdentifier->DeviceId) = Adapters[Adapter].gl_info.gl_card; *(pIdentifier->SubSysId) = 0; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 4379039..b6913fb 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3653,7 +3653,8 @@ typedef struct _WineD3D_GL_Info { GL_Vendors gl_vendor; GL_Cards gl_card; UINT vidmem; - DWORD gl_driver_version; + DWORD driver_version; + DWORD driver_version_hipart; CHAR gl_renderer[255]; /** * CAPS Constants

1 0

Stefan Dösinger : wined3d: Create VBOs.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 089c34b95a6d04ea4e698d2e42c75bd231c05fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=089c34b95a6d04ea4e698d2e4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 5 23:56:03 2008 +0100 wined3d: Create VBOs. --- dlls/wined3d/vertexbuffer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 880e506..72cef07 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -503,6 +503,7 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if if(!This->vbo) { /* TODO: Make converting independent from VBOs */ if(This->Flags & VBFLAG_CREATEVBO) { + CreateVBO(This); This->Flags &= ~VBFLAG_CREATEVBO; } else { return; /* Not doing any conversion */

1 0

Stefan Dösinger : ddraw: Some drivers return a refresh rate of 0.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 8ad3a1f49e86f3fa0dba5145e22d85c1801c38f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad3a1f49e86f3fa0dba5145e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 27 13:55:32 2008 +0100 ddraw: Some drivers return a refresh rate of 0. --- dlls/ddraw/tests/ddrawmodes.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 529c81a..ea8939b 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -118,11 +118,15 @@ static HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext ok(U1(*lpddsd).lPitch != 0, "EnumDisplayModes callback with bad pitch\n"); } - /* Check that frequency is valid if applicable */ + /* Check that frequency is valid if applicable + * + * This fails on some Windows drivers or Windows versions, so it isn't important + * apparently if(lpddsd->dwFlags & DDSD_REFRESHRATE) { ok(U2(*lpddsd).dwRefreshRate != 0, "EnumDisplayModes callback with bad refresh rate\n"); } + */ adddisplaymode(lpddsd);

1 0

Francois Gouget : riched20: Fix the name of the lpUsedDefChar field of GETTEXTEX.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 1552f22acfc32a61c20405f3bb198bea28664e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1552f22acfc32a61c20405f3b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 6 04:07:40 2008 +0100 riched20: Fix the name of the lpUsedDefChar field of GETTEXTEX. --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/tests/editor.c | 36 ++++++++++++++++++------------------ include/richedit.h | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3584525..6aa21a7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2426,7 +2426,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ex.flags = GT_USECRLF; ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; - ex.lpUsedDefaultChar = NULL; + ex.lpUsedDefChar = NULL; rc = RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, unicode ? (LPARAM)bufferW : (LPARAM)bufferA, unicode); if (unicode) @@ -2480,7 +2480,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); if (rc) rc--; /* do not count 0 terminator */ heap_free(buffer); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 73f87fa..090eaad 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1134,7 +1134,7 @@ static void test_EM_SETTEXTEX(void) getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); @@ -1150,7 +1150,7 @@ static void test_EM_SETTEXTEX(void) getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem2); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1167,7 +1167,7 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; memset(buf, 0, MAX_BUF_LEN); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); ok(lstrcmpW(buf, TestItem2) == 0, @@ -1182,7 +1182,7 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; memset(buf, 0, MAX_BUF_LEN); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); ok(lstrcmpW(buf, TestItem1) == 0, @@ -1195,7 +1195,7 @@ static void test_EM_SETTEXTEX(void) getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem3); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1208,7 +1208,7 @@ static void test_EM_SETTEXTEX(void) getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem3alt); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1221,7 +1221,7 @@ static void test_EM_SETTEXTEX(void) getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem4); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1829,7 +1829,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1") == 0, "EM_GETTEXTEX results not what was set by EM_REPLACESEL\n"); @@ -1844,7 +1844,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1873,7 +1873,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1902,7 +1902,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1921,7 +1921,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " ") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1940,7 +1940,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r\r \r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1959,7 +1959,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " \r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1978,7 +1978,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " \r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1997,7 +1997,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\rX\r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -2015,7 +2015,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -2034,7 +2034,7 @@ static void test_EM_REPLACESEL(void) getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; - getText.lpUsedDefaultChar = NULL; + getText.lpUsedDefChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r\r\r\r\r ") == 0, "EM_GETTEXTEX returned incorrect string\n"); diff --git a/include/richedit.h b/include/richedit.h index ffbf661..cb278f6 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -531,7 +531,7 @@ typedef struct _gettextex { DWORD flags; UINT codepage; LPCSTR lpDefaultChar; - LPBOOL lpUsedDefaultChar; + LPBOOL lpUsedDefChar; } GETTEXTEX; #define SF_TEXT 0x00000001

1 0

Andrew Talbot : winmm: Remove unneeded casts.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 19c58112561e7ac6a4144aaa489a050580bde738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c58112561e7ac6a4144aaa4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 5 22:32:58 2008 +0000 winmm: Remove unneeded casts. --- dlls/winmm/message16.c | 24 ++++++++++++------------ dlls/winmm/winmm.c | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index c9d5f95..77a9076 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -323,7 +323,7 @@ static WINMM_MapType MMDRV_MidiOut_Map16To32W (UINT wMsg, LPDWORD lpdwUser, DW mh32->dwFlags = mh16->dwFlags; /* FIXME: nothing on mh32->lpNext */ /* could link the mh32->lpNext at this level for memory house keeping */ - mh32->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? ((LPMIDIHDR)mh16)->dwOffset : 0; + mh32->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? mh16->dwOffset : 0; mh16->lpNext = mh32; /* for reuse in unprepare and write */ /* store size of passed MIDIHDR?? structure to know if dwOffset is available or not */ mh16->reserved = *lpParam2; @@ -340,7 +340,7 @@ static WINMM_MapType MMDRV_MidiOut_Map16To32W (UINT wMsg, LPDWORD lpdwUser, DW case MODM_LONGDATA: { LPMIDIHDR mh16 = MapSL(*lpParam1); - LPMIDIHDR mh32 = (LPMIDIHDR)mh16->lpNext; + LPMIDIHDR mh32 = mh16->lpNext; *lpParam1 = (DWORD)mh32; *lpParam2 = sizeof(MIDIHDR); @@ -486,7 +486,7 @@ static WINMM_MapType MMDRV_MidiOut_Map32WTo16 (UINT wMsg, LPDWORD lpdwUser, DW /* could link the mh32->lpNext at this level for memory house keeping */ mh16->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? mh32->dwOffset : 0; - mh32->lpNext = (LPMIDIHDR)mh16; /* for reuse in unprepare and write */ + mh32->lpNext = mh16; /* for reuse in unprepare and write */ mh32->reserved = *lpParam2; TRACE("mh16=%08lx mh16->lpData=%p mh32->buflen=%u mh32->lpData=%p\n", @@ -503,7 +503,7 @@ static WINMM_MapType MMDRV_MidiOut_Map32WTo16 (UINT wMsg, LPDWORD lpdwUser, DW case MODM_LONGDATA: { LPMIDIHDR mh32 = (LPMIDIHDR)(*lpParam1); - LPMIDIHDR mh16 = (LPMIDIHDR)mh32->lpNext; + LPMIDIHDR mh16 = mh32->lpNext; LPSTR ptr = (LPSTR)mh16 - sizeof(LPMIDIHDR); assert(*(LPMIDIHDR*)ptr == mh32); @@ -618,7 +618,7 @@ static WINMM_MapType MMDRV_MidiOut_UnMap32WTo16(UINT wMsg, LPDWORD lpdwUser, DW LPSTR ptr = (LPSTR)mh16 - sizeof(LPMIDIHDR); LPMIDIHDR mh32 = *(LPMIDIHDR*)ptr; - assert(mh32->lpNext == (LPMIDIHDR)mh16); + assert(mh32->lpNext == mh16); UnMapLS( *lpParam1 ); mh32->dwBytesRecorded = mh16->dwBytesRecorded; mh32->dwUser = mh16->dwUser; @@ -784,7 +784,7 @@ static WINMM_MapType MMDRV_WaveIn_Map16To32W (UINT wMsg, LPDWORD lpdwUser, DWO case WIDM_UNPREPARE: { LPWAVEHDR wh16 = MapSL(*lpParam1); - LPWAVEHDR wh32 = (LPWAVEHDR)wh16->lpNext; + LPWAVEHDR wh32 = wh16->lpNext; *lpParam1 = (DWORD)wh32; *lpParam2 = sizeof(WAVEHDR); @@ -914,8 +914,8 @@ static WINMM_MapType MMDRV_WaveIn_Map32WTo16 (UINT wMsg, LPDWORD lpdwUser, DWO xxx extra bytes to WAVEFORMATEX */ if (wod32->lpFormat->wFormatTag != WAVE_FORMAT_PCM) { - TRACE("Allocating %u extra bytes (%d)\n", ((LPWAVEFORMATEX)wod32->lpFormat)->cbSize, wod32->lpFormat->wFormatTag); - sz += ((LPWAVEFORMATEX)wod32->lpFormat)->cbSize; + TRACE("Allocating %u extra bytes (%d)\n", wod32->lpFormat->cbSize, wod32->lpFormat->wFormatTag); + sz += wod32->lpFormat->cbSize; } ptr = HeapAlloc( GetProcessHeap(), 0, @@ -1283,7 +1283,7 @@ static WINMM_MapType MMDRV_WaveOut_Map16To32W (UINT wMsg, LPDWORD lpdwUser, DW case WODM_WRITE: { LPWAVEHDR wh16 = MapSL(*lpParam1); - LPWAVEHDR wh32 = (LPWAVEHDR)wh16->lpNext; + LPWAVEHDR wh32 = wh16->lpNext; *lpParam1 = (DWORD)wh32; *lpParam2 = sizeof(WAVEHDR); @@ -1473,8 +1473,8 @@ static WINMM_MapType MMDRV_WaveOut_Map32WTo16 (UINT wMsg, LPDWORD lpdwUser, DW xxx extra bytes to WAVEFORMATEX */ if (wod32->lpFormat->wFormatTag != WAVE_FORMAT_PCM) { - TRACE("Allocating %u extra bytes (%d)\n", ((LPWAVEFORMATEX)wod32->lpFormat)->cbSize, wod32->lpFormat->wFormatTag); - sz += ((LPWAVEFORMATEX)wod32->lpFormat)->cbSize; + TRACE("Allocating %u extra bytes (%d)\n", wod32->lpFormat->cbSize, wod32->lpFormat->wFormatTag); + sz += wod32->lpFormat->cbSize; } ptr = HeapAlloc( GetProcessHeap(), 0, @@ -3348,7 +3348,7 @@ static WINMM_MapType MCI_UnMapMsg32WTo16(WORD uDevType, WORD wMsg, DWORD dwFlag mip32w->lpstrReturn, mip32w->dwRetSize / sizeof(WCHAR)); UnMapLS( lParam ); UnMapLS( mip16->lpstrReturn ); - HeapFree( GetProcessHeap(), 0, (void*)MapSL(mip16->lpstrReturn) ); + HeapFree( GetProcessHeap(), 0, MapSL(mip16->lpstrReturn) ); HeapFree( GetProcessHeap(), 0, (char*)mip16 - sizeof(LPMCI_OPEN_PARMSW) ); } return WINMM_MAP_OK; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4ecf34b..7e1138d 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1508,7 +1508,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); /* empty list of already submitted buffers */ - for (lpMidiHdr = lpMidiStrm->lpMidiHdr; lpMidiHdr; lpMidiHdr = (LPMIDIHDR)lpMidiHdr->lpNext) { + for (lpMidiHdr = lpMidiStrm->lpMidiHdr; lpMidiHdr; lpMidiHdr = lpMidiHdr->lpNext) { lpMidiHdr->dwFlags |= MHDR_DONE; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; @@ -1592,7 +1592,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI break; } - for (lpmh = &lpMidiStrm->lpMidiHdr; *lpmh; lpmh = (LPMIDIHDR*)&((*lpmh)->lpNext)); + for (lpmh = &lpMidiStrm->lpMidiHdr; *lpmh; lpmh = &(*lpmh)->lpNext); *lpmh = lpMidiHdr; lpMidiHdr = (LPMIDIHDR)msg->lParam; lpMidiHdr->lpNext = 0; @@ -1720,7 +1720,7 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) lpMidiHdr->dwFlags |= MHDR_DONE; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiStrm->lpMidiHdr = (LPMIDIHDR)lpMidiHdr->lpNext; + lpMidiStrm->lpMidiHdr = lpMidiHdr->lpNext; DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, (HDRVR)lpMidiStrm->hDevice, MM_MOM_DONE, lpwm->mod.dwInstance, (DWORD)lpMidiHdr, 0L);

1 0

Stefan Dösinger : wined3d: Restore the stateblock after Reset.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 564532f026b9ed8f046478ad56b48b775bb5bdd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564532f026b9ed8f046478ad5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 5 21:51:53 2008 +0100 wined3d: Restore the stateblock after Reset. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9d16156..7b924da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6931,6 +6931,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE swapchain->num_contexts = 1; This->activeContext = swapchain->context[0]; + hr = IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *) This->stateBlock); + if(FAILED(hr)) { + ERR("Resetting the stateblock failed with error 0x%08x\n", hr); + } + /* All done. There is no need to reload resources or shaders, this will happen automatically on the * first use */

1 0

Stefan Dösinger : wined3d: Tear down the dummy textures before resetting.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: cb6de00c86fd958aeab624088325ca7a1bd32002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6de00c86fd958aeab624088… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 5 21:56:46 2008 +0100 wined3d: Tear down the dummy textures before resetting. In theory the opengl library should release the gl resources when we destroy the context, and the stateblock reset will recreate the dummy textures, but I think it is cleaner to do this explicitly. --- dlls/wined3d/device.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7b924da..10d11b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6777,6 +6777,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE WINED3DDISPLAYMODE mode; IWineD3DBaseShaderImpl *shader; IWineD3DSurfaceImpl *target; + UINT i; TRACE("(%p)\n", This); hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &swapchain); @@ -6839,14 +6840,21 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader); } + ENTER_GL(); if(This->depth_blt_texture) { - ENTER_GL(); glDeleteTextures(1, &This->depth_blt_texture); - LEAVE_GL(); This->depth_blt_texture = 0; } This->shader_backend->shader_destroy_depth_blt(iface); + for (i = 0; i < GL_LIMITS(textures); i++) { + /* The stateblock initialization below will recreate them */ + glDeleteTextures(1, &This->dummyTextureName[i]); + checkGLcall("glDeleteTextures(1, &This->dummyTextureName[i])"); + This->dummyTextureName[i] = 0; + } + LEAVE_GL(); + while(This->numContexts) { DestroyContext(This, This->contexts[0]); }

1 0

Stefan Dösinger : wined3d: Move the highpart of the driver version to the gl structure.
by Alexandre Julliard 06 Feb '08

06 Feb '08

Module: wine Branch: master Commit: 3188d9ae30d6d3c333df9394a0ed8b68b83d2df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3188d9ae30d6d3c333df9394a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 5 22:28:00 2008 +0100 wined3d: Move the highpart of the driver version to the gl structure. While 6.14 is a sane default, we might want to override it on a per-driver basis, if we have really old Windows drivers on some cards. --- dlls/wined3d/directx.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 622c17e..4d5edb6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -637,6 +637,12 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } gl_info->gl_driver_version = MAKEDWORD_VERSION(major, minor); TRACE_(d3d_caps)("found GL_VERSION (%s)->%i.%i->(0x%08x)\n", debugstr_a(gl_string), major, minor, gl_info->gl_driver_version); + /* Current Windows drivers have versions like 6.14.... (some older have an earlier version) */ + gl_info->gl_driver_version_hipart = MAKEDWORD_VERSION(6, 14); + } else { + FIXME("OpenGL driver did not return version information\n"); + gl_info->gl_driver_version = MAKEDWORD_VERSION(0, 0); + gl_info->gl_driver_version_hipart = MAKEDWORD_VERSION(6, 14); } TRACE_(d3d_caps)("found GL_RENDERER (%s)->(0x%04x)\n", debugstr_a(gl_info->gl_renderer), gl_info->gl_card); @@ -1531,8 +1537,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad /* Note dx8 doesn't supply a DeviceName */ if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ - /* Current Windows drivers have versions like 6.14.... (some older have an earlier version) */ - pIdentifier->DriverVersion->u.HighPart = MAKEDWORD_VERSION(6, 14); + pIdentifier->DriverVersion->u.HighPart = Adapters[Adapter].gl_info.gl_driver_version_hipart; pIdentifier->DriverVersion->u.LowPart = Adapters[Adapter].gl_info.gl_driver_version; *(pIdentifier->VendorId) = Adapters[Adapter].gl_info.gl_vendor; *(pIdentifier->DeviceId) = Adapters[Adapter].gl_info.gl_card;

1 0