November 2007 - Wine-Commits

Stefan Dösinger : d3d9: Use HAL devices in some tests.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 50ea23efd644cbf2afb7666d86293c444509b57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ea23efd644cbf2afb7666d8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 27 22:40:57 2007 +0200 d3d9: Use HAL devices in some tests. --- dlls/d3d9/tests/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4f655b6..37b4362 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -164,7 +164,7 @@ static void test_swapchain(void) d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.BackBufferCount = 0; - hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); if (FAILED(hr)) goto cleanup; @@ -343,7 +343,7 @@ static void test_refcount(void) d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; - hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); if (FAILED(hr)) goto cleanup; @@ -653,7 +653,7 @@ static void test_cursor(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferFormat = d3ddm.Format; - hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); if (FAILED(hr)) goto cleanup;

1 0

Stefan Dösinger : wined3d: Set the display mode before creating the context.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 45ebea1f47bcdfac5466d6821cca47c2a0376512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ebea1f47bcdfac5466d6821… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 26 02:16:03 2007 +0200 wined3d: Set the display mode before creating the context. --- dlls/wined3d/device.c | 74 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a595840..6aa58cd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1358,6 +1358,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic IWineD3DSwapChainImpl *object; /** NOTE: impl ref allowed since this is a create function **/ HRESULT hr = WINED3D_OK; IUnknown *bufferParent; + BOOL displaymode_set = FALSE; TRACE("(%p) : Created Aditional Swap Chain\n", This); @@ -1450,30 +1451,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic goto error; } - /** - * Create an opengl context for the display visual - * NOTE: the visual is chosen as the window is created and the glcontext cannot - * use different properties after that point in time. FIXME: How to handle when requested format - * doesn't match actual visual? Cannot choose one here - code removed as it ONLY works if the one - * it chooses is identical to the one already being used! - **********************************/ - /** FIXME: Handle stencil appropriately via EnableAutoDepthStencil / AutoDepthStencilFormat **/ - - object->context = HeapAlloc(GetProcessHeap(), 0, sizeof(object->context)); - if(!object->context) - return E_OUTOFMEMORY; - object->num_contexts = 1; - - object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, object->win_handle, FALSE /* pbuffer */, pPresentationParameters); - if (!object->context[0]) { - ERR("Failed to create a new context\n"); - hr = WINED3DERR_NOTAVAILABLE; - goto error; - } else { - TRACE("Context created (HWND=%p, glContext=%p)\n", - object->win_handle, object->context[0]->glCtx); - } - /********************* * Windowed / Fullscreen *******************/ @@ -1504,6 +1481,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic devmode.dmPelsWidth = pPresentationParameters->BackBufferWidth; devmode.dmPelsHeight = pPresentationParameters->BackBufferHeight; ChangeDisplaySettingsExW(This->adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); + displaymode_set = TRUE; /* For GetDisplayMode */ This->ddraw_width = devmode.dmPelsWidth; @@ -1517,6 +1495,30 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic ClipCursor(&clip_rc); } + /** + * Create an opengl context for the display visual + * NOTE: the visual is chosen as the window is created and the glcontext cannot + * use different properties after that point in time. FIXME: How to handle when requested format + * doesn't match actual visual? Cannot choose one here - code removed as it ONLY works if the one + * it chooses is identical to the one already being used! + **********************************/ + /** FIXME: Handle stencil appropriately via EnableAutoDepthStencil / AutoDepthStencilFormat **/ + + object->context = HeapAlloc(GetProcessHeap(), 0, sizeof(object->context)); + if(!object->context) + return E_OUTOFMEMORY; + object->num_contexts = 1; + + object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, object->win_handle, FALSE /* pbuffer */, pPresentationParameters); + if (!object->context[0]) { + ERR("Failed to create a new context\n"); + hr = WINED3DERR_NOTAVAILABLE; + goto error; + } else { + TRACE("Context created (HWND=%p, glContext=%p)\n", + object->win_handle, object->context[0]->glCtx); + } + /********************* * Create the back, front and stencil buffers *******************/ @@ -1594,6 +1596,30 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic return WINED3D_OK; error: + if (displaymode_set) { + DEVMODEW devmode; + HDC hdc; + int bpp = 0; + RECT clip_rc; + + SetRect(&clip_rc, 0, 0, object->orig_width, object->orig_height); + ClipCursor(NULL); + + /* Get info on the current display setup */ + hdc = GetDC(0); + bpp = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + + /* Change the display settings */ + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmBitsPerPel = (bpp >= 24) ? 32 : bpp; /* Stupid XVidMode cannot change bpp */ + devmode.dmPelsWidth = object->orig_width; + devmode.dmPelsHeight = object->orig_height; + ChangeDisplaySettingsExW(This->adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); + } + if (object->backBuffer) { int i; for(i = 0; i < object->presentParms.BackBufferCount; i++) {

1 0

Stefan Dösinger : wined3d: Set the main hwnd before setting up the screen.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 38147d28dda1fa66a856acc3d44007b78ee0b0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38147d28dda1fa66a856acc3d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 26 00:32:08 2007 +0200 wined3d: Set the main hwnd before setting up the screen. --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd6bde8..a595840 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1385,6 +1385,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (!object->win_handle) { object->win_handle = This->createParms.hFocusWindow; } + if(!This->ddraw_window) IWineD3DDevice_SetHWND(iface, object->win_handle); hDc = GetDC(object->win_handle); TRACE("Using hDc %p\n", hDc); @@ -2002,8 +2003,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR } This->swapchains[0] = (IWineD3DSwapChain *) swapchain; - if(!This->ddraw_window) IWineD3DDevice_SetHWND(iface, swapchain->win_handle); - if(swapchain->backBuffer && swapchain->backBuffer[0]) { TRACE("Setting rendertarget to %p\n", swapchain->backBuffer); This->render_targets[0] = swapchain->backBuffer[0];

1 0

Andrew Talbot : snmpapi: Constify a variable.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 9a177b64075cb3bb68a5dd2193a52a8ec8876186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a177b64075cb3bb68a5dd219… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 6 21:29:25 2007 +0000 snmpapi: Constify a variable. --- dlls/snmpapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 3686ed9..62e9ab3 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(snmpapi); -static INT asn_any_copy(AsnAny *dst, AsnAny *src) +static INT asn_any_copy(AsnAny *dst, const AsnAny *src) { memset(dst, 0, sizeof(AsnAny)); switch (src->asnType)

1 0

Stefan Dösinger : wined3d: Refuse to create volumes and volume textures if not supported.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: c2b6cbf014b7a671dee3916d3a51d444fc8205b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b6cbf014b7a671dee3916d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 26 13:44:16 2007 +0200 wined3d: Refuse to create volumes and volume textures if not supported. --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/volume.c | 31 ++++++++++++++----------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6aa58cd..e9cd3de 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -952,6 +952,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa UINT tmpH; UINT tmpD; const GlPixelFormatDesc *glDesc; + getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); /* TODO: It should only be possible to create textures for formats @@ -960,6 +961,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN\n", This); return WINED3DERR_INVALIDCALL; } + if(!GL_SUPPORT(EXT_TEXTURE3D)) { + WARN("(%p) : Texture cannot be created - no volume texture support\n", This); + return WINED3DERR_INVALIDCALL; + } D3DCREATERESOURCEOBJECTINSTANCE(object, VolumeTexture, WINED3DRTYPE_VOLUMETEXTURE, 0); D3DINITIALIZEBASETEXTURE(object->baseTexture); @@ -1041,6 +1046,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface, IWineD3DVolumeImpl *object; /** NOTE: impl ref allowed since this is a create function **/ const StaticPixelFormatDesc *formatDesc = getFormatDescEntry(Format, NULL, NULL); + if(!GL_SUPPORT(EXT_TEXTURE3D)) { + WARN("(%p) : Volume cannot be created - no volume texture support\n", This); + return WINED3DERR_INVALIDCALL; + } + D3DCREATERESOURCEOBJECTINSTANCE(object, Volume, WINED3DRTYPE_VOLUME, ((Width * formatDesc->bpp) * Height * Depth)) TRACE("(%p) : W(%d) H(%d) D(%d), Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 425a45e..a70a351 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -270,9 +270,18 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int TRACE("(%p) : level %u, format %s (0x%08x)\n", This, gl_level, debug_d3dformat(format), format); - if(GL_SUPPORT(EXT_TEXTURE3D)) { - TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", - GL_TEXTURE_3D, + TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", + GL_TEXTURE_3D, + gl_level, + glDesc->glInternal, + This->currentDesc.Width, + This->currentDesc.Height, + This->currentDesc.Depth, + 0, + glDesc->glFormat, + glDesc->glType, + This->resource.allocatedMemory); + GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, gl_level, glDesc->glInternal, This->currentDesc.Width, @@ -281,20 +290,8 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int 0, glDesc->glFormat, glDesc->glType, - This->resource.allocatedMemory); - GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, - gl_level, - glDesc->glInternal, - This->currentDesc.Width, - This->currentDesc.Height, - This->currentDesc.Depth, - 0, - glDesc->glFormat, - glDesc->glType, - This->resource.allocatedMemory)); - checkGLcall("glTexImage3D"); - } else - WARN("This OpenGL implementation doesn't support 3D textures\n"); + This->resource.allocatedMemory)); + checkGLcall("glTexImage3D"); /* When adding code releasing This->resource.allocatedMemory to save data keep in mind that * GL_UNPACK_CLIENT_STORAGE_APPLE is enabled by default if supported(GL_APPLE_client_storage).

1 0

Stefan Dösinger : wined3d: Shader Model 3. 0 varying tests.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 5fc54b5459cce80cc3f29386da0f3b1f0a8c244b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc54b5459cce80cc3f29386d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 20:33:33 2007 +0100 wined3d: Shader Model 3.0 varying tests. --- dlls/d3d9/tests/visual.c | 684 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 683 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc54b5459cce80cc3f29…

1 0

Rob Shearman : rpcrt4: Add a stub for RpcErrorStartEnumeration.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: ebe885d782e620c5a365e0bf8b1a2249c7eedddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe885d782e620c5a365e0bf8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 6 15:54:59 2007 +0000 rpcrt4: Add a stub for RpcErrorStartEnumeration. --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 581075b..8accabc 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -414,7 +414,7 @@ @ stub RpcErrorNumberOfRecords # wxp @ stub RpcErrorResetEnumeration # wxp @ stub RpcErrorSaveErrorInfo # wxp -@ stub RpcErrorStartEnumeration # wxp +@ stdcall RpcErrorStartEnumeration(ptr) @ stub RpcFreeAuthorizationContext # wxp @ stub RpcGetAsyncCallStatus @ stub RpcIfIdVectorFree diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 513ff47..a7c3c21 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -828,3 +828,12 @@ DWORD WINAPI I_RpcMapWin32Status(RPC_STATUS status) FIXME("(%ld): stub\n", status); return 0; } + +/****************************************************************************** + * RpcErrorStartEnumeration (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(void** EnumHandle) +{ + FIXME("(%p): stub\n", EnumHandle); + return RPC_S_ENTRY_NOT_FOUND; +}

1 0

Maarten Lankhorst : dsound: Add support for WAVEFORMATEXTENSIBLE format.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 2a117a20176815b3b8e52c0e4b56a40c4e41e74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a117a20176815b3b8e52c0e4… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Nov 5 23:23:11 2007 +0100 dsound: Add support for WAVEFORMATEXTENSIBLE format. --- dlls/dsound/buffer.c | 3 ++- dlls/dsound/dsound.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_main.c | 3 +++ 3 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5d95078..02b763e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -495,8 +495,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat( *wfwritten = size; } else { WARN("invalid parameter: wfsize too small\n"); + CopyMemory(lpwf,This->pwfx,wfsize); if (wfwritten) - *wfwritten = 0; + *wfwritten = wfsize; return DSERR_INVALIDPARAM; } } else { diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index ed6c221..457ced1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -31,6 +31,10 @@ #include "mmsystem.h" #include "winternl.h" #include "mmddk.h" +#include "wingdi.h" +#include "mmreg.h" +#include "ks.h" +#include "ksmedia.h" #include "wine/debug.h" #include "dsound.h" #include "dsdriver.h" @@ -1522,6 +1526,7 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( WARN("invalid parameter: ppdsb == NULL\n"); return DSERR_INVALIDPARAM; } + *ppdsb = NULL; if (TRACE_ON(dsound)) { TRACE("(structsize=%d)\n",dsbd->dwSize); @@ -1558,12 +1563,51 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( } } else { IDirectSoundBufferImpl * dsb; + WAVEFORMATEXTENSIBLE *pwfxe; if (dsbd->lpwfxFormat == NULL) { WARN("invalid parameter: dsbd->lpwfxFormat can't be NULL for " "secondary buffer\n"); return DSERR_INVALIDPARAM; } + pwfxe = (WAVEFORMATEXTENSIBLE*)dsbd->lpwfxFormat; + + if (pwfxe->Format.wBitsPerSample != 16 && pwfxe->Format.wBitsPerSample != 8 && pwfxe->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE) + { + WARN("wBitsPerSample=%d needs a WAVEFORMATEXTENSIBLE\n", dsbd->lpwfxFormat->wBitsPerSample); + return DSERR_CONTROLUNAVAIL; + } + if (pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + if (pwfxe->Format.cbSize < (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) + { + WARN("Too small a cbSize (%d/%d)\n", pwfxe->Format.cbSize, (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))); + return DSERR_INVALIDPARAM; + } + + if (pwfxe->Format.cbSize > (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) + { + WARN("Too big a cbSize (%d/%d)\n", pwfxe->Format.cbSize, (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))); + return DSERR_CONTROLUNAVAIL; + } + + if (!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) + { + if (!IsEqualGUID(&pwfxe->SubFormat, &GUID_NULL)) + FIXME("SubFormat %s not supported right now.\n", debugstr_guid(&pwfxe->SubFormat)); + return DSERR_INVALIDPARAM; + } + if (pwfxe->Samples.wValidBitsPerSample > dsbd->lpwfxFormat->wBitsPerSample) + { + WARN("Samples.wValidBitsPerSample(%d) > Format.wBitsPerSample (%d)\n", pwfxe->Samples.wValidBitsPerSample, pwfxe->Format.wBitsPerSample); + return DSERR_INVALIDPARAM; + } + if (pwfxe->Samples.wValidBitsPerSample && pwfxe->Samples.wValidBitsPerSample < dsbd->lpwfxFormat->wBitsPerSample) + { + FIXME("Non-packed formats not supported right now: %d/%d\n", pwfxe->Samples.wValidBitsPerSample, dsbd->lpwfxFormat->wBitsPerSample); + return DSERR_CONTROLUNAVAIL; + } + } TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 791b33c..53f27a7 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -48,8 +48,11 @@ #include "wine/debug.h" #include "dsound.h" #include "dsconf.h" +#include "ks.h" #include "initguid.h" +#include "ksmedia.h" #include "dsdriver.h" + #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound);

1 0

Huw Davies : inetcomm: Add a stub implementation of the MimeSecurity object .
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 8ccf1066eb8b34af371b848c457a51cb8f36af06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ccf1066eb8b34af371b848c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 5 17:02:40 2007 +0000 inetcomm: Add a stub implementation of the MimeSecurity object. --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 184 +++++++++++++++++++++++++++++++++++++++++ dlls/inetcomm/tests/mimeole.c | 12 +++ 3 files changed, 197 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 23dba3f..a9e7d16 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -54,7 +54,7 @@ @ stdcall MimeOleCreateMessage(ptr ptr) @ stub MimeOleCreateMessageParts @ stub MimeOleCreatePropertySet -@ stub MimeOleCreateSecurity +@ stdcall MimeOleCreateSecurity(ptr) @ stdcall MimeOleCreateVirtualStream(ptr) @ stub MimeOleDecodeHeader @ stub MimeOleEncodeHeader diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 2732beb..16797bc 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -696,3 +696,187 @@ HRESULT WINAPI MimeOleCreateVirtualStream(IStream **ppStream) hr = CreateStreamOnHGlobal(NULL, TRUE, ppStream); return hr; } + +typedef struct MimeSecurity +{ + const IMimeSecurityVtbl *lpVtbl; + + LONG refs; +} MimeSecurity; + +static HRESULT WINAPI MimeSecurity_QueryInterface( + IMimeSecurity* iface, + REFIID riid, + void** obj) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IMimeSecurity)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + FIXME("no interface for %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MimeSecurity_AddRef( + IMimeSecurity* iface) +{ + MimeSecurity *This = (MimeSecurity *)iface; + TRACE("(%p)->()\n", iface); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI MimeSecurity_Release( + IMimeSecurity* iface) +{ + MimeSecurity *This = (MimeSecurity *)iface; + ULONG refs; + + TRACE("(%p)->()\n", iface); + + refs = InterlockedDecrement(&This->refs); + if (!refs) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refs; +} + +static HRESULT WINAPI MimeSecurity_InitNew( + IMimeSecurity* iface) +{ + FIXME("(%p)->(): stub\n", iface); + return S_OK; +} + +static HRESULT WINAPI MimeSecurity_CheckInit( + IMimeSecurity* iface) +{ + FIXME("(%p)->(): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_EncodeMessage( + IMimeSecurity* iface, + IMimeMessageTree* pTree, + DWORD dwFlags) +{ + FIXME("(%p)->(%p, %08x): stub\n", iface, pTree, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_EncodeBody( + IMimeSecurity* iface, + IMimeMessageTree* pTree, + HBODY hEncodeRoot, + DWORD dwFlags) +{ + FIXME("(%p)->(%p, %p, %08x): stub\n", iface, pTree, hEncodeRoot, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_DecodeMessage( + IMimeSecurity* iface, + IMimeMessageTree* pTree, + DWORD dwFlags) +{ + FIXME("(%p)->(%p, %08x): stub\n", iface, pTree, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_DecodeBody( + IMimeSecurity* iface, + IMimeMessageTree* pTree, + HBODY hDecodeRoot, + DWORD dwFlags) +{ + FIXME("(%p)->(%p, %p, %08x): stub\n", iface, pTree, hDecodeRoot, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_EnumCertificates( + IMimeSecurity* iface, + HCAPICERTSTORE hc, + DWORD dwUsage, + PCX509CERT pPrev, + PCX509CERT* ppCert) +{ + FIXME("(%p)->(%p, %08x, %p, %p): stub\n", iface, hc, dwUsage, pPrev, ppCert); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_GetCertificateName( + IMimeSecurity* iface, + const PCX509CERT pX509Cert, + const CERTNAMETYPE cn, + LPSTR* ppszName) +{ + FIXME("(%p)->(%p, %08x, %p): stub\n", iface, pX509Cert, cn, ppszName); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_GetMessageType( + IMimeSecurity* iface, + const HWND hwndParent, + IMimeBody* pBody, + DWORD* pdwSecType) +{ + FIXME("(%p)->(%p, %p, %p): stub\n", iface, hwndParent, pBody, pdwSecType); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeSecurity_GetCertData( + IMimeSecurity* iface, + const PCX509CERT pX509Cert, + const CERTDATAID dataid, + LPPROPVARIANT pValue) +{ + FIXME("(%p)->(%p, %x, %p): stub\n", iface, pX509Cert, dataid, pValue); + return E_NOTIMPL; +} + + +static const IMimeSecurityVtbl MimeSecurityVtbl = +{ + MimeSecurity_QueryInterface, + MimeSecurity_AddRef, + MimeSecurity_Release, + MimeSecurity_InitNew, + MimeSecurity_CheckInit, + MimeSecurity_EncodeMessage, + MimeSecurity_EncodeBody, + MimeSecurity_DecodeMessage, + MimeSecurity_DecodeBody, + MimeSecurity_EnumCertificates, + MimeSecurity_GetCertificateName, + MimeSecurity_GetMessageType, + MimeSecurity_GetCertData +}; + +/*********************************************************************** + * MimeOleCreateSecurity (INETCOMM.@) + */ +HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) +{ + MimeSecurity *This; + + TRACE("(%p)\n", ppSecurity); + + *ppSecurity = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &MimeSecurityVtbl; + This->refs = 1; + + *ppSecurity = (IMimeSecurity *)&This->lpVtbl; + return S_OK; +} diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index d128193..eebb783 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -41,9 +41,21 @@ static void test_CreateVirtualStream(void) IStream_Release(pstm); } +static void test_CreateSecurity(void) +{ + HRESULT hr; + IMimeSecurity *sec; + + hr = MimeOleCreateSecurity(&sec); + ok(hr == S_OK, "ret %08x\n", hr); + + IMimeSecurity_Release(sec); +} + START_TEST(mimeole) { OleInitialize(NULL); test_CreateVirtualStream(); + test_CreateSecurity(); OleUninitialize(); }

1 0

EA Durbin : wininet: Return true for case INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: bc745fa4c4bd8659ba0e9bfd7785ed9e8ac8af0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc745fa4c4bd8659ba0e9bfd7… Author: EA Durbin <ead1234(a)hotmail.com> Date: Tue Nov 6 11:18:00 2007 -0600 wininet: Return true for case INTERNET_OPTION_SECURITY_FLAGS. --- dlls/wininet/internet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4c1472c..5848ea1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2244,6 +2244,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d } case INTERNET_OPTION_SECURITY_FLAGS: FIXME("INTERNET_OPTION_SECURITY_FLAGS: Stub\n"); + bSuccess = TRUE; break; case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT:

1 0