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

Eric Pouech : winhelp: Added proper RTF conversion for non breakable space and hyphen.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 1e5199af352ea45f5f6785c325cbbff99f66ff5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5199af352ea45f5f6785c32… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:38:09 2008 +0200 winhelp: Added proper RTF conversion for non breakable space and hyphen. --- programs/winhelp/hlpfile.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 92bcb1b..e327b54 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1200,9 +1200,16 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE break; case 0x8B: + if (!HLPFILE_RtfAddControl(rd, "\\~")) goto done; + format += 1; + if (rd) /* FIXME: TEMP */ rd->char_pos++; + break; + case 0x8C: - WINE_FIXME("NIY non-break space/hyphen\n"); + if (!HLPFILE_RtfAddControl(rd, "\\_")) goto done; + /* FIXME: it could be that hypen is also in input stream !! */ format += 1; + if (rd) /* FIXME: TEMP */ rd->char_pos++; break; #if 0

1 0

Eric Pouech : winhelp: Add proper support for charset from headers and escaped non ANSI characters in RTF stream .
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 0a3f4d1173a53e66310a20c4394f2d72e79a82ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3f4d1173a53e66310a20c43… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:37:58 2008 +0200 winhelp: Add proper support for charset from headers and escaped non ANSI characters in RTF stream. --- programs/winhelp/hlpfile.c | 65 +++++++++++++++++++++++++++++++++++++------ programs/winhelp/hlpfile.h | 1 + 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index ac270c7..92bcb1b 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -647,6 +647,7 @@ static BOOL HLPFILE_RtfAddText(struct RtfData* rd, const char* str) const char* p; const char* last; const char* replace; + unsigned rlen; if (!rd) return TRUE; /* FIXME: TEMP */ if (!rd->in_text) @@ -656,15 +657,21 @@ static BOOL HLPFILE_RtfAddText(struct RtfData* rd, const char* str) } for (last = p = str; *p; p++) { - switch (*p) + if (*p < 0) /* escape non ASCII chars */ { - case '{': replace = "\\{"; break; - case '}': replace = "\\}"; break; - case '\\': replace = "\\\\"; break; + static char xx[8]; + rlen = sprintf(xx, "\\'%x", *(const BYTE*)p); + replace = xx; + } + else switch (*p) + { + case '{': rlen = 2; replace = "\\{"; break; + case '}': rlen = 2; replace = "\\}"; break; + case '\\': rlen = 2; replace = "\\\\"; break; default: continue; } if ((p != last && !HLPFILE_RtfAddRawString(rd, last, p - last)) || - !HLPFILE_RtfAddRawString(rd, replace, 2)) return FALSE; + !HLPFILE_RtfAddRawString(rd, replace, rlen)) return FALSE; last = p + 1; } return HLPFILE_RtfAddRawString(rd, last, p - last); @@ -1299,8 +1306,9 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd) HLPFILE *hlpfile = page->file; BYTE *buf, *end; DWORD ref = page->reference; - unsigned index, old_index = -1, offset, count = 0; + unsigned index, old_index = -1, offset, count = 0, cpg; char tmp[1024]; + const char* ck = NULL; if (rd) { /* FIXME: TEMP */ rd->in_text = TRUE; @@ -1309,7 +1317,40 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd) rd->force_color = FALSE; } - if (!HLPFILE_RtfAddControl(rd, "{\\rtf1\\ansi\\ansicpg1252\\deff0")) return FALSE; + switch (hlpfile->charset) + { + case DEFAULT_CHARSET: + case ANSI_CHARSET: cpg = 1252; break; + case SHIFTJIS_CHARSET: cpg = 932; break; + case HANGEUL_CHARSET: cpg = 949; break; + case GB2312_CHARSET: cpg = 936; break; + case CHINESEBIG5_CHARSET: cpg = 950; break; + case GREEK_CHARSET: cpg = 1253; break; + case TURKISH_CHARSET: cpg = 1254; break; + case HEBREW_CHARSET: cpg = 1255; break; + case ARABIC_CHARSET: cpg = 1256; break; + case BALTIC_CHARSET: cpg = 1257; break; + case VIETNAMESE_CHARSET: cpg = 1258; break; + case RUSSIAN_CHARSET: cpg = 1251; break; + case EE_CHARSET: cpg = 1250; break; + case THAI_CHARSET: cpg = 874; break; + case JOHAB_CHARSET: cpg = 1361; break; + case MAC_CHARSET: ck = "mac"; break; + default: + WINE_FIXME("Unsupported charset %u\n", hlpfile->charset); + cpg = 1252; + } + if (ck) + { + sprintf(tmp, "{\\rtf1\\%s\\deff0", ck); + if (!HLPFILE_RtfAddControl(rd, tmp)) return FALSE; + } + else + { + sprintf(tmp, "{\\rtf1\\ansi\\ansicpg%d\\deff0", cpg); + if (!HLPFILE_RtfAddControl(rd, tmp)) return FALSE; + } + /* generate font table */ if (!HLPFILE_RtfAddControl(rd, "{\\fonttbl")) return FALSE; for (index = 0; index < hlpfile->numFonts; index++) @@ -1324,9 +1365,10 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd) case FF_DECORATIVE: family = "decor"; break; default: family = "nil"; break; } - sprintf(tmp, "{\\f%d\\f%s\\fprq%d\\fcharset0 %s;}", + sprintf(tmp, "{\\f%d\\f%s\\fprq%d\\fcharset%d %s;}", index, family, hlpfile->fonts[index].LogFont.lfPitchAndFamily & 0x0F, + hlpfile->fonts[index].LogFont.lfCharSet, hlpfile->fonts[index].LogFont.lfFaceName); if (!HLPFILE_RtfAddControl(rd, tmp)) return FALSE; } @@ -1454,7 +1496,7 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile) hlpfile->fonts[i].LogFont.lfItalic = (flag & 2) ? TRUE : FALSE; hlpfile->fonts[i].LogFont.lfUnderline = (flag & 4) ? TRUE : FALSE; hlpfile->fonts[i].LogFont.lfStrikeOut = (flag & 8) ? TRUE : FALSE; - hlpfile->fonts[i].LogFont.lfCharSet = DEFAULT_CHARSET; + hlpfile->fonts[i].LogFont.lfCharSet = hlpfile->charset; hlpfile->fonts[i].LogFont.lfOutPrecision = OUT_DEFAULT_PRECIS; hlpfile->fonts[i].LogFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; hlpfile->fonts[i].LogFont.lfQuality = DEFAULT_QUALITY; @@ -1629,6 +1671,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) hlpfile->version = minor; hlpfile->flags = flags; + hlpfile->charset = DEFAULT_CHARSET; for (ptr = buf + 0x15; ptr + 4 <= end; ptr += GET_USHORT(ptr, 2) + 4) { @@ -1722,6 +1765,10 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) case 8: WINE_WARN("Citation: '%s'\n", ptr + 4); break; + case 11: + hlpfile->charset = ptr[4]; + WINE_TRACE("Charset: %d\n", hlpfile->charset); + break; default: WINE_WARN("Unsupported SystemRecord[%d]\n", GET_USHORT(ptr, 0)); } diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index f4e72d7..aa8cadc 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -141,6 +141,7 @@ typedef struct tagHlpFileFile unsigned short version; unsigned short flags; + unsigned short charset; unsigned short tbsize; /* topic block size */ unsigned short dsize; /* decompress size */ unsigned short compressed;

