March 2013 - Wine-Commits - list.winehq.org

Filip Navara : iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 7ca40003d2101c73e97acb5c1f1643c8ef1674c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca40003d2101c73e97acb5c1… Author: Filip Navara <xnavara(a)volny.cz> Date: Sat Mar 9 12:04:17 2013 +0100 iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds. Thanks to Hans Leidekker for diagnosing the problem. --- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 600bf8c..aeb91c1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -848,7 +848,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; - struct sockaddr_in *sa; + struct WS_sockaddr_in *sa; aa->Flags |= IP_ADAPTER_IPV4_ENABLED; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) @@ -860,12 +860,12 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); - sa = (struct sockaddr_in *)ua->Address.lpSockaddr; - sa->sin_family = AF_INET; - sa->sin_addr.s_addr = v4addrs[i]; - sa->sin_port = 0; + sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; + sa->sin_family = WS_AF_INET; + sa->sin_addr.S_un.S_addr = v4addrs[i]; + sa->sin_port = 0; TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, - debugstr_ipv4(&sa->sin_addr.s_addr, addr_buf)); + debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1)

1 0

Andrew Talbot : dwrite: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: fd00c806bf0e3fc610412c3770c71e5eed7a5d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd00c806bf0e3fc610412c377… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:49 2013 +0000 dwrite: Avoid signed-unsigned integer comparisons. --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a0a9008..5c692d1 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -211,7 +211,7 @@ static const struct script_range script_ranges[] = { static UINT16 get_char_script( WCHAR c ) { DWORD ch = c; - int i; + unsigned int i; for (i = 0; i < sizeof(script_ranges)/sizeof(struct script_range); i++) { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 191397e..ec18312 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -288,7 +288,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN HFONT hfont; WCHAR *str; HDC hdc; - int i; + unsigned int i; TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); @@ -783,7 +783,7 @@ static INT CALLBACK enum_font_families(const LOGFONTW *lf, const TEXTMETRICW *tm static void release_font_collection(IDWriteFontCollection *iface) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - int i; + unsigned int i; for (i = 0; i < This->count; i++) heap_free(This->families[i]); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c9009a9..da023d9 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -228,7 +228,7 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - int i; + unsigned int i; for (i = 0; i < This->count; i++) { heap_free(This->data[i].locale);

1 0

Andrew Talbot : joy.cpl: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 3e2c44af7dc0c4a55c14aa4b46923dc86cf67d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2c44af7dc0c4a55c14aa4b4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:51 2013 +0000 joy.cpl: Avoid signed-unsigned integer comparisons. --- dlls/joy.cpl/main.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index dec83ff..857cb69 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -233,7 +233,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) HKEY hkey, appkey; DWORD values = 0; HRESULT hr; - int i; + DWORD i; SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); @@ -394,6 +394,8 @@ static DWORD WINAPI input_thread(void *param) while (!data->stop) { int i; + unsigned int j; + poll_input(&data->joysticks[data->chosen_joystick], &state); dump_joy_state(&state, data->joysticks[data->chosen_joystick].num_buttons); @@ -412,12 +414,12 @@ static DWORD WINAPI input_thread(void *param) axes_pos[2][1] = state.lRz; /* Set pov values */ - for (i = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); i++) + for (j = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); j++) { - if (state.rgdwPOV[0] == pov_val[i]) + if (state.rgdwPOV[0] == pov_val[j]) { - axes_pos[3][0] = pov_pos[i][0]; - axes_pos[3][1] = pov_pos[i][1]; + axes_pos[3][0] = pov_pos[j][0]; + axes_pos[3][1] = pov_pos[j][1]; } }

1 0

Jacek Caban : wininet: Skip test_open_url_async on IEs older than 7.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 3157534347d29b2830b3e691764bc5036dcd8663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3157534347d29b2830b3e6917… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 9 17:52:02 2013 +0100 wininet: Skip test_open_url_async on IEs older than 7. --- dlls/wininet/tests/http.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7988de4..c2607dc 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3662,6 +3662,16 @@ static void test_open_url_async(void) ret = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + /* + * Some versions of IE6 fail those tests. They pass some notification data as UNICODE string, while + * other versions never do. They also hang of following tests. We disable it for everything older + * than IE7. + */ + if(!pInternetGetSecurityInfoByURLA) { + win_skip("Skipping async open on too old wininet version.\n"); + return; + } + ctx.req = NULL; ctx.event = CreateEvent(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1");

1 0

Hans Leidekker : dnsapi: Increase maximum packet size.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 8981bbd464c1b1dc0704c9624c8955168d2e35db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8981bbd464c1b1dc0704c9624… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Mar 9 12:37:59 2013 +0100 dnsapi: Increase maximum packet size. --- dlls/dnsapi/query.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 2116b11..b1d80dd 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -578,13 +578,13 @@ static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) return ERROR_SUCCESS; } -static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, - PDNS_RECORDA *result ) +#define DNS_MAX_PACKET_SIZE 4096 +static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECORDA *result ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned int i, num; - unsigned char answer[NS_PACKETSZ]; + unsigned char answer[DNS_MAX_PACKET_SIZE]; ns_sect sections[] = { ns_s_an, ns_s_ar }; ns_msg msg;

1 0

Daniel Jelinski : comctl32/listview: Fix overwriting of item values.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 6ad51d509cc70e42e985f780b4ce7783d480b85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad51d509cc70e42e985f780b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Mar 9 06:52:53 2013 +0100 comctl32/listview: Fix overwriting of item values. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b084e5e..52717e9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8290,10 +8290,10 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) lvItem.mask = LVIF_TEXT; lvItem.iItem = 0; lvItem.iSubItem = nColumn; - lvItem.pszText = szDispText; lvItem.cchTextMax = DISP_TEXT_SIZE; for (; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++) { + lvItem.pszText = szDispText; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) continue; nLabelWidth = LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE); if (max_cx < nLabelWidth) max_cx = nLabelWidth;

1 0

André Hentschel : widl: Remove SPARC and Alpha support .
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 478401dce70c73de8c0127380ba4dae8b249b490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478401dce70c73de8c0127380… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:33:55 2013 +0100 widl: Remove SPARC and Alpha support. --- tools/widl/widl.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 5626d13..cad1d6c 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -263,8 +263,6 @@ static void set_target( const char *target ) { "i786", SYS_WIN32 }, { "amd64", SYS_WIN64 }, { "x86_64", SYS_WIN64 }, - { "sparc", SYS_WIN32 }, - { "alpha", SYS_WIN32 }, { "powerpc", SYS_WIN32 }, { "arm", SYS_WIN32 }, { "aarch64", SYS_WIN64 }

1 0

André Hentschel : winedbg: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 40e7f7b78799f999378f5ae23aaf470b2f5cd626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e7f7b78799f999378f5ae23… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:33:10 2013 +0100 winedbg: Remove SPARC support. --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_sparc.c | 185 ----------------------------------------- programs/winedbg/gdbproxy.c | 36 -------- programs/winedbg/tgt_active.c | 2 - programs/winedbg/winedbg.c | 4 - 5 files changed, 0 insertions(+), 228 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index d38d5f0..6e77e2e 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ be_arm64.c \ be_i386.c \ be_ppc.c \ - be_sparc.c \ be_x86_64.c \ break.c \ crashdlg.c \ diff --git a/programs/winedbg/be_sparc.c b/programs/winedbg/be_sparc.c deleted file mode 100644 index 3d5ce36..0000000 --- a/programs/winedbg/be_sparc.c +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Debugger Sparc specific functions - * - * Copyright 2010 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "debugger.h" - -#if defined(__sparc__) - -static unsigned be_sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum be_cpu_addr bca, ADDRESS64* addr) -{ - switch (bca) - { - case be_cpu_addr_pc: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->pc); - case be_cpu_addr_stack: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->o6); - case be_cpu_addr_frame: - return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->i6); - } - return FALSE; -} - -static unsigned be_sparc_get_register_info(int regno, enum be_cpu_addr* kind) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static void be_sparc_single_step(CONTEXT* ctx, unsigned enable) -{ - dbg_printf("not done for Sparc\n"); -} - -static void be_sparc_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) -{ - dbg_printf("not done for Sparc\n"); -} - -static void be_sparc_print_segment_info(HANDLE hThread, const CONTEXT* ctx) -{ - dbg_printf("not done for Sparc\n"); -} - -static struct dbg_internal_var be_sparc_ctx[] = -{ - {0, NULL, 0, dbg_itype_none} -}; - -static unsigned be_sparc_is_step_over_insn(const void* insn) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_function_return(const void* insn) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_break_insn(const void* insn) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_func_call(const void* insn, ADDRESS64* callee) -{ - return FALSE; -} - -static unsigned be_sparc_is_jump(const void* insn, ADDRESS64* jumpee) -{ - return FALSE; -} - -static void be_sparc_disasm_one_insn(ADDRESS64* addr, int display) -{ - dbg_printf("not done for Sparc\n"); -} - -static unsigned be_sparc_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - CONTEXT* ctx, enum be_xpoint_type type, - void* addr, unsigned long* val, unsigned size) -{ - dbg_printf("not done for Sparc\n"); - return 0; -} - -static unsigned be_sparc_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, - CONTEXT* ctx, enum be_xpoint_type type, - void* addr, unsigned long val, unsigned size) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static unsigned be_sparc_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static void be_sparc_clear_watchpoint(CONTEXT* ctx, unsigned idx) -{ - dbg_printf("not done for Sparc\n"); -} - -static int be_sparc_adjust_pc_for_break(CONTEXT* ctx, BOOL way) -{ - if (way) - { - ctx->pc--; - return -1; - } - ctx->pc++; - return 1; -} - -static int be_sparc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static int be_sparc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) -{ - dbg_printf("not done for Sparc\n"); - return FALSE; -} - -static int be_sparc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned is_signed, LONGLONG val) -{ - dbg_printf("be_sparc_store_integer: not done\n"); - return FALSE; -} - -struct backend_cpu be_sparc = -{ - IMAGE_FILE_MACHINE_SPARC, - 4, - be_cpu_linearize, - be_cpu_build_addr, - be_sparc_get_addr, - be_sparc_get_register_info, - be_sparc_single_step, - be_sparc_print_context, - be_sparc_print_segment_info, - be_sparc_ctx, - be_sparc_is_step_over_insn, - be_sparc_is_function_return, - be_sparc_is_break_insn, - be_sparc_is_func_call, - be_sparc_is_jump, - be_sparc_disasm_one_insn, - be_sparc_insert_Xpoint, - be_sparc_remove_Xpoint, - be_sparc_is_watchpoint_set, - be_sparc_clear_watchpoint, - be_sparc_adjust_pc_for_break, - be_sparc_fetch_integer, - be_sparc_fetch_float, - be_sparc_store_integer, -}; -#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 66ff6a8..06ace0c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -337,42 +337,6 @@ static struct cpu_register cpu_register_map[] = { REG(SegFs, 4), REG(SegGs, 4), }; -#elif defined(__sparc__) -static const char target_xml[] = ""; -static struct cpu_register cpu_register_map[] = { - REG(g0, 4), - REG(g1, 4), - REG(g2, 4), - REG(g3, 4), - REG(g4, 4), - REG(g5, 4), - REG(g6, 4), - REG(g7, 4), - REG(o0, 4), - REG(o1, 4), - REG(o2, 4), - REG(o3, 4), - REG(o4, 4), - REG(o5, 4), - REG(o6, 4), - REG(o7, 4), - REG(l0, 4), - REG(l1, 4), - REG(l2, 4), - REG(l3, 4), - REG(l4, 4), - REG(l5, 4), - REG(l6, 4), - REG(l7, 4), - REG(i0, 4), - REG(i1, 4), - REG(i2, 4), - REG(i3, 4), - REG(i4, 4), - REG(i5, 4), - REG(i6, 4), - REG(i7, 4), -}; #elif defined(__arm__) static const char target_xml[] = "l <target><architecture>arm</architecture>\n" diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index ec97d07..a264a67 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -684,8 +684,6 @@ static void output_system_info(void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__sparc__) - static const char platform[] = "sparc"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; #elif defined(__arm__) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index fa89afb..ba72916 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -616,8 +616,6 @@ extern struct backend_cpu be_i386; extern struct backend_cpu be_ppc; #elif defined(__x86_64__) extern struct backend_cpu be_x86_64; -#elif defined(__sparc__) -extern struct backend_cpu be_sparc; #elif defined(__arm__) && !defined(__ARMEB__) extern struct backend_cpu be_arm; #elif defined(__aarch64__) && !defined(__AARCH64EB__) @@ -638,8 +636,6 @@ int main(int argc, char** argv) be_cpu = &be_ppc; #elif defined(__x86_64__) be_cpu = &be_x86_64; -#elif defined(__sparc__) - be_cpu = &be_sparc; #elif defined(__arm__) && !defined(__ARMEB__) be_cpu = &be_arm; #elif defined(__aarch64__) && !defined(__AARCH64EB__)

