wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Erich Hoover : hhctrl.ocx: Use the STD_PROPERTIES icon for the 'Options' toolbar button.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 1cabe3018395147f634e02f7a801956e10aec30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cabe3018395147f634e02f7a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 08:10:13 2011 -0600 hhctrl.ocx: Use the STD_PROPERTIES icon for the 'Options' toolbar button. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 7bde256..267f24e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -839,7 +839,7 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_OPTIONS) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PRINT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PROPERTIES); if (dwButtonFlags & HHWIN_BUTTON_PRINT) TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_PRINT, nStdBitmaps + STD_PRINT);

1 0

Bernhard Loos : server: Sharing 0 is not allowed for named pipes.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: bded698462a05e3acb976cfb115fe5059422684a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bded698462a05e3acb976cfb1… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 26 13:57:38 2011 +0200 server: Sharing 0 is not allowed for named pipes. --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 6909882..358e702 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -150,7 +150,7 @@ static void test_create_invalid(void) /* create a pipe with sharing = 0 */ res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, 2 /*FILE_CREATE*/, 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); + ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); if (!res) CloseHandle(handle); diff --git a/server/named_pipe.c b/server/named_pipe.c index 0f89f5b..66664bb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -940,6 +940,12 @@ DECL_HANDLER(create_named_pipe) struct unicode_str name; struct directory *root = NULL; + if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE))) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + reply->handle = 0; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 )))

1 0

