January 2013 - Wine-Commits

Vincent Povirk : winex11.drv: Flush property notify events before deleting properties.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 47217eaa8357df49a4eb1751319b207e3a1f3c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47217eaa8357df49a4eb17513… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 3 17:00:40 2013 -0600 winex11.drv: Flush property notify events before deleting properties. --- dlls/winex11.drv/clipboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 1da3a22..0df355a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2360,12 +2360,12 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (prop == None) return FALSE; - if (!X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, data, datasize)) - return FALSE; - while (XCheckTypedWindowEvent(display, w, PropertyNotify, &xe)) ; + if (!X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, data, datasize)) + return FALSE; + if (atype == x11drv_atom(INCR)) { unsigned char *buf = *data;

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileImpl_RegisterTemplates + tests.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: b742b98c55cb775066768b7f86b883cc1ca9ce3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b742b98c55cb775066768b7f8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jan 4 09:45:08 2013 +0100 d3dx9_36: Implement ID3DXFileImpl_RegisterTemplates + tests. --- dlls/d3dx9_36/tests/xfile.c | 59 ++++++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/xfile.c | 48 +++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 5500949..08a2ae1 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -20,16 +20,67 @@ #include "d3dx9.h" #include "d3dx9xof.h" -START_TEST(xfile) +char templates_bad_file_type1[] = +"xOf 0302txt 0064\n"; + +char templates_bad_file_version[] = +"xof 0102txt 0064\n"; + +char templates_bad_file_type2[] = +"xof 0302foo 0064\n"; + +char templates_bad_file_float_size[] = +"xof 0302txt 0050\n"; + +char templates_parse_error[] = +"xof 0302txt 0064" +"foobar;\n"; + +char templates[] = +"xof 0302txt 0064" +"template Header" +"{" +"<3D82AB43-62DA-11CF-AB39-0020AF71E433>" +"WORD major;" +"WORD minor;" +"DWORD flags;" +"}\n"; + + +void test_templates(void) { - ID3DXFile *file; + ID3DXFile *d3dxfile; HRESULT ret; ret = D3DXFileCreate(NULL); ok(ret == E_POINTER, "D3DXCreateFile returned %#x, expected %#x\n", ret, E_POINTER); - ret = D3DXFileCreate(&file); + ret = D3DXFileCreate(&d3dxfile); ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); - file->lpVtbl->Release(file); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_type1, (SIZE_T)(sizeof(templates_bad_file_type1) - 1)); + ok(ret == D3DXFERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILETYPE); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_version, (SIZE_T)(sizeof(templates_bad_file_version) - 1)); + ok(ret == D3DXFERR_BADFILEVERSION, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEVERSION); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_type2, (SIZE_T)(sizeof(templates_bad_file_type2) - 1)); + ok(ret == D3DXFERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILETYPE); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_float_size, (SIZE_T)(sizeof(templates_bad_file_float_size) - 1)); + ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_parse_error, (SIZE_T)(sizeof(templates_parse_error) - 1)); + todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates, (SIZE_T)(sizeof(templates) - 1)); + ok(ret == S_OK, "RegisterTemplates with %#x\n", ret); + + d3dxfile->lpVtbl->Release(d3dxfile); +} + + +START_TEST(xfile) +{ + test_templates(); } diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index ba04857..5d4d6aa 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -21,12 +21,33 @@ #include "d3dx9.h" #include "d3dx9xof.h" +#undef MAKE_DDHRESULT +#include "dxfile.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT error_dxfile_to_d3dxfile(HRESULT error) +{ + switch (error) + { + case DXFILEERR_BADFILETYPE: + return D3DXFERR_BADFILETYPE; + case DXFILEERR_BADFILEVERSION: + return D3DXFERR_BADFILEVERSION; + case DXFILEERR_BADFILEFLOATSIZE: + return D3DXFERR_BADFILEFLOATSIZE; + case DXFILEERR_PARSEERROR: + return D3DXFERR_PARSEERROR; + default: + FIXME("Cannot map error %#x\n", error); + return E_FAIL; + } +} + typedef struct { ID3DXFile ID3DXFile_iface; LONG ref; + IDirectXFile *dxfile; } ID3DXFileImpl; @@ -75,7 +96,10 @@ static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) TRACE("(%p)->(): new ref %d\n", iface, ref); if (!ref) + { + IDirectXFile_Release(This->dxfile); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -101,9 +125,19 @@ static HRESULT WINAPI ID3DXFileImpl_CreateSaveObject(ID3DXFile *iface, const voi static HRESULT WINAPI ID3DXFileImpl_RegisterTemplates(ID3DXFile *iface, const void *data, SIZE_T size) { - FIXME("(%p)->(%p, %lu): stub\n", iface, data, size); + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p, %lu)\n", iface, data, size); + + ret = IDirectXFile_RegisterTemplates(This->dxfile, (void*)data, size); + if (ret != DXFILE_OK) + { + WARN("Error %#x\n", ret); + return error_dxfile_to_d3dxfile(ret); + } + + return S_OK; } @@ -129,6 +163,7 @@ static const ID3DXFileVtbl ID3DXFile_Vtbl = HRESULT WINAPI D3DXFileCreate(ID3DXFile **d3dxfile) { ID3DXFileImpl *object; + HRESULT ret; TRACE("(%p)\n", d3dxfile); @@ -141,6 +176,15 @@ HRESULT WINAPI D3DXFileCreate(ID3DXFile **d3dxfile) if (!object) return E_OUTOFMEMORY; + ret = DirectXFileCreate(&object->dxfile); + if (ret != S_OK) + { + HeapFree(GetProcessHeap(), 0, object); + if (ret == E_OUTOFMEMORY) + return ret; + return E_FAIL; + } + object->ID3DXFile_iface.lpVtbl = &ID3DXFile_Vtbl; object->ref = 1;

1 0

Christian Costa : d3drm: Remove unused variable.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 1adda4cfbc9be7f5f95897429cb3cea44562cc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adda4cfbc9be7f5f95897429… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jan 4 09:45:34 2013 +0100 d3drm: Remove unused variable. --- dlls/d3drm/meshbuilder.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a07ce54..b7883ba 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1563,7 +1563,6 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* LPDIRECTXFILE pDXFile = NULL; LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEDATA pData = NULL; - LPDIRECTXFILEDATA pData2 = NULL; const GUID* pGuid; DWORD size; Header* pHeader; @@ -1659,8 +1658,6 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* end: - if (pData2) - IDirectXFileData_Release(pData2); if (pData) IDirectXFileData_Release(pData); if (pEnumObject)

1 0

Henri Verbeet : ddraw: Avoid LPD3DVIEWPORT.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 29cb3c1d90cabedbb78535ea79594601907de29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cb3c1d90cabedbb78535ea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:02:58 2013 +0100 ddraw: Avoid LPD3DVIEWPORT. --- include/d3d.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fcd8e31..72b73d1 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -653,8 +653,8 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; @@ -721,8 +721,8 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; @@ -797,8 +797,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE;

1 0

Henri Verbeet : wined3d: state-> user_stream is always FALSE in device_stream_info_from_declaration().
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 76a2864a3b29b4688f941dd09c4e1fe3f5d4cc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a2864a3b29b4688f941dd09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:02:59 2013 +0100 wined3d: state->user_stream is always FALSE in device_stream_info_from_declaration(). Since user pointer draws were removed, state->user_stream will only ever be set for "strided" draws, and device_stream_info_from_declaration() is never called for those. --- dlls/wined3d/device.c | 94 +++++++++++++++++++----------------------------- 1 files changed, 37 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42cd226..8852472 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -181,9 +181,11 @@ void device_stream_info_from_declaration(struct wined3d_device *device, struct w struct wined3d_vertex_declaration *declaration = state->vertex_declaration; BOOL use_vshader; unsigned int i; + WORD map; stream_info->use_map = 0; stream_info->swizzle_map = 0; + stream_info->all_vbo = 1; /* Check for transformed vertices, disable vertex shader if present. */ stream_info->position_transformed = declaration->position_transformed; @@ -205,37 +207,25 @@ void device_stream_info_from_declaration(struct wined3d_device *device, struct w if (!buffer) continue; - data.buffer_object = 0; - data.addr = NULL; - stride = stream->stride; - if (state->user_stream) + + TRACE("Stream %u, buffer %p.\n", element->input_slot, buffer); + buffer_get_memory(buffer, &device->adapter->gl_info, &data); + + /* We can't use VBOs if the base vertex index is negative. OpenGL + * doesn't accept negative offsets (or rather offsets bigger than the + * VBO, because the pointer is unsigned), so use system memory + * sources. In most sane cases the pointer - offset will still be > 0, + * otherwise it will wrap around to some big value. Hope that with the + * indices, the driver wraps it back internally. If not, + * drawStridedSlow() is needed, including a vertex buffer path. */ + if (state->load_base_vertex_index < 0) { - TRACE("Stream %u is UP, %p\n", element->input_slot, buffer); + WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); data.buffer_object = 0; - data.addr = (BYTE *)buffer; - } - else - { - TRACE("Stream %u isn't UP, %p\n", element->input_slot, buffer); - buffer_get_memory(buffer, &device->adapter->gl_info, &data); - - /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets - * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory - * sources. In most sane cases the pointer - offset will still be > 0, otherwise it will wrap - * around to some big value. Hope that with the indices, the driver wraps it back internally. If - * not, drawStridedSlow is needed, including a vertex buffer path. */ - if (state->load_base_vertex_index < 0) - { - WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", - state->load_base_vertex_index); - data.buffer_object = 0; - data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); - if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) - { - FIXME("System memory vertex data load offset is negative!\n"); - } - } + data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); + if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) + FIXME("System memory vertex data load offset is negative!\n"); } data.addr += element->offset; @@ -295,42 +285,32 @@ void device_stream_info_from_declaration(struct wined3d_device *device, struct w } } + /* Preload the vertex buffers. */ device->num_buffer_queries = 0; - if (!state->user_stream) + for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) { - WORD map = stream_info->use_map; - stream_info->all_vbo = 1; - - /* PreLoad all the vertex buffers. */ - for (i = 0; map; map >>= 1, ++i) - { - struct wined3d_stream_info_element *element; - struct wined3d_buffer *buffer; + struct wined3d_stream_info_element *element; + struct wined3d_buffer *buffer; - if (!(map & 1)) continue; + if (!(map & 1)) + continue; - element = &stream_info->elements[i]; - buffer = state->streams[element->stream_idx].buffer; - wined3d_buffer_preload(buffer); + element = &stream_info->elements[i]; + buffer = state->streams[element->stream_idx].buffer; + wined3d_buffer_preload(buffer); - /* If the preload dropped the buffer object, update the stream info. */ - if (buffer->buffer_object != element->data.buffer_object) - { - element->data.buffer_object = 0; - element->data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info) - + (ptrdiff_t)element->data.addr; - } + /* If the preload dropped the buffer object, update the stream info. */ + if (buffer->buffer_object != element->data.buffer_object) + { + element->data.buffer_object = 0; + element->data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info) + (ptrdiff_t)element->data.addr; + } - if (!buffer->buffer_object) - stream_info->all_vbo = 0; + if (!buffer->buffer_object) + stream_info->all_vbo = 0; - if (buffer->query) - device->buffer_queries[device->num_buffer_queries++] = buffer->query; - } - } - else - { - stream_info->all_vbo = 0; + if (buffer->query) + device->buffer_queries[device->num_buffer_queries++] = buffer->query; } }

1 0

Dmitry Timoshkov : windowscodecs: Implement ComponentFactory_CreateBitmapFromMemory.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 03724685d64a8be97e11c27f2039824837134d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03724685d64a8be97e11c27f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 4 18:05:30 2013 +0800 windowscodecs: Implement ComponentFactory_CreateBitmapFromMemory. --- dlls/windowscodecs/bitmap.c | 11 ++++++++--- dlls/windowscodecs/imgfactory.c | 18 +++++++++++------- dlls/windowscodecs/tests/bitmap.c | 13 ++++--------- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 520fdef..f8904df 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -447,19 +447,23 @@ static const IWICBitmapVtbl BitmapImpl_Vtbl = { }; HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + UINT stride, UINT datasize, BYTE *bits, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { HRESULT hr; BitmapImpl *This; - UINT bpp, stride, datasize; BYTE *data; + UINT bpp; hr = get_pixelformat_bpp(pixelFormat, &bpp); if (FAILED(hr)) return hr; - stride = (((bpp*uiWidth)+31)/32)*4; - datasize = stride * uiHeight; + if (!stride) stride = (((bpp*uiWidth)+31)/32)*4; + if (!datasize) datasize = stride * uiHeight; + + if (datasize < stride * uiHeight) return WINCODEC_ERR_INSUFFICIENTBUFFER; + if (stride < ((bpp*uiWidth)+7)/8) return E_INVALIDARG; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); @@ -469,6 +473,7 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, HeapFree(GetProcessHeap(), 0, data); return E_OUTOFMEMORY; } + if (bits) memcpy(data, bits, datasize); This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->ref = 1; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 54b390b..1d05ef5 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -459,7 +460,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, { TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, debugstr_guid(pixelFormat), option, ppIBitmap); - return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, @@ -506,7 +507,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto } if (SUCCEEDED(hr)) - hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); + hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); if (SUCCEEDED(hr)) { @@ -576,12 +577,15 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSourceRect(IWICComponentF } static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFactory *iface, - UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, UINT cbStride, - UINT cbBufferSize, BYTE *pbBuffer, IWICBitmap **ppIBitmap) + UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, + UINT size, BYTE *buffer, IWICBitmap **bitmap) { - FIXME("(%p,%u,%u,%s,%u,%u,%p,%p): stub\n", iface, uiWidth, uiHeight, - debugstr_guid(pixelFormat), cbStride, cbBufferSize, pbBuffer, ppIBitmap); - return E_NOTIMPL; + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, + debugstr_guid(format), stride, size, buffer, bitmap); + + if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; + + return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index af0446c..f2f9cb6 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -439,34 +439,27 @@ static void test_CreateBitmapFromMemory(void) hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 0, 0, NULL, &bitmap); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 0, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 6, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 12, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 9, sizeof(data3x3) - 1, data3x3, &bitmap); -todo_wine ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 9, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); - if (hr != S_OK) return; hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); @@ -486,7 +479,6 @@ todo_wine hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 2, &GUID_WICPixelFormat24bppBGR, 13, sizeof(orig_data3x3), orig_data3x3, &bitmap); ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); - if (hr != S_OK) return; hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); @@ -497,7 +489,10 @@ todo_wine hr = IWICBitmap_CopyPixels(bitmap, NULL, 13, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); + if ((i % 13) < 9) + ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); + else + todo_wine ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); IWICBitmap_Release(bitmap); } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 6857176..f8b7789 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -45,6 +45,7 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + UINT stride, UINT datasize, BYTE *bits, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 73df62c95b089a5093f0213ac756a038ed3351ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=73df62c95b089a5093f0213ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 4 00:54:06 2013 +0100 po: Update French translation. --- po/fr.po | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/po/fr.po b/po/fr.po index 86738bc..194a8a4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-12-19 21:13+0100\n" +"PO-Revision-Date: 2013-01-03 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3564,7 +3564,7 @@ msgstr "Constante chaîne de caractères non clôturée" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "Instruction « return » en dehors d'une fonction" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -8320,6 +8320,9 @@ msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Lorsqu'il est installé, ActiveX a un accès complet à votre ordinateur. Ne " +"cliquez pas sur le bouton d'installation à moins d'avoir une confiance " +"absolue dans la source ci-dessus." #: urlmon.rc:47 msgid "Installation of component failed: %08x" @@ -10231,32 +10234,32 @@ msgstr " (Oui|Non|Tous)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"Ne reconnaît pas « %1 » comme commande interne ou externe, ou fichier de " +"Ne reconnaît pas « %1 » comme commande interne ou externe, ou fichier de " "traitement par lots.\n" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "Erreur de division par zéro.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "Opérande attendu.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Erreur réseau inattendue.\n" +msgstr "Opérateur attendu.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "Discordance des parenthèses.\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"Nombre mal formé : doit être décimal (12),\n" +" hexadécimal (0x34) ou octal (056).\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10527,32 +10530,24 @@ msgid "DELETE_TCB" msgstr "" #: netstat.rc:40 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Connexion réseau local (LAN)" +msgstr "Connexions actives" #: netstat.rc:41 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:42 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Adresse électronique" +msgstr "Adresse locale" #: netstat.rc:43 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Adresse" +msgstr "Adresse distante" #: netstat.rc:44 -#, fuzzy -#| msgid "Status" msgid "State" -msgstr "Statut" +msgstr "État" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Jacek Caban : atl80: Added AtlComModuleRegisterServer implementation ( based on AtlModuleRegisterServer).
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: cc18fc0f1419ef0d029ca5acc2a85979c7684e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc18fc0f1419ef0d029ca5acc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 11:33:50 2013 +0100 atl80: Added AtlComModuleRegisterServer implementation (based on AtlModuleRegisterServer). --- dlls/atl80/atl80.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/atl80/atl80.spec | 2 +- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index c85f75e..278d736 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -26,6 +26,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); /*********************************************************************** + * AtlRegisterTypeLib [atl80.18] + */ +HRESULT WINAPI AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) +{ + const struct _ATL_CATMAP_ENTRY *catmap; + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p %x %s)\n", mod, bRegTypeLib, debugstr_guid(clsid)); + + for(iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) { + if(!clsid || IsEqualCLSID((*iter)->pclsid, clsid)) { + TRACE("Registering clsid %s\n", debugstr_guid((*iter)->pclsid)); + hres = (*iter)->pfnUpdateRegistry(TRUE); + if(FAILED(hres)) + return hres; + + catmap = (*iter)->pfnGetCategoryMap(); + if(catmap) { + hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, TRUE); + if(FAILED(hres)) + return hres; + } + } + } + + if(bRegTypeLib) { + hres = AtlRegisterTypeLib(mod->m_hInstTypeLib, NULL); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} + +/*********************************************************************** * AtlRegisterTypeLib [atl80.19] */ HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index e4d73f1..5c5967e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stub AtlComModuleRegisterClassObjects -18 stub AtlComModuleRegisterServer(ptr long ptr) +18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stub AtlComModuleRevokeClassObjects 22 stub AtlComModuleUnregisterServer