1 0

Dmitry Timoshkov : gdiplus: Protect from mixing BrushTypeLinearGradient and BrushTypePathGradient.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 2cca510a5b098a77fa4f646837bab886c3e494d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cca510a5b098a77fa4f64683… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 11 17:33:24 2013 +0900 gdiplus: Protect from mixing BrushTypeLinearGradient and BrushTypePathGradient. --- dlls/gdiplus/brush.c | 89 +++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cca510a5b098a77fa4f6…

1 0

Nikolay Sivov : xmllite: Support resuming to comments and PIs while on Content part.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 9377514583bd3959eee32e0074c5b27293e35d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9377514583bd3959eee32e007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 18:32:00 2013 +0400 xmllite: Support resuming to comments and PIs while on Content part. --- dlls/xmllite/reader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6fd0f69..688497c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1849,6 +1849,11 @@ static HRESULT reader_parse_content(xmlreader *reader) { case XmlReadResumeState_CDATA: return reader_parse_cdata(reader); + case XmlReadResumeState_Comment: + return reader_parse_comment(reader); + case XmlReadResumeState_PIBody: + case XmlReadResumeState_PITarget: + return reader_parse_pi(reader); default: ERR("unknown resume state %d\n", reader->resumestate); }

1 0

Nikolay Sivov : xmllite: Support CDATA nodes.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 4d1a65c1ba209ae0d54e3f442c1cfb3fdc43a85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1a65c1ba209ae0d54e3f442… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 18:29:43 2013 +0400 xmllite: Support CDATA nodes. --- dlls/xmllite/reader.c | 61 ++++++++++++++++++++++++++++++-- dlls/xmllite/tests/reader.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9216127..6fd0f69 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -63,6 +63,7 @@ typedef enum XmlReadResumeState_Initial, XmlReadResumeState_PITarget, XmlReadResumeState_PIBody, + XmlReadResumeState_CDATA, XmlReadResumeState_Comment, XmlReadResumeState_STag } XmlReaderResumeState; @@ -72,7 +73,7 @@ typedef enum { XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ XmlReadResume_Local, /* local for QName */ - XmlReadResume_Body, /* PI body, comment text */ + XmlReadResume_Body, /* PI body, comment text, CDATA text */ XmlReadResume_Last } XmlReaderResume; @@ -1772,8 +1773,51 @@ static HRESULT reader_parse_endtag(xmlreader *reader) [21] CDEnd ::= ']]>' */ static HRESULT reader_parse_cdata(xmlreader *reader) { - FIXME("CDATA sections are not supported\n"); - return E_NOTIMPL; + WCHAR *start, *ptr; + + if (reader->resume[XmlReadResume_Body]) + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + else + { + /* skip markup '<![CDATA[' */ + reader_skipn(reader, 9); + reader_shrink(reader); + ptr = start = reader_get_cur(reader); + reader->nodetype = XmlNodeType_CDATA; + reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_CDATA; + reader_set_strvalue(reader, StringValue_LocalName, NULL); + reader_set_strvalue(reader, StringValue_QualifiedName, NULL); + reader_set_strvalue(reader, StringValue_Value, NULL); + } + + while (*ptr) + { + if (*ptr == ']' && *(ptr+1) == ']' && *(ptr+2) == '>') + { + strval value = { start, ptr-start }; + + TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* skip ']]>' */ + reader_skipn(reader, 3); + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; + return S_OK; + } + else + { + reader_skipn(reader, 1); + ptr++; + } + } + + return S_OK; } /* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' @@ -1799,6 +1843,17 @@ static HRESULT reader_parse_content(xmlreader *reader) static const WCHAR etagW[] = {'<','/',0}; static const WCHAR ampW[] = {'&',0}; + if (reader->resumestate != XmlReadResumeState_Initial) + { + switch (reader->resumestate) + { + case XmlReadResumeState_CDATA: + return reader_parse_cdata(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } + } + reader_shrink(reader); /* handle end tag here, it indicates end of content as well */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9829452..7373a69 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1318,6 +1318,88 @@ todo_wine IXmlReader_Release(reader); } +static struct test_entry cdata_tests[] = { + { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, + { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { NULL } +}; + +static void test_read_cdata(void) +{ + struct test_entry *test = cdata_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + + /* read one more to get to CDATA */ + if (type == XmlNodeType_Element) + { + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + } + + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1334,6 +1416,7 @@ START_TEST(reader) test_reader_create(); test_readerinput(); test_reader_state(); + test_read_cdata(); test_read_comment(); test_read_pi(); test_read_dtd();

1 0

Nikolay Sivov : xmllite: Support resuming for start tag.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: c87a85cce37a239161924854042bf2c4d33923e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87a85cce37a2391619248540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 13:28:38 2013 +0400 xmllite: Support resuming for start tag. --- dlls/xmllite/reader.c | 166 +++++++++++++++++++++++++++++++------------ dlls/xmllite/tests/reader.c | 2 +- 2 files changed, 121 insertions(+), 47 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b4a7f33..489d346 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -62,14 +62,16 @@ typedef enum { XmlReadResumeState_Initial, XmlReadResumeState_PITarget, - XmlReadResumeState_PIBody + XmlReadResumeState_PIBody, + XmlReadResumeState_STag } XmlReaderResumeState; /* saved pointer index to resume from particular input position */ typedef enum { - XmlReadResume_Name, /* PITarget */ - XmlReadResume_Body, /* PI body, comment text */ + XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ + XmlReadResume_Local, /* local for QName */ + XmlReadResume_Body, /* PI body, comment text */ XmlReadResume_Last } XmlReaderResume; @@ -1525,17 +1527,20 @@ static HRESULT reader_parse_dtd(xmlreader *reader) return S_OK; } -/* [7 NS] QName ::= PrefixedName | UnprefixedName - [8 NS] PrefixedName ::= Prefix ':' LocalPart - [9 NS] UnprefixedName ::= LocalPart - [10 NS] Prefix ::= NCName - [11 NS] LocalPart ::= NCName */ -static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +/* [11 NS] LocalPart ::= NCName */ +static HRESULT reader_parse_local(xmlreader *reader, strval *local) { - WCHAR *ptr, *start = reader_get_cur(reader); + WCHAR *ptr, *start; - ptr = start; - if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + if (reader->resume[XmlReadResume_Local]) + { + start = reader->resume[XmlReadResume_Local]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + } while (is_ncnamechar(*ptr)) { @@ -1543,25 +1548,79 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc ptr = reader_get_cur(reader); } - /* got a qualified name */ - if (*ptr == ':') + if (is_reader_pending(reader)) { - prefix->str = start; - prefix->len = ptr-start; + reader->resume[XmlReadResume_Local] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Local] = NULL; - reader_skipn(reader, 1); - start = ptr = reader_get_cur(reader); + local->str = start; + local->len = ptr-start; + + return S_OK; +} +/* [7 NS] QName ::= PrefixedName | UnprefixedName + [8 NS] PrefixedName ::= Prefix ':' LocalPart + [9 NS] UnprefixedName ::= LocalPart + [10 NS] Prefix ::= NCName */ +static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + WCHAR *ptr, *start; + HRESULT hr; + + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Name] = start; + if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + } + + if (reader->resume[XmlReadResume_Local]) + { + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + + prefix->str = reader->resume[XmlReadResume_Name]; + prefix->len = local->str - prefix->str - 1; + } + else + { + /* skip prefix part */ while (is_ncnamechar(*ptr)) { reader_skipn(reader, 1); ptr = reader_get_cur(reader); } - } - else - { - prefix->str = NULL; - prefix->len = 0; + + if (is_reader_pending(reader)) return E_PENDING; + + /* got a qualified name */ + if (*ptr == ':') + { + prefix->str = start; + prefix->len = ptr-start; + + /* skip ':' */ + reader_skipn(reader, 1); + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + } + else + { + local->str = reader->resume[XmlReadResume_Name]; + local->len = ptr-local->str; + + prefix->str = NULL; + prefix->len = 0; + } } local->str = start; @@ -1576,6 +1635,9 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* count ':' too */ qname->len = (prefix->len ? prefix->len + 1 : 0) + local->len; + reader->resume[XmlReadResume_Name] = NULL; + reader->resume[XmlReadResume_Local] = NULL; + return S_OK; } @@ -1586,9 +1648,6 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca static const WCHAR endW[] = {'/','>',0}; HRESULT hr; - /* skip '<' */ - reader_skipn(reader, 1); - hr = reader_parse_qname(reader, prefix, local, qname); if (FAILED(hr)) return hr; @@ -1617,32 +1676,47 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* [39] element ::= EmptyElemTag | STag content ETag */ static HRESULT reader_parse_element(xmlreader *reader) { - strval qname, prefix, local; HRESULT hr; - int empty; - /* check if we are really on element */ - if (reader_cmp(reader, ltW)) return S_FALSE; - reader_shrink(reader); + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* check if we are really on element */ + if (reader_cmp(reader, ltW)) return S_FALSE; - /* this handles empty elements too */ - empty = 0; - hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); - if (FAILED(hr)) return hr; + /* skip '<' */ + reader_skipn(reader, 1); - /* FIXME: need to check for defined namespace to reject invalid prefix, - currently reject all prefixes */ - if (prefix.len) return NC_E_UNDECLAREDPREFIX; + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_STag; + case XmlReadResumeState_STag: + { + strval qname, prefix, local; + int empty = 0; - /* if we got empty element and stack is empty go straight to Misc */ - if (empty && list_empty(&reader->elements)) - reader->instate = XmlReadInState_MiscEnd; - else - reader->instate = XmlReadInState_Content; + /* this handles empty elements too */ + hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); + if (FAILED(hr)) return hr; - reader->nodetype = XmlNodeType_Element; - reader_set_strvalue(reader, StringValue_LocalName, &local); - reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + /* FIXME: need to check for defined namespace to reject invalid prefix, + currently reject all prefixes */ + if (prefix.len) return NC_E_UNDECLAREDPREFIX; + + /* if we got empty element and stack is empty go straight to Misc */ + if (empty && list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + else + reader->instate = XmlReadInState_Content; + + reader->nodetype = XmlNodeType_Element; + reader->resumestate = XmlReadResumeState_Initial; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + break; + } + default: + hr = E_FAIL; + } return hr; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 77e596a..9829452 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -994,7 +994,7 @@ static void test_read_full(void) hr = IXmlReader_Read(reader, &type); i++; } - ok(test->types[i] == XmlNodeType_None, "incomplete sequence\n"); + ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); IStream_Release(stream); IXmlReader_Release(reader);

1 0