Bernhard Loos : server: Only the sharing parameter of two instances of the same pipe have to match .
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 5098b131772c6bbe4e513ac4409e34debb882042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5098b131772c6bbe4e513ac44… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 26 13:57:29 2011 +0200 server: Only the sharing parameter of two instances of the same pipe have to match. --- dlls/kernel32/tests/pipe.c | 22 ++++++++++++++++++++-- server/named_pipe.c | 4 +--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a86baed..890a50e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -374,7 +374,7 @@ static void test_CreateNamedPipe_instances_must_match(void) ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); hnp2 = CreateNamedPipe(PIPENAME, PIPE_ACCESS_INBOUND, PIPE_TYPE_BYTE | PIPE_WAIT, - /* nMaxInstances */ 1, + /* nMaxInstances */ 2, /* nOutBufSize */ 1024, /* nInBufSize */ 1024, /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, @@ -384,7 +384,25 @@ static void test_CreateNamedPipe_instances_must_match(void) ok(CloseHandle(hnp), "CloseHandle\n"); - /* etc, etc */ + /* check everything else */ + hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 4, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + hnp2 = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE, + /* nMaxInstances */ 3, + /* nOutBufSize */ 102, + /* nInBufSize */ 24, + /* nDefaultWait */ 1234, + /* lpSecurityAttrib */ NULL); + ok(hnp2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + ok(CloseHandle(hnp), "CloseHandle\n"); + ok(CloseHandle(hnp2), "CloseHandle\n"); } /** implementation of alarm() */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 9a37acb..0f89f5b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -971,9 +971,7 @@ DECL_HANDLER(create_named_pipe) release_object( pipe ); return; } - if ((pipe->maxinstances != req->maxinstances) || - (pipe->timeout != req->timeout) || - (pipe->flags != req->flags)) + if (pipe->sharing != req->sharing) { set_error( STATUS_ACCESS_DENIED ); release_object( pipe );

1 0

Bernhard Loos : server: Store sharing state for named pipes.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 039bacb0c9edcba8dab5f3243105b1b1dd2d897e URL: http://source.winehq.org/git/wine.git/?a=commit;h=039bacb0c9edcba8dab5f3243… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 26 13:57:15 2011 +0200 server: Store sharing state for named pipes. --- dlls/kernel32/sync.c | 15 ++++++++------- dlls/ntdll/file.c | 1 + include/wine/server_protocol.h | 6 ++++-- server/named_pipe.c | 2 ++ server/protocol.def | 1 + server/request.h | 13 +++++++------ server/trace.c | 1 + 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 3f627a4..9630258 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1346,7 +1346,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, HANDLE handle; UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; - DWORD access, options; + DWORD access, options, sharing; BOOLEAN pipe_type, read_mode, non_block; NTSTATUS status; IO_STATUS_BLOCK iosb; @@ -1379,15 +1379,15 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, switch(dwOpenMode & 3) { case PIPE_ACCESS_INBOUND: - options = FILE_PIPE_INBOUND; + sharing = FILE_SHARE_WRITE; access = GENERIC_READ; break; case PIPE_ACCESS_OUTBOUND: - options = FILE_PIPE_OUTBOUND; + sharing = FILE_SHARE_READ; access = GENERIC_WRITE; break; case PIPE_ACCESS_DUPLEX: - options = FILE_PIPE_FULL_DUPLEX; + sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; access = GENERIC_READ | GENERIC_WRITE; break; default: @@ -1395,6 +1395,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, return INVALID_HANDLE_VALUE; } access |= SYNCHRONIZE; + options = 0; if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) ? TRUE : FALSE; @@ -1406,7 +1407,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, SetLastError(0); - status = NtCreateNamedPipeFile(&handle, access, &attr, &iosb, 0, + status = NtCreateNamedPipeFile(&handle, access, &attr, &iosb, sharing, FILE_OVERWRITE_IF, options, pipe_type, read_mode, non_block, nMaxInstances, nInBufferSize, nOutBufferSize, &timeout); @@ -1847,8 +1848,8 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, GetCurrentProcessId(), ++index); RtlInitUnicodeString(&nt_name, name); status = NtCreateNamedPipeFile(&hr, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, - 0, FILE_OVERWRITE_IF, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_PIPE_INBOUND, + FILE_SHARE_WRITE, FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT, FALSE, FALSE, FALSE, 1, size, size, &timeout); if (status) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4d49956..278da5d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2781,6 +2781,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access, req->attributes = attr->Attributes; req->rootdir = wine_server_obj_handle( attr->RootDirectory ); req->options = options; + req->sharing = sharing; req->flags = (pipe_type) ? NAMED_PIPE_MESSAGE_STREAM_WRITE : 0 | (read_mode) ? NAMED_PIPE_MESSAGE_STREAM_READ : 0 | diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ee438b4..9db7f78 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3030,13 +3030,15 @@ struct create_named_pipe_request unsigned int attributes; obj_handle_t rootdir; unsigned int options; + unsigned int sharing; unsigned int maxinstances; unsigned int outsize; unsigned int insize; + char __pad_44[4]; timeout_t timeout; unsigned int flags; /* VARARG(name,unicode_str); */ - char __pad_52[4]; + char __pad_60[4]; }; struct create_named_pipe_reply { @@ -5635,6 +5637,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 425 +#define SERVER_PROTOCOL_VERSION 426 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 29d5c5e..9a37acb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -91,6 +91,7 @@ struct named_pipe { struct object obj; /* object header */ unsigned int flags; + unsigned int sharing; unsigned int maxinstances; unsigned int outsize; unsigned int insize; @@ -960,6 +961,7 @@ DECL_HANDLER(create_named_pipe) pipe->maxinstances = req->maxinstances; pipe->timeout = req->timeout; pipe->flags = req->flags; + pipe->sharing = req->sharing; } else { diff --git a/server/protocol.def b/server/protocol.def index 123f16a..71524a4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2186,6 +2186,7 @@ enum message_type unsigned int attributes; /* object attributes */ obj_handle_t rootdir; /* root directory */ unsigned int options; + unsigned int sharing; unsigned int maxinstances; unsigned int outsize; unsigned int insize; diff --git a/server/request.h b/server/request.h index d2ca2f6..2d4528a 100644 --- a/server/request.h +++ b/server/request.h @@ -1477,12 +1477,13 @@ C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, attributes) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, rootdir) == 20 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, options) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, maxinstances) == 28 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, outsize) == 32 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, insize) == 36 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 40 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, flags) == 48 ); -C_ASSERT( sizeof(struct create_named_pipe_request) == 56 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, sharing) == 28 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, maxinstances) == 32 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, outsize) == 36 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, insize) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, flags) == 56 ); +C_ASSERT( sizeof(struct create_named_pipe_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_named_pipe_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index 37ea216..670958a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2607,6 +2607,7 @@ static void dump_create_named_pipe_request( const struct create_named_pipe_reque fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); fprintf( stderr, ", options=%08x", req->options ); + fprintf( stderr, ", sharing=%08x", req->sharing ); fprintf( stderr, ", maxinstances=%08x", req->maxinstances ); fprintf( stderr, ", outsize=%08x", req->outsize ); fprintf( stderr, ", insize=%08x", req->insize );

1 0

Maarten Lankhorst : winemp3: Add support for WAVE_FORMAT_MPEG.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 557deb0a197a095f93727e1c8004567758100e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=557deb0a197a095f93727e1c8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Sep 26 17:36:49 2011 +0200 winemp3: Add support for WAVE_FORMAT_MPEG. --- dlls/winemp3.acm/mpegl3.c | 65 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 548483a..21962b4 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -106,6 +106,7 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) hi = NUM_PCM_FORMATS; fmts = PCM_Formats; break; + case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEGLAYER3: hi = NUM_MPEG3_FORMATS; fmts = MPEG3_Formats; @@ -233,7 +234,8 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { goto theEnd; } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { /* resampling or mono <=> stereo not available @@ -583,7 +585,8 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) adsi->dwDriver = (DWORD_PTR)aad; - if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { OSStatus err; @@ -660,7 +663,7 @@ static LRESULT MPEG3_DriverDetails(PACMDRIVERDETAILSW add) add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; - add->cFormatTags = 2; /* PCM, MPEG3 */ + add->cFormatTags = 3; /* PCM, MPEG3 */ add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "WINE-MPEG3", -1, @@ -684,16 +687,17 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { static const WCHAR szPcm[]={'P','C','M',0}; static const WCHAR szMpeg3[]={'M','P','e','g','3',0}; + static const WCHAR szMpeg[]={'M','P','e','g',0}; switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: - if (aftd->dwFormatTagIndex >= 2) return ACMERR_NOTPOSSIBLE; + if (aftd->dwFormatTagIndex > 2) return ACMERR_NOTPOSSIBLE; break; case ACM_FORMATTAGDETAILSF_LARGESTSIZE: if (aftd->dwFormatTag == WAVE_FORMAT_UNKNOWN) { - aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_MPEGLAYER3 is bigger than PCM */ + aftd->dwFormatTagIndex = 2; /* WAVE_FORMAT_MPEG is biggest */ break; } /* fall thru */ @@ -702,6 +706,7 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { case WAVE_FORMAT_PCM: aftd->dwFormatTagIndex = 0; break; case WAVE_FORMAT_MPEGLAYER3: aftd->dwFormatTagIndex = 1; break; + case WAVE_FORMAT_MPEG: aftd->dwFormatTagIndex = 2; break; default: return ACMERR_NOTPOSSIBLE; } break; @@ -725,11 +730,17 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->cStandardFormats = NUM_MPEG3_FORMATS; lstrcpyW(aftd->szFormatTag, szMpeg3); break; + case 2: + aftd->dwFormatTag = WAVE_FORMAT_MPEG; + aftd->cbFormatSize = sizeof(MPEG1WAVEFORMAT); + aftd->cStandardFormats = NUM_MPEG3_FORMATS; + lstrcpyW(aftd->szFormatTag, szMpeg); + break; } return MMSYSERR_NOERROR; } -static void fill_in_wfx(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) +static void fill_in_mp3(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) { MPEGLAYER3WAVEFORMAT* mp3wfx = (MPEGLAYER3WAVEFORMAT*)wfx; @@ -746,6 +757,24 @@ static void fill_in_wfx(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) } } +static void fill_in_mpeg(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) +{ + MPEG1WAVEFORMAT* mp3wfx = (MPEG1WAVEFORMAT*)wfx; + + wfx->nAvgBytesPerSec = bit_rate / 8; + if (cbwfx >= sizeof(WAVEFORMATEX)) + wfx->cbSize = sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX); + if (cbwfx >= sizeof(MPEG1WAVEFORMAT)) + { + mp3wfx->fwHeadLayer = ACM_MPEG_LAYER3; + mp3wfx->dwHeadBitrate = wfx->nAvgBytesPerSec * 8; + mp3wfx->fwHeadMode = ACM_MPEG_JOINTSTEREO; + mp3wfx->fwHeadModeExt = 0xf; + mp3wfx->wHeadEmphasis = 1; + mp3wfx->fwHeadFlags = ACM_MPEG_ID_MPEG1; + } +} + /*********************************************************************** * MPEG3_FormatDetails * @@ -775,12 +804,16 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_MPEGLAYER3: + case WAVE_FORMAT_MPEG: if (afd->dwFormatIndex >= NUM_MPEG3_FORMATS) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = MPEG3_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = MPEG3_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = MPEG3_Formats[afd->dwFormatIndex].nBits; afd->pwfx->nBlockAlign = 1; - fill_in_wfx(afd->cbwfx, afd->pwfx, 192000); + if (afd->dwFormatTag == WAVE_FORMAT_MPEGLAYER3) + fill_in_mp3(afd->cbwfx, afd->pwfx, 192000); + else + fill_in_mpeg(afd->cbwfx, afd->pwfx, 192000); break; default: WARN("Unsupported tag %08x\n", afd->dwFormatTag); @@ -840,9 +873,13 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->nBlockAlign = (adfs->pwfxDst->nChannels * adfs->pwfxDst->wBitsPerSample) / 8; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; break; + case WAVE_FORMAT_MPEG: + adfs->pwfxDst->nBlockAlign = 1; + fill_in_mpeg(adfs->cbwfxDst, adfs->pwfxDst, 192000); + break; case WAVE_FORMAT_MPEGLAYER3: adfs->pwfxDst->nBlockAlign = 1; - fill_in_wfx(adfs->cbwfxDst, adfs->pwfxDst, 192000); + fill_in_mp3(adfs->cbwfxDst, adfs->pwfxDst, 192000); break; default: FIXME("\n"); @@ -865,14 +902,16 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad case ACM_STREAMSIZEF_DESTINATION: /* cbDstLength => cbSrcLength */ if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) + (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = (adss->cbDstLength - 3000) / (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); if (nblocks == 0) return ACMERR_NOTPOSSIBLE; adss->cbSrcLength = nblocks * 1152 * adsi->pwfxSrc->nBlockAlign; } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * 1152); @@ -888,7 +927,8 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad case ACM_STREAMSIZEF_SOURCE: /* cbSrcLength => cbDstLength */ if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) + (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); if (nblocks == 0) @@ -898,7 +938,8 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad nblocks++; adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec);

