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

Detlef Riekenberg : oleaut32/tests: Replace lstrcpyW and lstrcatW with memcpy to fix failures on win95.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 00703d0c2f2b583bc2cbd20f7142f308ff2a992b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00703d0c2f2b583bc2cbd20f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 14:45:09 2009 +0200 oleaut32/tests: Replace lstrcpyW and lstrcatW with memcpy to fix failures on win95. --- dlls/oleaut32/tests/vartest.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 24ef171..f0a6deb 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -106,15 +106,16 @@ static void init(void) res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), "Expected localized string for 'True'\n"); - lstrcpyW(sz12_true, sz12); - if (bstr) lstrcatW(sz12_true, bstr); + /* lstrcpyW / lstrcatW do not work on win95 */ + memcpy(sz12_true, sz12, sizeof(sz12)); + if (bstr) memcpy(&sz12_true[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); SysFreeString(bstr); res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), "Expected localized string for 'False'\n"); - lstrcpyW(sz12_false, sz12); - if (bstr) lstrcatW(sz12_false, bstr); + memcpy(sz12_false, sz12, sizeof(sz12)); + if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); SysFreeString(bstr); hOleaut32 = GetModuleHandle("oleaut32.dll");

1 0

Hans Leidekker : programs: Add stub termsv.exe.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 6137b1ba2d19a1ac5430c9c8d6c1a651ca0c0a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6137b1ba2d19a1ac5430c9c8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 15 14:58:00 2009 +0200 programs: Add stub termsv.exe. --- configure | 10 ++++ configure.ac | 1 + programs/termsv/Makefile.in | 15 +++++++ programs/termsv/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 10 ++++ 5 files changed, 135 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a98e04e..4d41840 100755 --- a/configure +++ b/configure @@ -28007,6 +28007,15 @@ programs/taskmgr/Makefile: programs/taskmgr/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/taskmgr/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/termsv/Makefile" +test "x$enable_termsv" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + termsv" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + termsv" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/termsv/Makefile: programs/termsv/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/termsv/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/uninstaller/Makefile" test "x$enable_uninstaller" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ uninstaller" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ @@ -29359,6 +29368,7 @@ do "programs/start/Makefile") CONFIG_FILES="$CONFIG_FILES programs/start/Makefile" ;; "programs/svchost/Makefile") CONFIG_FILES="$CONFIG_FILES programs/svchost/Makefile" ;; "programs/taskmgr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/taskmgr/Makefile" ;; + "programs/termsv/Makefile") CONFIG_FILES="$CONFIG_FILES programs/termsv/Makefile" ;; "programs/uninstaller/Makefile") CONFIG_FILES="$CONFIG_FILES programs/uninstaller/Makefile" ;; "programs/unlodctr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/unlodctr/Makefile" ;; "programs/view/Makefile") CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;; diff --git a/configure.ac b/configure.ac index f156bbe..bf5afe9 100644 --- a/configure.ac +++ b/configure.ac @@ -2326,6 +2326,7 @@ WINE_CONFIG_MAKEFILE([programs/spoolsv/Makefile],[programs/Makeprog.rules],[prog WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/termsv/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/unlodctr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in new file mode 100644 index 0000000..559a72e --- /dev/null +++ b/programs/termsv/Makefile.in @@ -0,0 +1,15 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = termsv.exe +APPMODE = -mconsole -municode +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/termsv/main.c b/programs/termsv/main.c new file mode 100644 index 0000000..6391525 --- /dev/null +++ b/programs/termsv/main.c @@ -0,0 +1,99 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(termsv); + +static WCHAR termserviceW[] = {'T','e','r','m','S','e','r','v','i','c','e',0}; + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( termserviceW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { termserviceW, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0c3a5cc..fb7c68c 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -78,10 +78,12 @@ AddReg=\ [DefaultInstall.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService +AddService=TermService,0,TerminalServices [DefaultInstall.NT.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService +AddService=TermService,0,TerminalServices [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2904,6 +2906,14 @@ StartType=4 ErrorControl=1 LoadOrderGroup="SpoolerGroup" +[TerminalServices] +Description="Remote desktop access" +DisplayName="Terminal Services" +ServiceBinary="%11%\termsv.exe" +ServiceType=32 +StartType=3 +ErrorControl=1 + [Services] HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,,""