Nikolay Sivov : xmllite: Support pending input reads for PI nodes.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: d1c52fe168c24ac61223b63cc41a10c63491271a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c52fe168c24ac61223b63cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 8 14:10:26 2013 +0400 xmllite: Support pending input reads for PI nodes. --- dlls/xmllite/reader.c | 99 +++++++++++++++++++++++++++++++++---------- dlls/xmllite/tests/reader.c | 1 + 2 files changed, 78 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c6f416d..b4a7f33 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -56,6 +56,23 @@ typedef enum XmlReadInState_MiscEnd } XmlReaderInternalState; +/* This state denotes where parsing was interrupted by input problem. + Reader resumes parsing using this information. */ +typedef enum +{ + XmlReadResumeState_Initial, + XmlReadResumeState_PITarget, + XmlReadResumeState_PIBody +} XmlReaderResumeState; + +/* saved pointer index to resume from particular input position */ +typedef enum +{ + XmlReadResume_Name, /* PITarget */ + XmlReadResume_Body, /* PI body, comment text */ + XmlReadResume_Last +} XmlReaderResume; + typedef enum { StringValue_LocalName, @@ -146,6 +163,7 @@ typedef struct IMalloc *imalloc; XmlReadState state; XmlReaderInternalState instate; + XmlReaderResumeState resumestate; XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ @@ -155,7 +173,7 @@ typedef struct struct list elements; strval strvalues[StringValue_Last]; UINT depth; - WCHAR *save; + WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; struct input_buffer @@ -1031,9 +1049,9 @@ static HRESULT reader_parse_comment(xmlreader *reader) { WCHAR *start, *ptr; - if (reader->save) + if (reader->resume[XmlReadResume_Body]) { - start = reader->save; + start = reader->resume[XmlReadResume_Body]; ptr = reader_get_cur(reader); } else @@ -1043,7 +1061,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_shrink(reader); ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; - reader->save = start; + reader->resume[XmlReadResume_Body] = start; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1067,7 +1085,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); - reader->save = NULL; + reader->resume[XmlReadResume_Body] = NULL; return S_OK; } else @@ -1166,10 +1184,18 @@ static inline int is_namechar(WCHAR ch) [5] Name ::= NameStartChar (NameChar)* */ static HRESULT reader_parse_name(xmlreader *reader, strval *name) { - WCHAR *ptr, *start = reader_get_cur(reader); + WCHAR *ptr, *start; - ptr = start; - if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + } while (is_namechar(*ptr)) { @@ -1177,6 +1203,14 @@ static HRESULT reader_parse_name(xmlreader *reader, strval *name) ptr = reader_get_cur(reader); } + if (is_reader_pending(reader)) + { + reader->resume[XmlReadResume_Name] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Name] = NULL; + TRACE("name %s:%d\n", debugstr_wn(start, ptr-start), (int)(ptr-start)); name->str = start; name->len = ptr-start; @@ -1193,7 +1227,7 @@ static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) UINT i; hr = reader_parse_name(reader, &name); - if (FAILED(hr)) return WC_E_PI; + if (FAILED(hr)) return is_reader_pending(reader) ? E_PENDING : WC_E_PI; /* now that we got name check for illegal content */ if (name.len == 3 && !strncmpiW(name.str, xmlW, 3)) @@ -1216,12 +1250,20 @@ static HRESULT reader_parse_pi(xmlreader *reader) strval target; HRESULT hr; - /* skip '<?' */ - reader_skipn(reader, 2); - reader_shrink(reader); - - hr = reader_parse_pitarget(reader, &target); - if (FAILED(hr)) return hr; + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* skip '<?' */ + reader_skipn(reader, 2); + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_PITarget; + case XmlReadResumeState_PITarget: + hr = reader_parse_pitarget(reader, &target); + if (FAILED(hr)) return hr; + reader->resumestate = XmlReadResumeState_PIBody; + default: + ; + } ptr = reader_get_cur(reader); /* exit earlier if there's no content */ @@ -1230,17 +1272,26 @@ static HRESULT reader_parse_pi(xmlreader *reader) /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } - /* now at least a single space char should be there */ - if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; - reader_skipspaces(reader); - - ptr = start = reader_get_cur(reader); + if (!reader->resume[XmlReadResume_Body]) + { + /* now at least a single space char should be there */ + if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; + reader_skipspaces(reader); + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Body] = start; + } + else + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } while (*ptr) { @@ -1254,6 +1305,8 @@ static HRESULT reader_parse_pi(xmlreader *reader) /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; + reader->resume[XmlReadResume_Body] = NULL; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &value); @@ -1832,7 +1885,8 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->line = This->pos = 0; reader_clear_elements(This); This->depth = 0; - This->save = NULL; + This->resumestate = XmlReadResumeState_Initial; + memset(This->resume, 0, sizeof(This->resume)); /* just reset current input */ if (!input) @@ -2255,6 +2309,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->input = NULL; reader->state = XmlReadState_Closed; reader->instate = XmlReadInState_Initial; + reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; reader->imalloc = imalloc; @@ -2265,7 +2320,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr = NULL; list_init(&reader->elements); reader->depth = 0; - reader->save = NULL; + memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 65c3448..77e596a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -852,6 +852,7 @@ static void test_read_comment(void) static struct test_entry pi_tests[] = { { "<?pi?>", "pi", "", S_OK }, { "<?pi ?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, { "<?pi pi data?>", "pi", "pi data", S_OK }, { "<?pi pi data ?>", "pi", "pi data ", S_OK }, { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER },

1 0

Francois Gouget : d3dx9_34: Add a space between the spec entry name and the implementation function.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 8f6497c7823c3a3070653e950d69b44aec7afed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6497c7823c3a3070653e950… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 9 07:42:35 2013 +0100 d3dx9_34: Add a space between the spec entry name and the implementation function. --- dlls/d3dx9_34/d3dx9_34.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index bbf36d8..1cd744c 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -272,7 +272,7 @@ @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd @ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr)d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight @ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection @ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight @ stdcall D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight

1 0

Piotr Caban : cryptnet: Lock cache file while accessing it.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 4f8932157799e4d7e2c182bb0b66aa4e161992fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8932157799e4d7e2c182bb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 8 11:17:11 2013 +0100 cryptnet: Lock cache file while accessing it. --- dlls/cryptnet/cryptnet_main.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 46eac4e..75dce9d 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -503,24 +503,26 @@ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, TRACE("(%s, %p, %p)\n", debugstr_w(pszURL), pObject, pAuxInfo); - ret = GetUrlCacheEntryInfoW(pszURL, NULL, &size); - if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + RetrieveUrlCacheEntryFileW(pszURL, NULL, &size, 0); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + + pCacheInfo = CryptMemAlloc(size); + if (!pCacheInfo) { - pCacheInfo = CryptMemAlloc(size); - if (pCacheInfo) - ret = TRUE; - else - SetLastError(ERROR_OUTOFMEMORY); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; } - if (ret && (ret = GetUrlCacheEntryInfoW(pszURL, pCacheInfo, &size))) + + if ((ret = RetrieveUrlCacheEntryFileW(pszURL, pCacheInfo, &size, 0))) { FILETIME ft; GetSystemTimeAsFileTime(&ft); if (CompareFileTime(&pCacheInfo->ExpireTime, &ft) >= 0) { - HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, - GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, GENERIC_READ, + FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) { @@ -547,6 +549,7 @@ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, DeleteUrlCacheEntryW(pszURL); ret = FALSE; } + UnlockUrlCacheEntryFileW(pszURL, 0); } CryptMemFree(pCacheInfo); TRACE("returning %d\n", ret);

1 0

Hans Leidekker : user32: Add a stub implementation of UserHandleGrantAccess .
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 6493d6abbcbcdee2ec5e25ac8e04ce368b904f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6493d6abbcbcdee2ec5e25ac8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 8 09:26:42 2013 +0100 user32: Add a stub implementation of UserHandleGrantAccess. --- dlls/user32/misc.c | 10 ++++++++++ dlls/user32/user32.spec | 2 +- include/winuser.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index ef7fff6..50bb79a 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -651,3 +651,13 @@ VOID WINAPI DisableProcessWindowsGhosting(VOID) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return; } + +/********************************************************************** + * UserHandleGrantAccess [USER32.@] + * + */ +BOOL WINAPI UserHandleGrantAccess(HANDLE handle, HANDLE job, BOOL grant) +{ + FIXME("(%p,%p,%d): stub\n", handle, job, grant); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 231d3b1..1ad59d9 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -734,7 +734,7 @@ @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr) @ stdcall UserClientDllInitialize(long long ptr) DllMain -@ stub UserHandleGrantAccess +@ stdcall UserHandleGrantAccess(ptr ptr long) # @ stub UserIsSystemResumeAutomatic # @ stub UserLpkPSMTextOut # @ stub UserLpkTabbedTextOut diff --git a/include/winuser.h b/include/winuser.h index c8ffe6d..59d5b8e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3988,6 +3988,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); +WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); WINUSERAPI UINT WINAPI UserRealizePalette(HDC); WINUSERAPI BOOL WINAPI ValidateRect(HWND,const RECT*); WINUSERAPI BOOL WINAPI ValidateRgn(HWND,HRGN);

1 0

Alexandre Julliard : jscript: Return after assert(0) to silence warnings.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: a27ecc40bab8883dc63ca95bb3dfafd02b48a550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27ecc40bab8883dc63ca95bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 19:29:24 2013 +0100 jscript: Return after assert(0) to silence warnings. --- dlls/jscript/compile.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 53ed9e7..84d3d5f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -799,6 +799,7 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st } default: assert(0); + return E_FAIL; } return *str ? S_OK : E_OUTOFMEMORY; @@ -1051,6 +1052,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL break; default: assert(0); + hres = E_FAIL; } if(FAILED(hres))

1 0

Daniel Jelinski : comctl32/imagelist: Use proper color format for merged image lists.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: cb8ce94e4dd4acb94cf9d991593b830bec82067a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8ce94e4dd4acb94cf9d9915… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed Feb 27 21:47:43 2013 +0100 comctl32/imagelist: Use proper color format for merged image lists. --- dlls/comctl32/imagelist.c | 6 +++- dlls/comctl32/tests/imagelist.c | 65 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 03c359f..76d5709 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2082,6 +2082,7 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, INT cxDst, cyDst; INT xOff1, yOff1, xOff2, yOff2; POINT pt1, pt2; + INT newFlags; TRACE("(himl1=%p i1=%d himl2=%p i2=%d dx=%d dy=%d)\n", himl1, i1, himl2, i2, dx, dy); @@ -2121,7 +2122,10 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, yOff2 = 0; } - himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | ILC_COLOR, 1, 1); + newFlags = (himl1->flags > himl2->flags ? himl1->flags : himl2->flags) & ILC_COLORDDB; + if (newFlags == ILC_COLORDDB && (himl1->flags & ILC_COLORDDB) == ILC_COLOR16) + newFlags = ILC_COLOR16; /* this is what native (at least v5) does, don't know why */ + himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | newFlags, 1, 1); if (himlDst) { diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 19d2437..58a7e70 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -492,6 +492,70 @@ static void test_DrawIndirect(void) DestroyWindow(hwndfortest); } +static int get_color_format(HBITMAP bmp) +{ + BITMAPINFO bmi; + HDC hdc = CreateCompatibleDC(0); + HBITMAP hOldBmp = SelectObject(hdc, bmp); + int ret; + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, bmp, 0, 0, 0, &bmi, DIB_RGB_COLORS); + ok(ret, "GetDIBits failed\n"); + + SelectObject(hdc, hOldBmp); + DeleteDC(hdc); + return bmi.bmiHeader.biBitCount; +} + +static void test_merge_colors(void) +{ + HIMAGELIST himl[8], hmerge; + int sizes[] = { ILC_COLOR, ILC_COLOR | ILC_MASK, ILC_COLOR4, ILC_COLOR8, ILC_COLOR16, ILC_COLOR24, ILC_COLOR32, ILC_COLORDDB }; + HICON hicon1; + IMAGEINFO info; + int bpp, i, j; + + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != NULL, "failed to create hicon1\n"); + + for (i = 0; i < 8; i++) + { + himl[i] = ImageList_Create(32, 32, sizes[i], 0, 3); + ok(himl[i] != NULL, "failed to create himl[%d]\n", i); + ok(0 == ImageList_AddIcon(himl[i], hicon1), "add icon1 to himl[%d] failed\n", i); + if (i == 0 || i == 1 || i == 7) + { + ImageList_GetImageInfo(himl[i], 0, &info); + sizes[i] = get_color_format(info.hbmImage); + } + } + DestroyIcon(hicon1); + for (i = 0; i < 8; i++) + for (j = 0; j < 8; j++) + { + hmerge = ImageList_Merge(himl[i], 0, himl[j], 0, 0, 0); + ok(hmerge != NULL, "merge himl[%d], himl[%d] failed\n", i, j); + + ImageList_GetImageInfo(hmerge, 0, &info); + bpp = get_color_format(info.hbmImage); + /* ILC_COLOR[X] is defined as [X] */ + if (i == 4 && j == 7) + ok(bpp == 16, /* merging ILC_COLOR16 with ILC_COLORDDB seems to be a special case */ + "wrong biBitCount %d when merging lists %d (%d) and %d (%d)\n", bpp, i, sizes[i], j, sizes[j]); + else + ok(bpp == (i > j ? sizes[i] : sizes[j]), + "wrong biBitCount %d when merging lists %d (%d) and %d (%d)\n", bpp, i, sizes[i], j, sizes[j]); + ok(info.hbmMask != 0, "Imagelist merged from %d and %d had no mask\n", i, j); + + if (hmerge) ImageList_Destroy(hmerge); + } + + for (i = 0; i < 8; i++) + ImageList_Destroy(himl[i]); +} + static void test_merge(void) { HIMAGELIST himl1, himl2, hmerge; @@ -2017,6 +2081,7 @@ START_TEST(imagelist) test_imagecount(); test_DrawIndirect(); test_merge(); + test_merge_colors(); test_imagelist_storage(); test_iconsize();

1 0

Jacek Caban : jscript: Avoid direct access to string buffer in a few more places.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 9323dc57afc346a9771545118aa66af6e3a235ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9323dc57afc346a9771545118… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 11:38:11 2013 +0100 jscript: Avoid direct access to string buffer in a few more places. --- dlls/jscript/string.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 2aa9e58..59885c4 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1338,12 +1338,13 @@ static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(r) { jsstr_t *ret; - ret = jsstr_alloc_len(str->str, jsstr_length(str)); + ret = jsstr_alloc_buf(jsstr_length(str)); if(!ret) { jsstr_release(str); return E_OUTOFMEMORY; } + jsstr_flush(str, ret->str); strlwrW(ret->str); *r = jsval_string(ret); } @@ -1366,12 +1367,13 @@ static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(r) { jsstr_t *ret; - ret = jsstr_alloc_len(str->str, jsstr_length(str)); + ret = jsstr_alloc_buf(jsstr_length(str)); if(!ret) { jsstr_release(str); return E_OUTOFMEMORY; } + jsstr_flush(str, ret->str); struprW(ret->str); *r = jsval_string(ret); } @@ -1449,12 +1451,12 @@ static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) StringInstance *string = (StringInstance*)jsdisp; jsstr_t *ret; - TRACE("%p[%u] = %s\n", string, idx, debugstr_wn(string->str->str+idx, 1)); - ret = jsstr_substr(string->str, idx, 1); if(!ret) return E_OUTOFMEMORY; + TRACE("%p[%u] = %s\n", string, idx, debugstr_jsstr(ret)); + *r = jsval_string(ret); return S_OK; }

