June 2007 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Add CryptMsg* stubs.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 85f29f52914f99a91dd358a67f194c795dbb6516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f29f52914f99a91dd358a67… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jun 8 09:20:49 2007 -0700 crypt32: Add CryptMsg* stubs. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32.spec | 11 ++++--- dlls/crypt32/msg.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 7d8c73b..e065c40 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ context.c \ decode.c \ encode.c \ + msg.c \ oid.c \ proplist.c \ protectdata.c \ diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index aba9065..cf85e7b 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -140,17 +140,18 @@ @ stdcall CryptMemFree(ptr) @ stdcall CryptMemRealloc(ptr long) @ stub CryptMsgCalculateEncodedLength -@ stub CryptMsgClose +@ stdcall CryptMsgClose(ptr) @ stub CryptMsgControl @ stub CryptMsgCountersign @ stub CryptMsgCountersignEncoded +@ stdcall CryptMsgDuplicate(ptr) @ stub CryptMsgEncodeAndSignCTL @ stub CryptMsgGetAndVerifySigner -@ stub CryptMsgGetParam -@ stub CryptMsgOpenToDecode -@ stub CryptMsgOpenToEncode +@ stdcall CryptMsgGetParam(ptr long long ptr ptr) +@ stdcall CryptMsgOpenToDecode(long long long long ptr ptr) +@ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) @ stub CryptMsgSignCTL -@ stub CryptMsgUpdate +@ stdcall CryptMsgUpdate(ptr ptr long long) @ stub CryptMsgVerifyCountersignatureEncoded @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c new file mode 100644 index 0000000..2377ae2 --- /dev/null +++ b/dlls/crypt32/msg.c @@ -0,0 +1,70 @@ +/* + * Copyright 2007 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(crypt); + +HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, + DWORD dwMsgType, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, + PCMSG_STREAM_INFO pStreamInfo) +{ + FIXME("(%08x, %08x, %08x, %p, %s, %p): stub\n", dwMsgEncodingType, dwFlags, + dwMsgType, pvMsgEncodeInfo, debugstr_a(pszInnerContentObjID), pStreamInfo); + return (HCRYPTMSG)1; +} + +HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, + DWORD dwMsgType, HCRYPTPROV hCryptProv, PCERT_INFO pRecipientInfo, + PCMSG_STREAM_INFO pStreamInfo) +{ + FIXME("(%08x, %08x, %08x, %08lx, %p, %p): stub\n", dwMsgEncodingType, + dwFlags, dwMsgType, hCryptProv, pRecipientInfo, pStreamInfo); + return (HCRYPTMSG)2; +} + +HCRYPTMSG WINAPI CryptMsgDuplicate(HCRYPTMSG hCryptMsg) +{ + FIXME("(%p): stub\n", hCryptMsg); + return hCryptMsg; +} + +BOOL WINAPI CryptMsgClose(HCRYPTMSG hCryptMsg) +{ + FIXME("(%p): stub\n", hCryptMsg); + return TRUE; +} + +BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, + DWORD cbData, BOOL fFinal) +{ + FIXME("(%p, %p, %d, %d): stub\n", hCryptMsg, pbData, cbData, fFinal); + return TRUE; +} + +BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + FIXME("(%p, %d, %d, %p, %p): stub\n", hCryptMsg, dwParamType, dwIndex, + pvData, pcbData); + return FALSE; +}

1 0

Evan Stade : gdiplus: Added beginnings of memory and startup functions.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: a781bbf096d9a3264fe52fa90891b5a19fca9e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a781bbf096d9a3264fe52fa90… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jun 8 13:46:27 2007 -0700 gdiplus: Added beginnings of memory and startup functions. --- dlls/gdiplus/gdiplus.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/gdiplus/gdiplus.spec | 8 ++++---- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 367fab5..2cb04a6 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Evan Stade + * Copyright (C) 2007 Google (Evan Stade) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +22,7 @@ #include "winbase.h" #include "winerror.h" #include "wine/debug.h" +#include "gdiplus.h" WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); @@ -43,3 +44,38 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } return TRUE; } + +Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput *input, + struct GdiplusStartupOutput *output) +{ + if(!token) + return InvalidParameter; + + if(input->GdiplusVersion != 1) { + return UnsupportedGdiplusVersion; + } else if ((input->DebugEventCallback) || + (input->SuppressBackgroundThread) || (input->SuppressExternalCodecs)){ + FIXME("Unimplemented for non-default GdiplusStartupInput"); + return NotImplemented; + } else if(output) { + FIXME("Unimplemented for non-null GdiplusStartupOutput"); + return NotImplemented; + } + + return Ok; +} + +void WINAPI GdiplusShutdown(ULONG_PTR token) +{ + /* FIXME: no object tracking */ +} + +void* WINGDIPAPI GdipAlloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +void WINGDIPAPI GdipFree(void* ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 863be69..99b56b8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -31,7 +31,7 @@ @ stub GdipAddPathRectanglesI @ stub GdipAddPathString @ stub GdipAddPathStringI -@ stub GdipAlloc +@ stdcall GdipAlloc(long) @ stub GdipBeginContainer2 @ stub GdipBeginContainer @ stub GdipBeginContainerI @@ -222,7 +222,7 @@ @ stub GdipFillRegion @ stub GdipFlattenPath @ stub GdipFlush -@ stub GdipFree +@ stdcall GdipFree(ptr) @ stub GdipGetAdjustableArrowCapFillState @ stub GdipGetAdjustableArrowCapHeight @ stub GdipGetAdjustableArrowCapMiddleInset @@ -605,5 +605,5 @@ @ stub GdipWindingModeOutline @ stub GdiplusNotificationHook @ stub GdiplusNotificationUnhook -@ stub GdiplusShutdown -@ stub GdiplusStartup +@ stdcall GdiplusShutdown(ptr) +@ stdcall GdiplusStartup(ptr ptr ptr)

1 0

Stefan Dösinger : wined3d: Some render target-> texture blit context handling.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: ef65b233c048fe34e391d48fba1c25951ece2376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef65b233c048fe34e391d48fb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 9 14:59:15 2007 +0200 wined3d: Some render target->texture blit context handling. --- dlls/wined3d/device.c | 15 ++++++++++++--- dlls/wined3d/surface.c | 14 ++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96186d5..f3bf509 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5553,9 +5553,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED TRACE("src_rect [%u, %u]->[%u, %u]\n", src_rect->x1, src_rect->y1, src_rect->x2, src_rect->y2); TRACE("dst_rect [%u, %u]->[%u, %u]\n", dst_rect->x1, dst_rect->y1, dst_rect->x2, dst_rect->y2); - glDisable(GL_SCISSOR_TEST); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); - switch (filter) { case WINED3DTEXF_LINEAR: gl_filter = GL_LINEAR; @@ -5571,10 +5568,12 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED /* Attach src surface to src fbo */ src_swapchain = get_swapchain(src_surface); + ENTER_GL(); if (src_swapchain) { GLenum buffer; TRACE("Source surface %p is onscreen\n", src_surface); + ActivateContext(This, src_surface, CTXUSAGE_RESOURCELOAD); GL_EXTCALL(glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0)); buffer = surface_get_gl_buffer(src_surface, src_swapchain); @@ -5597,6 +5596,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLenum buffer; TRACE("Destination surface %p is onscreen\n", dst_surface); + ActivateContext(This, dst_surface, CTXUSAGE_RESOURCELOAD); GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); @@ -5607,11 +5607,19 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED dst_rect->y2 = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect->y2; } else { TRACE("Destination surface %p is offscreen\n", dst_surface); + + /* No src or dst swapchain? Make sure some context is active(multithreading) */ + if(!src_swapchain) { + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } + bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->dst_fbo); attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface); glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); checkGLcall("glDrawBuffer()"); } + glDisable(GL_SCISSOR_TEST); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); if (flip) { GL_EXTCALL(glBlitFramebufferEXT(src_rect->x1, src_rect->y1, src_rect->x2, src_rect->y2, @@ -5636,6 +5644,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED glDrawBuffer(GL_BACK); checkGLcall("glDrawBuffer()"); } + LEAVE_GL(); } static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2d3b925..587f41e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2385,6 +2385,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D ENTER_GL(); ActivateContext(myDevice, SrcSurface, CTXUSAGE_BLIT); + IWineD3DSurface_PreLoad((IWineD3DSurface *) This); /* Bind the target texture */ glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); @@ -2470,6 +2471,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* Activate the Proper context for reading from the source surface, set it up for blitting */ ENTER_GL(); ActivateContext(myDevice, SrcSurface, CTXUSAGE_BLIT); + IWineD3DSurface_PreLoad((IWineD3DSurface *) This); /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. * This way we don't have to wait for the 2nd readback to finish to leave this function. @@ -2802,17 +2804,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Destination color key is checked above */ } - /* Call preload for the surface to make sure it isn't dirty */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); - checkGLcall("glActiveTextureARB"); - } - IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); - IWineD3DSurface_PreLoad((IWineD3DSurface *) This); - /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag - * glCopyTexSubImage is a bit picky about the parameters we pass to it - */ + * glCopyTexSubImage is a bit picky about the parameters we pass to it + */ if(SrcRect) { if(SrcRect->top < SrcRect->bottom) { srect.y1 = SrcRect->top;

1 0

Evan Stade : gdiplus: Added public headers.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 48f10d4bbff73e2d246b3b5c1f7e4d73a40f28ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f10d4bbff73e2d246b3b5c1… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jun 8 13:44:28 2007 -0700 gdiplus: Added public headers. --- include/Makefile.in | 8 +++++ include/gdiplus.h | 57 ++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 49 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 46 ++++++++++++++++++++++++++++ include/gdiplusgpstubs.h | 42 +++++++++++++++++++++++++ include/gdiplusinit.h | 67 +++++++++++++++++++++++++++++++++++++++++ include/gdiplusmem.h | 35 +++++++++++++++++++++ include/gdipluspixelformats.h | 24 ++++++++++++++ include/gdiplustypes.h | 54 +++++++++++++++++++++++++++++++++ 9 files changed, 382 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48f10d4bbff73e2d246b3…

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3DDevice8 methods.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 09aefe21085937abd953767642fa01528b3029b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09aefe21085937abd95376764… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 9 14:16:41 2007 +0200 d3d8: Hold the lock in IDirect3DDevice8 methods. --- dlls/d3d8/device.c | 491 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 416 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09aefe21085937abd9537…

1 0

Stefan Dösinger : wined3d: Store the adapter driver and description in the adapter.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 66930554d1cb5256a2e8d32cbb9259ed9aba59ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=66930554d1cb5256a2e8d32cb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 8 15:23:04 2007 +0200 wined3d: Store the adapter driver and description in the adapter. --- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c981528..8d15f7e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1316,8 +1316,8 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad /* Return the information requested */ TRACE_(d3d_caps)("device/Vendor Name and Version detection using FillGLCaps\n"); - strcpy(pIdentifier->Driver, "Display"); - strcpy(pIdentifier->Description, "Direct3D HAL"); + strcpy(pIdentifier->Driver, Adapters[Adapter].driver); + strcpy(pIdentifier->Description, Adapters[Adapter].description); /* Note dx8 doesn't supply a DeviceName */ if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ @@ -2621,6 +2621,8 @@ BOOL InitAdapters(void) { HeapFree(GetProcessHeap(), 0, Adapters); return FALSE; } + Adapters[0].driver = "Display"; + Adapters[0].description = "Direct3D HAL"; } numAdapters = 1; TRACE("%d adapters successfully initialized\n", numAdapters); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdb2cbb..be37ec1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -577,6 +577,8 @@ struct WineD3DAdapter POINT monitorPoint; Display *display; WineD3D_GL_Info gl_info; + const char *driver; + const char *description; }; extern BOOL InitAdapters(void);

