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

Piotr Caban : msvcp100: Manually define virtual destructors in vtables.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 5a5de655bef54271dfadfbe9085e3814dd161229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5de655bef54271dfadfbe90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 17 11:26:47 2012 +0200 msvcp100: Manually define virtual destructors in vtables. --- dlls/msvcp100/cxx.h | 2 - dlls/msvcp100/exception.c | 59 ++++----- dlls/msvcp100/ios.c | 301 ++++++++++++++++++++------------------------- dlls/msvcp100/locale.c | 131 +++++++++----------- 4 files changed, 216 insertions(+), 277 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a5de655bef54271dfadf…

1 0

Michael Stefaniuc : advpack/tests: Use the global "current directory" variable.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: e81c055e9c63bf4cc85d2e6135e7bdcf377f7b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81c055e9c63bf4cc85d2e613… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:19:28 2012 +0200 advpack/tests: Use the global "current directory" variable. --- dlls/advpack/tests/files.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index b29168a..9bb8cde 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -474,7 +474,6 @@ static void test_AdvInstallFile(void) { HRESULT hr; HMODULE hmod; - char CURR_DIR[MAX_PATH]; char destFolder[MAX_PATH]; hmod = LoadLibrary("setupapi.dll"); @@ -486,8 +485,6 @@ static void test_AdvInstallFile(void) FreeLibrary(hmod); - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - lstrcpyA(destFolder, CURR_DIR); lstrcatA(destFolder, "\\"); lstrcatA(destFolder, "dest");

1 0

Michael Stefaniuc : ddrawex: Forward to the wrapped surface instead of recursing forever.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 8ad17a79f0e669b69b0285eb6620782f3ab01f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad17a79f0e669b69b0285eb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:15:15 2012 +0200 ddrawex: Forward to the wrapped surface instead of recursing forever. --- dlls/ddrawex/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index ed9e374..b25639a 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -373,7 +373,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetAttachedSurface(IDirectDrawSurf HRESULT hr; TRACE("(%p)->(%p,%p)\n", This, Caps, Surface); - hr = IDirectDrawSurface4_GetAttachedSurface(dds4_from_impl(This), Caps, &inner); + hr = IDirectDrawSurface4_GetAttachedSurface(This->parent, Caps, &inner); if(SUCCEEDED(hr)) { *Surface = dds_get_outer(inner);

1 0

André Hentschel : include: Rename IMAGE_FILE_MACHINE_ARMV7 to IMAGE_FILE_MACHINE_ARMNT.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 538a0abbd7dae8bfd23e1c93223cac6dc51765ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=538a0abbd7dae8bfd23e1c932… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 16 22:39:46 2012 +0200 include: Rename IMAGE_FILE_MACHINE_ARMV7 to IMAGE_FILE_MACHINE_ARMNT. --- dlls/dbghelp/cpu_arm.c | 2 +- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/loader.c | 2 +- dlls/ntdll/virtual.c | 4 ++-- include/winnt.h | 2 +- programs/winedbg/be_arm.c | 2 +- tools/winedump/pe.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index a38afe8..769bc95 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -245,7 +245,7 @@ static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, u } DECLSPEC_HIDDEN struct cpu cpu_arm = { - IMAGE_FILE_MACHINE_ARMV7, + IMAGE_FILE_MACHINE_ARMNT, 4, CV_ARM_R0 + 11, arm_get_addr, diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c6e9f18..c046371 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1779,7 +1779,7 @@ static BOOL create_fake_dll( LPCSTR filename ) #elif defined __sparc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; #elif defined __arm__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMV7; + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; #else # error You must specify the machine type #endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e98ebc1..e503171 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -63,7 +63,7 @@ static IMAGE_NT_HEADERS nt_header = #elif defined __sparc__ IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ - IMAGE_FILE_MACHINE_ARMV7, /* Machine */ + IMAGE_FILE_MACHINE_ARMNT, /* Machine */ #else # error You must specify the machine type #endif diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 806b7a9..88bcdbb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1063,7 +1063,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) return STATUS_SUCCESS; - if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7) + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMNT) { SYSTEM_CPU_INFORMATION sci; if (SUCCEEDED(NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) && @@ -1086,7 +1086,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) case IMAGE_FILE_MACHINE_ALPHA64: arch = "Alpha-64"; break; case IMAGE_FILE_MACHINE_AMD64: arch = "AMD-64"; break; case IMAGE_FILE_MACHINE_ARM: arch = "ARM"; break; - case IMAGE_FILE_MACHINE_ARMV7: arch = "ARMv7"; break; + case IMAGE_FILE_MACHINE_ARMNT: arch = "ARMNT"; break; case IMAGE_FILE_MACHINE_THUMB: arch = "ARM Thumb"; break; case IMAGE_FILE_MACHINE_SPARC: arch = "SPARC"; break; default: arch = wine_dbg_sprintf( "Unknown-%04x", nt->FileHeader.Machine ); break; diff --git a/include/winnt.h b/include/winnt.h index 2f78820..5625e37 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2401,7 +2401,7 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_SH5 0x01a8 #define IMAGE_FILE_MACHINE_ARM 0x01c0 #define IMAGE_FILE_MACHINE_THUMB 0x01c2 -#define IMAGE_FILE_MACHINE_ARMV7 0x01c4 +#define IMAGE_FILE_MACHINE_ARMNT 0x01c4 #define IMAGE_FILE_MACHINE_AM33 0x01d3 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index f375fe8..2f1021e 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1189,7 +1189,7 @@ static int be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_arm = { - IMAGE_FILE_MACHINE_ARMV7, + IMAGE_FILE_MACHINE_ARMNT, 4, be_cpu_linearize, be_cpu_build_addr, diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c655451..4cf0b40 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -62,7 +62,7 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; case IMAGE_FILE_MACHINE_ARM: return "ARM"; - case IMAGE_FILE_MACHINE_ARMV7: return "ARMv7"; + case IMAGE_FILE_MACHINE_ARMNT: return "ARMNT"; case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; case IMAGE_FILE_MACHINE_SPARC: return "SPARC"; }

1 0

Qian Hong : riched20: Added support for UTF8 BOM stream.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: cb8c500ee67a64c4e5f08434d5ae0634bf82e375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8c500ee67a64c4e5f08434d… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Aug 17 03:05:56 2012 +0800 riched20: Added support for UTF8 BOM stream. --- dlls/riched20/editor.c | 22 +++++++++++++++++++--- dlls/riched20/tests/editor.c | 4 ++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6e0fb3c..18cd159 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -283,9 +283,10 @@ static ME_TextBuffer *ME_MakeText(void) { static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { - WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; WCHAR *pText; LRESULT total_bytes_read = 0; + BOOL is_read = FALSE; + static const char bom_utf8[] = {0xEF, 0xBB, 0xBF}; TRACE("%08x %p\n", dwFormat, stream); @@ -304,8 +305,23 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea if (!(dwFormat & SF_UNICODE)) { - /* FIXME? this is doomed to fail on true MBCS like UTF-8, luckily they're unlikely to be used as CP_ACP */ - nWideChars = MultiByteToWideChar(CP_ACP, 0, stream->buffer, stream->dwSize, wszText, STREAMIN_BUFFER_SIZE); + WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; + char * buf = stream->buffer; + DWORD size = stream->dwSize; + DWORD cp = CP_ACP; + + if (!is_read) + { + is_read = TRUE; + if (stream->dwSize >= 3 && !memcmp(stream->buffer, bom_utf8, 3)) + { + cp = CP_UTF8; + buf += 3; + size -= 3; + } + } + + nWideChars = MultiByteToWideChar(cp, 0, buf, size, wszText, STREAMIN_BUFFER_SIZE); pText = wszText; } else diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 27f4fee..fa80def 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5120,10 +5120,10 @@ static void test_EM_STREAMIN(void) ok(result == 18, "got %ld, expected %d\n", result, 18); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine ok(result == 15, + ok(result == 15, "EM_STREAMIN: Test UTF8WithBOM returned %ld, expected 15\n", result); result = strcmp (buffer,"TestUTF8WithBOM"); - todo_wine ok(result == 0, + ok(result == 0, "EM_STREAMIN: Test UTF8WithBOM set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8WithBOM set error %d, expected %d\n", es.dwError, 0);

1 0

André Hentschel : winebuild: Rename IMAGE_FILE_MACHINE_ARMV7 to IMAGE_FILE_MACHINE_ARMNT.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: ca234e3ed40b44d6a754a11039341c9aefbeaaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca234e3ed40b44d6a754a1103… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 16 22:40:14 2012 +0200 winebuild: Rename IMAGE_FILE_MACHINE_ARMV7 to IMAGE_FILE_MACHINE_ARMNT. --- tools/winebuild/spec32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7892f22..20fcbc0 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -36,7 +36,7 @@ #define IMAGE_FILE_MACHINE_I386 0x014c #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 -#define IMAGE_FILE_MACHINE_ARMV7 0x01C4 +#define IMAGE_FILE_MACHINE_ARMNT 0x01C4 /* Wine extension */ #define IMAGE_FILE_MACHINE_SPARC 0x2000 @@ -517,7 +517,7 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; - case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMV7; break; + case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } @@ -706,7 +706,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; - case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMV7 ); break; + case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; } put_word( nb_sections ); /* NumberOfSections */ put_dword( 0 ); /* TimeDateStamp */

1 0

Alexandre Julliard : winex11: Release the keyboard lock before sending input to the server.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 03d377eae78243b26df2dbfb32faf8324335a513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d377eae78243b26df2dbfb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 17 10:06:41 2012 +0200 winex11: Release the keyboard lock before sending input to the server. --- dlls/winex11.drv/keyboard.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 2ccacb7..ae7e72b 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1417,18 +1417,17 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) TRACE_(key)("keycode %u converted to vkey 0x%X scan %02x\n", event->keycode, vkey, bScan); - if (vkey) - { - dwFlags = 0; - if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; - if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; + LeaveCriticalSection( &kbd_section ); - update_lock_state( hwnd, vkey, event->state, event_time ); + if (!vkey) return; - X11DRV_send_keyboard_input( hwnd, vkey & 0xff, bScan, dwFlags, event_time ); - } - LeaveCriticalSection( &kbd_section ); + dwFlags = 0; + if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; + if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; + + update_lock_state( hwnd, vkey, event->state, event_time ); + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, bScan, dwFlags, event_time ); } /**********************************************************************

1 0

Andrew Eikum : winealsa.drv: Remap mmdevapi channels to correct ALSA channels.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: d402231e3f148a30ceca15c1223a765f5a388379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d402231e3f148a30ceca15c12… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 16 14:12:04 2012 -0500 winealsa.drv: Remap mmdevapi channels to correct ALSA channels. --- dlls/winealsa.drv/mmdevdrv.c | 201 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 173 insertions(+), 28 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0b500ad..3a6bf33 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -108,15 +108,20 @@ struct ACImpl { HANDLE event; float *vols; + BOOL need_remapping; + int alsa_channels; + int alsa_channel_map[32]; + BOOL initted, started; REFERENCE_TIME mmdev_period_rt; UINT64 written_frames, last_pos_frames; UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; + snd_pcm_uframes_t remapping_buf_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ HANDLE timer; - BYTE *local_buffer, *tmp_buffer; + BYTE *local_buffer, *tmp_buffer, *remapping_buf; LONG32 getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; @@ -885,6 +890,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) } HeapFree(GetProcessHeap(), 0, This->vols); HeapFree(GetProcessHeap(), 0, This->local_buffer); + HeapFree(GetProcessHeap(), 0, This->remapping_buf); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); HeapFree(GetProcessHeap(), 0, This->hw_params); CoTaskMemFree(This->fmt); @@ -1071,6 +1077,121 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } +static int alsa_channel_index(DWORD flag) +{ + switch(flag){ + case SPEAKER_FRONT_LEFT: + return 0; + case SPEAKER_FRONT_RIGHT: + return 1; + case SPEAKER_BACK_LEFT: + return 2; + case SPEAKER_BACK_RIGHT: + return 3; + case SPEAKER_FRONT_CENTER: + return 4; + case SPEAKER_LOW_FREQUENCY: + return 5; + case SPEAKER_SIDE_LEFT: + return 6; + case SPEAKER_SIDE_RIGHT: + return 7; + } + return -1; +} + +static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt) +{ + unsigned int i; + for(i = 0; i < fmt->nChannels; ++i){ + if(This->alsa_channel_map[i] != i) + return TRUE; + } + return FALSE; +} + +static DWORD get_channel_mask(unsigned int channels) +{ + switch(channels){ + case 0: + return 0; + case 1: + return KSAUDIO_SPEAKER_MONO; + case 2: + return KSAUDIO_SPEAKER_STEREO; + case 3: + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; + case 4: + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ + case 5: + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; + case 6: + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ + case 7: + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ + } + FIXME("Unknown speaker configuration: %u\n", channels); + return 0; +} + +static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) +{ + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2){ + WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; + DWORD mask, flag = SPEAKER_FRONT_LEFT; + UINT i = 0; + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0) + mask = fmtex->dwChannelMask; + else + mask = get_channel_mask(fmt->nChannels); + + This->alsa_channels = 0; + + while(i < fmt->nChannels && !(flag & SPEAKER_RESERVED)){ + if(mask & flag){ + This->alsa_channel_map[i] = alsa_channel_index(flag); + TRACE("Mapping mmdevapi channel %u (0x%x) to ALSA channel %d\n", + i, flag, This->alsa_channel_map[i]); + if(This->alsa_channel_map[i] >= This->alsa_channels) + This->alsa_channels = This->alsa_channel_map[i] + 1; + ++i; + } + flag <<= 1; + } + + while(i < fmt->nChannels){ + This->alsa_channel_map[i] = This->alsa_channels; + TRACE("Mapping mmdevapi channel %u to ALSA channel %d\n", + i, This->alsa_channel_map[i]); + ++This->alsa_channels; + ++i; + } + + for(i = 0; i < fmt->nChannels; ++i){ + if(This->alsa_channel_map[i] == -1){ + This->alsa_channel_map[i] = This->alsa_channels; + ++This->alsa_channels; + TRACE("Remapping mmdevapi channel %u to ALSA channel %d\n", + i, This->alsa_channel_map[i]); + } + } + + This->need_remapping = need_remapping(This, fmt); + + TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + }else{ + This->need_remapping = FALSE; + This->alsa_channels = fmt->nChannels; + TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + } + + return S_OK; +} + static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1135,6 +1256,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); + if(FAILED(map_channels(This, fmt))){ + WARN("map_channels failed\n"); + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -1174,7 +1301,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, } if((err = snd_pcm_hw_params_set_channels(This->pcm_handle, This->hw_params, - fmt->nChannels)) < 0){ + This->alsa_channels)) < 0){ WARN("Unable to set channels to %u: %d (%s)\n", fmt->nChannels, err, snd_strerror(err)); hr = AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -1428,32 +1555,6 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, return S_OK; } -static DWORD get_channel_mask(unsigned int channels) -{ - switch(channels){ - case 0: - return 0; - case 1: - return KSAUDIO_SPEAKER_MONO; - case 2: - return KSAUDIO_SPEAKER_STEREO; - case 3: - return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; - case 4: - return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ - case 5: - return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; - case 6: - return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ - case 7: - return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; - case 8: - return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ - } - FIXME("Unknown speaker configuration: %u\n", channels); - return 0; -} - static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, WAVEFORMATEX **out) @@ -1550,6 +1651,16 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, closest->nChannels = min; } + if(FAILED(map_channels(This, fmt))){ + hr = AUDCLNT_E_DEVICE_INVALIDATED; + WARN("map_channels failed\n"); + goto exit; + } + if(This->alsa_channels > max){ + hr = S_FALSE; + closest->nChannels = max; + } + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); @@ -1706,6 +1817,38 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, return S_OK; } +static BYTE *remap_channels(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) +{ + snd_pcm_uframes_t i; + UINT c; + UINT bytes_per_sample = This->fmt->wBitsPerSample / 8; + + if(!This->need_remapping) + return buf; + + if(!This->remapping_buf){ + This->remapping_buf = HeapAlloc(GetProcessHeap(), 0, + (This->fmt->wBitsPerSample / 8) * This->alsa_channels * frames); + This->remapping_buf_frames = frames; + }else if(This->remapping_buf_frames < frames){ + This->remapping_buf = HeapReAlloc(GetProcessHeap(), 0, This->remapping_buf, + (This->fmt->wBitsPerSample / 8) * This->alsa_channels * frames); + This->remapping_buf_frames = frames; + } + + snd_pcm_format_set_silence(This->alsa_format, This->remapping_buf, + frames * This->alsa_channels); + + for(i = 0; i < frames; ++i){ + for(c = 0; c < This->fmt->nChannels; ++c){ + memcpy(&This->remapping_buf[(i * This->alsa_channels + This->alsa_channel_map[c]) * bytes_per_sample], + &buf[(i * This->fmt->nChannels + c) * bytes_per_sample], bytes_per_sample); + } + } + + return This->remapping_buf; +} + static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, snd_pcm_uframes_t frames, ACImpl *This, BOOL mute) { @@ -1719,6 +1862,8 @@ static snd_pcm_sframes_t alsa_write_best_effort(snd_pcm_t *handle, BYTE *buf, snd_strerror(err)); } + buf = remap_channels(This, buf, frames); + written = snd_pcm_writei(handle, buf, frames); if(written < 0){ int ret;

1 0

André Hentschel : kernel32: Fix LocaleNameToLCID on mismatch.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 20e1b46d83c1c8e51aee80befc60665cb1f81eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e1b46d83c1c8e51aee80bef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 17 00:46:31 2012 +0200 kernel32: Fix LocaleNameToLCID on mismatch. --- dlls/kernel32/locale.c | 8 ++++++-- dlls/kernel32/tests/locale.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 29e38c9..1e5b7e5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -998,8 +998,12 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) locale_name.lcid, debugstr_w(name), locale_name.matches ); if (!locale_name.matches) - WARN( "locale %s not recognized, defaulting to English\n", debugstr_w(name) ); - else if (locale_name.matches == 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (locale_name.matches == 1) WARN( "locale %s not recognized, defaulting to %s\n", debugstr_w(name), debugstr_w(locale_name.lang) ); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a2a33fa..c264ca3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1869,22 +1869,25 @@ static void test_LocaleNameToLCID(void) /* special cases */ buffer[0] = 0; + SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(LOCALE_NAME_USER_DEFAULT, 0); ok(lcid == GetUserDefaultLCID() || broken(GetLastError() == ERROR_INVALID_PARAMETER /* Vista */), - "Expected lcid == %08x, got %08x, error %d\n", lcid, GetUserDefaultLCID(), GetLastError()); + "Expected lcid == %08x, got %08x, error %d\n", GetUserDefaultLCID(), lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); buffer[0] = 0; + SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); - todo_wine ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected lcid != 0, got %08x, error %d\n", lcid, GetLastError()); + ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected lcid == 0, got %08x, error %d\n", lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); buffer[0] = 0; + SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(LOCALE_NAME_INVARIANT, 0); todo_wine ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); @@ -1892,8 +1895,10 @@ static void test_LocaleNameToLCID(void) trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); /* bad name */ + SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(fooW, 0); - todo_wine ok(lcid == 0, "got 0x%04x\n", lcid); + ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected lcid == 0, got got %08x, error %d\n", lcid, GetLastError()); /* english neutral name */ lcid = pLocaleNameToLCID(enW, 0);

