September 2018 - Wine-commits

Henri Verbeet : wined3d: Get rid of the "attribute_size" field in struct wined3d_format.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: ccbee769a428cf2de546619790ea563cea3ec3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbee769a428cf2de5466197… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 10 01:20:45 2018 +0430 wined3d: Get rid of the "attribute_size" field in struct wined3d_format. Note that "byte_count" is 4 for R10G10B10X2_UINT/R10G10B10X2_SNORM, while "attribute_size" is 6. I think 4 is correct. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 35 ----------------------------------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f381b2e..e20d66c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -309,7 +309,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, } data = ((DWORD_PTR)attrib->data.addr) % buffer->stride; - for (i = 0; i < format->attribute_size; ++i) + for (i = 0; i < format->byte_count; ++i) { DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6f13f91..961e3fe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3665,34 +3665,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } -static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) -{ - switch (type) - { - case GL_HALF_FLOAT: - return component_count * sizeof(GLhalfNV); - case GL_FLOAT: - return component_count * sizeof(GLfloat); - case GL_BYTE: - return component_count * sizeof(GLbyte); - case GL_UNSIGNED_BYTE: - return component_count * sizeof(GLubyte); - case GL_SHORT: - return component_count * sizeof(GLshort); - case GL_UNSIGNED_SHORT: - return component_count * sizeof(GLushort); - case GL_INT: - return component_count * sizeof(GLint); - case GL_UNSIGNED_INT: - return component_count * sizeof(GLuint); - case GL_UNSIGNED_INT_2_10_10_10_REV: - return sizeof(GLuint); - default: - FIXME("Unhandled GL type %#x.\n", type); - return 0; - } -} - static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { @@ -3712,13 +3684,6 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format_vertex_info[i].component_count; format->gl_normalized = format_vertex_info[i].gl_normalized; - if (!(format->attribute_size = calculate_vertex_attribute_size(format->gl_vtx_type, - format->component_count))) - { - ERR("Invalid attribute size for vertex format %s (%#x).\n", - debug_d3dformat(format_vertex_info[i].id), format_vertex_info[i].id); - return FALSE; - } } return TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c050a6d..89329d4 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -315,7 +315,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].usage_idx = usage_idx; format = wined3d_get_format(state->adapter, format_id, 0); - state->offset += format->attribute_size; + state->offset += format->byte_count; ++state->idx; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7084168..9dd3cd2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4346,7 +4346,6 @@ struct wined3d_format GLenum gl_vtx_type; GLint gl_vtx_format; GLboolean gl_normalized; - unsigned int attribute_size; GLint glInternal; GLint glGammaInternal;

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateMFByteStreamOnStream.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 6e8e32bb57fc01840b65200ce0ab90c7177e2e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8e32bb57fc01840b65200c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 7 00:58:39 2018 +0000 mfplat: Implement MFCreateMFByteStreamOnStream. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45372 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 241 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 24 +++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c36a5ef..2d87429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -32,6 +32,7 @@ #include "mfidl.h" #include "mferror.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -441,6 +442,246 @@ HRESULT WINAPI MFShutdown(void) return S_OK; } + +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1b33e2d..1d64420 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -45,7 +45,7 @@ @ stdcall MFCreateEventQueue(ptr) @ stub MFCreateFile @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer -@ stub MFCreateMFByteStreamOnStream +@ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stub MFCreateMediaEvent diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f3a4521..f4b5014 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -37,6 +37,7 @@ #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -194,6 +195,7 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateSourceResolver); + X(MFCreateMFByteStreamOnStream); #undef X } @@ -250,6 +252,27 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); } +static void test_MFCreateMFByteStreamOnStream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IMFByteStream_Release(bytestream); +} START_TEST(mfplat) { @@ -261,6 +284,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFCreateMFByteStreamOnStream(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 12b351d..84be055 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -251,6 +251,7 @@ interface IMFGetService : IUnknown } cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);")

1 0

Zebediah Figura : msi: Add exception handling around all custom action RPC calls.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: baea371c3d4153bc4a718c07f46971d4d39aa9f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baea371c3d4153bc4a718c07… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 7 20:17:22 2018 -0500 msi: Add exception handling around all custom action RPC calls. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 13 +++- dlls/msi/custom.c | 5 ++ dlls/msi/format.c | 21 +++++- dlls/msi/install.c | 195 +++++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msi.c | 12 +++- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 92 ++++++++++++++++++++++--- dlls/msi/package.c | 57 +++++++++++++-- dlls/msi/suminfo.c | 12 +++- 9 files changed, 363 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=baea371c3d4153bc4a71…

1 0

