April 2016 - Wine-Commits - list.winehq.org

Marcus Meissner : ntdll: Cast left shifted 1 to be ulong wide (Coverity).
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 72828184f25de41376b707f137e971f2f20048e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72828184f25de41376b707f13… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 6 15:30:59 2016 +0100 ntdll: Cast left shifted 1 to be ulong wide (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit de853e2b65e54593e247c1eeac50738078abd386) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index fba3393..a7c033f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1520,7 +1520,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = 0; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY; @@ -1534,7 +1534,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = i; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY;

1 0

Alistair Leslie-Hughes : include: Add GdipGetPenTransform, GdipSetPenTransform declarations.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 5c823e7723c55adc24679589028ad2bd36e4022e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c823e7723c55adc246795890… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 24 18:23:57 2016 +1100 include: Add GdipGetPenTransform, GdipSetPenTransform declarations. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0a7cd7c153606f665365f3abbe627745513f75cf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/gdiplusflat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 29119b4..2e22ff4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -619,6 +619,7 @@ GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); +GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); @@ -637,6 +638,7 @@ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); GpStatus WINGDIPAPI GdipSetPenMode(GpPen*,GpPenAlignment); GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); +GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *, GpMatrix *); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen*,GpDashCap*); GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*);

1 0

Alistair Leslie-Hughes : gdiplus: Implement GdipGetPenTransform.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: e7deeb87ab2e95f50d48e384afee026a23d84341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7deeb87ab2e95f50d48e384a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 31 21:55:31 2016 +1100 gdiplus: Implement GdipGetPenTransform. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8449062eb13ed27612ac3df8e05c67587bce12f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/pen.c | 8 +++----- dlls/gdiplus/tests/pen.c | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1af0bd0..0013d75 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -197,6 +197,7 @@ struct GpPen{ REAL offset; /* dash offset */ GpBrush *brush; GpPenAlignment align; + GpMatrix transform; }; struct GpGraphics{ diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index f7dacef..47e91ec 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -171,6 +171,7 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, gp_pen->offset = 0.0; gp_pen->customstart = NULL; gp_pen->customend = NULL; + GdipSetMatrixElements(&gp_pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) { FIXME("UnitWorld, UnitPixel only supported units\n"); @@ -448,17 +449,14 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) { - static int calls; - TRACE("(%p,%p)\n", pen, matrix); if(!pen || !matrix) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + *matrix = pen->transform; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 6eee2ea..1e63560 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -380,7 +380,7 @@ static void test_transform(void) expect(Ok, status); status = GdipGetPenTransform(pen, matrix); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); @@ -398,7 +398,7 @@ static void test_transform(void) GdipDeleteMatrix(matrix2); status = GdipGetPenTransform(pen, matrix); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); todo_wine { @@ -413,7 +413,7 @@ todo_wine { todo_wine expect(Ok, status); status = GdipGetPenTransform(pen, matrix); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status);

1 0

Piotr Caban : msxml3: Update xmlNode reference count when nodes are merged in node_insert_before.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: a295338e36c12d71cddf62732ba1d1db6d4515c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a295338e36c12d71cddf62732… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:10 2015 +0100 msxml3: Update xmlNode reference count when nodes are merged in node_insert_before. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7bd995a1166d0807e830ccb8b810db4e7d65e27c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/node.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f8d7761..9c768bd 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -429,6 +429,19 @@ int xmlnode_get_inst_cnt(xmlnode *node) return node_get_inst_cnt(node->node); } +/* _private field holds a number of COM instances spawned from this libxml2 node */ +static void xmlnode_add_ref(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedIncrement((LONG*)&node->_private); +} + +static void xmlnode_release(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedDecrement((LONG*)&node->_private); +} + HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { @@ -489,6 +502,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if(before) { + xmlNodePtr new_node; xmlnode *before_node_obj = get_node_obj(before); /* refs count including subtree */ @@ -496,19 +510,35 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); - node_obj->node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); + new_node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); + if (new_node != node_obj->node) + { + if (refcount != 1) + FIXME("referenced xmlNode was freed, expect crashes\n"); + xmlnode_add_ref(new_node); + node_obj->node = new_node; + } if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } else { + xmlNodePtr new_node; + if (doc != This->node->doc) refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); - node_obj->node = xmlAddChild(This->node, node_obj->node); + new_node = xmlAddChild(This->node, node_obj->node); + if (new_node != node_obj->node) + { + if (refcount != 1) + FIXME("referenced xmlNode was freed, expect crashes\n"); + xmlnode_add_ref(new_node); + node_obj->node = new_node; + } if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } @@ -1392,19 +1422,6 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } -/* _private field holds a number of COM instances spawned from this libxml2 node */ -static void xmlnode_add_ref(xmlNodePtr node) -{ - if (node->type == XML_DOCUMENT_NODE) return; - InterlockedIncrement((LONG*)&node->_private); -} - -static void xmlnode_release(xmlNodePtr node) -{ - if (node->type == XML_DOCUMENT_NODE) return; - InterlockedDecrement((LONG*)&node->_private); -} - void destroy_xmlnode(xmlnode *This) { if(This->node)

1 0

Sebastian Lackner : ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 9c334d3bfe78a2f189a1d42c99fb46f8ce3854f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c334d3bfe78a2f189a1d42c9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:42 2016 +0100 ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64. Similar to eab168cf9eaa6ed9f8800b25155d329376f2343f for x86. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d0cc0dd69f029fcd54275784d3edc0f1426fc568) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/tests/exception.c | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index be5a342..84802b2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2482,6 +2482,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return STATUS_SUCCESS; + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) return STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 86a22d9..c62dcb3 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1870,7 +1870,6 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); } #else - todo_wine ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, @@ -1937,7 +1936,6 @@ static const BYTE call_debug_service_code[] = { static void test_debug_service(DWORD numexc) { - const BOOL is_win64 = (sizeof(void *) > sizeof(int)); DWORD (CDECL *func)(DWORD_PTR) = code_mem; DWORD expected_exc, expected_ret; void *vectored_handler; @@ -1958,7 +1956,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "BREAKPOINT_BREAK generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "BREAKPOINT_BREAK returned %u, expected %u\n", ret, expected_ret); @@ -1968,7 +1965,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "BREAKPOINT_PROMPT generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "BREAKPOINT_PROMPT returned %u, expected %u\n", ret, expected_ret); @@ -1978,7 +1974,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "invalid debug service generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "invalid debug service returned %u, expected %u\n", ret, expected_ret); @@ -2045,7 +2040,6 @@ static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; #else - todo_wine ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); todo_wine

