wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Stefan Leichter : wsnmp32: New stub dll.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 0c1bd482b58b0e86c7f7b5a6b67e2f9788291075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1bd482b58b0e86c7f7b5a6b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue May 1 08:07:57 2012 +0200 wsnmp32: New stub dll. --- configure | 1 + configure.ac | 1 + dlls/wsnmp32/Makefile.in | 5 ++++ dlls/wsnmp32/wsnmp32.c | 41 ++++++++++++++++++++++++++++++++++++++ dlls/wsnmp32/wsnmp32.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 96 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5b8c648..fbe00c6 100755 --- a/configure +++ b/configure @@ -15462,6 +15462,7 @@ wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test wine_fn_config_dll wshom.ocx enable_wshom_ocx wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test +wine_fn_config_dll wsnmp32 enable_wsnmp32 wine_fn_config_dll wsock32 enable_wsock32 implib wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_dll wuapi enable_wuapi diff --git a/configure.ac b/configure.ac index 18da8c5..849508c 100644 --- a/configure.ac +++ b/configure.ac @@ -2950,6 +2950,7 @@ WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) WINE_CONFIG_DLL(wshom.ocx) WINE_CONFIG_TEST(dlls/wshom.ocx/tests) +WINE_CONFIG_DLL(wsnmp32) WINE_CONFIG_DLL(wsock32,,[implib]) WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_DLL(wuapi) diff --git a/dlls/wsnmp32/Makefile.in b/dlls/wsnmp32/Makefile.in new file mode 100644 index 0000000..0fe0da2 --- /dev/null +++ b/dlls/wsnmp32/Makefile.in @@ -0,0 +1,5 @@ +MODULE = wsnmp32.dll + +C_SRCS = wsnmp32.c + +@MAKE_DLL_RULES@ diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c new file mode 100644 index 0000000..6ace895 --- /dev/null +++ b/dlls/wsnmp32/wsnmp32.c @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Stefan Leichter + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsnmp32); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/wsnmp32/wsnmp32.spec b/dlls/wsnmp32/wsnmp32.spec new file mode 100644 index 0000000..fedf760 --- /dev/null +++ b/dlls/wsnmp32/wsnmp32.spec @@ -0,0 +1,48 @@ +100 stub SnmpGetTranslateMode +101 stub SnmpSetTranslateMode +102 stub SnmpGetRetransmitMode +103 stub SnmpSetRetransmitMode +104 stub SnmpGetTimeout +105 stub SnmpSetTimeout +106 stub SnmpSetRetry +107 stub SnmpGetRetry +108 stub _SnmpConveyAgentAddress@4 +109 stub _SnmpSetAgentAddress@4 +120 stub SnmpGetVendorInfo +200 stub SnmpStartup +201 stub SnmpCleanup +202 stub SnmpOpen +203 stub SnmpClose +204 stub SnmpSendMsg +205 stub SnmpRecvMsg +206 stub SnmpRegister +220 stub SnmpCreateSession +221 stub SnmpListen +222 stub SnmpCancelMsg +300 stub SnmpStrToEntity +301 stub SnmpEntityToStr +302 stub SnmpFreeEntity +320 stub SnmpSetPort +400 stub SnmpStrToContext +401 stub SnmpContextToStr +402 stub SnmpFreeContext +500 stub SnmpCreatePdu +501 stub SnmpGetPduData +502 stub SnmpSetPduData +503 stub SnmpDuplicatePdu +504 stub SnmpFreePdu +600 stub SnmpCreateVbl +601 stub SnmpDuplicateVbl +602 stub SnmpFreeVbl +603 stub SnmpCountVbl +604 stub SnmpGetVb +605 stub SnmpSetVb +606 stub SnmpDeleteVb +900 stub SnmpFreeDescriptor +901 stub SnmpEncodeMsg +902 stub SnmpDecodeMsg +903 stub SnmpStrToOid +904 stub SnmpOidToStr +905 stub SnmpOidCopy +906 stub SnmpOidCompare +999 stub SnmpGetLastError

1 0