1 0

Maarten Lankhorst : quartz: Fix support for mpeg layer 1 and 2.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 12e132e9be304dbdcfea153af03c66c19cf9f7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e132e9be304dbdcfea153af… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Sep 26 17:34:44 2011 +0200 quartz: Fix support for mpeg layer 1 and 2. --- dlls/quartz/mpegsplit.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 6043f69..059a854 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -128,12 +128,14 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) LONGLONG duration; int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; + if (header[0] != 0xff) + return E_INVALIDARG; - if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && + if (!(((header[1]>>5)&0x7) == 0x7 && ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && ((header[2]>>2)&0x3) != 0x3)) { - FIXME("Not a valid header: %02x:%02x\n", header[0], header[1]); + FIXME("Not a valid header: %02x:%02x\n", header[1], header[2]); return E_INVALIDARG; } @@ -147,7 +149,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) padding = ((header[2]>>1)&0x1); bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; - if (!bitrate || layer != 3) + if (!bitrate) { FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG; @@ -353,6 +355,7 @@ static HRESULT MPEGSplitter_query_accept(LPVOID iface, const AM_MEDIA_TYPE *pmt) FIXME("MPEG-1 system streams not yet supported.\n"); else if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_MPEG1VideoCD)) FIXME("MPEG-1 VideoCD streams not yet supported.\n"); + else FIXME("%s\n", debugstr_guid(&pmt->subtype)); return S_FALSE; }

