wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Dmitry Timoshkov : Revert "msi: Correctly parse double quotes in the token value.".
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 2d7f00c8d38777266dcf585c047c05fa7a7e0fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7f00c8d38777266dcf585c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 18:08:08 2015 +0800 Revert "msi: Correctly parse double quotes in the token value.". This reverts commit 42caac841e1755570ba25c2ce95948fc28f31372. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/tests/install.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f2e8e71..df73652 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -245,7 +245,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) { case '"': state = state_quote; - if (in_quotes && p[1] != '\"') count--; + if (in_quotes) count--; else count++; break; case ' ': diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index df6fe9c..6b86cd2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4718,7 +4718,9 @@ static void test_propcase(void) r = MsiInstallProductA(msifile, "BLAHBLAH=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); +todo_wine ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); +todo_wine ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0

Ken Thomases : winemac: Cope with multiple seemingly-identical display modes, only some of which work, by trying them in sequence.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 4db8fc394d769b231bf3dc45b89a1ec4906effe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db8fc394d769b231bf3dc45b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 2 19:23:04 2015 -0600 winemac: Cope with multiple seemingly-identical display modes, only some of which work, by trying them in sequence. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7f6ca23..c0581b8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -699,9 +699,9 @@ int macdrv_err_on; return TRUE; } - - (CGDisplayModeRef)modeMatchingMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID + - (NSArray*)modesMatchingMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID { - CGDisplayModeRef ret = NULL; + NSMutableArray* ret = [NSMutableArray array]; NSDictionary* options = nil; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 @@ -715,10 +715,7 @@ int macdrv_err_on; { CGDisplayModeRef candidateMode = (CGDisplayModeRef)candidateModeObject; if ([self mode:candidateMode matchesMode:mode]) - { - ret = candidateMode; - break; - } + [ret addObject:candidateModeObject]; } return ret; } @@ -743,11 +740,15 @@ int macdrv_err_on; } else // ... otherwise, try to restore just the one display { - mode = [self modeMatchingMode:mode forDisplay:displayID]; - if (mode && CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + for (id modeObject in [self modesMatchingMode:mode forDisplay:displayID]) { - [originalDisplayModes removeObjectForKey:displayIDKey]; - ret = TRUE; + mode = (CGDisplayModeRef)modeObject; + if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + { + [originalDisplayModes removeObjectForKey:displayIDKey]; + ret = TRUE; + break; + } } } } @@ -755,6 +756,7 @@ int macdrv_err_on; { BOOL active = [NSApp isActive]; CGDisplayModeRef currentMode; + NSArray* modes; currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); if (!currentMode) @@ -771,8 +773,8 @@ int macdrv_err_on; CGDisplayModeRelease(currentMode); currentMode = NULL; - mode = [self modeMatchingMode:mode forDisplay:displayID]; - if (!mode) + modes = [self modesMatchingMode:mode forDisplay:displayID]; + if (!modes.count) return FALSE; if ([originalDisplayModes count] || displaysCapturedForFullscreen || @@ -789,7 +791,17 @@ int macdrv_err_on; originalMode = currentMode = CGDisplayCopyDisplayMode(displayID); if (originalMode) - ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + { + for (id modeObject in modes) + { + mode = (CGDisplayModeRef)modeObject; + if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + { + ret = TRUE; + break; + } + } + } if (ret && !(currentMode && [self mode:mode matchesMode:currentMode])) [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; else if (![originalDisplayModes count])

1 0