Józef Kucia : d3dx9: Implement conversion from DDS pixel format to D3DFORMAT.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: d3068976e5c9199f76aaec8f07a213457e448035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3068976e5c9199f76aaec8f0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Apr 29 21:43:10 2012 +0200 d3dx9: Implement conversion from DDS pixel format to D3DFORMAT. --- dlls/d3dx9_36/surface.c | 112 ++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/surface.c | 149 +++++++++++++++++++++-------------------- 2 files changed, 186 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3068976e5c9199f76aae…

1 0

Józef Kucia : d3dx9: Add partial DDS support implementation for D3DXGetImageInfo functions.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 4618e388e69400084dd84c2d6972f2950142ff0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4618e388e69400084dd84c2d6… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Apr 29 21:43:08 2012 +0200 d3dx9: Add partial DDS support implementation for D3DXGetImageInfo functions. --- dlls/d3dx9_36/surface.c | 133 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 129 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 5874c52..e361c80 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2009-2010 Tony Wasserka + * Copyright (C) 2012 Józef Kucia * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,9 +29,132 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /* Wine-specific WIC GUIDs */ - DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22); +/* dds_header.flags */ +#define DDS_CAPS 0x1 +#define DDS_HEIGHT 0x2 +#define DDS_WIDTH 0x2 +#define DDS_PITCH 0x8 +#define DDS_PIXELFORMAT 0x1000 +#define DDS_MIPMAPCOUNT 0x20000 +#define DDS_LINEARSIZE 0x80000 +#define DDS_DEPTH 0x800000 + +/* dds_header.caps */ +#define DDS_CAPS_COMPLEX 0x8 +#define DDS_CAPS_TEXTURE 0x1000 +#define DDS_CAPS_MIPMAP 0x400000 + +/* dds_header.caps2 */ +#define DDS_CAPS2_CUBEMAP 0x200 +#define DDS_CAPS2_CUBEMAP_POSITIVEX 0x400 +#define DDS_CAPS2_CUBEMAP_NEGATIVEX 0x800 +#define DDS_CAPS2_CUBEMAP_POSITIVEY 0x1000 +#define DDS_CAPS2_CUBEMAP_NEGATIVEY 0x2000 +#define DDS_CAPS2_CUBEMAP_POSITIVEZ 0x4000 +#define DDS_CAPS2_CUBEMAP_NEGATIVEZ 0x8000 +#define DDS_CAPS2_VOLUME 0x200000 + +/* dds_pixel_format.flags */ +#define DDS_PF_ALPHA 0x1 +#define DDS_PF_ALPHA_ONLY 0x2 +#define DDS_PF_FOURCC 0x4 +#define DDS_PF_RGB 0x40 +#define DDS_PF_YUV 0x200 +#define DDS_PF_LUMINANCE 0x20000 + +struct dds_pixel_format +{ + DWORD size; + DWORD flags; + DWORD fourcc; + DWORD bpp; + DWORD rmask; + DWORD gmask; + DWORD bmask; + DWORD amask; +}; + +struct dds_header +{ + DWORD signature; + DWORD size; + DWORD flags; + DWORD height; + DWORD width; + DWORD pitch_or_linear_size; + DWORD depth; + DWORD miplevels; + DWORD reserved[11]; + struct dds_pixel_format pixel_format; + DWORD caps; + DWORD caps2; + DWORD caps3; + DWORD caps4; + DWORD reserved2; +}; + +static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pixel_format) +{ + FIXME("Pixel format conversion not implemented.\n"); + return D3DFMT_UNKNOWN; +} + +/************************************************************ +* get_image_info_from_dds +* +* Fills a D3DXIMAGE_INFO structure with information +* about a DDS file stored in the memory. +* +* PARAMS +* buffer [I] pointer to DDS data +* length [I] size of DDS data +* info [O] pointer to D3DXIMAGE_INFO structure +* +* RETURNS +* Success: D3D_OK +* Failure: D3DXERR_INVALIDDATA +* +*/ +static HRESULT get_image_info_from_dds(const void *buffer, DWORD length, D3DXIMAGE_INFO *info) +{ + const struct dds_header *header = buffer; + + if (length < sizeof(*header) || !info) + return D3DXERR_INVALIDDATA; + + if (header->pixel_format.size != sizeof(header->pixel_format)) + return D3DXERR_INVALIDDATA; + + info->Width = header->width; + info->Height = header->height; + info->Depth = 1; + info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; + + info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); + if (info->Format == D3DFMT_UNKNOWN) + return D3DXERR_INVALIDDATA; + + if (header->caps2 & DDS_CAPS2_VOLUME) + { + info->Depth = header->depth; + info->ResourceType = D3DRTYPE_VOLUMETEXTURE; + } + else if (header->caps2 & DDS_CAPS2_CUBEMAP) + { + info->ResourceType = D3DRTYPE_CUBETEXTURE; + } + else + { + info->ResourceType = D3DRTYPE_TEXTURE; + } + + info->ImageFileFormat = D3DXIFF_DDS; + + return D3D_OK; +} + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -68,6 +192,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D if (!info) return D3D_OK; + if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) + return get_image_info_from_dds(data, datasize, info); + initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); @@ -81,9 +208,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D } if (FAILED(hr)) { - if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) - FIXME("File type DDS is not supported yet\n"); - else if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) + if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) FIXME("File type PPM is not supported yet\n"); else if ((datasize >= 2) && !strncmp(data, "BM", 2)) FIXME("File type DIB is not supported yet\n");

