July 2012 - Wine-Commits - list.winehq.org

André Hentschel : Wine 1.5.10 freigegeben
by Jeremy Newman July 31, 2012

July 31, 2012

Module: website Branch: master Commit: 746cf68ad916156b57a91d6b42e556cd4e4ab572 URL: http://source.winehq.org/git/website.git/?a=commit;h=746cf68ad916156b57a91d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 31 21:43:00 2012 +0200 Wine 1.5.10 freigegeben --- news/de/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2012073101.xml b/news/de/2012073101.xml new file mode 100644 index 0000000..551ca99 --- /dev/null +++ b/news/de/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>31. Juli 2012</date> +<title>Wine 1.5.10 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko Engine, basierend auf Firefox 14.</li> + <li>Unterstützung für OpenGL in der DIB Engine mit libOSMesa.</li> + <li>Off-screen Rendering nun Standard in Direct3D.</li> + <li>Ein wenig mehr WMI Infrastruktur.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.10
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: website Branch: master Commit: 8cc845da2af2edd27bcf2c9397c2c8ba706da837 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cc845da2af2edd27bcf2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:17:50 2012 +0200 Wine release 1.5.10 --- news/en/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2012073101.xml b/news/en/2012073101.xml new file mode 100644 index 0000000..d9f944c --- /dev/null +++ b/news/en/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>July 31, 2012</date> +<title>Wine 1.5.10 Released</title> +<body> + The Wine development release 1.5.10 is now available. + <a href="{$root}/announce/1.5.10">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 14.</li> + <li>Support for OpenGL in the DIB engine using libOSMesa.</li> + <li>Off-screen rendering is now the default in Direct3D.</li> + <li>Some more WMI infrastructure.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.10.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 9177c088306723d10475839c2fcf56fd30e1b611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9177c088306723d10475839c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:08:12 2012 +0200 Release 1.5.10. --- ANNOUNCE | 813 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 438 insertions(+), 395 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9177c088306723d104758…

1 0

Tag wine-1.5.10 : Alexandre Julliard : Release 1.5.10
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: refs/tags/wine-1.5.10 Tag: 584c1cb0f4b312a4ee3c34fc0cadf8c4ec00e47a URL: http://source.winehq.org/git/wine.git/?a=tag;h=584c1cb0f4b312a4ee3c34fc0cad… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:08:12 2012 +0200 Release 1.5.10

1 0

Jacek Caban : mshtml.idl: Added IHTMLDOMConstructorCollection declaration.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 76cb174dca2c4cfc4a086a0a44f1a0b3c43d1d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76cb174dca2c4cfc4a086a0a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 14:27:56 2012 +0200 mshtml.idl: Added IHTMLDOMConstructorCollection declaration. --- include/mshtmdid.h | 108 +++++++++++++ include/mshtml.idl | 442 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 550 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76cb174dca2c4cfc4a086…

1 0

