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

Nikolay Sivov : xmllite: Report attribute as non-default for now.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: be8d73d45638d9dd474bf1765f19256a4bb39dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8d73d45638d9dd474bf1765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 22:04:24 2013 +0400 xmllite: Report attribute as non-default for now. --- 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 0a89edb..0b587ff 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2406,7 +2406,7 @@ static HRESULT WINAPI xmlreader_GetBaseUri(IXmlReader* iface, static BOOL WINAPI xmlreader_IsDefault(IXmlReader* iface) { FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface)

1 0

Jacek Caban : mshtml: Better res protocol URL parsing.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: edf4e61891214039af9add7c2b0d8df9c36d62f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf4e61891214039af9add7c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 17:59:30 2013 +0200 mshtml: Better res protocol URL parsing. --- dlls/mshtml/protocol.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 021ce55..c8f8d08 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -631,31 +631,27 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } url_dll = url + sizeof(wszRes)/sizeof(wszRes[0]); - if(!(url_file = strrchrW(url_dll, '/'))) { + if(!(res_type = strchrW(url_dll, '/'))) { WARN("wrong url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); heap_free(url); return MK_E_SYNTAX; } - *url_file++ = 0; + *res_type++ = 0; + if ((url_file = strchrW(res_type, '/'))) { + *url_file++ = 0; + }else { + url_file = res_type; + res_type = MAKEINTRESOURCEW(RT_HTML); + } + hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); if(!hdll) { - if (!(res_type = strrchrW(url_dll, '/'))) { - WARN("Could not open dll: %s\n", debugstr_w(url_dll)); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - heap_free(url); - return HRESULT_FROM_WIN32(GetLastError()); - } - *res_type++ = 0; - - hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); - if(!hdll) { - WARN("Could not open dll: %s\n", debugstr_w(url_dll)); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - heap_free(url); - return HRESULT_FROM_WIN32(GetLastError()); - } + WARN("Could not open dll: %s\n", debugstr_w(url_dll)); + IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); + heap_free(url); + return HRESULT_FROM_WIN32(GetLastError()); } TRACE("trying to find resource type %s, name %s\n", debugstr_w(res_type), debugstr_w(url_file)); @@ -665,7 +661,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, LPWSTR endpoint = NULL; DWORD file_id = strtolW(url_file, &endpoint, 10); if(endpoint == url_file+strlenW(url_file)) - src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), MAKEINTRESOURCEW(RT_HTML)); + src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), res_type); if(!src) { WARN("Could not find resource\n");

1 0

Jacek Caban : mshtml/tests: Added more res protocol tests.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 2046d69b4e701bfa16c189452b1b019788272bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2046d69b4e701bfa16c189452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 17:59:40 2013 +0200 mshtml/tests: Added more res protocol tests. --- dlls/mshtml/tests/protocol.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/rsrc.rc | 8 ++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 7e66347..04c4714 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "urlmon.h" #include "shlwapi.h" +#include "wininet.h" #include "initguid.h" @@ -73,6 +74,9 @@ static const WCHAR about_test_url[] = {'a','b','o','u','t',':','t','e','s','t',0 static const WCHAR about_res_url[] = {'r','e','s',':','b','l','a','n','k',0}; static const WCHAR javascript_test_url[] = {'j','a','v','a','s','c','r','i','p','t',':','t','e','s','t','(',')',0}; +static WCHAR res_url_base[INTERNET_MAX_URL_LENGTH] = {'r','e','s',':','/','/'}; +static unsigned res_url_base_len; + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -248,7 +252,7 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT CHECK_CALLED(ReportResult); } -static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) +static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) { HRESULT hres; @@ -268,6 +272,33 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) CHECK_CALLED(ReportResult); } +static void test_res_url(const char *url_suffix) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + ULONG size, ref; + BYTE buf[100]; + HRESULT hres; + + memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)-res_url_base_len); + + hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + + protocol_start(protocol, url); + + hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &size); + ok(hres == S_OK, "Read failed: %08x\n", hres); + + hres = IInternetProtocol_Terminate(protocol, 0); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); + + + ref = IInternetProtocol_Release(protocol); + ok(!ref, "ref=%u\n", ref); +} + static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) { WCHAR buf[MAX_PATH]; @@ -578,6 +609,10 @@ static void test_res_protocol(void) } IUnknown_Release(unk); + + test_res_url("/jstest.html"); + test_res_url("/Test/res.html"); + test_res_url("/test/dir/dir2/res.html"); } static void do_test_about_protocol(IClassFactory *factory, DWORD bf) @@ -908,6 +943,8 @@ static void test_javascript_protocol(void) START_TEST(protocol) { + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)-6); + OleInitialize(NULL); test_res_protocol(); diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 49aecdf..07d816d 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -33,3 +33,11 @@ externscr.js HTML "externscr.js" /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb + +/* For res: protocol test: */ + +/* @makedep: jstest.html */ +res.html test "jstest.html" + +/* @makedep: jstest.html */ +dir/dir2/res.html test "jstest.html"

1 0

Nikolay Sivov : comctl32: Properly handle repainting for HDF_OWNERDRAW items.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: b130ca1c5fb48c06a1e9f59ba52b00a2dbe90082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b130ca1c5fb48c06a1e9f59ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 13 13:43:35 2013 +0400 comctl32: Properly handle repainting for HDF_OWNERDRAW items. --- dlls/comctl32/header.c | 102 ++++++++++++++++++++++++++++++------------------ 1 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index d1386e3..ec7d844 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -289,6 +289,41 @@ static void HEADER_GetHotDividerRect(const HEADER_INFO *infoPtr, RECT *r) } } +static void +HEADER_FillItemFrame(HEADER_INFO *infoPtr, HDC hdc, RECT *r, const HEADER_ITEM *item, BOOL hottrack) +{ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + + if (theme) { + int state = (item->bDown) ? HIS_PRESSED : (hottrack ? HIS_HOT : HIS_NORMAL); + DrawThemeBackground (theme, hdc, HP_HEADERITEM, state, r, NULL); + GetThemeBackgroundContentRect (theme, hdc, HP_HEADERITEM, state, r, r); + } + else + { + HBRUSH hbr = CreateSolidBrush(GetBkColor(hdc)); + FillRect(hdc, r, hbr); + DeleteObject(hbr); + } +} + +static void +HEADER_DrawItemFrame(HEADER_INFO *infoPtr, HDC hdc, RECT *r, const HEADER_ITEM *item) +{ + if (GetWindowTheme(infoPtr->hwndSelf)) return; + + if (!(infoPtr->dwStyle & HDS_FLAT)) + { + if (infoPtr->dwStyle & HDS_BUTTONS) { + if (item->bDown) + DrawEdge (hdc, r, BDR_RAISEDOUTER, BF_RECT | BF_FLAT | BF_ADJUST); + else + DrawEdge (hdc, r, EDGE_RAISED, BF_RECT | BF_SOFT | BF_ADJUST); + } + else + DrawEdge (hdc, r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); + } +} static INT HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESULT lCDFlags) @@ -325,43 +360,13 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU return phdi->rect.right; } - if (theme != NULL) { - int state = (phdi->bDown) ? HIS_PRESSED : - (bHotTrack ? HIS_HOT : HIS_NORMAL); - DrawThemeBackground (theme, hdc, HP_HEADERITEM, state, - &r, NULL); - GetThemeBackgroundContentRect (theme, hdc, HP_HEADERITEM, state, - &r, &r); - } - else { - HBRUSH hbr; + /* Fill background, owner could draw over it. */ + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); - if (!(infoPtr->dwStyle & HDS_FLAT)) - { - if (infoPtr->dwStyle & HDS_BUTTONS) { - if (phdi->bDown) { - DrawEdge (hdc, &r, BDR_RAISEDOUTER, - BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_RAISED, - BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); - } - - hbr = CreateSolidBrush(GetBkColor(hdc)); - FillRect(hdc, &r, hbr); - DeleteObject(hbr); - } - if (phdi->bDown) { - r.left += 2; - r.top += 2; - } - - if (phdi->fmt & HDF_OWNERDRAW) { + if (phdi->fmt & HDF_OWNERDRAW) + { DRAWITEMSTRUCT dis; + BOOL ret; dis.CtlType = ODT_HEADER; dis.CtlID = GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_ID); @@ -373,11 +378,32 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU dis.rcItem = phdi->rect; dis.itemData = phdi->lParam; oldBkMode = SetBkMode(hdc, TRANSPARENT); - SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); + ret = SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); + + if (!ret) + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); + + /* Edges are always drawn if we don't have attached theme. */ + HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); + /* If application processed WM_DRAWITEM we should skip label painting, + edges are drawn no matter what. */ + if (ret) return phdi->rect.right; } - else { + else + { + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); + HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); + } + + if (phdi->bDown) { + r.left += 2; + r.top += 2; + } + + /* Now text and image */ + { UINT rw, rh, /* width and height of r */ *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ /* cnt,txt,img,bmp */ @@ -495,7 +521,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU SetBkMode(hdc, oldBkMode); } HEADER_FreeCallbackItems(phdi); - }/*Ownerdrawn*/ + } return phdi->rect.right; }