1 0

Jacek Caban : jscript: Reuse static instance of 'undefined' string.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: d7f24b095663a960d949d1d72d2e7db8fbe58416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f24b095663a960d949d1d72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 11:37:56 2013 +0100 jscript: Reuse static instance of 'undefined' string. --- dlls/jscript/engine.c | 6 +--- dlls/jscript/global.c | 59 +++++++++------------------------------------- dlls/jscript/jsregexp.c | 11 +------- dlls/jscript/jsstr.c | 11 ++++++++- dlls/jscript/jsstr.h | 1 + dlls/jscript/jsutils.c | 5 +-- dlls/jscript/lex.c | 1 - dlls/jscript/string.c | 19 +++------------ 8 files changed, 33 insertions(+), 80 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index eb15be4..52cdc88 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1698,13 +1698,11 @@ static HRESULT interp_typeofid(exec_ctx_t *ctx) DISPID id; HRESULT hres; - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; - TRACE("\n"); obj = stack_pop_objid(ctx, &id); if(!obj) - return stack_push_string(ctx, undefinedW); + return stack_push(ctx, jsval_string(jsstr_undefined())); hres = disp_propget(ctx->script, obj, id, &v); IDispatch_Release(obj); @@ -1735,7 +1733,7 @@ static HRESULT interp_typeofident(exec_ctx_t *ctx) return hres; if(exprval.type == EXPRVAL_INVALID) { - hres = stack_push_string(ctx, undefinedW); + hres = stack_push(ctx, jsval_string(jsstr_undefined())); exprval_release(&exprval); return hres; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 0668e86..739a831 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -286,14 +286,8 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); if(!argc) { - if(r) { - ret_str = jsstr_alloc(undefinedW); - if(!ret_str) - return E_OUTOFMEMORY; - - *r = jsval_string(ret_str); - } - + if(r) + *r = jsval_string(jsstr_undefined()); return S_OK; } @@ -640,13 +634,8 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); if(!argc) { - if(r) { - ret_str = jsstr_alloc(undefinedW); - if(!ret_str) - return E_OUTOFMEMORY; - *r = jsval_string(ret_str); - } - + if(r) + *r = jsval_string(jsstr_undefined()); return S_OK; } @@ -781,14 +770,8 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags TRACE("\n"); if(!argc) { - if(r) { - ret = jsstr_alloc(undefinedW); - if(!ret) - return E_OUTOFMEMORY; - - *r = jsval_string(ret); - } - + if(r) + *r = jsval_string(jsstr_undefined()); return S_OK; } @@ -853,14 +836,8 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags TRACE("\n"); if(!argc) { - if(r) { - ret = jsstr_alloc(undefinedW); - if(!ret) - return E_OUTOFMEMORY; - - *r = jsval_string(ret); - } - + if(r) + *r = jsval_string(jsstr_undefined()); return S_OK; } @@ -944,14 +921,8 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W TRACE("\n"); if(!argc) { - if(r) { - ret = jsstr_alloc(undefinedW); - if(!ret) - return E_OUTOFMEMORY; - - *r = jsval_string(ret); - } - + if(r) + *r = jsval_string(jsstr_undefined()); return S_OK; } @@ -1014,14 +985,8 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W TRACE("\n"); if(!argc) { - if(r) { - ret = jsstr_alloc(undefinedW); - if(!ret) - return E_OUTOFMEMORY; - - *r = jsval_string(ret); - } - + if(r) + *r = jsval_string(jsstr_undefined()); return S_OK; } diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 43df35a..61e9a95 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -58,7 +58,6 @@ static const WCHAR idx7W[] = {'$','7',0}; static const WCHAR idx8W[] = {'$','8',0}; static const WCHAR idx9W[] = {'$','9',0}; -static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR emptyW[] = {0}; static inline RegExpInstance *regexp_from_vdisp(vdisp_t *vdisp) @@ -487,21 +486,15 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig jsval_t *r) { match_state_t *match; - heap_pool_t *mark; jsstr_t *undef_str; + heap_pool_t *mark; BOOL b; HRESULT hres; TRACE("\n"); - if(!argc) { - undef_str = jsstr_alloc(undefinedW); - if(!undef_str) - return E_OUTOFMEMORY; - } - mark = heap_pool_mark(&ctx->tmp_heap); - hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(undef_str), NULL, &match, &b); + hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(undef_str = jsstr_undefined()), NULL, &match, &b); heap_pool_clear(mark); if(!argc) jsstr_release(undef_str); diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index 59dfe98..3fb50b4 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -88,7 +88,7 @@ jsstr_t *jsstr_concat(jsstr_t *str1, jsstr_t *str2) return ret; } -static jsstr_t *empty_str, *nan_str; +static jsstr_t *empty_str, *nan_str, *undefined_str; jsstr_t *jsstr_nan(void) { @@ -100,14 +100,22 @@ jsstr_t *jsstr_empty(void) return jsstr_addref(empty_str); } +jsstr_t *jsstr_undefined(void) +{ + return jsstr_addref(undefined_str); +} + BOOL init_strings(void) { static const WCHAR NaNW[] = { 'N','a','N',0 }; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; if(!(empty_str = jsstr_alloc_buf(0))) return FALSE; if(!(nan_str = jsstr_alloc(NaNW))) return FALSE; + if(!(undefined_str = jsstr_alloc(undefinedW))) + return FALSE; return TRUE; } @@ -115,4 +123,5 @@ void free_strings(void) { jsstr_release(empty_str); jsstr_release(nan_str); + jsstr_release(undefined_str); } diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index cbe68ef..c71cbea 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -76,6 +76,7 @@ jsstr_t *jsstr_concat(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; jsstr_t *jsstr_nan(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_empty(void) DECLSPEC_HIDDEN; +jsstr_t *jsstr_undefined(void) DECLSPEC_HIDDEN; BOOL init_strings(void) DECLSPEC_HIDDEN; void free_strings(void) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 5900d81..60260bb 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -738,15 +738,14 @@ HRESULT double_to_string(double n, jsstr_t **str) /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) { - const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; const WCHAR nullW[] = {'n','u','l','l',0}; const WCHAR trueW[] = {'t','r','u','e',0}; const WCHAR falseW[] = {'f','a','l','s','e',0}; switch(jsval_type(val)) { case JSV_UNDEFINED: - *str = jsstr_alloc(undefinedW); - break; + *str = jsstr_undefined(); + return S_OK; case JSV_NULL: *str = jsstr_alloc(nullW); break; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 8823a30..54c8fcf 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -59,7 +59,6 @@ static const WCHAR throwW[] = {'t','h','r','o','w',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; static const WCHAR tryW[] = {'t','r','y',0}; static const WCHAR typeofW[] = {'t','y','p','e','o','f',0}; -static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR varW[] = {'v','a','r',0}; static const WCHAR voidW[] = {'v','o','i','d',0}; static const WCHAR whileW[] = {'w','h','i','l','e',0}; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 8f38621..2aa9e58 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -188,10 +188,7 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r, const WCHAR *tagname, const WCHAR *attrname) { - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; - jsstr_t *str, *attr_value = NULL; - unsigned attr_len; HRESULT hres; hres = get_string_val(ctx, jsthis, &str); @@ -204,9 +201,8 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig jsstr_release(str); return hres; } - attr_len = jsstr_length(attr_value); }else { - attr_len = sizeof(undefinedW)/sizeof(WCHAR)-1; + attr_value = jsstr_undefined(); } if(r) { @@ -214,7 +210,7 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig unsigned tagname_len = strlenW(tagname); jsstr_t *ret; - ret = jsstr_alloc_buf(2*tagname_len + attrname_len + attr_len + jsstr_length(str) + 9); + ret = jsstr_alloc_buf(2*tagname_len + attrname_len + jsstr_length(attr_value) + jsstr_length(str) + 9); if(ret) { WCHAR *ptr = ret->str; @@ -226,13 +222,7 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig ptr += attrname_len; *ptr++ = '='; *ptr++ = '"'; - - if(attr_value) - jsstr_flush(attr_value, ptr); - else - memcpy(ptr, undefinedW, attr_len*sizeof(WCHAR)); - ptr += attr_len; - + ptr += jsstr_flush(attr_value, ptr); *ptr++ = '"'; *ptr++ = '>'; ptr += jsstr_flush(str, ptr); @@ -249,8 +239,7 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig } } - if(attr_value) - jsstr_release(attr_value); + jsstr_release(attr_value); jsstr_release(str); return hres; }

1 0

Jacek Caban : jscript: Pass msg as jsstr_t to create_error.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: c7c71b87b894bb67d8b9a136162a66a273bedf61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c71b87b894bb67d8b9a1361… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 11:37:30 2013 +0100 jscript: Pass msg as jsstr_t to create_error. --- dlls/jscript/error.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 3e15144..41cba5a 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -180,10 +180,9 @@ static HRESULT alloc_error(script_ctx_t *ctx, jsdisp_t *prototype, } static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, - UINT number, const WCHAR *msg, jsdisp_t **ret) + UINT number, jsstr_t *msg, jsdisp_t **ret) { jsdisp_t *err; - jsstr_t *str; HRESULT hres; hres = alloc_error(ctx, NULL, constr, &err); @@ -196,16 +195,9 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, return hres; } - if(msg) str = jsstr_alloc(msg); - else str = jsstr_empty(); - if(str) { - hres = jsdisp_propput_name(err, messageW, jsval_string(str)); - if(SUCCEEDED(hres)) - hres = jsdisp_propput_dontenum(err, descriptionW, jsval_string(str)); - jsstr_release(str); - }else { - hres = E_OUTOFMEMORY; - } + hres = jsdisp_propput_name(err, messageW, jsval_string(msg)); + if(SUCCEEDED(hres)) + hres = jsdisp_propput_dontenum(err, descriptionW, jsval_string(msg)); if(FAILED(hres)) { jsdisp_release(err); return hres; @@ -235,19 +227,21 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, unsigned argc, jsval_ num = n; } - if(argc>1 && !msg) { - hres = to_string(ctx, argv[1], &msg); - if(FAILED(hres)) - return hres; + if(!msg) { + if(argc > 1) { + hres = to_string(ctx, argv[1], &msg); + if(FAILED(hres)) + return hres; + }else { + msg = jsstr_empty(); + } } switch(flags) { case INVOKE_FUNC: case DISPATCH_CONSTRUCT: - hres = create_error(ctx, constr, num, msg ? msg->str : NULL, &err); - if(msg) - jsstr_release(msg); - + hres = create_error(ctx, constr, num, msg, &err); + jsstr_release(msg); if(FAILED(hres)) return hres; @@ -375,6 +369,7 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j { WCHAR buf[1024], *pos = NULL; jsdisp_t *err; + jsstr_t *msg; HRESULT hres; if(!is_jscript_error(error)) @@ -392,7 +387,12 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j WARN("%s\n", debugstr_w(buf)); - hres = create_error(ctx, constr, error, buf, &err); + msg = jsstr_alloc(buf); + if(!msg) + return E_OUTOFMEMORY; + + hres = create_error(ctx, constr, error, msg, &err); + jsstr_release(msg); if(FAILED(hres)) return hres;

1 0

Piotr Caban : cryptnet: Open file with FILE_SHARE_READ flag in File_RetrieveEncodedObjectW.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 437df58dce20b3d52d1a103b60b4f7d33e76ac3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=437df58dce20b3d52d1a103b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 8 11:17:30 2013 +0100 cryptnet: Open file with FILE_SHARE_READ flag in File_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 75dce9d..64af80c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1032,8 +1032,8 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, /* Try to create the file directly - Wine handles / in pathnames */ lstrcpynW(path, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { /* Try again on the current drive */ @@ -1042,8 +1042,8 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, { lstrcpynW(path + 2, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } if (hFile == INVALID_HANDLE_VALUE) { @@ -1053,8 +1053,8 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, { lstrcpynW(path + 2, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } } }

1 0

Volkan Gezer : po: Updated Turkish translation.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 81e48cd0fa6050f1bbd86a7bbb8a0e445b80afa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e48cd0fa6050f1bbd86a7bb… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Tue Mar 5 20:57:20 2013 +0100 po: Updated Turkish translation. --- po/tr.po | 1094 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 554 insertions(+), 540 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81e48cd0fa6050f1bbd86…

1 0

Jacek Caban : urlmon: Fixed some test failures on IE10.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 8b0b99103c23f5b2d730dd1d50b85989d16996ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0b99103c23f5b2d730dd1d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 15:25:37 2013 +0100 urlmon: Fixed some test failures on IE10. --- dlls/urlmon/tests/protocol.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 8297738..b4b8f19 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -201,7 +201,7 @@ static const char *debugstr_guid(REFIID riid) { static char buf[50]; - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); @@ -1479,6 +1479,8 @@ static HRESULT WINAPI Protocol_Seek(IInternetProtocolEx *iface, static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) { + static const IID unknown_iid = {0x7daf9908,0x8415,0x4005,{0x95,0xae, 0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { *ppv = iface; return S_OK; @@ -1510,7 +1512,8 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE return E_NOINTERFACE; } - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + if(!IsEqualGUID(riid, &unknown_iid)) /* IE10 */ + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : wininet: Added a test of request reading from cache.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 9d11eee03df5ee5d10bb97d0af0c8eb2be79f807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d11eee03df5ee5d10bb97d0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 15:59:36 2013 +0100 wininet: Added a test of request reading from cache. --- dlls/wininet/tests/http.c | 110 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c682930..7988de4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -397,7 +397,7 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); - if(!--close_handle_cnt) + if(!InterlockedDecrement(&close_handle_cnt)) SetEvent(hCompleteEvent); break; case INTERNET_STATUS_REQUEST_COMPLETE: @@ -411,7 +411,8 @@ static VOID WINAPI callback( GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength); req_error = iar->dwError; - SetEvent(hCompleteEvent); + if(!close_handle_cnt) + SetEvent(hCompleteEvent); break; } case INTERNET_STATUS_REDIRECT: @@ -445,7 +446,6 @@ static void close_async_handle(HINTERNET handle, HANDLE complete_event, int hand ok(res, "InternetCloseHandle failed: %u\n", GetLastError()); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); - SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); } static void InternetReadFile_test(int flags, const test_data_t *test) @@ -1219,6 +1219,108 @@ done: ok(InternetCloseHandle(session), "Close session handle failed\n"); } +static void test_cache_read(void) +{ + HINTERNET session, connection, req; + FILETIME now, tomorrow, yesterday; + BYTE content[1000], buf[2000]; + char file_path[MAX_PATH]; + ULARGE_INTEGER li; + HANDLE file; + DWORD size; + unsigned i; + BOOL res; + + static const char cache_only_url[] = "http://test.winehq.org/tests/cache-only"; + BYTE cache_headers[] = "HTTP/1.1 200 OK\r\n\r\n"; + + trace("Testing cache read...\n"); + + hCompleteEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + for(i = 0; i < sizeof(content); i++) + content[i] = '0' + (i%10); + + GetSystemTimeAsFileTime(&now); + li.u.HighPart = now.dwHighDateTime; + li.u.LowPart = now.dwLowDateTime; + li.QuadPart += (LONGLONG)10000000 * 3600 * 24; + tomorrow.dwHighDateTime = li.u.HighPart; + tomorrow.dwLowDateTime = li.u.LowPart; + li.QuadPart -= (LONGLONG)10000000 * 3600 * 24 * 2; + yesterday.dwHighDateTime = li.u.HighPart; + yesterday.dwLowDateTime = li.u.LowPart; + + res = CreateUrlCacheEntryA(cache_only_url, sizeof(content), "", file_path, 0); + ok(res, "CreateUrlCacheEntryA failed: %u\n", GetLastError()); + + file = CreateFileA(file_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + + WriteFile(file, content, sizeof(content), &size, NULL); + CloseHandle(file); + + res = CommitUrlCacheEntryA(cache_only_url, file_path, tomorrow, yesterday, NORMAL_CACHE_ENTRY, + cache_headers, sizeof(cache_headers)-1, "", 0); + ok(res, "CommitUrlCacheEntryA failed: %u\n", GetLastError()); + + session = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + pInternetSetStatusCallbackA(session, callback); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + connection = InternetConnectA(session, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, + NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok(connection != NULL,"InternetConnect failed with error %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequestA(connection, "GET", "/tests/cache-only", NULL, NULL, NULL, 0, 0xdeadbead); + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_WINE_ALLOW(INTERNET_STATUS_SENDING_REQUEST); + SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_SENT); + SET_WINE_ALLOW(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_WINE_ALLOW(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, -1, NULL, 0); + todo_wine + ok(res, "HttpSendRequest failed: %u\n", GetLastError()); + + if(res) { + size = 0; + res = InternetQueryDataAvailable(req, &size, 0, 0); + ok(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(size == sizeof(content), "size = %u\n", size); + + size = sizeof(buf); + res = InternetReadFile(req, buf, sizeof(buf), &size); + ok(res, "InternetReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(content), "size = %u\n", size); + ok(!memcmp(content, buf, sizeof(content)), "unexpected content\n"); + } + + close_async_handle(session, hCompleteEvent, 2); + + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CLEAR_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + res = DeleteUrlCacheEntryA(cache_only_url); + ok(res, "DeleteUrlCacheEntryA failed: %u\n", GetLastError()); + + CloseHandle(hCompleteEvent); +} + static void test_http_cache(void) { HINTERNET session, connect, request; @@ -1333,6 +1435,8 @@ static void test_http_cache(void) ok(InternetCloseHandle(request), "Close request handle failed\n"); ok(InternetCloseHandle(connect), "Close connect handle failed\n"); ok(InternetCloseHandle(session), "Close session handle failed\n"); + + test_cache_read(); } static void HttpHeaders_test(void)

1 0

Piotr Caban : cryptnet: Don' t ignore HttpEndRequestW error in HTTP_RetrieveEncodedObjectW.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: b8e2edf19c27c91641a6c26d07b94ecf33839467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e2edf19c27c91641a6c26d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 8 11:17:53 2013 +0100 cryptnet: Don't ignore HttpEndRequestW error in HTTP_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 64af80c..ddfdbce 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -941,19 +941,15 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, else ret = TRUE; } - /* We don't set ret to TRUE in this block to avoid masking - * an error from HttpSendRequestExW. - */ if (ret && - !HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + !(ret = HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context)) && GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event, context->timeout) == WAIT_TIMEOUT) - { SetLastError(ERROR_TIMEOUT); - ret = FALSE; - } + else + ret = TRUE; } if (ret) ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp,

1 0

Jacek Caban : wininet: Don' t pass expected cache file size to CreateUrlCacheEntry if it's unknown.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: d1ce8ba0534e1e42e3b7129c1dc8b75e1354bfed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ce8ba0534e1e42e3b7129c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 15:59:20 2013 +0100 wininet: Don't pass expected cache file size to CreateUrlCacheEntry if it's unknown. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 890adce..498e848 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2276,7 +2276,7 @@ static void create_cache_entry(http_request_t *req) return; } - b = CreateUrlCacheEntryW(url, req->contentLength, NULL, file_name, 0); + b = CreateUrlCacheEntryW(url, req->contentLength == ~0u ? 0 : req->contentLength, NULL, file_name, 0); if(!b) { WARN("Could not create cache entry: %08x\n", GetLastError()); return;

1 0

Dmitry Timoshkov : windowscodecs: Fix handling of a tRNS PNG chunk in the frame CopyPalette method.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 18e76792a76291c7a8211b6daa433ba6532c840f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e76792a76291c7a8211b6da… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 8 13:18:06 2013 +0900 windowscodecs: Fix handling of a tRNS PNG chunk in the frame CopyPalette method. --- dlls/windowscodecs/pngformat.c | 17 ++++++----------- dlls/windowscodecs/tests/pngformat.c | 2 -- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2f6a9e3..1708580 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -798,7 +798,7 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, png_colorp png_palette; int num_palette; WICColor palette[256]; - png_bytep trans; + png_bytep trans_alpha; int num_trans; png_color_16p trans_values; int i; @@ -822,23 +822,18 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, goto end; } + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); + if (!ret) num_trans = 0; + for (i=0; i<num_palette; i++) { - palette[i] = (0xff000000| + BYTE alpha = (i < num_trans) ? trans_alpha[i] : 0xff; + palette[i] = (alpha << 24 | png_palette[i].red << 16| png_palette[i].green << 8| png_palette[i].blue); } - ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); - if (ret) - { - for (i=0; i<num_trans; i++) - { - palette[trans[i]] = 0x00000000; - } - } - end: LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 61c56b3..a222ebc 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -577,9 +577,7 @@ static void test_png_palette(void) hr = IWICPalette_GetColors(palette, 256, color, &ret); ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); -todo_wine ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); -todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); IWICPalette_Release(palette);