1 0

Eric Pouech : winhelp: Start feeding the richedit control with relevant RTF stream.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: e29b5f5dfb5fc797c0777df44618b68fefa6e33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29b5f5dfb5fc797c0777df44… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:37:51 2008 +0200 winhelp: Start feeding the richedit control with relevant RTF stream. --- programs/winhelp/hlpfile.c | 158 ++++++++++++++++++++++++++++++++++++++++---- programs/winhelp/hlpfile.h | 12 +++- programs/winhelp/winhelp.c | 76 ++++++++++++++++++---- 3 files changed, 220 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e29b5f5dfb5fc797c0777…

1 0

Eric Pouech : winhelp: Added as an option, to use richedit to render the text window.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: cf2de8c00d9b123598989f738b59f065cde17861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2de8c00d9b123598989f738… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 23 21:37:44 2008 +0200 winhelp: Added as an option, to use richedit to render the text window. --- programs/winhelp/Bg.rc | 1 + programs/winhelp/Cs.rc | 1 + programs/winhelp/Da.rc | 1 + programs/winhelp/De.rc | 1 + programs/winhelp/En.rc | 1 + programs/winhelp/Eo.rc | 1 + programs/winhelp/Es.rc | 1 + programs/winhelp/Fi.rc | 1 + programs/winhelp/Fr.rc | 1 + programs/winhelp/Hu.rc | 1 + programs/winhelp/It.rc | 1 + programs/winhelp/Ko.rc | 1 + programs/winhelp/Nl.rc | 1 + programs/winhelp/No.rc | 1 + programs/winhelp/Pl.rc | 1 + programs/winhelp/Pt.rc | 2 ++ programs/winhelp/Rm.rc | 1 + programs/winhelp/Ru.rc | 1 + programs/winhelp/Si.rc | 1 + programs/winhelp/Sk.rc | 1 + programs/winhelp/Sv.rc | 1 + programs/winhelp/Tr.rc | 1 + programs/winhelp/Wa.rc | 1 + programs/winhelp/Zh.rc | 1 + programs/winhelp/winhelp.c | 17 +++++++++++++++-- programs/winhelp/winhelp_res.h | 1 + 26 files changed, 41 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf2de8c00d9b123598989…

1 0