Dmitry Timoshkov : msi/tests: Add some tests for remote MSI summary info APIs.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 4acd7b6c45faa960aee3d753d2979315ad4d2b46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4acd7b6c45faa960aee3d753… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Sep 8 11:45:02 2018 +0800 msi/tests: Add some tests for remote MSI summary info APIs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6332d68..1cf2453 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -30,6 +30,7 @@ #include <msxml.h> #include <msi.h> #include <msiquery.h> +#include <msidefs.h> static int todo_level, todo_do_loop; @@ -279,7 +280,9 @@ static void test_db(MSIHANDLE hinst) MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r; + UINT r, count, type; + INT int_value; + FILETIME ft; hdb = MsiGetActiveDatabase(hinst); ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); @@ -452,6 +455,53 @@ static void test_db(MSIHANDLE hinst) r = MsiGetSummaryInformationA(hdb, NULL, 1, &suminfo); ok(hinst, !r, "got %u\n", r); + r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + count = 0xdeadbeef; + r = MsiSummaryInfoGetPropertyCount(suminfo, &count); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, count == 5, "got %u\n", count); + + r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); +todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r);

1 0

Dmitry Timoshkov : msi: Handle the remote case in MsiSummaryInfoSetProperty.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 190ef475fa3164d2f468d5b09c58c8150d30f129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=190ef475fa3164d2f468d5b0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Sep 8 11:45:15 2018 +0800 msi: Handle the remote case in MsiSummaryInfoSetProperty. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/suminfo.c | 20 ++++++++++++++++++++ dlls/msi/tests/custom.c | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index e796a69..8c844a6 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -836,7 +836,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = TRUE; str.str.w = szValue; @@ -867,7 +877,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = FALSE; str.str.a = szValue; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 1cf2453..0ba5f10 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -499,7 +499,9 @@ todo_wine ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); -todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + + r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); r = MsiCloseHandle(suminfo);

1 0

Dmitry Timoshkov : msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 00b8b3c5e0e04d229cfb9f8d8294113e5b30e9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b8b3c5e0e04d229cfb9f8d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Sep 8 11:45:35 2018 +0800 msi: Handle the remote case in MsiSummaryInfoGetPropertyCount. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/suminfo.c | 25 ++++++++++++++++++++++++- dlls/msi/tests/custom.c | 3 --- dlls/msi/winemsi.idl | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 8c844a6..d2bf678 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -600,7 +600,25 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount) si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) - return ERROR_INVALID_HANDLE; + { + MSIHANDLE remote; + UINT ret; + + if (!(remote = msi_get_remote( hSummaryInfo ))) + return ERROR_INVALID_HANDLE; + + __TRY + { + ret = remote_SummaryInfoGetPropertyCount( remote, pCount ); + } + __EXCEPT(rpc_filter) + { + ret = GetExceptionCode(); + } + __ENDTRY + + return ret; + } if( pCount ) *pCount = get_property_count( si->property ); @@ -1127,3 +1145,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package ) msiobj_release( &si->hdr ); return r; } + +UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *count ) +{ + return MsiSummaryInfoGetPropertyCount( suminfo, count ); +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0ba5f10..eb0ed62 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -456,14 +456,11 @@ static void test_db(MSIHANDLE hinst) ok(hinst, !r, "got %u\n", r); r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); -todo_wine ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); count = 0xdeadbeef; r = MsiSummaryInfoGetPropertyCount(suminfo, &count); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, count == 5, "got %u\n", count); r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 50f62fc..5a14ffd 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -74,6 +74,8 @@ interface IWineMsiRemote UINT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); + UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count ); + MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value );

1 0

Julian Rüger : German translation for release 3.13
by Jeremy Newman 10 Sep '18

10 Sep '18

Module: website Branch: master Commit: 39216f16e30bc99f452c137f1406a9cbd35b1a19 URL: https://source.winehq.org/git/website.git/?a=commit;h=39216f16e30bc99f452c1… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Sep 10 17:43:09 2018 +0200 German translation for release 3.13 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018072001.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2018072001.xml b/news/de/2018072001.xml new file mode 100644 index 0000000..b3cf6ad --- /dev/null +++ b/news/de/2018072001.xml @@ -0,0 +1,18 @@ +<news> +<date>20. Juli 2018</date> +<title>Wine 3.13 freigegeben</title> +<body> + Die Entwicklungsversion 3.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Vulkan-Unterstützung unter macOS durch MoltenVK.</li> + <li>Anfängliche Unterstützung von Performance-Daten in der Registrierung.</li> + <li>Update der Mono-Engine mit einigen Fehlerkorrekturen.</li> + <li>Unterstützung für das Auslesen von BIOS-Informationen unter Linux.</li> + <li>GnuTLS wird nun auch unter macOS benutzt, falls verfügbar.</li> + <li>Verbesserungen am Standard-Taskdialog.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.14
by Jeremy Newman 10 Sep '18