1 0

Andrew Talbot : d3dxof: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 4, 2013

Jan. 4, 2013

Module: wine Branch: master Commit: 1af386218638dd5c593b2b7b756054b1fda42292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af386218638dd5c593b2b7b7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 3 22:46:51 2013 +0000 d3dxof: Avoid signed-unsigned integer comparisons. --- dlls/d3dxof/d3dxof.c | 8 ++++---- dlls/d3dxof/parsing.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index bbdfe64..c865fd8 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -248,7 +248,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (TRACE_ON(d3dxof)) { - int i; + ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 0; i < This->nb_xtemplates; i++) DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); @@ -326,7 +326,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (TRACE_ON(d3dxof)) { - int i; + ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 0; i < This->nb_xtemplates; i++) DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); @@ -616,7 +616,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS if (szMember) { - int i; + ULONG i; for (i = 0; i < This->pobj->nb_members; i++) if (!strcmp(This->pobj->members[i].name, szMember)) break; @@ -968,7 +968,7 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i if (!ref) { - int i; + ULONG i; for (i = 0; i < This->nb_xobjects; i++) IDirectXFileData_Release(This->pRefObjects[i]); if (This->mapped_memory) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 0bef29d..16621ff 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -124,7 +124,7 @@ static const char* get_primitive_string(WORD token) static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) { - int j, k; + ULONG j, k; GUID* clsid; clsid = &ptemplate->class_id; @@ -1171,15 +1171,15 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional); static BOOL parse_object_members_list(parse_buffer * buf) { DWORD token; - int i; + ULONG i; xtemplate* pt = buf->pxt[buf->level]; buf->pxo->nb_members = pt->nb_members; for (i = 0; i < pt->nb_members; i++) { - int k; - int nb_elems = 1; + ULONG k; + ULONG nb_elems = 1; buf->pxo->members[i].name = pt->members[i].name; buf->pxo->members[i].start = buf->cur_pos_data; @@ -1192,7 +1192,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) nb_elems *= *(DWORD*)(buf->pxo->root->pdata + buf->pxo->members[pt->members[i].dim_value[k]].start); } - TRACE("Elements to consider: %d\n", nb_elems); + TRACE("Elements to consider: %u\n", nb_elems); for (k = 0; k < nb_elems; k++) { @@ -1213,7 +1213,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) if (pt->members[i].type == TOKEN_NAME) { - int j; + ULONG j; TRACE("Found sub-object %s\n", buf->pdxf->xtemplates[pt->members[i].idx_template].name); buf->level++; @@ -1351,7 +1351,7 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { if (check_TOKEN(buf) == TOKEN_OBRACE) { - int i, j; + ULONG i, j; get_TOKEN(buf); if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; @@ -1423,7 +1423,7 @@ _exit: BOOL parse_object(parse_buffer * buf) { - int i; + ULONG i; buf->pxo->pos_data = buf->cur_pos_data; buf->pxo->ptarget = NULL;

1 0

André Hentschel : More german translation fixes
by Jeremy Newman Jan. 4, 2013

Jan. 4, 2013

Module: website Branch: master Commit: 675837174e57bd54c542a4118a500bab88a4685d URL: http://source.winehq.org/git/website.git/?a=commit;h=675837174e57bd54c542a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 4 17:59:41 2013 +0100 More german translation fixes Julian Rüger spotted some more :D --- news/de/2012122101.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/news/de/2012122101.xml b/news/de/2012122101.xml index 45fc1aa..2907034 100644 --- a/news/de/2012122101.xml +++ b/news/de/2012122101.xml @@ -5,11 +5,11 @@ Die Entwicklungsversion 1.5.20 von Wine ist jetzt verfügbar. <a href="{$root}/announce/1.5.20">Neuerungen (en)</a> in dieser Version: <ul> - <li>Ein haufen DLLs mit hässlichen Namen für die API Set Unterstützung.</li> - <li>Mehr implementierte ATL Funktionen.</li> - <li>Schonwieder mehr C++ Runtime Funktionen.</li> - <li>Mehere Text Render Fehlerbehebungen.</li> - <li>PostScript Treiber Verbesserungen.</li> + <li>Ein Haufen DLLs mit hässlichen Namen für die API Set Unterstützung.</li> + <li>Mehr implementierte ATL-Funktionen.</li> + <li>Schon wieder mehr C++ Runtime Funktionen.</li> + <li>Mehrere Text Render Fehlerbehebungen.</li> + <li>PostScript-Treiber Verbesserungen.</li> <li>Verschiedene Fehlerbehebungen.</li> </ul> Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.20.tar.bz2">verfügbar</a>.

1 0