1 0

Sebastian Lackner : ntdll: Mimic Windows behaviour when calling debug service.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 2785c5925bd65407439144c8f70a993f99f394d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2785c5925bd65407439144c8f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 09:58:13 2016 +0100 ntdll: Mimic Windows behaviour when calling debug service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 218bc84e03eaa807caca58027334e9b173dcfa7e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_i386.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 10235fe..5708aae 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1940,6 +1940,21 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context goto done; } break; + case EXCEPTION_BREAKPOINT: + if (!is_wow64) + { + /* On Wow64, the upper DWORD of Rax contains garbage, and the debug + * service is usually not recognized when called from usermode. */ + switch (rec->ExceptionInformation[0]) + { + case 1: /* BREAKPOINT_PRINT */ + case 3: /* BREAKPOINT_LOAD_SYMBOLS */ + case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ + case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ + goto done; + } + } + break; } status = NtRaiseException( rec, context, TRUE ); raise_status( status, rec );

1 0

Nikolay Sivov : dwrite: Handle font data initialization failure when building collections.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 61fe2c74abbe59b890e4ad7d4c2635985739e9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fe2c74abbe59b890e4ad7d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 17:47:14 2016 +0300 dwrite: Handle font data initialization failure when building collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7276d5fac1417dd81344db45b3af904f8f2c7d77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9244978..68b2c17 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -359,7 +359,8 @@ static void release_font_data(struct dwrite_font_data *data) if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } - IDWriteLocalizedStrings_Release(data->names); + if (data->names) + IDWriteLocalizedStrings_Release(data->names); IDWriteFontFile_Release(data->file); IDWriteFactory2_Release(data->factory); @@ -3141,8 +3142,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat /* alloc and init new font data structure */ hr = init_font_data(factory, file, face_type, i, &family_name, &font_data); - if (FAILED(hr)) + if (FAILED(hr)) { + /* move to next one */ + hr = S_OK; continue; + } fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR));