1 0

Jan Beich : ntdll: Prefer a portable function to get thread id.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: fa4e97f4547d7478f42cf5702cca1da85fd76b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4e97f4547d7478f42cf5702… Author: Jan Beich <jbeich(a)tormail.org> Date: Thu Aug 16 19:04:51 2012 +0000 ntdll: Prefer a portable function to get thread id. --- configure | 1 + configure.ac | 1 + dlls/ntdll/server.c | 7 ++++++- include/config.h.in | 3 +++ 4 files changed, 11 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 86c9698..12c99e8 100755 --- a/configure +++ b/configure @@ -10611,6 +10611,7 @@ LIBS="$LIBS $LIBPTHREAD" for ac_func in \ pthread_attr_get_np \ pthread_getattr_np \ + pthread_getthreadid_np \ pthread_get_stackaddr_np \ pthread_get_stacksize_np do : diff --git a/configure.ac b/configure.ac index c80fd8a..c9e81fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1471,6 +1471,7 @@ dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ pthread_attr_get_np \ pthread_getattr_np \ + pthread_getthreadid_np \ pthread_get_stackaddr_np \ pthread_get_stacksize_np, [$LIBPTHREAD]) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 392668d..cc49bad 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -28,6 +28,9 @@ #endif #include <errno.h> #include <fcntl.h> +#ifdef HAVE_PTHREAD_NP_H +# include <pthread_np.h> +#endif #include <signal.h> #include <stdarg.h> #include <stdio.h> @@ -944,7 +947,9 @@ static void send_server_task_port(void) static int get_unix_tid(void) { int ret = -1; -#ifdef linux +#ifdef HAVE_PTHREAD_GETTHREADID_NP + ret = pthread_getthreadid_np(); +#elif defined(linux) ret = syscall( SYS_gettid ); #elif defined(__sun) ret = pthread_self(); diff --git a/include/config.h.in b/include/config.h.in index 844600c..e9416a4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -632,6 +632,9 @@ /* Define to 1 if you have the `pthread_getattr_np' function. */ #undef HAVE_PTHREAD_GETATTR_NP +/* Define to 1 if you have the `pthread_getthreadid_np' function. */ +#undef HAVE_PTHREAD_GETTHREADID_NP + /* Define to 1 if you have the `pthread_get_stackaddr_np' function. */ #undef HAVE_PTHREAD_GET_STACKADDR_NP

1 0