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

Detlef Riekenberg : winspool: Basic tests for AddMonitor.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: f0a95868798b826023168a42cd49a6eadb1295ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0a95868798b826023168a4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 10 00:29:22 2006 +0200 winspool: Basic tests for AddMonitor. --- dlls/winspool/tests/info.c | 225 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 224 insertions(+), 1 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index 74ab592..3574003 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2003, 2004 Stefan Leichter - * Copyright (C) 2005 Detlef Riekenberg + * Copyright (C) 2005, 2006 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,11 +32,17 @@ static char env_x86[] = "Windows NT x86"; static char env_win9x_case[] = "windowS 4.0"; +static char winetest_monitor[] = "winetest"; static HANDLE hwinspool; static FARPROC pGetDefaultPrinterA; static FARPROC pSetDefaultPrinterA; +struct monitor_entry { + LPSTR env; + LPSTR dllname; +}; + /* report common behavior only once */ static DWORD report_deactivated_spooler = 1; #define RETURN_ON_DEACTIVATED_SPOOLER(res) \ @@ -106,6 +112,222 @@ static LPSTR find_default_printer(VOID) return default_printer; } + +static struct monitor_entry * find_installed_monitor(void) +{ + MONITOR_INFO_2A mi2a; + static struct monitor_entry * entry = NULL; + DWORD res; + DWORD num_tests; + DWORD i = 0; + + static struct monitor_entry monitor_table[] = { + {env_win9x_case, "localspl.dll"}, + {env_x86, "localspl.dll"}, + {env_win9x_case, "localmon.dll"}, + {env_x86, "localmon.dll"}, + {env_win9x_case, "tcpmon.dll"}, + {env_x86, "tcpmon.dll"}, + {env_win9x_case, "usbmon.dll"}, + {env_x86, "usbmon.dll"}, + {env_win9x_case, "mspp32.dll"}, + {env_x86, "win32spl.dll"}, + {env_x86, "redmonnt.dll"}, + {env_x86, "redmon35.dll"}, + {env_win9x_case, "redmon95.dll"}, + {env_x86, "pdfcmnnt.dll"}, + {env_win9x_case, "pdfcmn95.dll"}, + }; + + if (entry) return entry; + + num_tests = (sizeof(monitor_table)/sizeof(struct monitor_entry)); + + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, NULL, NULL); + if (!res && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { + trace("DeleteMonitorA() not implemented yet\n"); + return NULL; + } + + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 0, NULL); + if (!res && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { + trace("AddMonitorA() not implemented yet\n"); + return NULL; + } + + /* cleanup */ + DeleteMonitorA(NULL, env_x86, winetest_monitor); + DeleteMonitorA(NULL, env_win9x_case, winetest_monitor); + + /* find a usable monitor from the table */ + mi2a.pName = winetest_monitor; + while ((entry == NULL) && (i < num_tests)) { + entry = &monitor_table[i]; + i++; + mi2a.pEnvironment = entry->env; + mi2a.pDLLName = entry->dllname; + + if (AddMonitorA(NULL, 2, (LPBYTE) &mi2a)) { + /* we got one */ + trace("using '%s', '%s'\n", entry->env, entry->dllname); + DeleteMonitorA(NULL, entry->env, winetest_monitor); + } + else + { + entry = NULL; + } + } + return entry; +} + +/* ########################### */ + + +static void test_AddMonitor(void) +{ + MONITOR_INFO_2A mi2a; + struct monitor_entry * entry = NULL; + DWORD res; + + entry = find_installed_monitor(); + + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 1, NULL); + ok(!res && (GetLastError() == ERROR_INVALID_LEVEL), + "returned %ld with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 3, NULL); + ok(!res && (GetLastError() == ERROR_INVALID_LEVEL), + "returned %ld with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, NULL); + /* NT: unchanged, 9x: ERROR_PRIVILEGE_NOT_HELD */ + ok(!res && + ((GetLastError() == MAGIC_DEAD) || + (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), + "returned %ld with %ld (expected '0' with: MAGIC_DEAD or " \ + "ERROR_PRIVILEGE_NOT_HELD)\n", res, GetLastError()); + + ZeroMemory(&mi2a, sizeof(MONITOR_INFO_2A)); + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + RETURN_ON_DEACTIVATED_SPOOLER(res) + + if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { + trace("skip tests (ACCESS_DENIED)\n"); + return; + } + + /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_INVALID_ENVIRONMENT */ + ok(!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || + (GetLastError() == ERROR_INVALID_ENVIRONMENT)), + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " \ + "ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError()); + + if (!entry) { + trace("No usable Monitor found: Skip tests\n"); + return; + } + +#if 0 + /* The Test is deactivated, because when mi2a.pName is NULL, the subkey + HKLM\System\CurrentControlSet\Control\Print\Monitors\C:\WINDOWS\SYSTEM + or HKLM\System\CurrentControlSet\Control\Print\Monitors\� + is created on win9x and we do not want to hit this bug here. */ + + mi2a.pEnvironment = entry->env; + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_PRIVILEGE_NOT_HELD */ +#endif + + mi2a.pEnvironment = entry->env; + mi2a.pName = ""; + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_PRIVILEGE_NOT_HELD */ + ok( !res && + ((GetLastError() == ERROR_INVALID_PARAMETER) || + (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " \ + "ERROR_PRIVILEGE_NOT_HELD)\n", + res, GetLastError()); + + mi2a.pName = winetest_monitor; + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_PRIVILEGE_NOT_HELD */ + ok( !res && + ((GetLastError() == ERROR_INVALID_PARAMETER) || + (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " \ + "ERROR_PRIVILEGE_NOT_HELD)\n", + res, GetLastError()); + + mi2a.pDLLName = ""; + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %ld with %ld (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + + + mi2a.pDLLName = "does_not_exists.dll"; + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + /* NT: ERROR_MOD_NOT_FOUND, 9x: ERROR_INVALID_PARAMETER */ + ok( !res && + ((GetLastError() == ERROR_MOD_NOT_FOUND) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %ld with %ld (expected '0' with: ERROR_MOD_NOT_FOUND or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + mi2a.pDLLName = "version.dll"; + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + /* NT: ERROR_PROC_NOT_FOUND, 9x: ERROR_INVALID_PARAMETER */ + todo_wine { + ok( !res && + ((GetLastError() == ERROR_PROC_NOT_FOUND) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %ld with %ld (expected '0' with: ERROR_PROC_NOT_FOUND or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + if (res) DeleteMonitorA(NULL, entry->env, winetest_monitor); + } + + /* Test AddMonitor with real options */ + mi2a.pDLLName = entry->dllname; + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); + + /* add a monitor twice */ + SetLastError(MAGIC_DEAD); + res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + /* NT: ERROR_PRINT_MONITOR_ALREADY_INSTALLED (3006), 9x: ERROR_ALREADY_EXISTS (183) */ + ok( !res && + ((GetLastError() == ERROR_PRINT_MONITOR_ALREADY_INSTALLED) || + (GetLastError() == ERROR_ALREADY_EXISTS)), + "returned %ld with %ld (expected '0' with: " \ + "ERROR_PRINT_MONITOR_ALREADY_INSTALLED or ERROR_ALREADY_EXISTS)\n", + res, GetLastError()); + + DeleteMonitorA(NULL, entry->env, winetest_monitor); + SetLastError(MAGIC_DEAD); + res = AddMonitorA("", 2, (LPBYTE) &mi2a); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); + + /* cleanup */ + DeleteMonitorA(NULL, entry->env, winetest_monitor); + +} + /* ########################### */ static void test_EnumMonitors(void) @@ -698,6 +920,7 @@ START_TEST(info) find_default_printer(); + test_AddMonitor(); test_EnumMonitors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory();