1 0

Alexandre Julliard : libwine: Fix the default character for EBCDIC codepages.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 89a54082be83b9f00be8bf546cce43f2f2fa6032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a54082be83b9f00be8bf546… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 09:59:17 2013 +0200 libwine: Fix the default character for EBCDIC codepages. --- libs/wine/c_037.c | 976 ++++++++++++++++++++++++++-------------------------- libs/wine/c_1026.c | 980 ++++++++++++++++++++++++++-------------------------- libs/wine/c_500.c | 976 ++++++++++++++++++++++++++-------------------------- libs/wine/c_875.c | 950 +++++++++++++++++++++++++------------------------- tools/make_unicode | 8 +- 5 files changed, 1945 insertions(+), 1945 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89a54082be83b9f00be8b…

1 0

Alexandre Julliard : libwine: Use the best fit data for codepage 1361.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 4be0f88e8de2b8febcb20efe63309007eb19c8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be0f88e8de2b8febcb20efe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 10:02:27 2013 +0200 libwine: Use the best fit data for codepage 1361. --- dlls/msvcrt/tests/string.c | 4 +- libs/wine/c_1361.c | 924 +++++++++++++++++++------------------------- tools/make_unicode | 2 +- 3 files changed, 398 insertions(+), 532 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4be0f88e8de2b8febcb20…