1 0

Ken Thomases : winemac: Improve handling of "invert" pixels in monochrome cursors.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 37b33a9de83d0942616f08c9eb66203296ae6ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b33a9de83d0942616f08c9e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 7 20:37:02 2013 -0600 winemac: Improve handling of "invert" pixels in monochrome cursors. --- dlls/winemac.drv/mouse.c | 109 +++++++++++++++++++++++++++++++++------------- 1 files changed, 79 insertions(+), 30 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index cfbb274..66214fe 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -258,21 +258,6 @@ done: } /*********************************************************************** - * release_provider_cfdata - * - * Helper for create_monochrome_cursor. A CFData is used by two - * different CGDataProviders, using different offsets. One of them is - * constructed with a pointer to the bytes, not a reference to the - * CFData object (because of the offset). So, the CFData is CFRetain'ed - * on its behalf at creation and released here. - */ -void release_provider_cfdata(void *info, const void *data, size_t size) -{ - CFRelease(info); -} - - -/*********************************************************************** * create_monochrome_cursor */ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, int height) @@ -280,6 +265,9 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *info = (BITMAPINFO *)buffer; unsigned int width_bytes = (width + 31) / 32 * 4; + unsigned long *and_bits = NULL, *xor_bits; + unsigned long *data_bits; + int count, i; CGColorSpaceRef colorspace; CFMutableDataRef data; CGDataProviderRef provider; @@ -306,43 +294,86 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - /* This will be owned by the data provider for the mask image and released - when it is destroyed. */ - data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage); - if (!data) + and_bits = HeapAlloc(GetProcessHeap(), 0, info->bmiHeader.biSizeImage); + if (!and_bits) { - WARN("failed to create data\n"); + WARN("failed to allocate and_bits\n"); return NULL; } - CFDataSetLength(data, info->bmiHeader.biSizeImage); + xor_bits = (unsigned long*)((char*)and_bits + info->bmiHeader.biSizeImage / 2); - if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, CFDataGetMutableBytePtr(data), info, DIB_RGB_COLORS)) + if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, and_bits, info, DIB_RGB_COLORS)) { WARN("GetDIBits failed\n"); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } + /* On Windows, the pixels of a monochrome cursor can have four effects: + draw black, draw white, leave unchanged (transparent), or invert. The Mac + only supports the first three. It can't do pixels which invert the + background. Since the background is usually white, I am arbitrarily + mapping "invert" to "draw black". This entails bitwise math between the + cursor's AND mask and XOR mask: + + AND | XOR | Windows cursor pixel + -------------------------------- + 0 | 0 | black + 0 | 1 | white + 1 | 0 | transparent + 1 | 1 | invert + + AND | XOR | Mac image + --------------------- + 0 | 0 | black (0) + 0 | 1 | white (1) + 1 | 0 | don't care + 1 | 1 | black (0) + + AND | XOR | Mac mask + --------------------------- + 0 | 0 | paint (0) + 0 | 1 | paint (0) + 1 | 0 | don't paint (1) + 1 | 1 | paint (0) + + So, Mac image = AND ^ XOR and Mac mask = AND & ~XOR. + */ + /* Create data for Mac image. */ + data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage / 2); + if (!data) + { + WARN("failed to create data\n"); + HeapFree(GetProcessHeap(), 0, and_bits); + return NULL; + } + + /* image data = AND mask */ + CFDataAppendBytes(data, (UInt8*)and_bits, info->bmiHeader.biSizeImage / 2); + /* image data ^= XOR mask */ + data_bits = (unsigned long*)CFDataGetMutableBytePtr(data); + count = (info->bmiHeader.biSizeImage / 2) / sizeof(*data_bits); + for (i = 0; i < count; i++) + data_bits[i] ^= xor_bits[i]; + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGray); if (!colorspace) { WARN("failed to create colorspace\n"); CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } - /* The data object needs to live as long as this provider, so retain it an - extra time and have the provider's data-release callback release it. */ - provider = CGDataProviderCreateWithData(data, CFDataGetBytePtr(data) + width_bytes * height, - width_bytes * height, release_provider_cfdata); + provider = CGDataProviderCreateWithCFData(data); + CFRelease(data); if (!provider) { WARN("failed to create data provider\n"); CGColorSpaceRelease(colorspace); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } - CFRetain(data); cgimage = CGImageCreate(width, height, 1, 1, width_bytes, colorspace, kCGImageAlphaNone | kCGBitmapByteOrderDefault, @@ -352,10 +383,28 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, if (!cgimage) { WARN("failed to create image\n"); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); + return NULL; + } + + /* Create data for mask. */ + data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage / 2); + if (!data) + { + WARN("failed to create data\n"); + CGImageRelease(cgimage); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } + /* mask data = AND mask */ + CFDataAppendBytes(data, (UInt8*)and_bits, info->bmiHeader.biSizeImage / 2); + /* mask data &= ~XOR mask */ + data_bits = (unsigned long*)CFDataGetMutableBytePtr(data); + for (i = 0; i < count; i++) + data_bits[i] &= ~xor_bits[i]; + HeapFree(GetProcessHeap(), 0, and_bits); + provider = CGDataProviderCreateWithCFData(data); CFRelease(data); if (!provider)