Dan Hipschman : wininet: Don' t forget the INTERNET_STATUS_REDIRECT callback in HttpEndRequest.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: d3051cba22db94b5f419790230372d06bc53a100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3051cba22db94b5f41979023… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 23 15:33:18 2008 -0700 wininet: Don't forget the INTERNET_STATUS_REDIRECT callback in HttpEndRequest. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3f50d5c..0f7df63 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -878,6 +878,9 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb); lpwhr->lpszVerb = WININET_strdupW(szGET); HTTP_DrainContent(lpwhr); + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_REDIRECT, szNewLocation, + dwBufferSize); rc = HTTP_HandleRedirect(lpwhr, szNewLocation); if (rc) rc = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE);

1 0

Juan Lang : cryptdlg: Implement GetFriendlyNameOfCertA/W.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 2f2ccbd779b25f17c0c0b0182951811568af2572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2ccbd779b25f17c0c0b0182… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Apr 23 14:59:44 2008 -0700 cryptdlg: Implement GetFriendlyNameOfCertA/W. --- dlls/cryptdlg/Makefile.in | 2 +- dlls/cryptdlg/cryptdlg.spec | 4 ++-- dlls/cryptdlg/main.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 9c93630..612a90d 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptdlg.dll -IMPORTS = kernel32 +IMPORTS = crypt32 kernel32 C_SRCS = \ main.c diff --git a/dlls/cryptdlg/cryptdlg.spec b/dlls/cryptdlg/cryptdlg.spec index 1b80d40..70f38b9 100644 --- a/dlls/cryptdlg/cryptdlg.spec +++ b/dlls/cryptdlg/cryptdlg.spec @@ -17,5 +17,5 @@ 17 stub CertViewPropertiesW 18 stub DllRegisterServer 19 stub DllUnregisterServer -20 stub GetFriendlyNameOfCertA -21 stub GetFriendlyNameOfCertW +20 stdcall GetFriendlyNameOfCertA(ptr ptr long) +21 stdcall GetFriendlyNameOfCertW(ptr ptr long) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index eec0fa0..c3c2ae7 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "wincrypt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg); @@ -44,3 +45,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +DWORD GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, + DWORD cchBuffer) +{ + return CertGetNameStringA(pccert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, + pchBuffer, cchBuffer); +} + +DWORD GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, + DWORD cchBuffer) +{ + return CertGetNameStringW(pccert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, + pchBuffer, cchBuffer); +}

1 0

Jacek Caban : mshtml: Return S_OK in QueryContinue.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 6f33fee5afd224be3fc414e5dc34a763f23cbad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f33fee5afd224be3fc414e5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:47:52 2008 +0200 mshtml: Return S_OK in QueryContinue. --- dlls/mshtml/script.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index d924e57..de76062 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -386,8 +386,10 @@ static ULONG WINAPI ActiveScriptSiteInterruptPoll_Release(IActiveScriptSiteInter static HRESULT WINAPI ActiveScriptSiteInterruptPoll_QueryContinue(IActiveScriptSiteInterruptPoll *iface) { ScriptHost *This = ACTSCPPOLL_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return S_OK; } #undef ACTSCPPOLL_THIS

1 0

Jacek Caban : mshtml: Fixed typo.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 38e9364b65866d278150efebc945a92726a10dd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e9364b65866d278150efebc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:47:33 2008 +0200 mshtml: Fixed typo. --- dlls/mshtml/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3424d90..d924e57 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -710,7 +710,7 @@ static ScriptHost *get_script_host(HTMLDocument *doc, const GUID *guid) { ScriptHost *iter; - if(IsEqualGUID(&CLSID_JScript, &guid)) { + if(IsEqualGUID(&CLSID_JScript, guid)) { FIXME("Ignoring JScript\n"); return NULL; }

1 0

Jacek Caban : oleaut32: Handle VT_R4 in RecordClear ( spotted by Konrad Rzepecki).
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: e14ba15e0eaeb3e0a14a838350cf257d57bf7b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14ba15e0eaeb3e0a14a83835… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 17:10:03 2008 +0200 oleaut32: Handle VT_R4 in RecordClear (spotted by Konrad Rzepecki). --- dlls/oleaut32/recinfo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 5b58fc6..61f6554 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -216,6 +216,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvEx break; case VT_I2: case VT_I4: + case VT_R4: case VT_R8: case VT_CY: case VT_DATE:

1 0

Jacek Caban : oleaut32: Clear record in RecordDestroy.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: dda741e4569e604108524c8a195175d0d5e9a009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda741e4569e604108524c8a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 17:09:43 2008 +0200 oleaut32: Clear record in RecordDestroy. --- dlls/oleaut32/recinfo.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 3576e1b..5b58fc6 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -466,9 +466,14 @@ static HRESULT WINAPI IRecordInfoImpl_RecordCreateCopy(IRecordInfo *iface, PVOID static HRESULT WINAPI IRecordInfoImpl_RecordDestroy(IRecordInfo *iface, PVOID pvRecord) { IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + HRESULT hres; TRACE("(%p)->(%p)\n", This, pvRecord); + hres = IRecordInfo_RecordClear(iface, pvRecord); + if(FAILED(hres)) + return hres; + if(!HeapFree(GetProcessHeap(), 0, pvRecord)) return E_INVALIDARG;

1 0