November 2015 - Wine-commits

Alexandre Julliard : makefiles: Generate rules for building the libwine import library.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 79c852340c63a68c378c2059e1ffe73ad6d891ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c852340c63a68c378c2059e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 23:19:24 2015 +0900 makefiles: Generate rules for building the libwine import library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 ++------------- configure.ac | 15 ++------------- tools/makedep.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/configure b/configure index e83ca7b..4fecf62 100755 --- a/configure +++ b/configure @@ -7986,23 +7986,12 @@ fi LIBWINE_RULES=" SHAREDLIB = libwine.dll +IMPORTLIB = libwine.a INSTALL_LIB = libwine.dll +INSTALL_DEV = libwine.a libwine_LDFLAGS = -shared \$(srcdir)/wine.def -EXTRA_TARGETS = libwine.a - -all: libwine.a - -libwine.a: \$(srcdir)/wine.def - \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def - libwine.dll: \$(srcdir)/wine.def - -install install-dev:: libwine.a - \$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a - -uninstall:: - \$(RM) \$(DESTDIR)\$(libdir)/libwine.a " ;; diff --git a/configure.ac b/configure.ac index 372d06e..48268b0 100644 --- a/configure.ac +++ b/configure.ac @@ -719,23 +719,12 @@ case $host_os in AC_SUBST(LIBWINE_RULES,[" SHAREDLIB = libwine.dll +IMPORTLIB = libwine.a INSTALL_LIB = libwine.dll +INSTALL_DEV = libwine.a libwine_LDFLAGS = -shared \$(srcdir)/wine.def -EXTRA_TARGETS = libwine.a - -all: libwine.a - -libwine.a: \$(srcdir)/wine.def - \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def - libwine.dll: \$(srcdir)/wine.def - -install install-dev:: libwine.a - \$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a - -uninstall:: - \$(RM) \$(DESTDIR)\$(libdir)/libwine.a "]) ;; diff --git a/tools/makedep.c b/tools/makedep.c index f037d6b..023c0ec 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -145,6 +145,7 @@ static const char *fontforge; static const char *convert; static const char *rsvg; static const char *icotool; +static const char *dlltool; struct makefile { @@ -2612,6 +2613,18 @@ static struct strarray output_sources( const struct makefile *make, struct strar strarray_addall( &all_targets, names ); } + if (make->importlib && !make->module) /* stand-alone import lib (for libwine) */ + { + char *def_file = replace_extension( make->importlib, ".a", ".def" ); + + if (!strncmp( def_file, "lib", 3 )) def_file += 3; + output( "%s: %s\n", obj_dir_path( make, make->importlib ), src_dir_path( make, def_file )); + output( "\t%s -l $@ -d %s\n", dlltool, src_dir_path( make, def_file )); + add_install_rule( make, install_rules, make->importlib, make->importlib, + strmake( "d$(libdir)/%s", make->importlib )); + strarray_add( &all_targets, make->importlib ); + } + if (make->testdll) { char *testmodule = replace_extension( make->testdll, ".dll", "_test.exe" ); @@ -3252,6 +3265,7 @@ int main( int argc, char *argv[] ) convert = get_expanded_make_variable( top_makefile, "CONVERT" ); rsvg = get_expanded_make_variable( top_makefile, "RSVG" ); icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); + dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL;

1 0

Jacek Caban : server: Store all 32 bits of value type.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 731d09fa9dd7b2efbf8b6a72ddd6dbe68402592f URL: http://source.winehq.org/git/wine.git/?a=commit;h=731d09fa9dd7b2efbf8b6a72d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:26:25 2015 +0100 server: Store all 32 bits of value type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 14 ++++++++++++-- server/registry.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index dfec007..96f190b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -530,14 +530,14 @@ static void test_NtQueryValueKey(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING ValName; KEY_VALUE_BASIC_INFORMATION *basic_info; - KEY_VALUE_PARTIAL_INFORMATION *partial_info; + KEY_VALUE_PARTIAL_INFORMATION *partial_info, pi; KEY_VALUE_FULL_INFORMATION *full_info; DWORD len, expected; pRtlCreateUnicodeStringFromAsciiz(&ValName, "deletetest"); InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); - status = pNtOpenKey(&key, KEY_READ, &attr); + status = pNtOpenKey(&key, KEY_READ|KEY_SET_VALUE, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); len = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); @@ -632,8 +632,18 @@ static void test_NtQueryValueKey(void) ok(len == expected, "NtQueryValueKey wrong len %u\n", len); HeapFree(GetProcessHeap(), 0, partial_info); + pRtlFreeUnicodeString(&ValName); + pRtlCreateUnicodeStringFromAsciiz(&ValName, "custtest"); + status = pNtSetValueKey(key, &ValName, 0, 0xff00ff00, NULL, 0); + ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08x\n", status); + + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, &pi, sizeof(pi), &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_BUFFER_TOO_SMALL instead of 0x%08x\n", status); + ok(pi.Type == 0xff00ff00, "Type=%x\n", pi.Type); + ok(pi.DataLength == 0, "DataLength=%u\n", pi.DataLength); pRtlFreeUnicodeString(&ValName); + pNtClose(key); } diff --git a/server/registry.c b/server/registry.c index dad86e7..c95e103 100644 --- a/server/registry.c +++ b/server/registry.c @@ -93,7 +93,7 @@ struct key_value { WCHAR *name; /* value name */ unsigned short namelen; /* length of value name */ - unsigned short type; /* value type */ + unsigned int type; /* value type */ data_size_t len; /* value data length in bytes */ void *data; /* pointer to value data */ };

1 0

Austin English : ndis.sys: Forward NdisInitUnicodeString to ntdll.RtlInitUnicodeString.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 370254cbe93beae6a9ff693d98c638db5bfb1134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370254cbe93beae6a9ff693d9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 11 23:27:43 2015 -0500 ndis.sys: Forward NdisInitUnicodeString to ntdll.RtlInitUnicodeString. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/ndis.sys.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 1dd8b82..bd83b48 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -130,7 +130,7 @@ @ stub NdisImmediateWritePortUshort @ stub NdisImmediateWriteSharedMemory @ stub NdisInitAnsiString -@ stub NdisInitUnicodeString +@ stdcall NdisInitUnicodeString(ptr wstr) ntdll.RtlInitUnicodeString @ stub NdisInitializeEvent @ stub NdisInitializeReadWriteLock @ stub NdisInitializeString

1 0

Nikolay Sivov : hnetcfg: Return success from put_Enabled for a port.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 84b3606b2fc9d6b2b961f8c013fffb96a1f5697e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b3606b2fc9d6b2b961f8c01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 22:43:31 2015 +0300 hnetcfg: Return success from put_Enabled for a port. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index f4c755b..036ecb9 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -318,7 +318,7 @@ static HRESULT WINAPI fw_port_put_Enabled( fw_port *This = impl_from_INetFwOpenPort( iface ); FIXME("%p %d\n", This, enabled); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI fw_port_get_BuiltIn(

1 0

Nikolay Sivov : dwrite: Remove a couple of dead assignments (Clang).
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: c4b894db63fca9c64a0361e46b307e30caac8aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b894db63fca9c64a0361e46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 23:55:04 2015 +0300 dwrite: Remove a couple of dead assignments (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f7ca0cf..723a762 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1198,9 +1198,11 @@ static void apply_cluster_spacing(FLOAT leading_spacing, FLOAT trailing_spacing, advance += trailing_spacing; modified_advances[end-1] += trailing_spacing; } - if (advance < min_advance_width) { + + advance = min_advance_width - advance; + if (advance > 0.0f) { /* additional spacing is only applied to leading and trailing glyph */ - FLOAT half = (min_advance_width - advance) / 2.0; + FLOAT half = advance / 2.0f; if (!reduced) { origin -= half; @@ -1213,13 +1215,11 @@ static void apply_cluster_spacing(FLOAT leading_spacing, FLOAT trailing_spacing, modified_advances[end-1] += half; } else if (leading_spacing < 0.0) { - origin -= min_advance_width - advance; - modified_advances[start] += min_advance_width - advance; + origin -= advance; + modified_advances[start] += advance; } else - modified_advances[end-1] += min_advance_width - advance; - - advance = min_advance_width; + modified_advances[end-1] += advance; } /* now apply positive spacing adjustments */ @@ -1317,7 +1317,6 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly return S_OK; } - start = 0; for (start = 0; start < len;) { UINT32 length = get_cluster_length(clustermap, start, len);

1 0

Nikolay Sivov : comctl32/tests: Test more return values (Clang).
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 1b5aaa163963415c83b6d5a5f91e241a89b74910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5aaa163963415c83b6d5a5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 00:46:49 2015 +0300 comctl32/tests: Test more return values (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 15 +++++++++++++++ dlls/comctl32/tests/status.c | 1 + dlls/comctl32/tests/toolbar.c | 2 -- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 676dca1..acfcd20 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5342,6 +5342,7 @@ static void test_header_notification2(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ITEMCHANGINGW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); parent_header_notify_seq[0].id = HDN_ITEMCHANGINGA; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, "header notify, parent", TRUE); @@ -5350,6 +5351,7 @@ static void test_header_notification2(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ITEMCHANGEDW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); parent_header_notify_seq[0].id = HDN_ITEMCHANGEDA; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, "header notify, parent", TRUE); @@ -5360,30 +5362,35 @@ static void test_header_notification2(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ITEMCLICKW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_click_seq, "header notify, parent", FALSE); ok(nmhdr.hdr.code == HDN_ITEMCLICKA, "Expected ANSI notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ITEMDBLCLICKW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "header notify, parent", FALSE); ok(nmhdr.hdr.code == HDN_ITEMDBLCLICKW, "Expected Unicode notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_DIVIDERDBLCLICKW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_divider_dclick_seq, "header notify, parent", TRUE); ok(nmhdr.hdr.code == HDN_DIVIDERDBLCLICKA, "Expected ANSI notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_BEGINTRACKW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "header notify, parent", FALSE); ok(nmhdr.hdr.code == HDN_BEGINTRACKW, "Expected Unicode notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ENDTRACKW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); parent_header_notify_seq[0].id = HDN_ENDTRACKA; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, "header notify, parent", FALSE); @@ -5391,6 +5398,7 @@ static void test_header_notification2(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_TRACKW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); parent_header_notify_seq[0].id = HDN_TRACKA; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, "header notify, parent", FALSE); @@ -5398,17 +5406,20 @@ static void test_header_notification2(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_BEGINDRAG; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 1, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "header notify, parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ENDDRAG; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); parent_header_notify_seq[0].id = HDN_ENDDRAG; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, "header notify, parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_FILTERCHANGE; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); parent_header_notify_seq[0].id = HDN_FILTERCHANGE; parent_header_notify_seq[0].flags |= optional; /* NT4 does not send this message */ ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, @@ -5417,21 +5428,25 @@ static void test_header_notification2(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_BEGINFILTEREDIT; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "header notify, parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ENDFILTEREDIT; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "header notify, parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ITEMSTATEICONCLICK; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "header notify, parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ITEMKEYDOWN; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok(ret == 0, "got %d\n", ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "header notify, parent", FALSE); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f3156e9..f537fe0 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -344,6 +344,7 @@ static void test_status_control(void) r = SendMessageA(hWndStatus, SB_SETTEXTA, 0, (LPARAM)chstr); expect(TRUE,r); r = SendMessageA(hWndStatus, SB_GETTEXTA, 0, (LPARAM)charArray); + ok(r == strlen(charArray), "got %d\n", r); /* substitution with single space */ if (ch > 0x00 && ch < 0x20 && ch != '\t') chstr[5] = ' '; diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 23eb250..bab746b 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1536,7 +1536,6 @@ static void test_sizes(void) /* Single non-BTNS_AUTOSIZE button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); - style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); @@ -1545,7 +1544,6 @@ static void test_sizes(void) /* Single non-BTNS_AUTOSIZE, BTNS_SHOWTEXT button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); - style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[2]) == 1, "TB_ADDBUTTONSA failed\n"); ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 );

1 0

Nikolay Sivov : dwrite/tests: Remove unused assignment (Clang).
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 446fddb1228da94ac8c7143f81e1dc06e85ab50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=446fddb1228da94ac8c7143f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 00:50:41 2015 +0300 dwrite/tests: Remove unused assignment (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f6bca9c..681f010 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4521,7 +4521,6 @@ if (0) /* crashes on native */ } } - gasp = get_gasp_flags(fontface, emsize, 1.0f); /* IDWriteFontFace1 offers another variant of this method */ if (fontface1) { for (i = 0; i < sizeof(recmode_tests1)/sizeof(recmode_tests1[0]); i++) {

1 0

Austin English : wine.inf: Add HKLM\System\CurrentControlSet\Control\ServiceGroupOrder\List registry key.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: d25bdf8b6c17ceeb327cb0c85b1512d086ff9cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25bdf8b6c17ceeb327cb0c85… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 11 11:12:40 2015 -0600 wine.inf: Add HKLM\System\CurrentControlSet\Control\ServiceGroupOrder\List registry key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 343bc6a..fea8da4 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -655,6 +655,7 @@ HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 +HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"TimeZoneKeyName",2,"" HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16

1 0

Austin English : bthprops.cpl: Comment out CPLApplet from spec file.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 35f9ee3d97ef81397f4e15b0d7ae48fe443023bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f9ee3d97ef81397f4e15b0d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 11 13:51:18 2015 -0600 bthprops.cpl: Comment out CPLApplet from spec file. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index bb7a6ff..7a9de48 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -60,6 +60,6 @@ @ stub BthpEnableAllServices @ stub BthpFindPnpInfo @ stub BthpMapStatusToErr -@ stub CPlApplet +#@ stub CPlApplet @ stub DllCanUnloadNow @ stub DllGetClassObject

1 0

Jacek Caban : server: Return KeyFullInformation maximal string lengths in bytes.
by Alexandre Julliard 12 Nov '15

12 Nov '15

Module: wine Branch: master Commit: 3d5db6bdf5e13a61a226ff5531e8f3fb18ecf3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5db6bdf5e13a61a226ff553… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 14:16:59 2015 +0100 server: Return KeyFullInformation maximal string lengths in bytes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++------ server/registry.c | 13 ++++--------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 67120cd..0f23f4c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -895,10 +895,10 @@ LSTATUS WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPD if (class_len) *class_len = info->ClassLength / sizeof(WCHAR); if (subkeys) *subkeys = info->SubKeys; - if (max_subkey) *max_subkey = info->MaxNameLen; - if (max_class) *max_class = info->MaxClassLen; + if (max_subkey) *max_subkey = info->MaxNameLen / sizeof(WCHAR); + if (max_class) *max_class = info->MaxClassLen / sizeof(WCHAR); if (values) *values = info->Values; - if (max_value) *max_value = info->MaxValueNameLen; + if (max_value) *max_value = info->MaxValueNameLen / sizeof(WCHAR); if (max_data) *max_data = info->MaxValueDataLen; if (modif) *modif = *(FILETIME *)&info->LastWriteTime; @@ -1090,10 +1090,10 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW else status = STATUS_SUCCESS; if (subkeys) *subkeys = info->SubKeys; - if (max_subkey) *max_subkey = info->MaxNameLen; - if (max_class) *max_class = info->MaxClassLen; + if (max_subkey) *max_subkey = info->MaxNameLen / sizeof(WCHAR); + if (max_class) *max_class = info->MaxClassLen / sizeof(WCHAR); if (values) *values = info->Values; - if (max_value) *max_value = info->MaxValueNameLen; + if (max_value) *max_value = info->MaxValueNameLen / sizeof(WCHAR); if (max_data) *max_data = info->MaxValueDataLen; if (modif) *modif = *(FILETIME *)&info->LastWriteTime; diff --git a/server/registry.c b/server/registry.c index 3c9ae70..94777b3 100644 --- a/server/registry.c +++ b/server/registry.c @@ -908,18 +908,13 @@ static void enum_key( const struct key *key, int index, int info_class, case KeyFullInformation: for (i = 0; i <= key->last_subkey; i++) { - struct key *subkey = key->subkeys[i]; - len = subkey->namelen / sizeof(WCHAR); - if (len > max_subkey) max_subkey = len; - len = subkey->classlen / sizeof(WCHAR); - if (len > max_class) max_class = len; + if (key->subkeys[i]->namelen > max_subkey) max_subkey = key->subkeys[i]->namelen; + if (key->subkeys[i]->classlen > max_class) max_class = key->subkeys[i]->classlen; } for (i = 0; i <= key->last_value; i++) { - len = key->values[i].namelen / sizeof(WCHAR); - if (len > max_value) max_value = len; - len = key->values[i].len; - if (len > max_data) max_data = len; + if (key->values[i].namelen > max_value) max_value = key->values[i].namelen; + if (key->values[i].len > max_data) max_data = key->values[i].len; } reply->max_subkey = max_subkey; reply->max_class = max_class;

1 0