1 0

Dmitry Timoshkov : gdiplus: Add more traces to font APIs.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 542e30b5319c43a32034861f67b1b7dc4371c9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542e30b5319c43a32034861f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 1 15:47:51 2012 +0900 gdiplus: Add more traces to font APIs. --- dlls/gdiplus/font.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 8e61aba..7cc5910 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -316,6 +316,7 @@ GpStatus WINGDIPAPI GdipGetFontSize(GpFont *font, REAL *size) if (!(font && size)) return InvalidParameter; *size = font->emSize; + TRACE("%s,%d => %f\n", debugstr_w(font->lfw.lfFaceName), font->lfw.lfHeight, *size); return Ok; } @@ -372,6 +373,7 @@ GpStatus WINGDIPAPI GdipGetFontUnit(GpFont *font, Unit *unit) if (!(font && unit)) return InvalidParameter; *unit = font->unit; + TRACE("%s,%d => %d\n", debugstr_w(font->lfw.lfFaceName), font->lfw.lfHeight, *unit); return Ok; } @@ -412,6 +414,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, return InvalidParameter; *lfw = font->lfw; + TRACE("=> %s,%d\n", debugstr_w(font->lfw.lfFaceName), font->lfw.lfHeight); return Ok; } @@ -512,6 +515,9 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, return NotImplemented; } + TRACE("%s,%d(unit %d) => %f\n", + debugstr_w(font->lfw.lfFaceName), font->lfw.lfHeight, font->unit, *height); + return Ok; } @@ -705,6 +711,7 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, if (!(family && CellAscent)) return InvalidParameter; *CellAscent = family->otm.otmTextMetrics.tmAscent; + TRACE("%d => %u\n", family->otm.otmTextMetrics.tmHeight, *CellAscent); return Ok; } @@ -717,6 +724,7 @@ GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, if (!(family && CellDescent)) return InvalidParameter; *CellDescent = family->otm.otmTextMetrics.tmDescent; + TRACE("%d => %u\n", family->otm.otmTextMetrics.tmHeight, *CellDescent); return Ok; } @@ -742,6 +750,7 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U TRACE("%p (%s), %d, %p\n", family, debugstr_w(family->FamilyName), style, EmHeight); *EmHeight = family->otm.otmEMSquare; + TRACE("%d => %u\n", family->otm.otmTextMetrics.tmHeight, *EmHeight); return Ok; } @@ -772,6 +781,7 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, if (style) FIXME("ignoring style\n"); *LineSpacing = family->otm.otmTextMetrics.tmAscent + family->otm.otmTextMetrics.tmDescent + family->otm.otmTextMetrics.tmExternalLeading; + TRACE("%d => %u\n", family->otm.otmTextMetrics.tmHeight, *LineSpacing); return Ok; }

