wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Detlef Riekenberg : msi/tests: Replace lstrcatW with memcpy to fix failures on win95.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: a26da7b7a37ea78476d0e10e813a38f61ffd86dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26da7b7a37ea78476d0e10e8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 15:18:44 2009 +0200 msi/tests: Replace lstrcatW with memcpy to fix failures on win95. --- dlls/msi/tests/automation.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 7229748..88ce287 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2331,7 +2331,6 @@ static void test_Installer_InstallProduct(void) static void test_Installer(void) { - static WCHAR szBackslash[] = { '\\',0 }; static WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 }; static WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; @@ -2395,8 +2394,9 @@ static void test_Installer(void) ok(len, "MultiByteToWideChar returned error %d\n", GetLastError()); if (!len) return; - lstrcatW(szPath, szBackslash); - lstrcatW(szPath, szMsifile); + /* lstrcatW does not work on win95 */ + szPath[len - 1] = '\\'; + memcpy(&szPath[len], szMsifile, sizeof(szMsifile)); /* Installer::OpenPackage */ hr = Installer_OpenPackage(szPath, 0, &pSession);

1 0

Detlef Riekenberg : oleaut32/tests: Replace lstrcpyW and lstrcatW with memcpy to fix failures on win95.
by Alexandre Julliard 20 Apr '09

20 Apr '09

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

Brad Martin : wined3d: Fix prototype for EnumAdapterModes.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 2ea6b36ef1b1ed8c375d067875ba93751f180b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea6b36ef1b1ed8c375d06787… Author: Brad Martin <wine(a)fatlxception.no-ip.org> Date: Thu Apr 16 20:10:26 2009 -0500 wined3d: Fix prototype for EnumAdapterModes. --- include/wine/wined3d.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b8691a7..6f86688 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2222,8 +2222,8 @@ interface IWineD3D : IWineD3DBase ); HRESULT EnumAdapterModes( [in] UINT adapter_idx, - [in] UINT mode_idx, [in] WINED3DFORMAT format, + [in] UINT mode_idx, [out] WINED3DDISPLAYMODE *mode ); HRESULT GetAdapterDisplayMode(

1 0

Hans Leidekker : programs: Add stub termsv.exe.
by Alexandre Julliard 20 Apr '09

20 Apr '09

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

Nikolay Sivov : fonts: Fix a typo in copyright text.
by Alexandre Julliard 20 Apr '09

20 Apr '09

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: Show messages in hex as they are defines in headers.
by Alexandre Julliard 20 Apr '09

20 Apr '09

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 20 Apr '09

20 Apr '09

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

Christian Costa : mciqtz32: Fix some traces.
by Alexandre Julliard 20 Apr '09

20 Apr '09

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

Christian Costa : mciqtz32: Use opened state to avoid device to be closed several times.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 1506e226632596ff5ba12db3ed1828296111780b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1506e226632596ff5ba12db3e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:00 2009 +0200 mciqtz32: Use opened state to avoid device to be closed several times. --- dlls/mciqtz32/mciqtz.c | 12 ++++++------ dlls/mciqtz32/mciqtz_private.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 0cd973b..da3e09a 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -185,6 +185,8 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } + wma->opened = TRUE; + return 0; err: @@ -215,14 +217,12 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP if (!wma) return MCIERR_INVALID_DEVICE_ID; - if (wma->pgraph) + if (wma->opened) { IGraphBuilder_Release(wma->pgraph); - wma->pgraph = NULL; - if (wma->pmctrl) IMediaControl_Release(wma->pmctrl); - wma->pmctrl = NULL; - - CoUninitialize(); + CoUninitialize(); + wma->opened = FALSE; + } return 0; } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index cbcece0..23945a4 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -27,6 +27,7 @@ typedef struct { MCIDEVICEID wDevID; + BOOL opened; IGraphBuilder* pgraph; IMediaControl* pmctrl; BOOL started;

1 0

Stefan Dösinger : wined3d: Merge match_apple and implementation_is_apple.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: de4f3dc8e864ac3fa927368305144a1dabb01eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4f3dc8e864ac3fa92736830… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 15 00:38:07 2009 +0200 wined3d: Merge match_apple and implementation_is_apple. --- dlls/wined3d/directx.c | 18 +++++++----------- dlls/wined3d/wined3d_gl.h | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 50443e2..6a15a48 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3850,7 +3850,7 @@ ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { return IUnknown_Release(volumeParent); } -static BOOL implementation_is_apple(const WineD3D_GL_Info *gl_info) +static BOOL match_apple(const WineD3D_GL_Info *gl_info) { /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to @@ -4002,7 +4002,7 @@ static const struct driver_version_information driver_version_table[] = { /* TODO: Add information about legacy ATI hardware, Intel and other cards */ }; -static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) { +static BOOL match_ati_r300_to_500(const WineD3D_GL_Info *gl_info) { if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; if(gl_info->gl_card == CARD_ATI_RADEON_9500) return TRUE; if(gl_info->gl_card == CARD_ATI_RADEON_X700) return TRUE; @@ -4010,11 +4010,7 @@ static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) { return FALSE; } -static BOOL match_apple(WineD3D_GL_Info *gl_info) { - return implementation_is_apple(gl_info); -} - -static BOOL match_geforce5(WineD3D_GL_Info *gl_info) { +static BOOL match_geforce5(const 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; @@ -4023,12 +4019,12 @@ static BOOL match_geforce5(WineD3D_GL_Info *gl_info) { 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_intel(const WineD3D_GL_Info *gl_info) { + return gl_info->gl_vendor == VENDOR_INTEL && match_apple(gl_info); } -static BOOL match_apple_nonr500ati(WineD3D_GL_Info *gl_info) { - if(!implementation_is_apple(gl_info)) return FALSE; +static BOOL match_apple_nonr500ati(const WineD3D_GL_Info *gl_info) { + if(!match_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; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 763ed69..55c5855 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3965,7 +3965,7 @@ typedef struct _WineD3D_GL_Info { #undef USE_GL_FUNC struct driver_quirk { - BOOL (*match)(WineD3D_GL_Info *gl_info); + BOOL (*match)(const WineD3D_GL_Info *gl_info); void (*apply)(WineD3D_GL_Info *gl_info); const char *description; };

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009