Vincent Povirk : gdiplus: Placeable is optional in GdipCreateMetafileFromWmf.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 2dc568589794ae1110bbe6c534b1e3a2b7baeec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc568589794ae1110bbe6c53… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 15:20:39 2015 -0600 gdiplus: Placeable is optional in GdipCreateMetafileFromWmf. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 25 +++++++++++++++---------- dlls/gdiplus/tests/image.c | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ad1b7fc..922c101 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1076,7 +1076,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile); - if(!hwmf || !metafile || !placeable) + if(!hwmf || !metafile) return InvalidParameter; *metafile = NULL; @@ -1094,15 +1094,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if (retval == Ok) { - (*metafile)->image.xres = (REAL)placeable->Inch; - (*metafile)->image.yres = (REAL)placeable->Inch; - (*metafile)->bounds.X = ((REAL)placeable->BoundingBox.Left) / ((REAL)placeable->Inch); - (*metafile)->bounds.Y = ((REAL)placeable->BoundingBox.Top) / ((REAL)placeable->Inch); - (*metafile)->bounds.Width = (REAL)(placeable->BoundingBox.Right - - placeable->BoundingBox.Left); - (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - - placeable->BoundingBox.Top); - (*metafile)->metafile_type = MetafileTypeWmfPlaceable; + if (placeable) + { + (*metafile)->image.xres = (REAL)placeable->Inch; + (*metafile)->image.yres = (REAL)placeable->Inch; + (*metafile)->bounds.X = ((REAL)placeable->BoundingBox.Left) / ((REAL)placeable->Inch); + (*metafile)->bounds.Y = ((REAL)placeable->BoundingBox.Top) / ((REAL)placeable->Inch); + (*metafile)->bounds.Width = (REAL)(placeable->BoundingBox.Right - + placeable->BoundingBox.Left); + (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - + placeable->BoundingBox.Top); + (*metafile)->metafile_type = MetafileTypeWmfPlaceable; + } + else + (*metafile)->metafile_type = MetafileTypeWmf; (*metafile)->image.format = ImageFormatWMF; if (delete) DeleteMetaFile(hwmf); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c14f684..d3e7202 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1544,6 +1544,22 @@ static void test_createfromwmf(void) GdipDisposeImage(img); } +static void test_createfromwmf_noplaceable(void) +{ + HMETAFILE hwmf; + GpImage *img; + GpStatus stat; + + hwmf = SetMetaFileBitsEx(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), + wmfimage+sizeof(WmfPlaceableFileHeader)); + ok(hwmf != 0, "SetMetaFileBitsEx failed\n"); + + stat = GdipCreateMetafileFromWmf(hwmf, TRUE, NULL, (GpMetafile**)&img); + expect(Ok, stat); + + GdipDisposeImage(img); +} + static void test_resolution(void) { GpStatus stat; @@ -4758,6 +4774,7 @@ START_TEST(image) test_getrawformat(); test_loadwmf(); test_createfromwmf(); + test_createfromwmf_noplaceable(); test_resolution(); test_createhbitmap(); test_getthumbnail();

1 0

Vincent Povirk : gdiplus: Return Ok from GdipSetMetafileDownLevelRasterizationLimit.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: c7bdc8881204a88d68104fbb77e961a04e74756c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bdc8881204a88d68104fbb7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 15:16:29 2015 -0600 gdiplus: Return Ok from GdipSetMetafileDownLevelRasterizationLimit. Until we have a reason to use this value (application asks for it or we're building the emf part of a dual emf+), there's no need to worry about this. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 6d7048a..ad1b7fc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1141,14 +1141,9 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile, UINT limitDpi) { - static int calls; - TRACE("(%p,%u)\n", metafile, limitDpi); - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref,

1 0

Nikolay Sivov : dwrite: When assembling run bitmap combine instead of overwriting.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: d3b6b437ed17928b5c567f1d6af337dffbe73543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b6b437ed17928b5c567f1d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 23:34:21 2015 +0300 dwrite: When assembling run bitmap combine instead of overwriting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c00aeed..2c52840 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4269,7 +4269,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[3*x] = dst[3*x+1] = dst[3*x+2] = (src[x / 8] & masks[x % 8]) ? DWRITE_ALPHA_MAX : 0; + if (src[x / 8] & masks[x % 8]) + dst[3*x] = dst[3*x+1] = dst[3*x+2] = DWRITE_ALPHA_MAX; src += glyph_bitmap.pitch; dst += (analysis->bounds.right - analysis->bounds.left) * 3; } @@ -4277,7 +4278,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW else { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[x] = (src[x / 8] & masks[x % 8]) ? DWRITE_ALPHA_MAX : 0; + if (src[x / 8] & masks[x % 8]) + dst[x] = DWRITE_ALPHA_MAX; src += get_dib_stride(width, 1); dst += analysis->bounds.right - analysis->bounds.left; } @@ -4287,7 +4289,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW /* at this point it's DWRITE_TEXTURE_CLEARTYPE_3x1 with 8bpp src bitmap */ for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[3*x] = dst[3*x+1] = dst[3*x+2] = src[x]; + dst[3*x] = dst[3*x+1] = dst[3*x+2] = src[x] | dst[3*x]; src += glyph_bitmap.pitch; dst += (analysis->bounds.right - analysis->bounds.left) * 3; }