1 0

André Hentschel : d3drm/tests: Add tests for handling Visuals.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 782c543abb600e5525d531c4c2960f49d659dc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782c543abb600e5525d531c4c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 30 17:11:12 2012 +0200 d3drm/tests: Add tests for handling Visuals. --- dlls/d3drm/tests/d3drm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 36ae19d..e5ab519 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -407,6 +407,10 @@ static void test_Frame(void) LPDIRECT3DRMFRAME pFrameP2; LPDIRECT3DRMFRAME pFrameTmp; LPDIRECT3DRMFRAMEARRAY pArray; + LPDIRECT3DRMMESHBUILDER pMeshBuilder; + LPDIRECT3DRMVISUAL pVisual1; + LPDIRECT3DRMVISUAL pVisualTmp; + LPDIRECT3DRMVISUALARRAY pVisualArray; DWORD count; hr = pDirect3DRMCreate(&pD3DRM); @@ -595,6 +599,47 @@ static void test_Frame(void) IDirect3DRMFrameArray_Release(pArray); } + /* [Add/Delete]Visual with NULL pointer */ + hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + + hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + + /* Create Visual */ + hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + pVisual1 = (LPDIRECT3DRMVISUAL)pMeshBuilder; + + /* Add Visual to first parent */ + hr = IDirect3DRMFrame_AddVisual(pFrameP1, pVisual1); + ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pVisual1, 2); + + pVisualArray = NULL; + hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &pVisualArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr); + if (pVisualArray) + { + count = IDirect3DRMVisualArray_GetSize(pVisualArray); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMVisualArray_GetElement(pVisualArray, 0, &pVisualTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pVisualTmp == pVisual1, "pVisualTmp = %p\n", pVisualTmp); + IDirect3DRMVisual_Release(pVisualTmp); + IDirect3DRMVisualArray_Release(pVisualArray); + } + + /* Delete Visual */ + hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, pVisual1); + ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + IDirect3DRMMeshBuilder_Release(pMeshBuilder); + + /* Cleanup */ IDirect3DRMMeshBuilder_Release(pFrameP2); CHECK_REFCOUNT(pFrameC, 2); todo_wine CHECK_REFCOUNT(pFrameP1, 3);

1 0

André Hentschel : d3drm: Implement IDirect3DRMFrameX_DeleteVisual.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 154c1658d35d209910aba5437759d032fe49d9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154c1658d35d209910aba5437… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 30 17:10:48 2012 +0200 d3drm: Implement IDirect3DRMFrameX_DeleteVisual. --- dlls/d3drm/frame.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 2e98059..7f2497d 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -522,9 +522,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteVisual(IDirect3DRMFrame2* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, vis); + TRACE("(%p/%p)->(%p)\n", iface, This, vis); - return E_NOTIMPL; + return IDirect3DRMFrame3_DeleteVisual(&This->IDirect3DRMFrame3_iface, (LPUNKNOWN)vis); } static D3DCOLOR WINAPI IDirect3DRMFrame2Impl_GetSceneBackground(IDirect3DRMFrame2* iface) @@ -1448,10 +1448,26 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3 static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteVisual(IDirect3DRMFrame3* iface, LPUNKNOWN vis) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; + + TRACE("(%p/%p)->(%p)\n", iface, This, vis); - FIXME("(%p/%p)->(%p): stub\n", iface, This, vis); + if (!vis) + return D3DRMERR_BADOBJECT; - return E_NOTIMPL; + /* Check if visual exists */ + for (i = 0; i < This->nb_visuals; i++) + if (This->visuals[i] == (IDirect3DRMVisual*)vis) + break; + + if (i == This->nb_visuals) + return D3DRMERR_BADVALUE; + + memmove(This->visuals + i, This->visuals + i + 1, sizeof(IDirect3DRMVisual*) * (This->nb_visuals - 1 - i)); + IDirect3DRMVisual_Release(vis); + This->nb_visuals--; + + return D3DRM_OK; } static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetSceneBackground(IDirect3DRMFrame3* iface)

