wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Daniel Lehman : msvcp90: Fix num_get<>::_Getffld.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 82c1fb41aa4abb14ff6c86ff984c811f9f4bddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c1fb41aa4abb14ff6c86ff9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 2 11:30:40 2012 -0700 msvcp90: Fix num_get<>::_Getffld. --- dlls/msvcp90/locale.c | 288 ++++++++++++++++++++++----------------------- dlls/msvcp90/tests/ios.c | 160 +++++++++++++++++++++++++ 2 files changed, 301 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82c1fb41aa4abb14ff6c8…

1 0

Daniel Lehman : msvcp: Sync num_get<>::_Getifld.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 4c357de5d326c178de54d6084dd50ee01de6e153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c357de5d326c178de54d6084… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 11 14:21:49 2012 -0700 msvcp: Sync num_get<>::_Getifld. --- dlls/msvcp100/locale.c | 152 +++++++++++++++++++++++++++------------------ dlls/msvcp100/msvcp.h | 2 + dlls/msvcp100/string.c | 53 ++++++++++++++++ dlls/msvcp60/locale.c | 158 ++++++++++++++++++++++++++++------------------- dlls/msvcp71/locale.c | 152 +++++++++++++++++++++++++++------------------ 5 files changed, 331 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c357de5d326c178de54d…

1 0

Dan Kegel : vcomp: No-op stubs for _vcomp_single_begin, _vcomp_single_end.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: c99a19208ad5e3673c847ba8ac66b2cc84754599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99a19208ad5e3673c847ba8a… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Oct 15 11:54:13 2012 -0700 vcomp: No-op stubs for _vcomp_single_begin, _vcomp_single_end. --- dlls/vcomp/main.c | 11 +++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 34baf6e..38b76da 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -96,6 +96,17 @@ void CDECL _vcomp_set_num_threads(int num_threads) TRACE("(%d): stub\n", num_threads); } +int CDECL _vcomp_single_begin(int flags) +{ + TRACE("(%x): stub\n", flags); + return TRUE; +} + +void CDECL _vcomp_single_end(void) +{ + TRACE("stub\n"); +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 21e3ff9..306dd15 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -86,8 +86,8 @@ @ stub _vcomp_sections_init @ stub _vcomp_sections_next @ cdecl _vcomp_set_num_threads(long) -@ stub _vcomp_single_begin -@ stub _vcomp_single_end +@ cdecl _vcomp_single_begin(long) +@ cdecl _vcomp_single_end() @ stub omp_destroy_lock @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index da1bad6..39cf91c 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -86,8 +86,8 @@ @ stub _vcomp_sections_init @ stub _vcomp_sections_next @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads -@ stub _vcomp_single_begin -@ stub _vcomp_single_end +@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin +@ cdecl _vcomp_single_end() vcomp._vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index da1bad6..39cf91c 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -86,8 +86,8 @@ @ stub _vcomp_sections_init @ stub _vcomp_sections_next @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads -@ stub _vcomp_single_begin -@ stub _vcomp_single_end +@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin +@ cdecl _vcomp_single_end() vcomp._vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic

1 0

Dan Kegel : vcomp: No-op stub for _vcomp_barrier.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: fd104f83d384215e2961b69aac9ab123dde99f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd104f83d384215e2961b69aa… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Oct 15 11:48:37 2012 -0700 vcomp: No-op stub for _vcomp_barrier. --- dlls/vcomp/main.c | 5 +++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 5faf0a1..34baf6e 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -86,6 +86,11 @@ void CDECL omp_set_num_threads(int num_threads) TRACE("(%d): stub\n", num_threads); } +void CDECL _vcomp_barrier(void) +{ + TRACE("stub\n"); +} + void CDECL _vcomp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 41b57fb..21e3ff9 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -50,7 +50,7 @@ @ stub _vcomp_atomic_xor_i2 @ stub _vcomp_atomic_xor_i4 @ stub _vcomp_atomic_xor_i8 -@ stub _vcomp_barrier +@ cdecl _vcomp_barrier() @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive @ stub _vcomp_enter_critsect diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 7f52a7a..da1bad6 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -50,7 +50,7 @@ @ stub _vcomp_atomic_xor_i2 @ stub _vcomp_atomic_xor_i4 @ stub _vcomp_atomic_xor_i8 -@ stub _vcomp_barrier +@ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive @ stub _vcomp_enter_critsect diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 7f52a7a..da1bad6 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -50,7 +50,7 @@ @ stub _vcomp_atomic_xor_i2 @ stub _vcomp_atomic_xor_i4 @ stub _vcomp_atomic_xor_i8 -@ stub _vcomp_barrier +@ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive @ stub _vcomp_enter_critsect