1 0

Stefan Dösinger : wined3d: Find possible fbconfis on dll load time, use them in CheckDepthStencilMatch.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: efbdd515f8724299a7d7f5144984e289e119e767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbdd515f8724299a7d7f5144… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 8 14:16:37 2007 +0200 wined3d: Find possible fbconfis on dll load time, use them in CheckDepthStencilMatch. --- dlls/wined3d/directx.c | 48 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8d15f7e..07e0dbe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1469,9 +1469,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDepthStencilMatch(IWineD3D *iface, UINT WINED3DFORMAT RenderTargetFormat, WINED3DFORMAT DepthStencilFormat) { IWineD3DImpl *This = (IWineD3DImpl *)iface; - HRESULT hr = WINED3DERR_NOTAVAILABLE; - GLXFBConfig* cfgs = NULL; - int nCfgs = 0; int it; WARN_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%x,%s), AdptFmt:(%x,%s), RendrTgtFmt:(%x,%s), DepthStencilFmt:(%x,%s))\n", @@ -1486,34 +1483,17 @@ static HRESULT WINAPI IWineD3DImpl_CheckDepthStencilMatch(IWineD3D *iface, UINT return WINED3DERR_INVALIDCALL; } - /* TODO: Store an array in the adapter */ - if(WineD3D_CreateFakeGLContext()) - cfgs = glXGetFBConfigs(wined3d_fake_gl_context_display, DefaultScreen(wined3d_fake_gl_context_display), &nCfgs); - - if (cfgs) { - for (it = 0; it < nCfgs; ++it) { - if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(wined3d_fake_gl_context_display, cfgs[it], RenderTargetFormat)) { - if (IWineD3DImpl_IsGLXFBConfigCompatibleWithDepthFmt(wined3d_fake_gl_context_display, cfgs[it], DepthStencilFormat)) { - hr = WINED3D_OK; - break ; - } + for (it = 0; it < Adapters[Adapter].nCfgs; ++it) { + if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(Adapters[Adapter].display, Adapters[Adapter].cfgs[it], RenderTargetFormat)) { + if (IWineD3DImpl_IsGLXFBConfigCompatibleWithDepthFmt(Adapters[Adapter].display, Adapters[Adapter].cfgs[it], DepthStencilFormat)) { + TRACE_(d3d_caps)("(%p) : Formats matched\n", This); + return WINED3D_OK; } } - XFree(cfgs); - if(hr != WINED3D_OK) - ERR("unsupported format pair: %s and %s\n", debug_d3dformat(RenderTargetFormat), debug_d3dformat(DepthStencilFormat)); - } else { - ERR_(d3d_caps)("returning WINED3D_OK even so CreateFakeGLContext or glXGetFBConfigs failed\n"); - hr = WINED3D_OK; } + WARN_(d3d_caps)("unsupported format pair: %s and %s\n", debug_d3dformat(RenderTargetFormat), debug_d3dformat(DepthStencilFormat)); - WineD3D_ReleaseFakeGLContext(); - - if (hr != WINED3D_OK) - TRACE_(d3d_caps)("Failed to match stencil format to device\n"); - - TRACE_(d3d_caps)("(%p) : Returning %x\n", This, hr); - return hr; + return WINED3DERR_NOTAVAILABLE; } static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, @@ -2615,9 +2595,21 @@ BOOL InitAdapters(void) { Adapters[0].display = get_display(device_context); ReleaseDC(0, device_context); + ENTER_GL(); + if(WineD3D_CreateFakeGLContext()) { + Adapters[0].cfgs = glXGetFBConfigs(Adapters[0].display, DefaultScreen(Adapters[0].display), &Adapters[0].nCfgs); + WineD3D_ReleaseFakeGLContext(); + } else { + ERR("Failed to create a fake opengl context to find fbconfigs formats\n"); + LEAVE_GL(); + return FALSE; + } + LEAVE_GL(); + ret = IWineD3DImpl_FillGLCaps(&Adapters[0].gl_info, Adapters[0].display); - if(ret != TRUE) { + if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); + XFree(Adapters[0].cfgs); HeapFree(GetProcessHeap(), 0, Adapters); return FALSE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index be37ec1..6673bc0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -579,6 +579,8 @@ struct WineD3DAdapter WineD3D_GL_Info gl_info; const char *driver; const char *description; + GLXFBConfig *cfgs; + int nCfgs; }; extern BOOL InitAdapters(void);