1 0

Vitaliy Margolen : d3d9: VertexDeclaration and VertexShader should keep reference to the parent device object .
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 4a25828c0d8d7fa08793027f4c4d2ba14dc5407d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a25828c0d8d7fa08793027… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Apr 11 22:09:27 2006 -0600 d3d9: VertexDeclaration and VertexShader should keep reference to the parent device object. --- dlls/d3d9/d3d9_private.h | 4 ++++ dlls/d3d9/vertexdeclaration.c | 3 +++ dlls/d3d9/vertexshader.c | 3 +++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 02c15eb..797eb4b 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -541,6 +541,8 @@ typedef struct IDirect3DVertexDeclaratio /* IDirect3DVertexDeclaration9 fields */ IWineD3DVertexDeclaration *wineD3DVertexDeclaration; + /* Parent reference */ + LPDIRECT3DDEVICE9 parentDevice; } IDirect3DVertexDeclaration9Impl; /* ---------------------- */ @@ -563,6 +565,8 @@ typedef struct IDirect3DVertexShader9Imp /* IDirect3DVertexShader9 fields */ IWineD3DVertexShader *wineD3DVertexShader; + /* Parent reference */ + LPDIRECT3DDEVICE9 parentDevice; } IDirect3DVertexShader9Impl; /* --------------------- */ diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index ef8ed54..1e1b7b1 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -56,6 +56,7 @@ ULONG WINAPI IDirect3DVertexDeclaration9 if (ref == 0) { IWineD3DVertexDeclaration_Release(This->wineD3DVertexDeclaration); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -129,6 +130,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cr FIXME("(%p) call to IWineD3DDevice_CreateVertexDeclaration failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; *ppDecl = (LPDIRECT3DVERTEXDECLARATION9) object; TRACE("(%p) : Created vertex declatanio %p\n", This, object); } diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 034b097..050e387 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -56,6 +56,7 @@ ULONG WINAPI IDirect3DVertexShader9Impl_ if (ref == 0) { IWineD3DVertexShader_Release(This->wineD3DVertexShader); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -122,6 +123,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea FIXME("Call to IWineD3DDevice_CreateVertexShader failed\n"); HeapFree(GetProcessHeap(), 0, object); }else{ + IUnknown_AddRef(iface); + object->parentDevice = iface; *ppShader = (IDirect3DVertexShader9 *)object; TRACE("(%p) : Created vertex shader %p\n", This, object); }

1 0

Detlef Riekenberg : winspool: Implement AddMonitor.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: ed1161f993ecfba6bdb3e7f89667b0ea0cb95c77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed1161f993ecfba6bdb3e7f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 11 20:42:18 2006 +0200 winspool: Implement AddMonitor. --- dlls/winspool/info.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 132 insertions(+), 9 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 124970b..c33072b 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1318,9 +1318,59 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinte */ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) { - FIXME("(%s,0x%08lx,%p), stub!\n", debugstr_a(pName), Level, pMonitors); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPWSTR nameW = NULL; + INT len; + BOOL res; + LPMONITOR_INFO_2A mi2a; + MONITOR_INFO_2W mi2w; + + mi2a = (LPMONITOR_INFO_2A) pMonitors; + TRACE("(%s, %ld, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors, + mi2a ? debugstr_a(mi2a->pName) : NULL, + mi2a ? debugstr_a(mi2a->pEnvironment) : NULL, + mi2a ? debugstr_a(mi2a->pDLLName) : NULL); + + if (Level != 2) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + /* XP: unchanged, win9x: ERROR_INVALID_ENVIRONMENT */ + if (mi2a == NULL) { + return FALSE; + } + + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + memset(&mi2w, 0, sizeof(MONITOR_INFO_2W)); + if (mi2a->pName) { + len = MultiByteToWideChar(CP_ACP, 0, mi2a->pName, -1, NULL, 0); + mi2w.pName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, mi2a->pName, -1, mi2w.pName, len); + } + if (mi2a->pEnvironment) { + len = MultiByteToWideChar(CP_ACP, 0, mi2a->pEnvironment, -1, NULL, 0); + mi2w.pEnvironment = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, mi2a->pEnvironment, -1, mi2w.pEnvironment, len); + } + if (mi2a->pDLLName) { + len = MultiByteToWideChar(CP_ACP, 0, mi2a->pDLLName, -1, NULL, 0); + mi2w.pDLLName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, mi2a->pDLLName, -1, mi2w.pDLLName, len); + } + + res = AddMonitorW(nameW, Level, (LPBYTE) &mi2w); + + HeapFree(GetProcessHeap(), 0, mi2w.pName); + HeapFree(GetProcessHeap(), 0, mi2w.pEnvironment); + HeapFree(GetProcessHeap(), 0, mi2w.pDLLName); + + HeapFree(GetProcessHeap(), 0, nameW); + return (res); } /****************************************************************************** @@ -1340,15 +1390,88 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWO * NOTES * All Files for the Monitor must already be copied to %winsysdir% ("%SystemRoot%\system32") * - * BUGS - * only a Stub - * */ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { - FIXME("(%s,0x%08lx,%p), stub!\n",debugstr_w(pName), Level, pMonitors); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPMONITOR_INFO_2W mi2w; + HKEY hroot = NULL; + HKEY hentry = NULL; + HMODULE hdll = NULL; + DWORD disposition; + BOOL res = FALSE; + + mi2w = (LPMONITOR_INFO_2W) pMonitors; + TRACE("(%s, %ld, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors, + mi2w ? debugstr_w(mi2w->pName) : NULL, + mi2w ? debugstr_w(mi2w->pEnvironment) : NULL, + mi2w ? debugstr_w(mi2w->pDLLName) : NULL); + + if (Level != 2) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + /* XP: unchanged, win9x: ERROR_INVALID_ENVIRONMENT */ + if (mi2w == NULL) { + return FALSE; + } + + if (pName && (pName[0])) { + FIXME("for server %s not implemented\n", debugstr_w(pName)); + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + + if (!mi2w->pName || (! mi2w->pName[0])) { + WARN("pName not valid : %s \n", debugstr_w(mi2w->pName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!mi2w->pEnvironment || lstrcmpW(mi2w->pEnvironment, envname_x86W)) { + WARN("Environment %s requested (we support only %s)\n", + debugstr_w(mi2w->pEnvironment), debugstr_w(envname_x86W)); + SetLastError(ERROR_INVALID_ENVIRONMENT); + return FALSE; + } + + if (!mi2w->pDLLName || (! mi2w->pDLLName[0])) { + WARN("pDLLName not valid : %s \n", debugstr_w(mi2w->pDLLName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((hdll = LoadLibraryW(mi2w->pDLLName)) == NULL) { + return FALSE; + } + FreeLibrary(hdll); + + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) != ERROR_SUCCESS) { + ERR("unable to create key %s\n", debugstr_w(MonitorsW)); + return FALSE; + } + + if(RegCreateKeyExW(hroot, mi2w->pName, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, &hentry, &disposition) == ERROR_SUCCESS) { + + if (disposition == REG_OPENED_EXISTING_KEY) { + TRACE("monitor %s already exists\n", debugstr_w(mi2w->pName)); + /* NT: ERROR_PRINT_MONITOR_ALREADY_INSTALLED (3006) + 9x: ERROR_ALREADY_EXISTS (183) */ + SetLastError(ERROR_PRINT_MONITOR_ALREADY_INSTALLED); + } + else + { + INT len; + len = (lstrlenW(mi2w->pDLLName) +1) * sizeof(WCHAR); + res = (RegSetValueExW(hentry, DriverW, 0, + REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); + } + RegCloseKey(hentry); + } + + RegCloseKey(hroot); + return (res); } /******************************************************************

1 0

Alexandre Julliard : server: Don't attach thread input to the desktop.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 0fab85a5b66bfe0bccfd6bbd0ece68b986e5df5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fab85a5b66bfe0bccfd6bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 12 11:19:20 2006 +0200 server: Don't attach thread input to the desktop. Now that the desktop can be owned by a thread we need to explicitly check for it in the thread attach check. --- server/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 8254793..5ceab49 100644 --- a/server/window.c +++ b/server/window.c @@ -426,7 +426,7 @@ static struct window *create_window( str } /* if parent belongs to a different thread, attach the two threads */ - if (parent && parent->thread && parent->thread != current) + if (parent && parent->thread && parent->thread != current && !is_desktop_window(parent)) { if (!attach_thread_input( current, parent->thread )) goto failed; }

1 0

Vitaliy Margolen : d3d8: VertexShader should keep reference to the parent device object.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 99136998e2345ac5e2408f5f129c4b5d11db6c5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99136998e2345ac5e2408f5… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Apr 11 22:09:27 2006 -0600 d3d8: VertexShader should keep reference to the parent device object. --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/device.c | 2 ++ dlls/d3d8/vertexshader.c | 1 + 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index c0f8eb0..77a73c9 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -531,6 +531,9 @@ struct IDirect3DVertexShader8Impl { LONG ref; IWineD3DVertexShader *wineD3DVertexShader; + + /* Parent reference */ + LPDIRECT3DDEVICE8 parentDevice; }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0176459..2590498 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1070,6 +1070,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea FIXME("(%p) : Number of shaders exceeds the maximum number of possible shaders\n", This); hrc = E_OUTOFMEMORY; } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; This->vShaders[i] = object; *ppShader = i + VS_HIGHESTFIXEDFXF + 1; } diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index 5bba7aa..f11e756 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -56,6 +56,7 @@ ULONG WINAPI IDirect3DVertexShader8Impl_ if (ref == 0) { IWineD3DVertexShader_Release(This->wineD3DVertexShader); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Petr Tesarik : winedos: Implement INT2F/AX=1501 (get drive device list).
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 31b0a4edf6880ada83fe74218ebedd83e53c20d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31b0a4edf6880ada83fe742… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Tue Apr 11 19:35:17 2006 +0200 winedos: Implement INT2F/AX=1501 (get drive device list). --- dlls/winedos/int2f.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c index 617c4f0..27dea2b 100644 --- a/dlls/winedos/int2f.c +++ b/dlls/winedos/int2f.c @@ -972,6 +972,27 @@ static void MSCDEX_Handler(CONTEXT86* co SET_CX( context, (drive < 26) ? drive : 0 ); break; + case 0x01: /* get drive device list */ + { + CDROM_HEAP* cdrom_heap = CDROM_GetHeap(); + CDROM_DEVICE_HEADER* dev = &cdrom_heap->hdr; + SEGPTR ptr_dev = ISV86(context) + ? MAKESEGPTR( cdrom_heap->cdrom_segment, + FIELD_OFFSET(CDROM_HEAP, hdr) ) + : MAKESEGPTR( cdrom_heap->cdrom_selector, + FIELD_OFFSET(CDROM_HEAP, hdr) ); + + p = CTX_SEG_OFF_TO_LIN(context, context->SegEs, context->Ebx); + for (drive = 0; drive < dev->units; drive++) { + *p = drive; /* subunit */ + ++p; + *(DWORD*)p = ptr_dev; + p += sizeof(DWORD); + } + TRACE("Get drive device list\n"); + } + break; + case 0x0B: /* drive check */ SET_AX( context, is_cdrom(CX_reg(context)) ); SET_BX( context, 0xADAD );

1 0

Juan Lang : msi: Fix possible crash bugs in error path.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 37009138034c996ab80e6bc5f48e3b453d7b8076 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37009138034c996ab80e6bc… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Apr 11 09:10:33 2006 -0700 msi: Fix possible crash bugs in error path. --- dlls/msi/appsearch.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index d4de09f..d65bddb 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -158,7 +158,8 @@ static UINT ACTION_AppSearchGetSignature TRACE("Languages is %s\n", debugstr_w(sig->Languages)); end: - msiobj_release(&row->hdr); + if (row) + msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); } @@ -220,7 +221,8 @@ static UINT ACTION_AppSearchComponents(M debugstr_w(guid)); end: - msiobj_release(&row->hdr); + if (row) + msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); } @@ -393,7 +395,8 @@ end: msi_free( keyPath); msi_free( valueName); - msiobj_release(&row->hdr); + if (row) + msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); } @@ -448,7 +451,8 @@ static UINT ACTION_AppSearchIni(MSIPACKA msi_free( fileName); end: - msiobj_release(&row->hdr); + if (row) + msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); } @@ -872,7 +876,8 @@ static UINT ACTION_AppSearchDr(MSIPACKAG rc = ACTION_SearchDirectory(package, sig, expanded, depth); end: - msiobj_release(&row->hdr); + if (row) + msiobj_release(&row->hdr); MSI_ViewClose(view); msiobj_release(&view->hdr); }