1 0

Paul TBBle Hampson : dinput: Add missing newline to trace message.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 98c1c8e741c0c684a097f48a484c0baeded8e239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c1c8e741c0c684a097f48a4… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Sat Apr 18 22:21:30 2009 +1000 dinput: Add missing newline to trace message. --- dlls/dinput/dinput_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index f9ba1c6..9769d74 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -203,7 +203,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { }; TRACE(" flags: "); if (dwFlags == 0) { - TRACE("DIEDFL_ALLDEVICES"); + TRACE("DIEDFL_ALLDEVICES\n"); return; } for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++)

1 0

Nicolas Le Cam : msi/tests: Test MsiRecordGetString on null and empty strings.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: edac581d6afdc6e1eb1252d82f4f6200900f0c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edac581d6afdc6e1eb1252d82… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Apr 16 01:06:21 2009 +0200 msi/tests: Test MsiRecordGetString on null and empty strings. --- dlls/msi/tests/record.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 8f2b963..ca70494 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -122,15 +122,47 @@ static void test_msirecord(void) r = MsiRecordGetInteger(h, 0); ok(r == 1, "failed to get integer\n"); - /* same record, but add a string to it */ + /* same record, but add a null or empty string to it */ r = MsiRecordSetString(h, 0, NULL); ok(r == ERROR_SUCCESS, "Failed to set null string at 0\n"); r = MsiRecordIsNull(h, 0); ok(r == TRUE, "null string not null field\n"); + r = MsiRecordDataSize(h, 0); + ok(r == 0, "size of string record is strlen\n"); + buf[0] = 0; + sz = sizeof buf; + r = MsiRecordGetStringA(h, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(buf[0] == 0, "MsiRecordGetStringA returned the wrong string\n"); + ok(sz == 0, "MsiRecordGetStringA returned the wrong length\n"); + bufW[0] = 0; + sz = sizeof bufW / sizeof bufW[0]; + r = MsiRecordGetStringW(h, 0, bufW, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); + todo_wine + ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); r = MsiRecordSetString(h, 0, ""); ok(r == ERROR_SUCCESS, "Failed to set empty string at 0\n"); r = MsiRecordIsNull(h, 0); ok(r == TRUE, "null string not null field\n"); + r = MsiRecordDataSize(h, 0); + ok(r == 0, "size of string record is strlen\n"); + buf[0] = 0; + sz = sizeof buf; + r = MsiRecordGetStringA(h, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(buf[0] == 0, "MsiRecordGetStringA returned the wrong string\n"); + ok(sz == 0, "MsiRecordGetStringA returned the wrong length\n"); + bufW[0] = 0; + sz = sizeof bufW / sizeof bufW[0]; + r = MsiRecordGetStringW(h, 0, bufW, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); + todo_wine + ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); + + /* same record, but add a string to it */ r = MsiRecordSetString(h,0,str); ok(r == ERROR_SUCCESS, "Failed to set string at 0\n"); r = MsiRecordGetInteger(h, 0);

1 0

Christian Costa : mciqtz32: Show messages in hex as they are defines in headers.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 93009ebbeda2a28817630de8453a399d2c606794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93009ebbeda2a28817630de84… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:17 2009 +0200 mciqtz32: Show messages in hex as they are defines in headers. --- dlls/mciqtz32/mciqtz.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 15dd6b4..0719c91 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -484,18 +484,18 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_UNDO: case MCI_CONFIGURE: case MCI_RESTORE: - FIXME("Unimplemented command [%u]\n", wMsg); + FIXME("Unimplemented command [%08X]\n", wMsg); break; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [%u]\n", wMsg); + WARN("Unsupported command [%08X]\n", wMsg); break; case MCI_OPEN: case MCI_CLOSE: FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n"); break; default: - TRACE("Sending msg [%u] to default driver proc\n", wMsg); + TRACE("Sending msg [%08X] to default driver proc\n", wMsg); return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); }