1 0

Alexandre Julliard : usp10: Update the line breaking algorithm to Unicode 6 .2.0.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 2c5c2b5546d79307643b8d8efb0335b611511f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5c2b5546d79307643b8d8ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 11:08:18 2013 +0200 usp10: Update the line breaking algorithm to Unicode 6.2.0. --- dlls/usp10/breaking.c | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index ff6e740..6e044b2 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); extern const unsigned short wine_linebreak_table[]; -enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2}; +enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2, b_HL, b_CJ, b_RI}; enum breaking_class {b_r=1, b_s, b_x}; @@ -111,6 +111,8 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT case b_SG: case b_XX: break_class[i] = b_AL; + case b_CJ: + break_class[i] = b_NS; } } @@ -283,6 +285,16 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT if (i < count-1) else_break(&break_before[i+1],b_x); break; + /* LB21a */ + case b_HL: + if (i < count-2) + switch (break_class[i+1]) + { + case b_HY: + case b_BA: + else_break(&break_before[i+2], b_x); + } + break; /* LB22 */ case b_IN: if (i > 0) @@ -290,6 +302,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT switch (break_class[i-1]) { case b_AL: + case b_HL: case b_ID: case b_IN: case b_NU: @@ -304,12 +317,16 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT /* LB23 */ if ((break_class[i] == b_ID && break_class[i+1] == b_PO) || (break_class[i] == b_AL && break_class[i+1] == b_NU) || - (break_class[i] == b_NU && break_class[i+1] == b_AL)) + (break_class[i] == b_HL && break_class[i+1] == b_NU) || + (break_class[i] == b_NU && break_class[i+1] == b_AL) || + (break_class[i] == b_NU && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB24 */ if ((break_class[i] == b_PR && break_class[i+1] == b_ID) || (break_class[i] == b_PR && break_class[i+1] == b_AL) || - (break_class[i] == b_PO && break_class[i+1] == b_AL)) + (break_class[i] == b_PR && break_class[i+1] == b_HL) || + (break_class[i] == b_PO && break_class[i+1] == b_AL) || + (break_class[i] == b_PO && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB25 */ @@ -373,19 +390,27 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT } /* LB28 */ - if (break_class[i] == b_AL && break_class[i+1] == b_AL) + if ((break_class[i] == b_AL && break_class[i+1] == b_AL) || + (break_class[i] == b_AL && break_class[i+1] == b_HL) || + (break_class[i] == b_HL && break_class[i+1] == b_AL) || + (break_class[i] == b_HL && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB29 */ - if (break_class[i] == b_IS && break_class[i+1] == b_AL) + if ((break_class[i] == b_IS && break_class[i+1] == b_AL) || + (break_class[i] == b_IS && break_class[i+1] == b_HL)) else_break(&break_before[i+1],b_x); /* LB30 */ - if ((break_class[i] == b_AL || break_class[i] == b_NU) && + if ((break_class[i] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU) && break_class[i+1] == b_OP) else_break(&break_before[i+1],b_x); if (break_class[i] == b_CP && - (break_class[i+1] == b_AL || break_class[i] == b_NU)) + (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) + else_break(&break_before[i+1],b_x); + + /* LB30a */ + if (break_class[i] == b_RI && break_class[i+1] == b_RI) else_break(&break_before[i+1],b_x); } }

1 0

Alexandre Julliard : usp10: Update the character data tables to Unicode 6.2 .0.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 1f44de3f65bc7d8ebb0155d6277b672c8f2b87b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f44de3f65bc7d8ebb0155d62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 11:12:55 2013 +0200 usp10: Update the character data tables to Unicode 6.2.0. --- dlls/usp10/indicsyllable.c | 40 +++-- dlls/usp10/linebreak.c | 394 ++++++++++++++++++++++++-------------------- dlls/usp10/mirror.c | 4 +- dlls/usp10/shaping.c | 124 ++++++++------- tools/make_unicode | 7 +- 5 files changed, 313 insertions(+), 256 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f44de3f65bc7d8ebb015…

1 0

Alexandre Julliard : libwine: Update the codepage tables to Unicode 6.2.0.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 6cb5cf183ae6b7842692bb971632659ad6f55ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb5cf183ae6b7842692bb971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 11:26:45 2013 +0200 libwine: Update the codepage tables to Unicode 6.2.0. --- dlls/kernel32/tests/locale.c | 2 +- libs/wine/c_037.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10000.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10002.c | 79 ++++++++++++++++++++++++---------- libs/wine/c_10003.c | 79 ++++++++++++++++++++++++---------- libs/wine/c_10006.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10007.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10008.c | 81 ++++++++++++++++++++++++---------- libs/wine/c_10010.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10017.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10021.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10029.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_1006.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10079.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10081.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_10082.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_1026.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_20127.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_20866.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_20932.c | 81 ++++++++++++++++++++++++---------- libs/wine/c_21866.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28591.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28592.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28593.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28594.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28595.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28596.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28597.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28598.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28599.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28600.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28603.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28604.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28605.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_28606.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_424.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_437.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_500.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_737.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_775.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_850.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_852.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_855.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_856.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_857.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_860.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_861.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_862.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_863.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_864.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_865.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_866.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_869.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_875.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/c_878.c | 99 ++++++++++++++++++++++++++++-------------- libs/wine/casemap.c | 53 +++++++++++----------- libs/wine/wctype.c | 92 +++++++++++++++++++------------------- tools/l_intl.nls | Bin 6022 -> 6086 bytes 58 files changed, 3600 insertions(+), 1817 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cb5cf183ae6b7842692b…

1 0

Nikolay Sivov : xmllite: Store prefix for start tag and return it.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 5a1a7455707ae73fc128d741ea52bde35e74117a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1a7455707ae73fc128d741e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 00:54:44 2013 +0400 xmllite: Store prefix for start tag and return it. --- dlls/xmllite/reader.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5256c35..9193d2f 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -80,6 +80,7 @@ typedef enum typedef enum { StringValue_LocalName, + StringValue_Prefix, StringValue_QualifiedName, StringValue_Value, StringValue_Last @@ -1749,6 +1750,7 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); break; } @@ -2260,12 +2262,14 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U return S_OK; } -static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, - LPCWSTR *prefix, - UINT *prefix_length) +static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UINT *len) { - FIXME("(%p %p %p): stub\n", iface, prefix, prefix_length); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, prefix, len); + *prefix = This->strvalues[StringValue_Prefix].str; + if (len) *len = This->strvalues[StringValue_Prefix].len; + return S_OK; } static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len)

1 0