1 0

C.W. Betts : winemac: Fix compilation on Lion and later.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: c333c6ea6c3338b2d4650342ab75219147b062cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c333c6ea6c3338b2d4650342a… Author: C.W. Betts <computers57(a)hotmail.com> Date: Thu Mar 7 15:12:45 2013 -0700 winemac: Fix compilation on Lion and later. --- dlls/winemac.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 0f62e28..e3e9aa4 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -33,6 +33,7 @@ #include "wine/wglext.h" #define __gl_h_ +#define __gltypes_h_ #include <OpenGL/OpenGL.h> #include <OpenGL/glu.h> #include <OpenGL/CGLRenderers.h>

1 0

Daniel Jelinski : comctl32/listview: Correct sending NM_CUSTOMDRAW to subitem 0.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: fae9738cc37c4d30710f12ee99abc11c7ae37130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae9738cc37c4d30710f12ee9… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Mar 7 20:35:19 2013 +0100 comctl32/listview: Correct sending NM_CUSTOMDRAW to subitem 0. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4ae974e..b084e5e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4621,7 +4621,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS if (nSubItem == 0) infoPtr->cditemmode = cdsubitemmode; if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; /* we have to send a CDDS_SUBITEM customdraw explicitly for subitem 0 */ - if (nSubItem == 0 && cdsubitemmode == CDRF_NOTIFYITEMDRAW) + if (nSubItem == 0 && (cdsubitemmode & CDRF_NOTIFYITEMDRAW) != 0) { cdsubitemmode = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint;

1 0

Andrew Talbot : ws2_32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 05d5654237c1af93661a3f5e21c792f6e431883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d5654237c1af93661a3f5e2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 7 22:22:31 2013 +0000 ws2_32: Avoid signed-unsigned integer comparisons. --- dlls/ws2_32/socket.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 05c7aac..f9e8a6c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2881,7 +2881,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { struct irda_device_list *src = (struct irda_device_list *)buf; DEVICELIST *dst = (DEVICELIST *)optval; - INT needed = sizeof(DEVICELIST), i; + INT needed = sizeof(DEVICELIST); + unsigned int i; if (src->len > 0) needed += (src->len - 1) * sizeof(IRDA_DEVICE_INFO); @@ -4605,6 +4606,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) static struct WS_hostent* WS_get_local_ips( char *hostname ) { int last_metric, numroutes = 0, i, j; + DWORD n; PIP_ADAPTER_INFO adapters = NULL, k; struct WS_hostent *hostlist = NULL; PMIB_IPFORWARDTABLE routes = NULL; @@ -4627,15 +4629,15 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) if (GetIpForwardTable(routes, &route_size, FALSE) != NO_ERROR) goto cleanup; /* Store the interface associated with each route */ - for (i = 0; i < routes->dwNumEntries; i++) + for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; DWORD ifmetric, exists = FALSE; - if (routes->table[i].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) + if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue; - ifindex = routes->table[i].dwForwardIfIndex; - ifmetric = routes->table[i].dwForwardMetric1; + ifindex = routes->table[n].dwForwardIfIndex; + ifmetric = routes->table[n].dwForwardMetric1; /* Only store the lowest valued metric for an interface */ for (j = 0; j < numroutes; j++) {

1 0

Andrew Talbot : xmllite: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 2cc28bc7ae96b0ddc685e9bd53a71c5b68268543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc28bc7ae96b0ddc685e9bd5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 7 22:22:42 2013 +0000 xmllite: Avoid signed-unsigned integer comparisons. --- dlls/xmllite/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 7bec2b1..c6f416d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1190,7 +1190,7 @@ static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) static const WCHAR xmlW[] = {'x','m','l'}; strval name; HRESULT hr; - int i; + UINT i; hr = reader_parse_name(reader, &name); if (FAILED(hr)) return WC_E_PI;

1 0

Andrew Talbot : wsock32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 19502c65c991ad50019293ebcd1f83b824dfd7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=19502c65c991ad50019293ebc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 7 22:22:36 2013 +0000 wsock32: Avoid signed-unsigned integer comparisons. --- dlls/wsock32/protocol.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 9482887..f398d6a 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -115,7 +115,8 @@ INT WINAPI EnumProtocolsA(LPINT protocols, LPVOID buffer, LPDWORD buflen) { WSAPROTOCOL_INFOA *wsabuf; PROTOCOL_INFOA *pi = buffer; - unsigned int i, string_offset; + unsigned int string_offset; + INT i; if (!(wsabuf = HeapAlloc(GetProcessHeap(), 0, size))) return SOCKET_ERROR; @@ -169,7 +170,8 @@ INT WINAPI EnumProtocolsW(LPINT protocols, LPVOID buffer, LPDWORD buflen) { WSAPROTOCOL_INFOW *wsabuf; PROTOCOL_INFOW *pi = buffer; - unsigned int i, string_offset; + unsigned int string_offset; + INT i; if (!(wsabuf = HeapAlloc(GetProcessHeap(), 0, size))) return SOCKET_ERROR;

1 0

Francois Gouget : testbot: Some documentation tweaks and fixes for the crontab examples and a git clone command .
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: tools Branch: master Commit: 09c1b483b7c062442fcfd4fb38efd59f5bf4c2ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=09c1b483b7c062442fcfd4fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 8 15:13:59 2013 +0100 testbot: Some documentation tweaks and fixes for the crontab examples and a git clone command. --- testbot/doc/INSTALL.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index c8597d2..4e4e33c 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -66,10 +66,10 @@ General setup for the web site: Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial tasks. For instance: - 17 30 * * * /home/winehq/tools/testbot/bin/Janitor.pl + 0 0 * * * $HOME/tools/testbot/bin/Janitor.pl - Run the CheckWineTestBot.pl script periodically to get notified in case the WineTestBot server dies. For instance: - * 5 * * * /home/winehq/tools/testbot/scripts/CheckWineTestBot.pl + */20 * * * * $HOME/tools/testbot/scripts/CheckWineTestBot.pl Setup for Wine's patches site: - See http://source.winehq.org/patches/ for reference. @@ -96,8 +96,8 @@ Setup for Wine's patches site: Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 32 - * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 64 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 Setup for wine-patches: - A proper WineTestBot system should integrate with Wine's patches site. @@ -142,7 +142,7 @@ Dependencies: repository to wine: mkdir $HOME/tools/testbot/var cd $HOME/tools/testbot/var - git clone git://source.winehq.org/git/wine.git wine + git clone git://source.winehq.org/git/wine.git - Run $HOME/tools/testbot/bin/build/Reconfig.pl. - Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix issues until it works.

1 0

Francois Gouget : patches: Improve the documentation, particularly for the installation process.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: tools Branch: master Commit: 7e9eb2d3d0b023740abeaa28a15c0f04bc8378f9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7e9eb2d3d0b023740abeaa28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 8 15:14:52 2013 +0100 patches: Improve the documentation, particularly for the installation process. --- patches/doc/INSTALL.txt | 77 +++++++++++++++++++++++++++++++++++++++++ patches/doc/vhost_source.conf | 11 ++++++ patches/expire | 3 +- patches/filter | 4 ++- patches/filter-testbot | 3 +- patches/notify-bot | 2 +- patches/update | 3 +- patches/update-regressions | 3 ++ 8 files changed, 101 insertions(+), 5 deletions(-) diff --git a/patches/doc/INSTALL.txt b/patches/doc/INSTALL.txt new file mode 100644 index 0000000..86b3dca --- /dev/null +++ b/patches/doc/INSTALL.txt @@ -0,0 +1,77 @@ +1. Dependencies +--------------- + +- Text::CSV::Encoded (libtext-csv-encoded-perl) +- Email::MIME (libemail-mime-perl) + + +2. General setup +---------------- + +- Create a new user 'winehq'. +- Clone Wine's tools repository to $HOME/tools (so this document + should be available as $HOME/tools/patches/README). +- Create directory $HOME/opt/source/git. Run: + mkdir -p $HOME/opt/source/git +- Clone the Wine repository to a new bare repository (it can be read-only). + cd $HOME/opt/source/git + git clone --bare git://source.winehq.org/git/wine.git +- Arrange for the Wine source to be updated regularly. For instance: + 0 * * * * cd $HOME/opt/source/git/wine.git && git fetch + +Apache setup: +- Create the $HOME/opt/source directory. This is the root of the source website: + mkdir -p $HOME/opt/source +- Create a new virtual host, use vhost_source.conf as a template. + + +3. Setup for the LXR source site +-------------------------------- + +- FIXME: Document how to set up LXR in $HOME/opt/source. + + +4. Setup for the patches site +----------------------------- + +- Create the $HOME/opt/source/patches directory and copy patches.css there: + mkdir $HOME/opt/source/patches + cp patches.css $HOME/opt/source/patches +- Create the $HOME/patches and $HOME/patches/OLD directories where the patch + data will live: + mkdir -p $HOME/patches/OLD +- Arrange for the filter script to be fed the wine-patches emails. One way to + do so would be to subscribe the winehq user to the wine-patches mailing list + and to then add the following lines to the .procmailrc file: + :0 + * ^List-Id: Wine Patch Submissions + { + :0 hbfw + | $HOME/tools/patches/filter + :0: + $HOME/patches/. + } +- If you have a set of patch emails in the mbox format you can test with: + formail -ds procmail <mbox-file +- Run update regularly to update the website: + */5 * * * * $HOME/tools/patches/update +- Run expire regularly to delete old patches: + 0 0 * * * $HOME/tools/patches/expire -v $HOME/patches + +To integrate with the WineTestBot also do the following: +- Run the notify-bot script regularly to notify the WineTestBot when there are + new patches to test. + */5 * * * * $HOME/tools/patches/notify-bot <winetestbot-email-address> +- Arrange for the filter-testbot script to be fed the WineTestBot emails. One + way to do so is to add the following lines to the .procmailrc file: + :0 bfw + * ^X-TestBot-Results: + | $HOME/tools/patches/filter-testbot + + + +5. Setup for the regressions site +--------------------------------- + +- Run update-regressions regularly. For instance: + 0 * * * * $HOME/tools/patches/update-regressions diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf new file mode 100644 index 0000000..30bfca5 --- /dev/null +++ b/patches/doc/vhost_source.conf @@ -0,0 +1,11 @@ +<VirtualHost *:80> + DocumentRoot /home/winehq/opt/source + + ServerName source.example.com + ServerAdmin winehq(a)example.com + + <Directory /home/winehq/opt/source> + Order allow,deny + Allow from all + </Directory> +</VirtualHost> diff --git a/patches/expire b/patches/expire index 05aee19..f143ab1 100755 --- a/patches/expire +++ b/patches/expire @@ -1,6 +1,7 @@ #!/usr/bin/perl -w # -# Patches expiration script +# Deletes or archives 'old' patches. Note that the exact definition of 'old' +# depends on the patch's status. # # Copyright 2009 Alexandre Julliard # diff --git a/patches/filter b/patches/filter index dbdb9ec..306787d 100755 --- a/patches/filter +++ b/patches/filter @@ -1,6 +1,8 @@ #!/usr/bin/perl -w # -# Filter a wine-patches submission. +# Reformat a wine-patches email so it can be put in a file that the patches +# site can link to. In particular this means only keeping the relevant +# header fields and decoding / decompressing the patch. # # Copyright 2009 Alexandre Julliard # diff --git a/patches/filter-testbot b/patches/filter-testbot index 3c4e33b..844090c 100755 --- a/patches/filter-testbot +++ b/patches/filter-testbot @@ -1,6 +1,7 @@ #!/usr/bin/perl -w # -# Filter a testbot result report. +# Process a testbot result email and generate the .testfail and .testbot +# result files that the patches site uses / links to. # # Copyright 2010 Alexandre Julliard # diff --git a/patches/notify-bot b/patches/notify-bot index 104a496..9676c42 100755 --- a/patches/notify-bot +++ b/patches/notify-bot @@ -1,6 +1,6 @@ #!/bin/sh # -# Notify winetestbot of the arrival of new patches +# Send an email to the WineTestBot to let it know of new patches. # # Copyright 2010 Alexandre Julliard # diff --git a/patches/update b/patches/update index f92a64c..c716354 100755 --- a/patches/update +++ b/patches/update @@ -1,6 +1,7 @@ #!/usr/bin/perl -w # -# Update the patches data and index file +# Scans the local patches and their result files to rebuild the index file and +# update the patches website. # # Copyright 2009 Alexandre Julliard # diff --git a/patches/update-regressions b/patches/update-regressions index 3a71509..3bc2fff 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -1,5 +1,8 @@ #!/usr/bin/perl -w # +# Grabs Bugzilla's data about known regressions and rebuilds the regressions +# website index. +# # Copyright 2011 Henri Verbeet # Copyright 2011 Alexandre Julliard #

1 0

Francois Gouget : patches: Fail cleanly when expire cannot open the patches directories.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: tools Branch: master Commit: fe3b6ec5e296af486340bac3f9a52c39833fbf2c URL: http://source.winehq.org/git/tools.git/?a=commit;h=fe3b6ec5e296af486340bac3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 7 18:32:54 2013 +0100 patches: Fail cleanly when expire cannot open the patches directories. --- patches/expire | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/expire b/patches/expire index c4d49f3..05aee19 100755 --- a/patches/expire +++ b/patches/expire @@ -100,7 +100,7 @@ sub get_patch_state($) # expire current patches -opendir DIR, $dir; +opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; @@ -140,7 +140,7 @@ closedir DIR; # expire old patches whose status has changed -opendir DIR, "$dir/OLD"; +opendir DIR, "$dir/OLD" or die "cannot open '$dir/OLD': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/;

1 0

Jacek Caban : wininet: Fixed crash in chunked_read if netconn is not available.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 7d8c8af9d71dc8ecf6a07ec19dfbc0deb108f8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8c8af9d71dc8ecf6a07ec19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:32:43 2013 +0100 wininet: Fixed crash in chunked_read if netconn is not available. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8fec2a4..890adce 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2643,7 +2643,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(read_mode == READMODE_NOBLOCK) { DWORD avail; - if(!NETCON_query_data_available(req->netconn, &avail) || !avail) + if(!req->netconn || !NETCON_query_data_available(req->netconn, &avail) || !avail) break; if(read_bytes > avail) read_bytes = avail;

1 0

Nozomi Kodama : d3dx9: Save multiplications for better performance.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 479195ea41e6360182b6f61f6a3262caa1e24255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479195ea41e6360182b6f61f6… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Mon Mar 4 00:56:53 2013 -1000 d3dx9: Save multiplications for better performance. --- dlls/d3dx9_36/math.c | 80 ++++++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 35 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5603c0b..8adabb3 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2378,60 +2378,70 @@ HRESULT WINAPI D3DXSHEvalConeLight(UINT order, const D3DXVECTOR3 *dir, FLOAT rad FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir) { + const FLOAT dirxx = dir->x * dir->x; + const FLOAT dirxy = dir->x * dir->y; + const FLOAT dirxz = dir->x * dir->z; + const FLOAT diryy = dir->y * dir->y; + const FLOAT diryz = dir->y * dir->z; + const FLOAT dirzz = dir->z * dir->z; + const FLOAT dirxxxx = dirxx * dirxx; + const FLOAT diryyyy = diryy * diryy; + const FLOAT dirzzzz = dirzz * dirzz; + const FLOAT dirxyxy = dirxy * dirxy; TRACE("out %p, order %u, dir %p\n", out, order, dir); - if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) ) + if ((order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER)) return out; out[0] = 0.5f / sqrt(D3DX_PI); out[1] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->y; out[2] = 0.5f / sqrt(D3DX_PI / 3.0f) * dir->z; out[3] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->x; - if ( order == 2 ) + if (order == 2) return out; - out[4] = 0.5f / sqrt(D3DX_PI / 15.0f) * dir->x * dir->y; - out[5] = -0.5f / sqrt(D3DX_PI / 15.0f) * dir->y * dir->z; - out[6] = 0.25f / sqrt(D3DX_PI / 5.0f) * ( 3.0f * dir->z * dir->z - 1.0f ); - out[7] = -0.5f / sqrt(D3DX_PI / 15.0f) * dir->x * dir->z; - out[8] = 0.25f / sqrt(D3DX_PI / 15.0f) * ( dir->x * dir->x - dir->y * dir->y ); - if ( order == 3 ) + out[4] = 0.5f / sqrt(D3DX_PI / 15.0f) * dirxy; + out[5] = -0.5f / sqrt(D3DX_PI / 15.0f) * diryz; + out[6] = 0.25f / sqrt(D3DX_PI / 5.0f) * (3.0f * dirzz - 1.0f); + out[7] = -0.5f / sqrt(D3DX_PI / 15.0f) * dirxz; + out[8] = 0.25f / sqrt(D3DX_PI / 15.0f) * (dirxx - diryy); + if (order == 3) return out; - out[9] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dir->x * dir->x - dir->y * dir->y ); - out[10] = sqrt(105.0f / D3DX_PI) / 2.0f * dir->x * dir->y * dir->z; - out[11] = -sqrt(42.0 / D3DX_PI) / 8.0f * dir->y * ( -1.0f + 5.0f * dir->z * dir->z ); - out[12] = sqrt(7.0f / D3DX_PI) / 4.0f * dir->z * ( 5.0f * dir->z * dir->z - 3.0f ); - out[13] = sqrt(42.0 / D3DX_PI) / 8.0f * dir->x * ( 1.0f - 5.0f * dir->z * dir->z ); - out[14] = sqrt(105.0f / D3DX_PI) / 4.0f * dir->z * ( dir->x * dir->x - dir->y * dir->y ); - out[15] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->x * ( dir->x * dir->x - 3.0f * dir->y * dir->y ); - if ( order == 4 ) + out[9] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dirxx - diryy); + out[10] = sqrt(105.0f / D3DX_PI) / 2.0f * dirxy * dir->z; + out[11] = -sqrt(42.0 / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); + out[12] = sqrt(7.0f / D3DX_PI) / 4.0f * dir->z * (5.0f * dirzz - 3.0f); + out[13] = sqrt(42.0 / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); + out[14] = sqrt(105.0f / D3DX_PI) / 4.0f * dir->z * (dirxx - diryy); + out[15] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->x * (dirxx - 3.0f * diryy); + if (order == 4) return out; - out[16] = 0.75f * sqrt(35.0f / D3DX_PI) * dir->x * dir->y * (dir->x * dir->x - dir->y * dir->y ); + out[16] = 0.75f * sqrt(35.0f / D3DX_PI) * dirxy * (dirxx - diryy); out[17] = 3.0f * dir->z * out[9]; - out[18] = 0.75f * sqrt(5.0f / D3DX_PI) * dir->x * dir->y * ( 7.0f * dir->z * dir->z - 1.0f ); - out[19] = 0.375f * sqrt(10.0f / D3DX_PI) * dir->y * dir->z * ( 3.0f - 7.0f * dir->z * dir->z ); - out[20] = 3.0f / ( 16.0f * sqrt(D3DX_PI) ) * ( 35.0f * dir->z * dir->z * dir->z * dir->z - 30.f * dir->z * dir->z + 3.0f ); - out[21] = 0.375f * sqrt(10.0f / D3DX_PI) * dir->x * dir->z * ( 3.0f - 7.0f * dir->z * dir->z ); - out[22] = 0.375f * sqrt(5.0f / D3DX_PI) * ( dir->x * dir->x - dir->y * dir->y ) * ( 7.0f * dir->z * dir->z - 1.0f); + out[18] = 0.75f * sqrt(5.0f / D3DX_PI) * dirxy * (7.0f * dirzz - 1.0f); + out[19] = 0.375f * sqrt(10.0f / D3DX_PI) * diryz * (3.0f - 7.0f * dirzz); + out[20] = 3.0f / (16.0f * sqrt(D3DX_PI)) * (35.0f * dirzzzz - 30.f * dirzz + 3.0f); + out[21] = 0.375f * sqrt(10.0f / D3DX_PI) * dirxz * (3.0f - 7.0f * dirzz); + out[22] = 0.375f * sqrt(5.0f / D3DX_PI) * (dirxx - diryy) * (7.0f * dirzz - 1.0f); out[23] = 3.0 * dir->z * out[15]; - out[24] = 3.0f / 16.0f * sqrt(35.0f / D3DX_PI) * ( dir->x * dir->x * dir->x * dir->x- 6.0f * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); - if ( order == 5 ) + out[24] = 3.0f / 16.0f * sqrt(35.0f / D3DX_PI) * (dirxxxx - 6.0f * dirxyxy + diryyyy); + if (order == 5) return out; - out[25] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->y * ( 5.0f * dir->x * dir->x * dir->x * dir->x - 10.0f * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); - out[26] = 0.75f * sqrt(385.0f / D3DX_PI) * dir->x * dir->y * dir->z * ( dir->x * dir->x - dir->y * dir->y ); - out[27] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->y * ( 3.0f * dir->x * dir->x - dir->y * dir->y ) * ( 1.0f - 9.0f * dir->z * dir->z ); - out[28] = sqrt(1155.0f / D3DX_PI) / 4.0f * dir->x * dir->y * dir->z * ( 3.0f * dir->z * dir->z - 1.0f); - out[29] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->y * ( 14.0f * dir->z * dir->z - 21.0f * dir->z * dir->z * dir->z * dir->z - 1.0f ); - out[30] = sqrt(11.0f / D3DX_PI) / 16.0f * dir->z * ( 63.0f * dir->z * dir->z * dir->z * dir->z - 70.0f * dir->z * dir->z + 15.0f ); - out[31] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->x * ( 14.0f * dir->z * dir->z - 21.0f * dir->z * dir->z * dir->z * dir->z - 1.0f ); - out[32] = sqrt(1155.0f / D3DX_PI) / 8.0f * dir->z * ( dir->x * dir->x - dir->y * dir->y ) * ( 3.0f * dir->z * dir->z - 1.0f ); - out[33] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->x * ( dir->x * dir->x - 3.0f * dir->y * dir->y ) * ( 1.0f - 9.0f * dir->z * dir->z ); - out[34] = 3.0f / 16.0f * sqrt(385.0f / D3DX_PI) * dir->z * ( dir->x * dir->x * dir->x * dir->x - 6.0 * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); - out[35] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->x * ( dir->x * dir->x * dir->x * dir->x - 10.0f * dir->x * dir->x * dir->y * dir->y + 5.0f * dir->y * dir->y * dir->y * dir->y ); + out[25] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->y * (5.0f * dirxxxx - 10.0f * dirxyxy + diryyyy); + out[26] = 0.75f * sqrt(385.0f / D3DX_PI) * dirxy * dir->z * (dirxx - diryy); + out[27] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->y * (3.0f * dirxx - diryy) * (1.0f - 9.0f * dirzz); + out[28] = sqrt(1155.0f / D3DX_PI) / 4.0f * dirxy * dir->z * (3.0f * dirzz - 1.0f); + out[29] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->y * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[30] = sqrt(11.0f / D3DX_PI) / 16.0f * dir->z * (63.0f * dirzzzz - 70.0f * dirzz + 15.0f); + out[31] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[32] = sqrt(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); + out[33] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); + out[34] = 3.0f / 16.0f * sqrt(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); + out[35] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); return out; }