10 Sep '18

Module: website Branch: master Commit: 5642ac69e56d6d64922f7c440d3b43444496974b URL: https://source.winehq.org/git/website.git/?a=commit;h=5642ac69e56d6d64922f7… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Sep 10 17:49:25 2018 +0200 German translation for release 3.14 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018081701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2018081701.xml b/news/de/2018081701.xml new file mode 100644 index 0000000..be0127a --- /dev/null +++ b/news/de/2018081701.xml @@ -0,0 +1,17 @@ +<news> +<date>17. August 2018</date> +<title>Wine 3.14 freigegeben</title> +<body> + Die Entwicklungsversion 3.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von DXTn-Texturkomprimierung.</li> + <li>Unterstützung der MSI-Installationsaktion "Aufschub" (Deferral).</li> + <li>Unterstützung von japanischen Tastaturen in DirectInput.</li> + <li>Weitere Verbesserungen am Standard-Taskdialog.</li> + <li>Einige zusätzliche Icons in Shell32.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.14.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for the SteamPlay announcement
by Jeremy Newman 10 Sep '18

10 Sep '18

Module: website Branch: master Commit: 896f3ededffc4c7195f7f921a1d8cb4060d0e09c URL: https://source.winehq.org/git/website.git/?a=commit;h=896f3ededffc4c7195f7f… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Sep 10 18:14:31 2018 +0200 German translation for the SteamPlay announcement Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018082301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018082301.xml b/news/de/2018082301.xml new file mode 100644 index 0000000..a445fb6 --- /dev/null +++ b/news/de/2018082301.xml @@ -0,0 +1,16 @@ +<news> + <date>23. August 2018</date> + <title>Valve veröffentlicht SteamPlay für Linux</title> + <body> + Valve hat am Freitag die <a href="http://steamcommunity.com/games/221410/announcements/detail/169605585573935…">SteamPlay Beta</a> für Linux veröffentlicht, welche eine modifizierte Version von Wine verwendet, um Kompatibilität mit Spieletiteln für Windows anbieten zu können. Die darin enthaltenen Verbesserungen an Wine wurden von Valve konzipiert und finanziert, in gemeinsamer Entwicklung mit <a href="https://www.codeweavers.com/about/blogs/jwhite/2018/8/22/wine-and-steam-a-m…">CodeWeavers</a>. + Einige Beispiele, an denen seit 2016 gemeinsam gearbeitet wurde, sind: + <ul> + <li><a href="https://source.winehq.org/git/vkd3d.git/">vkd3d</a>, die Direct3D-12-Implementierung basierend auf Vulkan</li> + <li>Die nativen OpenVR- und Steamworks-API-Brücken</li> + <li>Viele Geschwindigkeits- und Funktionalitätskorrekturen für Direct3D 9 und Direct3D 11</li> + <li>Überarbeitete Vollbild- und Gamepad-Unterstützung</li> + <li>Das "<a href="https://github.com/zfigura/wine/blob/esync/">esync</a>"-Patchset für verbesserte Multithread-Performance</li> + </ul> + Proton, das Werkzeug mit dessen Hilfe SteamPlay Windows-Kompatibilität anbietet, enthält eine angepasste Version von Wine sowie zusätzliche Bibliotheken, die parallel dazu entwickelt wurden. Es ist vollständig Open-Source und <a href="https://github.com/ValveSoftware/Proton">auf GitHub</a> verfügbar. + </body> +</news>

1 0

Julian Rüger : German translation for release 3.15
by Jeremy Newman 10 Sep '18

10 Sep '18

Module: website Branch: master Commit: 10eee743c0a10926525e481a8bf5219f456c9fb2 URL: https://source.winehq.org/git/website.git/?a=commit;h=10eee743c0a10926525e4… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Sep 10 18:18:08 2018 +0200 German translation for release 3.15 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018083101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2018083101.xml b/news/de/2018083101.xml new file mode 100644 index 0000000..743213f --- /dev/null +++ b/news/de/2018083101.xml @@ -0,0 +1,17 @@ +<news> +<date>31. August 2018</date> +<title>Wine 3.15 freigegeben</title> +<body> + Die Entwicklungsversion 3.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von DPI-Skalierung unter Android.</li> + <li>Unterstützung von HID-Geräten in Raw-Input.</li> + <li>Viele neue Icons in Shell32.</li> + <li>WinHTTP verwendet nun Windows-Sockets.</li> + <li>Syntaxkorrekturen im Befehlszeileninterpreter.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.15.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0