1 0

Alexandre Julliard : advapi32: Fix null termination in RegQueryInfoKeyA.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 85b003cb2e08a6e45b64413dcb4ce34f60dccdea URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b003cb2e08a6e45b64413dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 14:06:29 2016 +0900 advapi32: Fix null termination in RegQueryInfoKeyA. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 303daeef58b7fe56ef991dde8504d65c11924937) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4f33fe6..0b40a8d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1091,12 +1091,12 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength ); if (len) { - class[len - 1] = 0; if (*class_len + 1 > len) { status = STATUS_BUFFER_OVERFLOW; *class_len -= 1; } + class[*class_len] = 0; } } else status = STATUS_SUCCESS; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 254a8b6..b798129 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1985,6 +1985,17 @@ static void test_reg_query_info(void) "classbuffer = \"%.*s\", expected %s\n", (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + strcpy(expectbuffer, subkey_class); + ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), + "classbuffer = \"%.*s\", expected %s\n", + (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class); ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1996,6 +2007,17 @@ static void test_reg_query_info(void) "classbufferW = %s, expected %s\n", wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + lstrcpyW(expectbufferW, subkey_classW); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), + "classbufferW = %s, expected %s\n", + wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + RegDeleteKeyA(subsubkey, ""); RegCloseKey(subsubkey); RegDeleteKeyA(subkey, "");

1 0

Hans Leidekker : msi: Fix the CHAR column type.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 72ad32b6693ebdc2b9e22dd6c71e623e19aa69f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ad32b6693ebdc2b9e22dd6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 10:16:12 2016 +0100 msi: Fix the CHAR column type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b21373bf112aed3cce495f1ef51334cf51224bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/sql.y | 2 +- dlls/msi/tests/db.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 553cc6d..366764d 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -355,7 +355,7 @@ data_type_l: data_type: TK_CHAR { - $$ = MSITYPE_STRING | 1; + $$ = MSITYPE_STRING | 0x400; } | TK_CHAR TK_LP data_count TK_RP { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 98e0e96..7dd878a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1286,13 +1286,15 @@ static void test_viewgetcolumninfo(void) r = run_query( hdb, 0, "CREATE TABLE `Properties` " "( `Property` CHAR(255), " - " `Value` CHAR(1), " - " `Intvalue` INT, " - " `Integervalue` INTEGER, " - " `Shortvalue` SHORT, " - " `Longvalue` LONG, " - " `Longcharvalue` LONGCHAR " - " PRIMARY KEY `Property`)" ); + " `Value` CHAR(1), " + " `Intvalue` INT, " + " `Integervalue` INTEGER, " + " `Shortvalue` SHORT, " + " `Longvalue` LONG, " + " `Longcharvalue` LONGCHAR, " + " `Charvalue` CHAR, " + " `Localizablevalue` CHAR LOCALIZABLE " + " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1306,6 +1308,8 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n"); + ok( check_record( rec, 8, "S0"), "wrong record type\n"); + ok( check_record( rec, 9, "L0"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1317,6 +1321,8 @@ static void test_viewgetcolumninfo(void) ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); + ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 8 ), "_columns table wrong\n"); + ok( 0x1f00 == get_columns_table_type(hdb, "Properties", 9 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1329,6 +1335,8 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); + ok( check_record( rec, 8, "Charvalue"), "wrong record type\n"); + ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n"); MsiCloseHandle( rec );

1 0

Józef Kucia : wined3d: Allow to query if surface format supports gamma correction.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: b67659f49d57139aec708e2d2b2560e6255fd0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67659f49d57139aec708e2d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 8 00:04:41 2016 +0100 wined3d: Allow to query if surface format supports gamma correction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b7dcf112e9b3893ff0e7c680c59ff4a6eafaa7b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 254102e..eb414cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4651,6 +4651,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + if (usage & WINED3DUSAGE_RENDERTARGET) + allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; gl_type = WINED3D_GL_RES_TYPE_RB; break;

1 0