1 0

Christian Costa : mciqtz32: Hook MCI_STOP.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 586d9cf5696de3b849a6ecf19ca4af0bd33c6a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=586d9cf5696de3b849a6ecf19… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:12 2009 +0200 mciqtz32: Hook MCI_STOP. --- dlls/mciqtz32/mciqtz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index c0ec81c..15dd6b4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -449,9 +449,9 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); + case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_RECORD: - case MCI_STOP: case MCI_SET: case MCI_PAUSE: case MCI_RESUME:

1 0

Nikolay Sivov : fonts: Fix a typo in copyright text.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: aa2cba4e78905a5cb98b8eca68d4ddb72b589048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2cba4e78905a5cb98b8eca6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 13 21:27:10 2009 -0400 fonts: Fix a typo in copyright text. --- fonts/tahoma.sfd | 2 +- fonts/tahoma.ttf | Bin 85796 -> 85796 bytes fonts/tahomabd.sfd | 2 +- fonts/tahomabd.ttf | Bin 76628 -> 76624 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index e4e3e63..c9b3720 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -3,7 +3,7 @@ FontName: WineTahoma FullName: Tahoma FamilyName: Tahoma Weight: Regular -Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regaurding this font. +Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regarding this font. Version: 000.001 FONDName: WineTahoma DefaultBaseFilename: tahoma diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index 1059dfc..016286f 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index 87b893b..327f7ec 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -3,7 +3,7 @@ FontName: WineTahomaBold FullName: Tahoma Bold FamilyName: Tahoma Weight: Bold -Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regaurding this font. +Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regarding this font. Version: 000.001 FONDName: WineTahomaBold DefaultBaseFilename: tahomabd diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index 8fedd31..091174b 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Christian Costa : mciqtz32: Fix some traces.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: d2a6b23dc279aa1a02fcfd0f704127a3481b3f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a6b23dc279aa1a02fcfd0f7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:06 2009 +0200 mciqtz32: Fix some traces. --- dlls/mciqtz32/mciqtz.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index da3e09a..c0ec81c 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -60,7 +60,7 @@ static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) { WINE_MCIQTZ* wma; - TRACE("%s, %p\n", debugstr_w(str), modp); + TRACE("(%s, %p)\n", debugstr_w(str), modp); /* session instance */ if (!modp) @@ -83,7 +83,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) { WINE_MCIQTZ* wma; - TRACE("%04x\n", dwDevID); + TRACE("(%04x)\n", dwDevID); /* finish all outstanding things */ MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); @@ -105,7 +105,7 @@ static DWORD MCIQTZ_drvConfigure(DWORD dwDevID) { WINE_MCIQTZ* wma; - TRACE("%04x\n", dwDevID); + TRACE("(%04x)\n", dwDevID); MCIQTZ_mciStop(dwDevID, MCI_WAIT, NULL);

1 0

Stefan Dösinger : wined3d: Reserve additional GLSL constants on some drivers.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 39877a2ad2365c5ff28ab20d8aa428241d4d8217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39877a2ad2365c5ff28ab20d8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 20:33:15 2009 +0200 wined3d: Reserve additional GLSL constants on some drivers. Some drivers apparently need private constants, or don't have an efficient immval packing. For example, MacOS seems to need 1 float for each different relative addressing offset. fglrx has the same issue, although it is more efficient in general Previously this worked on most drivers because the 16 + 4 reserved int and bool constants kept the problem hidden. Now that we are more aggressive with uniforms we have to keep free room for some drivers. --- dlls/wined3d/directx.c | 18 +++++++++++++++++- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e7a74d4..50443e2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4041,6 +4041,16 @@ static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { gl_info->ps_glsl_constantsF = gl_info->ps_arb_constantsF; } +static void quirk_apple_glsl_constants(WineD3D_GL_Info *gl_info) { + quirk_arb_constants(gl_info); + /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. + * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should + * allow 48 different offsets or other helper immediate values + */ + TRACE_(d3d_caps)("Reserving 12 GLSL constants for compiler private use\n"); + gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); +} + static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { quirk_arb_constants(gl_info); @@ -4059,6 +4069,12 @@ static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; + + /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although + * it is generally more efficient. Reserve just 8 constants + */ + TRACE_(d3d_caps)("Reserving 8 GLSL constants for compiler private use\n"); + gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 8); } static void quirk_no_np2(WineD3D_GL_Info *gl_info) { @@ -4116,7 +4132,7 @@ struct driver_quirk quirk_table[] = { */ { match_apple, - quirk_arb_constants, + quirk_apple_glsl_constants, "Apple GLSL uniform override" }, { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2cf4e3f..763ed69 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3951,6 +3951,7 @@ typedef struct _WineD3D_GL_Info { BOOL arb_vs_offset_limit; BOOL set_texcoord_w; + DWORD reserved_glsl_constants; BOOL supported[OPENGL_SUPPORTED_EXT_END + 1];

1 0

Stefan Dösinger : wined3d: Move the remaining quirks into the quirk table.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 78d26a659d14b050c90b1393580bc0d13b36e7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d26a659d14b050c90b13935… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 20:24:26 2009 +0200 wined3d: Move the remaining quirks into the quirk table. --- dlls/wined3d/directx.c | 159 ++++++++++++++++++++++++++++-------------------- 1 files changed, 93 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d3531a..e7a74d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4014,6 +4014,26 @@ static BOOL match_apple(WineD3D_GL_Info *gl_info) { return implementation_is_apple(gl_info); } +static BOOL match_geforce5(WineD3D_GL_Info *gl_info) { + if(gl_info->gl_vendor == VENDOR_NVIDIA) { + if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) { + return TRUE; + } + } + return FALSE; +} + +static BOOL match_apple_intel(WineD3D_GL_Info *gl_info) { + return gl_info->gl_vendor == VENDOR_INTEL && implementation_is_apple(gl_info); +} + +static BOOL match_apple_nonr500ati(WineD3D_GL_Info *gl_info) { + if(!implementation_is_apple(gl_info)) return FALSE; + if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; + if(gl_info->gl_card == CARD_ATI_RADEON_X1600) return FALSE; + return TRUE; +} + static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL\n", gl_info->vs_arb_constantsF); gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; @@ -4021,57 +4041,8 @@ static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { gl_info->ps_glsl_constantsF = gl_info->ps_arb_constantsF; } -struct driver_quirk quirk_table[] = { - { - match_ati_r300_to_500, - quirk_arb_constants, - "ATI GLSL constant quirk" - }, - /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are - * used it falls back to software. While the compiler can detect if the shader uses all declared - * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader - * using relative addressing falls back to software. - * - * ARB vp gives the correct amount of uniforms, so use it instead of GLSL - */ - { - match_apple, - quirk_arb_constants, - "Apple GLSL uniform override" - } -}; - -static void fixup_extensions(WineD3D_GL_Info *gl_info) { - unsigned int i; - BOOL apple = implementation_is_apple(gl_info); - - for(i = 0; i < (sizeof(quirk_table) / sizeof(*quirk_table)); i++) { - if(!quirk_table[i].match(gl_info)) continue; - TRACE_(d3d_caps)("Applying driver quirk \"%s\"\n", quirk_table[i].description); - quirk_table[i].apply(gl_info); - } - - if(apple) { - /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems - * with fixed function fragment processing. Ideally this flag should be detected with a test shader - * and OpenGL feedback mode, but some GL implementations (MacOS ATI at least, probably all MacOS ones) - * do not like vertex shaders in feedback mode and return an error, even though it should be valid - * according to the spec. - * - * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This - * makes the shader slower and eats instruction slots which should be available to the d3d app. - * - * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards, blacklist - * all radeon cards on Macs and whitelist the good ones. That way we're prepared for the future. If - * this workaround is activated on cards that do not need it, it won't break things, just affect - * performance negatively. - */ - if(gl_info->gl_vendor == VENDOR_INTEL || - (gl_info->gl_vendor == VENDOR_ATI && gl_info->gl_card != CARD_ATI_RADEON_X1600)) { - TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); - gl_info->set_texcoord_w = TRUE; - } - } +static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { + quirk_arb_constants(gl_info); /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and earlier cards, although * these cards only support GL_ARB_texture_rectangle(D3DPTEXTURECAPS_NONPOW2CONDITIONAL). @@ -4085,16 +4056,12 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * has this extension promoted to core. The extension loading code sets this extension supported * due to that, so this code works on fglrx as well. */ - if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_info->gl_vendor == VENDOR_ATI) { - if(gl_info->gl_card == CARD_ATI_RADEON_X700 || gl_info->gl_card == CARD_ATI_RADEON_X1600 || - gl_info->gl_card == CARD_ATI_RADEON_9500 || gl_info->gl_card == CARD_ATI_RADEON_8500 || - gl_info->gl_card == CARD_ATI_RADEON_7200 || gl_info->gl_card == CARD_ATI_RAGE_128PRO) { - TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; - } - } + TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; +} +static void quirk_no_np2(WineD3D_GL_Info *gl_info) { /* The nVidia GeForceFX series reports OpenGL 2.0 capabilities with the latest drivers versions, but * doesn't explicitly advertise the ARB_tex_npot extension in the GL extension string. * This usually means that ARB_tex_npot is supported in hardware as long as the application is staying @@ -4110,12 +4077,72 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * post-processing effects in the game "Max Payne 2"). * The behaviour can be verified through a simple test app attached in bugreport #14724. */ - if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_info->gl_vendor == VENDOR_NVIDIA) { - if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) { - TRACE("GL_ARB_texture_non_power_of_two advertised through OpenGL 2.0 on NV FX card, removing\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; - } + TRACE("GL_ARB_texture_non_power_of_two advertised through OpenGL 2.0 on NV FX card, removing\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; +} + +static void quirk_texcoord_w(WineD3D_GL_Info *gl_info) { + /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems + * with fixed function fragment processing. Ideally this flag should be detected with a test shader + * and OpenGL feedback mode, but some GL implementations (MacOS ATI at least, probably all MacOS ones) + * do not like vertex shaders in feedback mode and return an error, even though it should be valid + * according to the spec. + * + * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This + * makes the shader slower and eats instruction slots which should be available to the d3d app. + * + * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards, blacklist + * all radeon cards on Macs and whitelist the good ones. That way we're prepared for the future. If + * this workaround is activated on cards that do not need it, it won't break things, just affect + * performance negatively. + */ + TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); + gl_info->set_texcoord_w = TRUE; +} + +struct driver_quirk quirk_table[] = { + { + match_ati_r300_to_500, + quirk_ati_dx9, + "ATI GLSL constant and normalized texrect quirk" + }, + /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are + * used it falls back to software. While the compiler can detect if the shader uses all declared + * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader + * using relative addressing falls back to software. + * + * ARB vp gives the correct amount of uniforms, so use it instead of GLSL + */ + { + match_apple, + quirk_arb_constants, + "Apple GLSL uniform override" + }, + { + match_geforce5, + quirk_no_np2, + "Geforce 5 NP2 disable" + }, + { + match_apple_intel, + quirk_texcoord_w, + "Init texcoord .w for Apple Intel GPU driver" + }, + { + match_apple_nonr500ati, + quirk_texcoord_w, + "Init texcoord .w for Apple ATI >= r600 GPU driver" + } +}; + +static void fixup_extensions(WineD3D_GL_Info *gl_info) { + unsigned int i; + + for(i = 0; i < (sizeof(quirk_table) / sizeof(*quirk_table)); i++) { + if(!quirk_table[i].match(gl_info)) continue; + TRACE_(d3d_caps)("Applying driver quirk \"%s\"\n", quirk_table[i].description); + quirk_table[i].apply(gl_info); } /* Find out if PBOs work as they are supposed to */

1 0