1 0

Nozomi Kodama : d3dx9: Implement D3DXSHEvalConeLight.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 9085f1d27f4f8b979f2657a20b445d9a3384ba5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9085f1d27f4f8b979f2657a20… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Mon Mar 4 00:55:50 2013 -1000 d3dx9: Implement D3DXSHEvalConeLight. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 73 +++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 161 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 255 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9085f1d27f4f8b979f265…

1 0

Hans Leidekker : winhttp: Make the first parameter of resolve_hostname const.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 9e019c9b4b930b892f09e0b497b1ed68ae40c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e019c9b4b930b892f09e0b49… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 7 14:50:48 2013 +0100 winhttp: Make the first parameter of resolve_hostname const. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2177416..9fca4b5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -843,7 +843,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -static DWORD resolve_hostname( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) +static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) { char *hostname; #ifdef HAVE_GETADDRINFO @@ -928,7 +928,7 @@ static DWORD resolve_hostname( WCHAR *hostnameW, INTERNET_PORT port, struct sock struct resolve_args { - WCHAR *hostname; + const WCHAR *hostname; INTERNET_PORT port; struct sockaddr *sa; socklen_t *sa_len;

1 0

Dmitry Timoshkov : windowscodecs: Ask libpng to ignore CRC of PNG chunks.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: ec22949874f9051eff6209fde43346a4bb5997fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec22949874f9051eff6209fde… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 7 15:26:13 2013 +0900 windowscodecs: Ask libpng to ignore CRC of PNG chunks. According to my tests with manually created PNG images WIC ignores CRC errors for both critical and ancillary chunks. --- dlls/windowscodecs/pngformat.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fb8bf51..2f6a9e3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -174,6 +174,7 @@ MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_crc_action); MAKE_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -222,6 +223,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); LOAD_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); @@ -438,6 +440,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(This->png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); /* seek to the start of the stream */ seek.QuadPart = 0;