Dmitry Timoshkov : include/winnt.h: MSC compiler doesn' t support __asm keyword in x86_64 mode.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 9d9496058fea447a30956695e93a795c556e8daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9496058fea447a30956695e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 12:38:24 2012 +0900 include/winnt.h: MSC compiler doesn't support __asm keyword in x86_64 mode. --- include/winnt.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c19eb47..2f78820 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2221,14 +2221,6 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); return teb; } -#elif defined(__x86_64__) && defined (_MSC_VER) -static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) -{ - struct _TEB *teb; - __asm mov rax, gs:[0x30]; - __asm mov teb, rax; - return teb; -} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Hans Leidekker : msi: Implement the RemoveExistingProducts standard action.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: f180de40dd7820753479f823b6cb08a34b479c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f180de40dd7820753479f823b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 31 12:25:42 2012 +0200 msi: Implement the RemoveExistingProducts standard action. --- dlls/msi/action.c | 42 ++++++++++++++--- dlls/msi/tests/action.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d452c92..1ad3bc2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7045,23 +7045,51 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) { + static const WCHAR fmtW[] = + {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; - const WCHAR *property = MSI_RecordGetString( rec, 1 ); - WCHAR *value; + const WCHAR *property = MSI_RecordGetString( rec, 7 ); + UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + WCHAR *product, *features, *cmd; + STARTUPINFOW si; + PROCESS_INFORMATION info; + BOOL ret; - if ((value = msi_dup_property( package->db, property ))) + if (!(product = msi_dup_property( package->db, property ))) return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString( rec, 6 ), &features ); + + len += strlenW( product ); + if (features) + len += strlenW( features ); + else + len += sizeof(szAll) / sizeof(szAll[0]); + + if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) { - FIXME("remove %s\n", debugstr_w(value)); - msi_free( value ); + msi_free( product ); + msi_free( features ); + return ERROR_OUTOFMEMORY; } + sprintfW( cmd, fmtW, product, features ? features : szAll ); + msi_free( product ); + msi_free( features ); + + memset( &si, 0, sizeof(STARTUPINFOW) ); + ret = CreateProcessW( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info ); + msi_free( cmd ); + if (!ret) return GetLastError(); + CloseHandle( info.hThread ); + + WaitForSingleObject( info.hProcess, INFINITE ); + CloseHandle( info.hProcess ); return ERROR_SUCCESS; } static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) { static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','A','c','t','i','o','n','P','r','o','p','e','r','t','y',' ', - 'F','R','O','M',' ','U','p','g','r','a','d','e',0}; + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','U','p','g','r','a','d','e',0}; MSIQUERY *view; UINT r; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 814b49c..1fcb82d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1461,6 +1461,76 @@ static const char pa_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rep_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "rep.txt\trep\trep.txt\t1000\t\t\t8192\t1\n"; + +static const char rep_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "rep\t\t\trep feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char rep_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "rep\trep\n"; + +static const char rep_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "rep\t{A24FAF2A-3B2E-41EF-AA78-331542E1A29D}\tMSITESTDIR\t0\t\trep.txt\n"; + +static const char rep_upgrade_dat[] = + "UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\n" + "s38\tS20\tS20\tS255\ti4\tS255\ts72\n" + "Upgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n" + "{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\t\t\t\t256\t\tPRODUCT\n"; + +static const char rep_property_dat[] = + "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "HASUIRUN\t0\n" + "INSTALLLEVEL\t3\n" + "InstallMode\tTypical\n" + "Manufacturer\tWine\n" + "PIDTemplate\t###-#######\n" + "ProductCode\t{1699F0BB-0B61-4A89-AFE4-CFD60DFD76F3}\n" + "ProductLanguage\t1033\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\n" + "PRODUCT\t2F41860D-7B4C-4DA7-BED9-B64F26594C56\n" + "MSIFASTINSTALL\t1\n"; + +static const char rep_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "FindRelatedProducts\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "RemoveExistingProducts\t\t1499\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "UnregisterExtensionInfo\t\t3000\n" + "UnregisterMIMEInfo\t\t3500\n" + "RegisterExtensionInfo\t\t4000\n" + "RegisterMIMEInfo\t\t4500\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const char *filename; @@ -1818,6 +1888,19 @@ static const msi_table pa_tables[] = ADD_TABLE(property) }; +static const msi_table rep_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rep_component), + ADD_TABLE(rep_feature), + ADD_TABLE(rep_feature_comp), + ADD_TABLE(rep_file), + ADD_TABLE(rep_upgrade), + ADD_TABLE(rep_property), + ADD_TABLE(rep_install_exec_seq), + ADD_TABLE(media) +}; + /* based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LSTATUS action_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey, REGSAM access) { @@ -6125,6 +6208,42 @@ done: DeleteFile(msifile); } +static void test_remove_existing_products(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_file("msitest\\rep.txt", 1000); + create_database(msifile, rep_tables, sizeof(rep_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\rep.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + +error: + DeleteFileA("msitest\\rep.txt"); + delete_test_files(); + DeleteFile(msifile); +} + START_TEST(action) { DWORD len; @@ -6202,6 +6321,7 @@ START_TEST(action) test_register_extension_info(); test_register_mime_info(); test_publish_assemblies(); + test_remove_existing_products(); DeleteFileA(log_file);

1 0

Dmitry Timoshkov : gdiplus: Improve precision of calculated pixel to units transformation.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 3298a3021150526f9e1fd3e030c05bf18ba3c048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3298a3021150526f9e1fd3e03… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 18:48:46 2012 +0900 gdiplus: Improve precision of calculated pixel to units transformation. --- dlls/gdiplus/gdiplus.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 9b43cd6..2599c58 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static const REAL mm_per_inch = 25.4; -static const REAL inch_per_point = 1.0/72.0; +static const REAL point_per_inch = 72.0; static Status WINAPI NotificationHook(ULONG_PTR *token) { @@ -353,7 +353,7 @@ REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) case UnitDisplay: return units; case UnitPoint: - return units * dpi * inch_per_point; + return units * dpi / point_per_inch; case UnitInch: return units * dpi; case UnitDocument: @@ -376,7 +376,7 @@ REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) case UnitDisplay: return pixels; case UnitPoint: - return pixels / dpi / inch_per_point; + return pixels * point_per_inch / dpi; case UnitInch: return pixels / dpi; break;