1 0

Andrew Eikum : mmdevapi/tests: Remove todo_wine on some tests for winepulse.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 69da3a24d24c8d995177aaaba601d63a75840519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69da3a24d24c8d995177aaaba… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 2 11:55:24 2015 -0600 mmdevapi/tests: Remove todo_wine on some tests for winepulse. winepulse succeeds where other drivers fail. Avoid todo_wine failures when running winepulse. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index afb99fc..865859b 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -244,7 +244,11 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + if(qpc2 != qpc) + /* FIXME: Some drivers fail */ + todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + else + ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); } /* trace after the GCP test because log output to MS-DOS console disturbs timing */ @@ -307,14 +311,23 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + /* FIXME: Some drivers fail */ + todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + todo_wine ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + }else{ + ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + + /* Native's position is one period further than what we read. + * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: + * signal when the position jump left a gap. */ + ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + } + ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - /* Native's position is one period further than what we read. - * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: - * signal when the position jump left a gap. */ - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) sum = pos; }

1 0

Sebastian Lackner : winepulse.drv: Add a missing linebreak to ERR message.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 64e83ddcad40d3f2ec5c290d71cd06689a9229b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e83ddcad40d3f2ec5c290d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 3 01:25:21 2015 +0100 winepulse.drv: Add a missing linebreak to ERR message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cf94d05..6b69488 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -434,7 +434,7 @@ static HRESULT pulse_connect(void) { if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, NULL, 0, NULL))) { - ERR("Failed to create mainloop thread."); + ERR("Failed to create mainloop thread.\n"); return E_FAIL; } SetThreadPriority(pulse_thread, THREAD_PRIORITY_TIME_CRITICAL);

1 0