1 0

Andrew Eikum : dsound: Reimplement PropertySet on mmdevapi.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 8856ea79f3468d6f532f5f20e9b28c295d6e1db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8856ea79f3468d6f532f5f20e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 08:51:33 2011 -0500 dsound: Reimplement PropertySet on mmdevapi. --- dlls/dsound/dsound_main.c | 20 +++- dlls/dsound/dsound_private.h | 4 + dlls/dsound/propset.c | 262 ++++++++++++++++++++---------------------- 3 files changed, 141 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8856ea79f3468d6f532f5…

1 0

Andrew Eikum : dsound: Reimplement capturing devices on mmdevapi.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 3735ecac219ab0560e0b1141e0b6bf745e62fa13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3735ecac219ab0560e0b1141e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 08:51:22 2011 -0500 dsound: Reimplement capturing devices on mmdevapi. --- dlls/dsound/capture.c | 465 +++++++++++++++++++++++------------------- dlls/dsound/dsound.c | 4 +- dlls/dsound/dsound_main.c | 62 +----- dlls/dsound/dsound_private.h | 23 ++- 4 files changed, 282 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3735ecac219ab0560e0b1…

1 0

Andrew Eikum : dsound: Reimplement rendering devices on mmdevapi.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: e786998daff4ad49521a4c9c39c172ddcdcad82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e786998daff4ad49521a4c9c3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 08:51:07 2011 -0500 dsound: Reimplement rendering devices on mmdevapi. --- dlls/dsound/Makefile.in | 2 +- dlls/dsound/dsound.c | 225 ++++++++++-------- dlls/dsound/dsound_main.c | 369 +++++++++++++++++++++++----- dlls/dsound/dsound_private.h | 25 ++- dlls/dsound/mixer.c | 140 ++++++----- dlls/dsound/primary.c | 494 ++++++++++++++++++++++++++----------- dlls/mmdevapi/tests/dependency.c | 2 +- 7 files changed, 875 insertions(+), 382 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e786998daff4ad49521a4…

1 0

Andrew Eikum : winecfg: Replace DirectSound settings with Driver Diagnostics.
by Alexandre Julliard 27 Sep '11

27 Sep '11

1 0

← Newer
1
2
3
4
5
6
7
...
100
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 September 2011