1 0

Michael Stefaniuc : kernel32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 97512d70cfa0a3f4bc4b0c068c1c67ac1f78c580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97512d70cfa0a3f4bc4b0c068… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 31 11:34:54 2012 +0200 kernel32: Avoid TRUE:FALSE conditional expressions. --- dlls/kernel32/atom.c | 2 +- dlls/kernel32/file.c | 2 +- dlls/kernel32/locale.c | 2 +- dlls/kernel32/toolhelp.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index a8deb5e..5ab5c06 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -78,7 +78,7 @@ static RTL_ATOM_TABLE get_local_table(DWORD entries) */ BOOL WINAPI InitAtomTable( DWORD entries ) { - return get_local_table( entries ) ? TRUE : FALSE; + return get_local_table( entries ) != 0; } /****************************************************************** diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 18ed188..717ae9b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1383,7 +1383,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, qos.Length = sizeof(qos); qos.ImpersonationLevel = (attributes >> 16) & 0x3; qos.ContextTrackingMode = attributes & SECURITY_CONTEXT_TRACKING ? SECURITY_DYNAMIC_TRACKING : SECURITY_STATIC_TRACKING; - qos.EffectiveOnly = attributes & SECURITY_EFFECTIVE_ONLY ? TRUE : FALSE; + qos.EffectiveOnly = (attributes & SECURITY_EFFECTIVE_ONLY) != 0; attr.SecurityQualityOfService = &qos; } else diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 90603f2..3867d8d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3397,7 +3397,7 @@ static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs) if (NLS_RegEnumValue( hKey, ulIndex, szNumber, sizeof(szNumber), szValue, sizeof(szValue) )) { - BOOL bInstalled = szValue[0] == '1' ? TRUE : FALSE; + BOOL bInstalled = szValue[0] == '1'; LGRPID lgrpid = strtoulW( szNumber, NULL, 16 ); TRACE("grpid %s (%sinstalled)\n", debugstr_w(szNumber), diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index 6fbf4bf..94c1a78 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -319,7 +319,7 @@ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) if (flags & TH32CS_SNAPTHREAD) sect_size += num_thd * sizeof(THREADENTRY32); if (flags & TH32CS_SNAPHEAPLIST)FIXME("Unimplemented: heap list snapshot\n"); - sa.bInheritHandle = (flags & TH32CS_INHERIT) ? TRUE : FALSE; + sa.bInheritHandle = (flags & TH32CS_INHERIT) != 0; sa.lpSecurityDescriptor = NULL; hSnapShot = CreateFileMappingW( INVALID_HANDLE_VALUE, &sa,

1 0

Michael Stefaniuc : winmm: Avoid TRUE FALSE conditional expressions.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: d94eaa3b20a8bfe5eb3a6a6d56f07c05d67796b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94eaa3b20a8bfe5eb3a6a6d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 31 10:58:15 2012 +0200 winmm: Avoid TRUE FALSE conditional expressions. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/playsound.c | 2 +- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index e77d641..7f35480 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -481,7 +481,7 @@ static BOOL MMIO_Destroy(LPWINE_MMIO wm) wm = NULL; } LeaveCriticalSection(&WINMM_cs); - return wm ? FALSE : TRUE; + return !wm; } /**************************************************************** diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index e5b820b..0d32274 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -525,7 +525,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo if (fdwSound & SND_ASYNC) { HANDLE handle; - wps->bLoop = (fdwSound & SND_LOOP) ? TRUE : FALSE; + wps->bLoop = (fdwSound & SND_LOOP) != 0; if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, NULL)) != 0) { SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); CloseHandle(handle); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 111dd1c..28b4145 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -605,7 +605,7 @@ static void wave_out_test_deviceOut(int device, double duration, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; - BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; + BOOL has_volume = (pcaps->dwSupport & WAVECAPS_VOLUME) != 0; double paused = 0.0; DWORD_PTR callback = 0; DWORD_PTR callback_instance = 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 602eb06..73f7a04 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1778,7 +1778,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) IAudioClient_Reset(device->client); cb_info = device->cb_info; - is_out = device->render ? TRUE : FALSE; + is_out = device->render != NULL; LeaveCriticalSection(&device->lock);

1 0