1 0

Louis Lenders : shell32: Add stub for SHUpdateRecycleBinIcon.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 6089fe8667bfa0bf4f93437d9745a6ca862299df URL: http://source.winehq.org/git/wine.git/?a=commit;h=6089fe8667bfa0bf4f93437d9… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jun 10 12:08:09 2007 +0100 shell32: Add stub for SHUpdateRecycleBinIcon. --- dlls/shell32/recyclebin.c | 11 +++++++++++ dlls/shell32/shell32.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 7a756b9..a1ca9a6 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -512,3 +512,14 @@ static const IPersistFolder2Vtbl recycleBinPersistVtbl = /* IPersistFolder2 */ RecycleBin_GetCurFolder }; + +/************************************************************************* + * SHUpdateRecycleBinIcon [SHELL32.@] + * + * Undocumented + */ +HRESULT WINAPI SHUpdateRecycleBinIcon(void) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 2bf62dc..5d47e3d 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -368,7 +368,7 @@ @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) @ stdcall SHSetLocalizedName(wstr wstr long) -@ stub SHUpdateRecycleBinIcon +@ stdcall SHUpdateRecycleBinIcon() @ stdcall SheChangeDirA(str) @ stub SheChangeDirExA @ stub SheChangeDirExW

1 0

Stefan Dösinger : wined3d: Store the gl information in a per adapter structure and initialize it only once .
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: a460a2df43aa8eae10b1db028c6020829b009c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a460a2df43aa8eae10b1db028… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 9 14:27:41 2007 +0200 wined3d: Store the gl information in a per adapter structure and initialize it only once. --- dlls/wined3d/arb_program_shader.c | 10 +- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 7 +-- dlls/wined3d/directx.c | 169 ++++++++++++++++++------------------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 14 ++-- dlls/wined3d/indexbuffer.c | 2 +- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/query.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 5 +- dlls/wined3d/vertexbuffer.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_main.c | 10 ++- dlls/wined3d/wined3d_private.h | 18 +++-- 22 files changed, 133 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a460a2df43aa8eae10b1d…

1 0

Christian Costa : winealsa.drv: Fix compilation with old alsa headers.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: de559d9ce050f1b776ffde862e91e7c1c25d6e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de559d9ce050f1b776ffde862… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Jun 10 12:38:56 2007 +0200 winealsa.drv: Fix compilation with old alsa headers. --- dlls/winealsa.drv/midi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4f6d77b..a95f36c 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -55,6 +55,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); #ifdef HAVE_ALSA +#ifndef SND_SEQ_PORT_TYPE_PORT +#define SND_SEQ_PORT_TYPE_PORT (1<<19) /* Appears in version 1.0.12rc1 */ +#endif + typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ DWORD bufsize;

1 0