1 0

Mike McCormack : shdocvw: Register iexplore.exe as a COM local server.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 42c7372b6b8c64b8f6e9ea378c283d0903988bfd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42c7372b6b8c64b8f6e9ea3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 11 21:38:14 2006 +0900 shdocvw: Register iexplore.exe as a COM local server. --- dlls/shdocvw/Makefile.in | 2 +- dlls/shdocvw/regsvr.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index b18eff9..c9c394b 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shdocvw.dll IMPORTLIB = libshdocvw.$(IMPLIBEXT) -IMPORTS = shlwapi user32 advapi32 kernel32 +IMPORTS = shell32 shlwapi user32 advapi32 kernel32 DELAYIMPORTS = urlmon ole32 oleaut32 EXTRALIBS = -luuid diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index 5c282df..8b8d23d 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -102,6 +102,11 @@ static WCHAR const viprogid_keyname[25] 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; +static WCHAR const lcs32_keyname[] = { + 'L','o','c','a','l','S','e','r','v','e','r','3','2',0 }; +static const WCHAR szIERelPath[] = { + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', + 'i','e','x','p','l','o','r','e','.','e','x','e',0 }; /*********************************************************************** * static helper functions @@ -509,6 +514,14 @@ static struct regsvr_coclass const cocla "Shell.Explorer.2", "Shell.Explorer" }, + { &CLSID_InternetExplorer, + "Internet Explorer(Ver 1.0)", + NULL, + NULL, + NULL, + "InternetExplorer.Application.1", + "InternetExplorer.Application" + }, { NULL } /* list terminator */ }; @@ -520,6 +533,43 @@ static struct regsvr_interface const int { NULL } /* list terminator */ }; +static HRESULT register_localserver(void) +{ + HKEY coclass_key = 0, clsid_key = 0; + WCHAR buf[39], path[MAX_PATH]; + LONG res; + UINT len; + + res = SHGetFolderPathW(NULL, CSIDL_FLAG_CREATE|CSIDL_PROGRAM_FILES, + NULL, SHGFP_TYPE_CURRENT, path); + if (FAILED(res)) + return res; + + len = lstrlenW(path); + if ((len + (sizeof szIERelPath/sizeof(WCHAR)) + 1) > MAX_PATH) + return E_FAIL; + + path[len] = '\\'; + lstrcpyW(&path[len+1], szIERelPath); + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto err; + + StringFromGUID2(&CLSID_InternetExplorer, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto err; + + res = register_key_defvalueW(clsid_key, lcs32_keyname, path); + if (res != ERROR_SUCCESS) goto err; + +err: + if (clsid_key) RegCloseKey(clsid_key); + if (coclass_key) RegCloseKey(coclass_key); + return (res == ERROR_SUCCESS) ? S_OK : E_FAIL; +} + /*********************************************************************** * DllRegisterServer (SHDOCVW.@) */ @@ -532,6 +582,8 @@ HRESULT WINAPI DllRegisterServer(void) hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = register_localserver(); return hr; }

1 0

Jason Green : wined3d: Spelling fixes and downgrade a FIXME to a TRACE.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: be10a6a0992499e9c325bfc8dda832928b7363a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be10a6a0992499e9c325bfc… Author: Jason Green <jave27(a)gmail.com> Date: Tue Apr 11 19:25:42 2006 -0400 wined3d: Spelling fixes and downgrade a FIXME to a TRACE. --- dlls/wined3d/vertexdeclaration.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 78c07c5..8db4288 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -462,7 +462,7 @@ static HRESULT WINAPI IWineD3DVertexDecl /* The Incredibles and Teenage Mutant Ninja Turtles require this in d3d9 for NumElements == 0, TODO: this needs to be tested against windows */ if(*pSizeOfData == 0) { - TRACE("(%p) : Requested the vertex declaration without specefying the size of the return buffer\n", This); + TRACE("(%p) : Requested the vertex declaration without specifying the size of the return buffer\n", This); *pSizeOfData = This->declaration8Length; memcpy(pData, This->pDeclaration8, This->declaration8Length); return WINED3D_OK; @@ -510,7 +510,7 @@ HRESULT WINAPI IWineD3DVertexDeclaration hr = IWineD3DVertexDeclarationImpl_GetDeclaration9(iface, (D3DVERTEXELEMENT9 *)pData, pSize); break; default: - FIXME("(%p) : Unsupport DirectX version %u\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); + FIXME("(%p) : Unsupported DirectX version %u\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); break; } return hr; @@ -523,15 +523,15 @@ HRESULT WINAPI IWineD3DVertexDeclaration TRACE("(%p) : d3d version %d\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); switch (((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion) { case 8: - TRACE("Parsing declatation 8\n"); + TRACE("Parsing declaration 8\n"); hr = IWineD3DVertexDeclarationImpl_ParseDeclaration8(iface, (CONST DWORD *)pDecl); break; case 9: - FIXME("Parsing declatation 9\n"); + TRACE("Parsing declaration 9\n"); hr = IWineD3DVertexDeclarationImpl_ParseDeclaration9(iface, (CONST D3DVERTEXELEMENT9 *)pDecl); break; default: - FIXME("(%p) : Unsupport DirectX version %u\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); + FIXME("(%p) : Unsupported DirectX version %u\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); break; } TRACE("Returning\n");

1 0

Stefan Dösinger : wined3d: Don' t do a logical AND on the swap effect.
by Alexandre Julliard 12 Apr '06

12 Apr '06

Module: wine Branch: refs/heads/master Commit: 108688f96aef3c403beda7d752818a3e23f29552 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=108688f96aef3c403beda7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 10 18:26:46 2006 +0200 wined3d: Don't do a logical AND on the swap effect. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8f67220..f20198c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -314,7 +314,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Pre LEAVE_GL(); /* Although this is not strictly required, a simple demo showed this does occur on (at least non-debug) d3d */ - if (This->presentParms.SwapEffect & WINED3DSWAPEFFECT_DISCARD) { + if (This->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { TRACE("Clearing\n");

1 0