1 0

André Hentschel : vcomp: Sync spec files.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 2a0055af2954c5d3aa8fe62e795cb5e529de4185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0055af2954c5d3aa8fe62e7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 15 22:40:09 2012 +0200 vcomp: Sync spec files. --- dlls/vcomp100/vcomp100.spec | 16 ++++++++-------- dlls/vcomp90/vcomp90.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index d888577..7f52a7a 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -90,22 +90,22 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic -@ stub omp_get_max_threads -@ stub omp_get_nested +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested @ cdecl omp_get_num_procs() vcomp.omp_get_num_procs -@ stub omp_get_num_threads -@ stub omp_get_thread_num +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index d888577..7f52a7a 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -90,22 +90,22 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic -@ stub omp_get_max_threads -@ stub omp_get_nested +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested @ cdecl omp_get_num_procs() vcomp.omp_get_num_procs -@ stub omp_get_num_threads -@ stub omp_get_thread_num +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock

1 0

Vincent Povirk : Revert "wine.inf: Add .NET keys to the 64-bit registry.".
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: d9fd5ede20e62a1d315018181e76b781adc2c3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fd5ede20e62a1d315018181… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 15 15:19:08 2012 -0500 Revert "wine.inf: Add .NET keys to the 64-bit registry.". This reverts commit c1279a6b03ed78a65ddf87755aff15700e086a12. --- tools/wine.inf.in | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f39b929..03a748a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -89,7 +89,6 @@ AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -511,42 +510,6 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" HKCU,Control Panel\Mouse,Beep,2,"No" -[DotNet] -HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" -HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727" -HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 - -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0" - -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1" - [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00

1 0

Vincent Povirk : mscoree: Update Wine Mono to 0.0.8.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: b3c0d3cd63e7603d6c576e3b89f3dd53da332f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c0d3cd63e7603d6c576e3b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 15 15:17:11 2012 -0500 mscoree: Update Wine Mono to 0.0.8. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3348cdb..60d2472 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -66,8 +66,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "0.0.4" -#define MONO_SHA "7d827f7d28a88ae0da95a136573783124ffce4b1" +#define MONO_VERSION "0.0.8" +#define MONO_SHA "dd349e72249ce5ff981be0e9dae33ac4a46a9f60" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c7a50c1..620fb9b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -652,7 +652,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "0.0.4"; + static const char* mono_version = "0.0.8"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Detlef Riekenberg : dsound/tests: Handle broken E_FAIL of broken AC97 driver.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: b23450e38e83c8034104046be57de9149e5ad4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23450e38e83c8034104046be… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 14 23:39:46 2012 +0200 dsound/tests: Handle broken E_FAIL of broken AC97 driver. --- dlls/dsound/tests/dsound.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 5b941a3..ad17d54 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1535,7 +1535,7 @@ static void test_hw_buffers(void) trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); - ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL), + ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), "CreateSoundBuffer(%u) failed: %08x\n", i, hr); if(hr != S_OK) break; @@ -1553,8 +1553,9 @@ static void test_hw_buffers(void) (caps.dwMaxHwMixingAllBuffers == 0 && hr == DSERR_INVALIDCALL) || /* no hw buffers at all */ hr == E_NOTIMPL || /* don't support hw buffers */ broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ + broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer gave wrong error: %08x\n", hr); + "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);