Maarten Lankhorst : winepulse: Add support for IMarshal.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: e1933acb7b018d392df7401a5392047bad9d4125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1933acb7b018d392df7401a5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:54:51 2015 -0600 winepulse: Add support for IMarshal. Based on Jeff Klein's patches for the other drivers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 9f933ef..cf94d05 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -157,6 +157,7 @@ struct ACImpl { IAudioClock IAudioClock_iface; IAudioClock2 IAudioClock2_iface; IAudioStreamVolume IAudioStreamVolume_iface; + IUnknown *marshal; IMMDevice *parent; struct list entry; float vol[PA_CHANNELS_MAX]; @@ -834,6 +835,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; int i; EDataFlow dataflow; + HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); if (IsEqualGUID(guid, &pulse_render_guid)) @@ -859,6 +861,12 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; for (i = 0; i < PA_CHANNELS_MAX; ++i) This->vol[i] = 1.f; + + hr = CoCreateFreeThreadedMarshaler((IUnknown*)This, &This->marshal); + if (hr) { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } IMMDevice_AddRef(This->parent); *out = &This->IAudioClient_iface; @@ -870,10 +878,13 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioClient(iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_POINTER; + *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) *ppv = iface; @@ -881,6 +892,10 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } + + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -913,6 +928,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) list_remove(&This->entry); pthread_mutex_unlock(&pulse_lock); } + IUnknown_Release(This->marshal); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); HeapFree(GetProcessHeap(), 0, This); @@ -1853,6 +1869,7 @@ static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioRenderClient_QueryInterface( IAudioRenderClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioRenderClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -1867,6 +1884,9 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1991,6 +2011,7 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { static HRESULT WINAPI AudioCaptureClient_QueryInterface( IAudioCaptureClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -2005,6 +2026,9 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -2145,6 +2169,9 @@ static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -2280,6 +2307,8 @@ static const IAudioClock2Vtbl AudioClock2_Vtbl = static HRESULT WINAPI AudioStreamVolume_QueryInterface( IAudioStreamVolume *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioStreamVolume(iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) @@ -2294,6 +2323,9 @@ static HRESULT WINAPI AudioStreamVolume_QueryInterface( return S_OK; } + if (IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->marshal, riid, ppv); + WARN("Unknown interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Maarten Lankhorst : winepulse: Fixup IsFormatSupported calls.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: cbbe26ea88f182ef45f977879c568901aa489746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbbe26ea88f182ef45f977879… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:53:12 2015 -0600 winepulse: Fixup IsFormatSupported calls. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 174 +++++++++++++++++++++++++++++------------- 1 file changed, 120 insertions(+), 54 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35453af..9f933ef 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1144,10 +1144,8 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) } } This->map.channels = fmt->nChannels; - if (!mask || mask == SPEAKER_ALL) + if (!mask || (mask & (SPEAKER_ALL|SPEAKER_RESERVED))) mask = get_channel_mask(fmt->nChannels); - else if (mask == ~0U && fmt->nChannels == 1) - mask = SPEAKER_FRONT_CENTER; for (j = 0; j < sizeof(pulse_pos_from_wfx)/sizeof(*pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { if (mask & (1 << j)) This->map.map[i++] = pulse_pos_from_wfx[j]; @@ -1430,79 +1428,147 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ACImpl *This = impl_from_IAudioClient(iface); HRESULT hr = S_OK; WAVEFORMATEX *closest = NULL; + BOOL exclusive; TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); - if (!fmt || (mode == AUDCLNT_SHAREMODE_SHARED && !out)) + if (!fmt) return E_POINTER; if (out) *out = NULL; - if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) + + if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) { + exclusive = 1; + out = NULL; + } else if (mode == AUDCLNT_SHAREMODE_SHARED) { + exclusive = 0; + if (!out) + return E_POINTER; + } else return E_INVALIDARG; - if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; - switch (fmt->wFormatTag) { - case WAVE_FORMAT_EXTENSIBLE: - if (fmt->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - dump_fmt(fmt); - break; - case WAVE_FORMAT_ALAW: - case WAVE_FORMAT_MULAW: - case WAVE_FORMAT_IEEE_FLOAT: - case WAVE_FORMAT_PCM: - dump_fmt(fmt); - break; - default: - dump_fmt(fmt); - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } + if (fmt->nChannels == 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; + closest = clone_format(fmt); - if (!closest) { - if (out) - *out = NULL; + if (!closest) return E_OUTOFMEMORY; - } - if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - UINT32 mask = 0, i, channels = 0; + dump_fmt(fmt); + + switch (fmt->wFormatTag) { + case WAVE_FORMAT_EXTENSIBLE: { WAVEFORMATEXTENSIBLE *ext = (WAVEFORMATEXTENSIBLE*)closest; - if ((fmt->nChannels > 1 && ext->dwChannelMask == SPEAKER_ALL) || - (fmt->nChannels == 1 && ext->dwChannelMask == ~0U)) { - mask = ext->dwChannelMask; - channels = fmt->nChannels; - } else if (ext->dwChannelMask) { - for (i = 1; !(i & SPEAKER_RESERVED); i <<= 1) { - if (i & ext->dwChannelMask) { - mask |= i; - channels++; + if ((fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX) && + fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE)) || + fmt->nBlockAlign != fmt->wBitsPerSample / 8 * fmt->nChannels || + ext->Samples.wValidBitsPerSample > fmt->wBitsPerSample || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec) { + hr = E_INVALIDARG; + break; + } + + if (exclusive) { + UINT32 mask = 0, i, channels = 0; + + if (!(ext->dwChannelMask & (SPEAKER_ALL | SPEAKER_RESERVED))) { + for (i = 1; !(i & SPEAKER_RESERVED); i <<= 1) { + if (i & ext->dwChannelMask) { + mask |= i; + channels++; + } } + + if (channels != fmt->nChannels || (ext->dwChannelMask & ~mask)) { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + } else { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; } - if (channels < fmt->nChannels) - mask = get_channel_mask(fmt->nChannels); - } else - mask = ext->dwChannelMask; - if (ext->dwChannelMask != mask) { - ext->dwChannelMask = mask; - hr = S_FALSE; } + + if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { + if (fmt->wBitsPerSample != 32) { + hr = E_INVALIDARG; + break; + } + + if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample) { + hr = S_FALSE; + ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample; + } + } else if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { + if (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8) { + hr = E_INVALIDARG; + break; + } + + if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample && + !(fmt->wBitsPerSample == 32 && + ext->Samples.wValidBitsPerSample == 24)) { + hr = S_FALSE; + ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample; + break; + } + } else { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + + break; } - if (hr == S_OK || !out) { + case WAVE_FORMAT_ALAW: + case WAVE_FORMAT_MULAW: + if (fmt->wBitsPerSample != 8) { + hr = E_INVALIDARG; + break; + } + /* Fall-through */ + case WAVE_FORMAT_IEEE_FLOAT: + if (fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT && fmt->wBitsPerSample != 32) { + hr = E_INVALIDARG; + break; + } + /* Fall-through */ + case WAVE_FORMAT_PCM: + if (fmt->wFormatTag == WAVE_FORMAT_PCM && + (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8)) { + hr = E_INVALIDARG; + break; + } + + if (fmt->nChannels > 2) { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + /* + * fmt->cbSize, fmt->nBlockAlign and fmt->nAvgBytesPerSec seem to be + * ignored, invalid values are happily accepted. + */ + break; + default: + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + break; + } + + if (exclusive && hr != S_OK) { + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + CoTaskMemFree(closest); + } else if (hr != S_FALSE) CoTaskMemFree(closest); - if (out) - *out = NULL; - } else if (closest) { - closest->nBlockAlign = - closest->nChannels * closest->wBitsPerSample / 8; - closest->nAvgBytesPerSec = - closest->nBlockAlign * closest->nSamplesPerSec; + else *out = closest; - } + + /* Winepulse does not currently support exclusive mode, if you know of an + * application that uses it, I will correct this.. + */ + if (hr == S_OK && exclusive) + return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; TRACE("returning: %08x %p\n", hr, out ? *out : NULL); return hr;

1 0

Maarten Lankhorst : winepulse: Forward winmm functions to winealsa.
by Alexandre Julliard 03 Nov '15

03 Nov '15

Module: wine Branch: master Commit: 10c72255f2602a895e474d0f629b84e96ebdc479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c72255f2602a895e474d0f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:52:40 2015 -0600 winepulse: Forward winmm functions to winealsa. PulseAudio doesn't support MIDI, so we forward to ALSA to provide MIDI support for winepulse users. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/winepulse.drv.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 612bf46..288de87 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -3,3 +3,8 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager + +# WinMM driver functions +@ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc +@ stdcall -private midMessage(long long long long long) winealsa.drv.midMessage +@ stdcall -private modMessage(long long long long long) winealsa.drv.modMessage

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
63
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 November 2015