1 0

André Hentschel : d3drm: Implement IDirect3DRMFrameX_AddVisual.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: acfb249af6f1bc38d8d46f13b3f7d5e113e1b92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfb249af6f1bc38d8d46f13b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 30 17:10:27 2012 +0200 d3drm: Implement IDirect3DRMFrameX_AddVisual. --- dlls/d3drm/frame.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 55fa08b..2e98059 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -37,6 +37,9 @@ typedef struct { ULONG nb_children; ULONG children_capacity; IDirect3DRMFrame3** children; + ULONG nb_visuals; + ULONG visuals_capacity; + IDirect3DRMVisual** visuals; } IDirect3DRMFrameImpl; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) @@ -279,9 +282,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddVisual(IDirect3DRMFrame2* iface, { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, vis); + TRACE("(%p/%p)->(%p)\n", iface, This, vis); - return E_NOTIMPL; + return IDirect3DRMFrame3_AddVisual(&This->IDirect3DRMFrame3_iface, (LPUNKNOWN)vis); } static HRESULT WINAPI IDirect3DRMFrame2Impl_GetChildren(IDirect3DRMFrame2* iface, @@ -1169,10 +1172,45 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddRotation(IDirect3DRMFrame3* iface static HRESULT WINAPI IDirect3DRMFrame3Impl_AddVisual(IDirect3DRMFrame3* iface, LPUNKNOWN vis) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; + IDirect3DRMVisual** visuals; - FIXME("(%p/%p)->(%p): stub\n", iface, This, vis); + TRACE("(%p/%p)->(%p)\n", iface, This, vis); - return E_NOTIMPL; + if (!vis) + return D3DRMERR_BADOBJECT; + + /* Check if already existing and return gracefully without increasing ref count */ + for (i = 0; i < This->nb_visuals; i++) + if (This->visuals[i] == (IDirect3DRMVisual*)vis) + return D3DRM_OK; + + if ((This->nb_visuals + 1) > This->visuals_capacity) + { + ULONG new_capacity; + + if (!This->visuals_capacity) + { + new_capacity = 16; + visuals = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMVisual*)); + } + else + { + new_capacity = This->visuals_capacity * 2; + visuals = HeapReAlloc(GetProcessHeap(), 0, This->visuals, new_capacity * sizeof(IDirect3DRMVisual*)); + } + + if (!visuals) + return E_OUTOFMEMORY; + + This->visuals_capacity = new_capacity; + This->visuals = visuals; + } + + This->visuals[This->nb_visuals++] = (IDirect3DRMVisual*)vis; + IDirect3DRMVisual_AddRef(vis); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_GetChildren(IDirect3DRMFrame3* iface,

1 0

Austin English : shell32: Add a stub SHGetKnownFolderIDList.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: adc0518af74d79e45b68a4119d3532c6c4e8599e URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc0518af74d79e45b68a4119… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 30 17:52:12 2012 -0500 shell32: Add a stub SHGetKnownFolderIDList. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 2ac4310..29685e8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -374,6 +374,7 @@ @ stdcall SHGetInstanceExplorer(long) @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) +@ stdcall SHGetKnownFolderIDList(ptr long ptr ptr) @ stdcall SHGetKnownFolderPath(ptr long ptr ptr) @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index c883e64..800019f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4009,3 +4009,9 @@ HRESULT WINAPI KnownFolderManager_Constructor( IUnknown *punk, REFIID riid, void return foldermanager_create( ppv ); } + +HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PIDLIST_ABSOLUTE *pidl) +{ + FIXME("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); + return E_NOTIMPL; +}

1 0

Henri Verbeet : wined3d: Keep track of "all_vbo" in the stream info structure.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 42b835754b71f8a9cf29d186c68201f9a01d0863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b835754b71f8a9cf29d186c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 30 21:30:21 2012 +0200 wined3d: Keep track of "all_vbo" in the stream info structure. --- dlls/wined3d/device.c | 24 ++++++++++-------------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e477021..2f48027 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -171,8 +171,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) } /* Context activation is done by the caller. */ -void device_stream_info_from_declaration(struct wined3d_device *device, - struct wined3d_stream_info *stream_info, BOOL *all_vbo) +void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info) { const struct wined3d_state *state = &device->stateBlock->state; /* We need to deal with frequency data! */ @@ -297,8 +296,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (!state->user_stream) { WORD map = stream_info->use_map; - if (all_vbo) - *all_vbo = TRUE; + stream_info->all_vbo = 1; /* PreLoad all the vertex buffers. */ for (i = 0; map; map >>= 1, ++i) @@ -320,16 +318,16 @@ void device_stream_info_from_declaration(struct wined3d_device *device, + (ptrdiff_t)element->data.addr; } - if (!buffer->buffer_object && all_vbo) - *all_vbo = FALSE; + if (!buffer->buffer_object) + stream_info->all_vbo = 0; if (buffer->query) device->buffer_queries[device->num_buffer_queries++] = buffer->query; } } - else if (all_vbo) + else { - *all_vbo = FALSE; + stream_info->all_vbo = 0; } } @@ -406,7 +404,6 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined { struct wined3d_stream_info *stream_info = &device->strided_streams; const struct wined3d_state *state = &device->stateBlock->state; - BOOL all_vbo; if (device->up_strided) { @@ -414,17 +411,16 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined TRACE("=============================== Strided Input ================================\n"); device_stream_info_from_strided(gl_info, device->up_strided, stream_info); if (TRACE_ON(d3d)) device_trace_strided_stream_info(stream_info); - all_vbo = FALSE; } else { TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, stream_info, &all_vbo); + device_stream_info_from_declaration(device, stream_info); } if (state->vertex_shader && !stream_info->position_transformed) { - if (state->vertex_declaration->half_float_conv_needed && !all_vbo) + if (state->vertex_declaration->half_float_conv_needed && !stream_info->all_vbo) { TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); device->useDrawStridedSlow = TRUE; @@ -440,7 +436,7 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); - if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !all_vbo) + if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) { device->useDrawStridedSlow = TRUE; } @@ -3468,7 +3464,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->vertex_shader; state->vertex_shader = NULL; state->user_stream = FALSE; - device_stream_info_from_declaration(device, &stream_info, NULL); + device_stream_info_from_declaration(device, &stream_info); state->user_stream = streamWasUP; state->vertex_shader = vs; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6c67ada..3a2b26b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -813,7 +813,7 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct wined3d_rect_pat * the stateblock. Beware of VBOs. */ vs = state->vertex_shader; state->vertex_shader = NULL; - device_stream_info_from_declaration(This, &stream_info, NULL); + device_stream_info_from_declaration(This, &stream_info); state->vertex_shader = vs; e = &stream_info.elements[WINED3D_FFP_POSITION]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 92b259e..1e5f87c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -920,7 +920,8 @@ struct wined3d_stream_info_element struct wined3d_stream_info { struct wined3d_stream_info_element elements[MAX_ATTRIBS]; - BOOL position_transformed; + DWORD position_transformed : 1; + DWORD all_vbo : 1; WORD swizzle_map; /* MAX_ATTRIBS, 16 */ WORD use_map; /* MAX_ATTRIBS, 16 */ }; @@ -1802,7 +1803,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(struct wined3d_device *device, - struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; + struct wined3d_stream_info *stream_info) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3dx9: Cleanup parameter names for D3DXLoadSurfaceFromMemory().
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: b8f6c9cdb14f47edc5ada64480c1a164b8ddc1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f6c9cdb14f47edc5ada6448… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 30 21:30:20 2012 +0200 d3dx9: Cleanup parameter names for D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/surface.c | 99 ++++++++++++++++++++++++----------------------- include/d3dx9tex.h | 14 ++----- 2 files changed, 54 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8f6c9cdb14f47edc5ada…

1 0

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 May 2012