1 0

Detlef Riekenberg : dsound/tests: Handle broken E_FAIL in dsound8 for AC97.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 45c56bcc80e0e518f8be176fd987565351cfc419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c56bcc80e0e518f8be176fd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 14 23:38:13 2012 +0200 dsound/tests: Handle broken E_FAIL in dsound8 for AC97. --- dlls/dsound/tests/dsound8.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index ae2f7a7..ba04d9f 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1021,7 +1021,7 @@ static void test_hw_buffers(void) trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); - ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL), + ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), "CreateSoundBuffer(%u) failed: %08x\n", i, hr); if(hr != S_OK) break; @@ -1039,8 +1039,9 @@ static void test_hw_buffers(void) (caps.dwMaxHwMixingAllBuffers == 0 && hr == DSERR_INVALIDCALL) || /* no hw buffers at all */ hr == E_NOTIMPL || /* don't support hw buffers */ broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ + broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer gave wrong error: %08x\n", hr); + "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);

1 0

Jason Edmeades : cmd: %* expands to first non-whitespace delimiter of first arg.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: f45f75ca7dece7b7549d457c6215aa314016b4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45f75ca7dece7b7549d457c6… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sat Oct 13 22:24:35 2012 +0100 cmd: %* expands to first non-whitespace delimiter of first arg. --- programs/cmd/tests/test_cmdline.cmd | 10 ++++++++++ programs/cmd/tests/test_cmdline.cmd.exp | 8 ++++++++ programs/cmd/wcmdmain.c | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 7e08b29..0442a38 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -251,6 +251,16 @@ call tell;1;;2 if errorlevel 2 echo error %ErrorLevel% call tell "p "1 p" "2 call tell p"1 p";2 + +echo --------- Testing delimiters and parameter passing -------------- +echo @echo 0:%%0,1:%%1,2:%%2,All:'%%*'> tell.bat +call;tell 1 2 +call tell 1 2 +==call==tell==1==2 +call tell(1234) +call tell(12(34) +call tell(12;34) +echo --------- Finished -------------- del tell.bat say*.* exit :setError diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 4ea4ce0..0317a99 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -122,3 +122,11 @@ THIS FAILS: cmd ignoreme/c say one 1:1,2:2@space@ 1:"p@space@"1,2:p"@space@"2@space@ 1:p"1@space@p",2:2@space@ +--------- Testing delimiters and parameter passing -------------- +0:tell,1:1,2:2,All:'1 2'@or_broken@0:tell,1:1,2:2,All:' 1 2' +0:tell,1:1,2:2,All:'1 2'@or_broken@0:tell,1:1,2:2,All:' 1 2' +0:tell,1:1,2:2,All:'==1==2' +@todo_wine@0:tell,1:(1234),2:,All:'(1234)' +@todo_wine@0:tell,1:(12(34),2:,All:'(12(34)' +@todo_wine@0:tell,1:(12,2:34),All:'(12;34)' +@todo_wine@--------- Finished -------------- diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index eb0897a..f60ba84 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -843,10 +843,12 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, /* Replace use of %* if in batch program*/ } else if (!justFors && context && *(p+1)=='*') { WCHAR *startOfParms = NULL; - WCMD_parameter(context -> command, 1, &startOfParms, NULL, TRUE); - if (startOfParms != NULL) + WCMD_parameter(context -> command, 0, NULL, &startOfParms, TRUE); + if (startOfParms != NULL) { + startOfParms++; /* Skip to first delimiter then skip whitespace */ + while (*startOfParms==' ' || *startOfParms == '\t') startOfParms++; WCMD_strsubstW(p, p+2, startOfParms, -1); - else + } else WCMD_strsubstW(p, p+2, NULL, 0); } else if (forVariable &&

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
96
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 October 2012