1 0

Alistair Leslie-Hughes : msxml3: Add xmlns attribute test.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 461951e3d4427cfa702a9cfea199d777fa9dcd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461951e3d4427cfa702a9cfea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 5 09:21:03 2013 +1100 msxml3: Add xmlns attribute test. --- dlls/msxml3/tests/domdoc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d69547f..8775312 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10754,6 +10754,61 @@ static void test_nodeValue(void) IXMLDOMDocument_Release(doc); } +void test_xmlns_attribute(void) +{ + BSTR str; + IXMLDOMDocument *doc; + IXMLDOMElement *root; + IXMLDOMAttribute *pAttribute; + IXMLDOMElement *elem; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); + + str = SysAllocString(szAttribute); + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute); + ok( hr == S_OK, "returns %08x\n", hr ); + if(hr == S_OK) + { + VARIANT v; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); + hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); + + hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMNode_put_dataType((IXMLDOMNode*)root, _bstr_("bin.base64")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release( pAttribute); + } + + SysFreeString(str); + + IXMLDOMDocument_Release(doc); + + free_bstrs(); +} + static const char namespacesA[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" " <ns1:elem1 xmlns:ns1=\"http://blah.org\" b='1' >" @@ -11461,6 +11516,7 @@ START_TEST(domdoc) test_put_data(); test_putref_schemas(); test_namedmap_newenum(); + test_xmlns_attribute(); test_xsltemplate(); test_xsltext();

1 0

Jacek Caban : jscript: Use (index,length) pair as match result.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: c3eecec680593e50314a0bc35757969f09d000f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3eecec680593e50314a0bc35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 11:03:23 2013 +0100 jscript: Use (index,length) pair as match result. --- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 35e2c3f..135b77f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -362,8 +362,8 @@ typedef struct { } jsexcept_t; typedef struct { - const WCHAR *str; - DWORD len; + unsigned index; + unsigned length; } match_result_t; struct _script_ctx_t { diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index f9b9992..43df35a 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -98,11 +98,11 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, for(i=0; i < n; i++) { if(ret->parens[i].index == -1) { - ctx->match_parens[i].str = NULL; - ctx->match_parens[i].len = 0; + ctx->match_parens[i].index = 0; + ctx->match_parens[i].length = 0; }else { - ctx->match_parens[i].str = ctx->last_match->str + ret->parens[i].index; - ctx->match_parens[i].len = ret->parens[i].length; + ctx->match_parens[i].index = ret->parens[i].index; + ctx->match_parens[i].length = ret->parens[i].length; } } @@ -216,8 +216,8 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B } } - ret[i].str = result->cp - result->match_len; - ret[i++].len = result->match_len; + ret[i].index = result->cp - str->str - result->match_len; + ret[i++].length = result->match_len; if(!gflag && !(This->jsregexp->flags & REG_GLOB)) { hres = S_OK; @@ -736,7 +736,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval for(i=0; i < match_cnt; i++) { jsstr_t *tmp_str; - tmp_str = jsstr_alloc_len(match_result[i].str, match_result[i].len); + tmp_str = jsstr_substr(str, match_result[i].index, match_result[i].length); if(!tmp_str) { hres = E_OUTOFMEMORY; break; @@ -749,12 +749,12 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval } while(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(array, indexW, jsval_number(match_result[match_cnt-1].str-str->str)); + hres = jsdisp_propput_name(array, indexW, jsval_number(match_result[match_cnt-1].index)); if(FAILED(hres)) break; hres = jsdisp_propput_name(array, lastIndexW, - jsval_number(match_result[match_cnt-1].str-str->str+match_result[match_cnt-1].len)); + jsval_number(match_result[match_cnt-1].index + match_result[match_cnt-1].length)); if(FAILED(hres)) break; @@ -777,7 +777,7 @@ static HRESULT global_idx(script_ctx_t *ctx, DWORD flags, DWORD idx, jsval_t *r) case DISPATCH_PROPERTYGET: { jsstr_t *ret; - ret = jsstr_alloc_len(ctx->match_parens[idx].str, ctx->match_parens[idx].len); + ret = jsstr_substr(ctx->last_match, ctx->match_parens[idx].index, ctx->match_parens[idx].length); if(!ret) return E_OUTOFMEMORY;

1 0

Jacek Caban : urlmon: Added HTTP cache reading tests.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 4d92d604e074f82e53c52aef98bdd1c0c203f91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d92d604e074f82e53c52aef9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:29:58 2013 +0100 urlmon: Added HTTP cache reading tests. --- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/protocol.c | 121 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 118 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d92d604e074f82e53c52…

1 0

Jacek Caban : urlmon: Fixed handling binding reading immediately from cache .
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 7483f975de90cf13028c689460145d1a92f18ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7483f975de90cf13028c68946… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 16:29:48 2013 +0100 urlmon: Fixed handling binding reading immediately from cache. --- dlls/urlmon/http.c | 15 ++++++-- dlls/urlmon/protocol.c | 81 ++++++++++++++++++++++++++++++--------------- dlls/urlmon/urlmon_main.h | 2 + 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index b2c3d10..d5cef5c 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -445,11 +445,18 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques do { error = send_http_request(This); - if(error == ERROR_IO_PENDING || error == ERROR_SUCCESS) + switch(error) { + case ERROR_IO_PENDING: return S_OK; - - hres = handle_http_error(This, error); - + case ERROR_SUCCESS: + /* + * If sending response ended synchronously, it means that we have the whole data + * available locally (most likely in cache). + */ + return protocol_syncbinding(&This->base); + default: + hres = handle_http_error(This, error); + } } while(hres == RPC_E_RETRY); WARN("HttpSendRequest failed: %d\n", error); diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 890d013..5598780 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -70,6 +70,55 @@ static void all_data_read(Protocol *protocol) report_result(protocol, S_OK); } +static HRESULT start_downloading(Protocol *protocol) +{ + HRESULT hres; + + hres = protocol->vtbl->start_downloading(protocol); + if(FAILED(hres)) { + protocol_close_connection(protocol); + report_result(protocol, hres); + return S_OK; + } + + if(protocol->bindf & BINDF_NEEDFILE) { + WCHAR cache_file[MAX_PATH]; + DWORD buflen = sizeof(cache_file); + + if(InternetQueryOptionW(protocol->request, INTERNET_OPTION_DATAFILE_NAME, cache_file, &buflen)) { + report_progress(protocol, BINDSTATUS_CACHEFILENAMEAVAILABLE, cache_file); + }else { + FIXME("Could not get cache file\n"); + } + } + + protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; + return S_OK; +} + +HRESULT protocol_syncbinding(Protocol *protocol) +{ + BOOL res; + HRESULT hres; + + protocol->flags |= FLAG_SYNC_READ; + + hres = start_downloading(protocol); + if(FAILED(hres)) + return hres; + + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); + if(res) + protocol->available_bytes = protocol->query_available; + else + WARN("InternetQueryDataAvailable failed: %u\n", GetLastError()); + + protocol->flags |= FLAG_FIRST_DATA_REPORTED|FLAG_LAST_DATA_REPORTED; + IInternetProtocolSink_ReportData(protocol->protocol_sink, BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, + protocol->available_bytes, protocol->content_length); + return S_OK; +} + static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) { PROTOCOLDATA data; @@ -298,12 +347,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) BOOL is_start; HRESULT hres; - if (!data) { - WARN("Expected pProtocolData to be non-NULL\n"); - return S_OK; - } - - is_start = data->pData == UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); + is_start = !data || data->pData == UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); if(!protocol->request) { WARN("Expected request to be non-NULL\n"); @@ -325,29 +369,12 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return write_post_stream(protocol); if(is_start) { - hres = protocol->vtbl->start_downloading(protocol); - if(FAILED(hres)) { - protocol_close_connection(protocol); - report_result(protocol, hres); + hres = start_downloading(protocol); + if(FAILED(hres)) return S_OK; - } - - if(protocol->bindf & BINDF_NEEDFILE) { - WCHAR cache_file[MAX_PATH]; - DWORD buflen = sizeof(cache_file); - - if(InternetQueryOptionW(protocol->request, INTERNET_OPTION_DATAFILE_NAME, - cache_file, &buflen)) { - report_progress(protocol, BINDSTATUS_CACHEFILENAMEAVAILABLE, cache_file); - }else { - FIXME("Could not get cache file\n"); - } - } - - protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; } - if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { + if(!data || data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { if(!protocol->available_bytes) { if(protocol->query_available) { protocol->available_bytes = protocol->query_available; @@ -400,7 +427,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret return S_FALSE; } - if(!(protocol->flags & FLAG_REQUEST_COMPLETE) || !protocol->available_bytes) { + if(!(protocol->flags & FLAG_SYNC_READ) && (!(protocol->flags & FLAG_REQUEST_COMPLETE) || !protocol->available_bytes)) { *read_ret = 0; return E_PENDING; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ba23e74..faab45a 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -149,6 +149,7 @@ struct ProtocolVtbl { #define FLAG_LAST_DATA_REPORTED 0x0010 #define FLAG_RESULT_REPORTED 0x0020 #define FLAG_ERROR 0x0040 +#define FLAG_SYNC_READ 0x0080 HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN; HRESULT protocol_continue(Protocol*,PROTOCOLDATA*) DECLSPEC_HIDDEN; @@ -156,6 +157,7 @@ HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*) DECLSPEC_HIDDEN; HRESULT protocol_lock_request(Protocol*) DECLSPEC_HIDDEN; HRESULT protocol_unlock_request(Protocol*) DECLSPEC_HIDDEN; HRESULT protocol_abort(Protocol*,HRESULT) DECLSPEC_HIDDEN; +HRESULT protocol_syncbinding(Protocol*) DECLSPEC_HIDDEN; void protocol_close_connection(Protocol*) DECLSPEC_HIDDEN; void find_domain_name(const WCHAR*,DWORD,INT*) DECLSPEC_HIDDEN;

1 0

Piotr Caban : wininet: Rename URLCacheContainer_* functions to cache_container_*.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 36ce3d256dbe7df42ca2a62ce9f11c6bdea74584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ce3d256dbe7df42ca2a62ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:27 2013 +0100 wininet: Rename URLCacheContainer_* functions to cache_container_*. --- dlls/wininet/urlcache.c | 174 +++++++++++++++++++++++----------------------- 1 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36ce3d256dbe7df42ca2a…

1 0

Piotr Caban : wininet: Cleanup and optimize URLCacheContainer_OpenIndex function.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 8a06b11f76bd1d2af47f4ba672648b3309c1fa62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a06b11f76bd1d2af47f4ba67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 7 13:50:01 2013 +0100 wininet: Cleanup and optimize URLCacheContainer_OpenIndex function. --- dlls/wininet/urlcache.c | 485 ++++++++++++++++++++++------------------------- 1 files changed, 226 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a06b11f76bd1d2af47f4…

1 0

Jacek Caban : jscript: Use jsstr_flush in literal_as_bstr.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: 324d8b6fa3efcd49f520f0df40cfc930c5338020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324d8b6fa3efcd49f520f0df4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 11:03:34 2013 +0100 jscript: Use jsstr_flush in literal_as_bstr. --- dlls/jscript/compile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c776c83..53ed9e7 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -791,7 +791,9 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st if(FAILED(hres)) return hres; - *str = compiler_alloc_bstr(ctx, jsstr->str); + *str = compiler_alloc_bstr_len(ctx, NULL, jsstr_length(jsstr)); + if(*str) + jsstr_flush(jsstr, *str); jsstr_release(jsstr); break; }

1 0

Petr Kočandrle : po: Completed winecfg and clock Czech translation.
by Alexandre Julliard March 7, 2013

March 7, 2013

Module: wine Branch: master Commit: c496899deff2c3ce8759145a8a2599b957dd3daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c496899deff2c3ce8759145a8… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Thu Mar 7 00:15:36 2013 +0100 po: Completed winecfg and clock Czech translation. --- po/cs.po | 132 +++++++++++++++++++++++++------------------------------------- 1 files changed, 53 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c496899deff2c3ce87591…

1 0