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

Andrew Talbot : wineps.drv: Remove unused code.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 86b99de84fa20bd0978d226194ca317a8636407c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b99de84fa20bd0978d22619… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu May 1 23:29:00 2008 +0100 wineps.drv: Remove unused code. --- dlls/wineps.drv/text.c | 11 ----------- dlls/wineps.drv/type42.c | 5 ----- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 88579a1..282ce35 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -95,21 +95,10 @@ static BOOL PSDRV_Text(PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, LPCWSTR UINT count, BOOL bDrawBackground, const INT *lpDx) { WORD *glyphs = NULL; - double cosEsc, sinEsc; - LOGFONTW lf; if (!count) return TRUE; - GetObjectW(GetCurrentObject(physDev->hdc, OBJ_FONT), sizeof(lf), &lf); - if(lf.lfEscapement != 0) { - cosEsc = cos(lf.lfEscapement * M_PI / 1800); - sinEsc = sin(lf.lfEscapement * M_PI / 1800); - } else { - cosEsc = 1; - sinEsc = 0; - } - if(physDev->font.fontloc == Download) glyphs = (LPWORD)str; diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 6031366..172072e 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -285,8 +285,6 @@ BOOL T42_download_glyph(PSDRV_PDEVICE *physDev, DOWNLOAD *pdl, DWORD index, DWORD start, end, i; char *buf; TYPE42 *t42; - WORD awidth; - short lsb; const char glyph_def[] = "/%s findfont exch 1 index\n" @@ -317,9 +315,6 @@ BOOL T42_download_glyph(PSDRV_PDEVICE *physDev, DOWNLOAD *pdl, DWORD index, if(!get_glyf_pos(t42, index, &start, &end)) return FALSE; TRACE("start = %x end = %x\n", start, end); - awidth = GET_BE_WORD(t42->tables[t42->hmtx_tab].data + index * 4); - lsb = GET_BE_WORD(t42->tables[t42->hmtx_tab].data + index * 4 + 2); - if(GET_BE_WORD(t42->tables[t42->glyf_tab].data + start) == 0xffff) { /* Composite glyph */ BYTE *sg_start = t42->tables[t42->glyf_tab].data + start + 10;

1 0

Kai Blin : secur32: Don't call waitpid() in dispatcher.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: bee29a6c2e96b20f8ec7f00e3c2657b238fb8963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee29a6c2e96b20f8ec7f00e3… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu May 1 21:40:27 2008 +0200 secur32: Don't call waitpid() in dispatcher. As Wine ignores SIGCHLD, waitpid() works on Linux only by accident. On FreeBSD it doesn't work. --- dlls/secur32/dispatcher.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 4003346..5707e6a 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -272,8 +272,6 @@ void cleanup_helper(PNegoHelper helper) close(helper->pipe_out); close(helper->pipe_in); - waitpid(helper->helper_pid, NULL, 0); - helper->helper_pid = 0; HeapFree(GetProcessHeap(), 0, helper); }

1 0

Eric Pouech : winhelp: Added support for relative offsets in richedit rendered pages.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 00040c4814dc07c7e2c1993ce23a44acb168500e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00040c4814dc07c7e2c1993ce… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 1 21:17:41 2008 +0200 winhelp: Added support for relative offsets in richedit rendered pages. --- programs/winhelp/hlpfile.c | 21 +++++++++++++++------ programs/winhelp/hlpfile.h | 5 ++++- programs/winhelp/winhelp.c | 12 +++++++++--- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index d78fb26..046d25a 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1039,7 +1039,8 @@ unsigned HLPFILE_HalfPointsToTwips(unsigned pts) * * HLPFILE_BrowseParagraph */ -static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE *buf, BYTE* end) +static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, + BYTE *buf, BYTE* end, unsigned* parlen) { UINT textsize; BYTE *format, *format_end; @@ -1054,6 +1055,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;}; + *parlen = 0; blocksize = GET_UINT(buf, 0); size = GET_UINT(buf, 0x4); datalen = GET_UINT(buf, 0x10); @@ -1084,7 +1086,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE if (buf[0x14] == 0x20 || buf[0x14] == 0x23) { fetch_long(&format); - fetch_ushort(&format); + *parlen = fetch_ushort(&format); } if (buf[0x14] == 0x23) @@ -1505,12 +1507,14 @@ done: * HLPFILE_BrowsePage * */ -BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, unsigned font_scale) +BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, + unsigned font_scale, unsigned relative) { HLPFILE *hlpfile = page->file; BYTE *buf, *end; DWORD ref = page->reference; - unsigned index, old_index = -1, offset, count = 0, cpg; + unsigned index, old_index = -1, offset, count = 0, offs = 0; + unsigned cpg, parlen; char tmp[1024]; const char* ck = NULL; @@ -1520,6 +1524,8 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, unsigned font rd->first_link = rd->current_link = NULL; rd->force_color = FALSE; rd->font_scale = font_scale; + rd->relative = relative; + rd->char_pos_rel = 0; switch (hlpfile->charset) { @@ -1623,7 +1629,7 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, unsigned font buf = hlpfile->topic_map[index] + offset; if (buf + 0x15 >= hlpfile->topic_end) {WINE_WARN("extra\n"); break;} end = min(buf + GET_UINT(buf, 0), hlpfile->topic_end); - if (index != old_index) {old_index = index;} + if (index != old_index) {offs = 0; old_index = index;} switch (buf[0x14]) { @@ -1633,7 +1639,10 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, unsigned font case 0x01: case 0x20: case 0x23: - if (!HLPFILE_BrowseParagraph(page, rd, buf, end)) return FALSE; + if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE; + if (relative >= index * 0x8000 + offs) + rd->char_pos_rel = rd->char_pos; + offs += parlen; break; default: WINE_ERR("buf[0x14] = %x\n", buf[0x14]); diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 0f58c85..9b086c2 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -184,6 +184,9 @@ struct RtfData { HLPFILE_LINK*first_link; HLPFILE_LINK*current_link; BOOL force_color; + unsigned relative; /* offset within page to lookup for */ + unsigned char_pos_rel; /* char_pos correspondinf to relative */ }; -BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd, unsigned font_scale); +BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd, + unsigned font_scale, unsigned relative); diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index b7fcc21..51cebf7 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1068,8 +1068,12 @@ static void WINHELP_SetupText(HWND hTextWnd, WINHELP_WINDOW* win, ULONG relative { struct RtfData rd; EDITSTREAM es; + unsigned cp = 0; + POINTL ptl; + POINT pt; - if (HLPFILE_BrowsePage(win->page, &rd, win->font_scale)) + + if (HLPFILE_BrowsePage(win->page, &rd, win->font_scale, relative)) { rd.where = rd.data; es.dwCookie = (DWORD_PTR)&rd; @@ -1077,17 +1081,19 @@ static void WINHELP_SetupText(HWND hTextWnd, WINHELP_WINDOW* win, ULONG relative es.pfnCallback = WINHELP_RtfStreamIn; SendMessageW(hTextWnd, EM_STREAMIN, SF_RTF, (LPARAM)&es); + cp = rd.char_pos_rel; } /* FIXME: else leaking potentially the rd.first_link chain */ HeapFree(GetProcessHeap(), 0, rd.data); + SendMessage(hTextWnd, EM_POSFROMCHAR, (WPARAM)&ptl, cp ? cp - 1 : 0); + pt.x = 0; pt.y = ptl.y; + SendMessage(hTextWnd, EM_SETSCROLLPOS, 0, (LPARAM)&pt); } else { SendMessage(hTextWnd, WM_SETTEXT, 0, (LPARAM)""); } SendMessage(hTextWnd, WM_SETREDRAW, TRUE, 0); - SendMessage(hTextWnd, EM_SETSEL, 0, 0); - SendMessage(hTextWnd, EM_SCROLLCARET, 0, 0); InvalidateRect(hTextWnd, NULL, TRUE); }

1 0

Eric Pouech : winhelp: Added support for font scaling when using RichEdit.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 15f6786bcc2cd36a8c6e84e05385934dd81c0008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f6786bcc2cd36a8c6e84e05… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 1 21:17:29 2008 +0200 winhelp: Added support for font scaling when using RichEdit. --- programs/winhelp/En.rc | 23 +++++++++++ programs/winhelp/Fr.rc | 23 +++++++++++ programs/winhelp/hlpfile.c | 11 ++++- programs/winhelp/hlpfile.h | 3 +- programs/winhelp/winhelp.c | 81 ++++++++++++++++++++++++++++++++++++++- programs/winhelp/winhelp.h | 1 + programs/winhelp/winhelp_res.h | 14 ++++++- 7 files changed, 149 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15f6786bcc2cd36a8c6e8…

1 0

Eric Pouech : winhelp: We can now get rid of the tests about a NULL rtfData block.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: c3b022cecf54fa388c490d76fe6ac6c5ff347d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b022cecf54fa388c490d76f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 1 21:17:13 2008 +0200 winhelp: We can now get rid of the tests about a NULL rtfData block. --- programs/winhelp/hlpfile.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 0d76ddd..69c8eda 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -609,7 +609,6 @@ static BYTE* HLPFILE_DecompressGfx(BYTE* src, unsigned csz, unsigned sz, BYTE static BOOL HLPFILE_RtfAddRawString(struct RtfData* rd, const char* str, size_t sz) { - if (!rd) return TRUE; /* FIXME: TEMP */ if (rd->ptr + sz >= rd->data + rd->allocated) { char* new = HeapReAlloc(GetProcessHeap(), 0, rd->data, rd->allocated *= 2); @@ -625,7 +624,6 @@ static BOOL HLPFILE_RtfAddRawString(struct RtfData* rd, const char* str, size_t static BOOL HLPFILE_RtfAddControl(struct RtfData* rd, const char* str) { - if (!rd) return TRUE; /* FIXME: TEMP */ if (*str == '\\' || *str == '{') rd->in_text = FALSE; else if (*str == '}') rd->in_text = TRUE; return HLPFILE_RtfAddRawString(rd, str, strlen(str)); @@ -638,7 +636,6 @@ static BOOL HLPFILE_RtfAddText(struct RtfData* rd, const char* str) const char* replace; unsigned rlen; - if (!rd) return TRUE; /* FIXME: TEMP */ if (!rd->in_text) { if (!HLPFILE_RtfAddRawString(rd, " ", 1)) return FALSE; @@ -677,7 +674,6 @@ static BOOL HLPFILE_RtfAddHexBytes(struct RtfData* rd, const void* _ptr, unsigne const BYTE* ptr = _ptr; static const char* _2hex = "0123456789abcdef"; - if (!rd) return TRUE; /* FIXME: TEMP */ if (!rd->in_text) { if (!HLPFILE_RtfAddRawString(rd, " ", 1)) return FALSE; @@ -1399,14 +1395,14 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE case 0x8B: if (!HLPFILE_RtfAddControl(rd, "\\~")) goto done; format += 1; - if (rd) /* FIXME: TEMP */ rd->char_pos++; + rd->char_pos++; break; case 0x8C: 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++; + rd->char_pos++; break; #if 0 @@ -1512,13 +1508,11 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd) char tmp[1024]; const char* ck = NULL; - if (rd) { /* FIXME: TEMP */ rd->in_text = TRUE; rd->data = rd->ptr = HeapAlloc(GetProcessHeap(), 0, rd->allocated = 32768); rd->char_pos = 0; rd->first_link = rd->current_link = NULL; rd->force_color = FALSE; - } switch (hlpfile->charset) { @@ -1647,7 +1641,6 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd) ref = GET_UINT(buf, 0xc); } while (ref != 0xffffffff); done: - if (rd) page->first_link = rd->first_link; return HLPFILE_RtfAddControl(rd, "}"); }

1 0

Eric Pouech : winhelp: Remove the internal data used for the old rendering.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 2ee5cd8d7c839479d14474960332e4ea47dd8ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee5cd8d7c839479d14474960… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 1 21:17:04 2008 +0200 winhelp: Remove the internal data used for the old rendering. --- programs/winhelp/hlpfile.c | 377 ++------------------------------------------ programs/winhelp/hlpfile.h | 40 +----- 2 files changed, 18 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ee5cd8d7c839479d1447…

1 0

Eric Pouech : winhelp: Get rid of the old internal rendering.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 303462329cc31b4d875e82aba08c7e4dbc95826d URL: http://source.winehq.org/git/wine.git/?a=commit;h=303462329cc31b4d875e82aba… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 1 21:16:53 2008 +0200 winhelp: Get rid of the old internal rendering. --- programs/winhelp/string.c | 1 - programs/winhelp/winhelp.c | 840 +------------------------------------------- programs/winhelp/winhelp.h | 38 -- 3 files changed, 10 insertions(+), 869 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=303462329cc31b4d875e8…

1 0

Dylan Smith : richedit: Updated editor. h to reflect the contents of source files.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 10e676ab3e752bb2d89bfa7641156bca2bfbcd48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e676ab3e752bb2d89bfa764… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 1 12:05:45 2008 -0400 richedit: Updated editor.h to reflect the contents of source files. --- dlls/riched20/editor.h | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 992ce7f..aa28060 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -189,9 +189,6 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); -void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC); -void ME_DestroyContext(ME_Context *c, HWND release); -ME_Style *GetInsertStyle(ME_TextEditor *editor, int nCursor); void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para); void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height); @@ -209,6 +206,10 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how); ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor); BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor); +/* context.c */ +void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC); +void ME_DestroyContext(ME_Context *c, HWND release); + /* wrap.c */ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor); void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor); @@ -272,11 +273,6 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd); void ME_DestroyEditor(ME_TextEditor *editor); void ME_SendOldNotify(ME_TextEditor *editor, int nCode); void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam); -ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_DisplayItem *pdi); -void ME_CommitUndo(ME_TextEditor *editor); -void ME_Undo(ME_TextEditor *editor); -void ME_Redo(ME_TextEditor *editor); -void ME_EmptyUndoStack(ME_TextEditor *editor); int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF); ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset); void ME_StreamInFill(ME_InStream *stream); @@ -284,6 +280,13 @@ int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar); extern int me_debug; extern void DoWrap(ME_TextEditor *editor); +/* undo.c */ +ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_DisplayItem *pdi); +void ME_CommitUndo(ME_TextEditor *editor); +void ME_Undo(ME_TextEditor *editor); +void ME_Redo(ME_TextEditor *editor); +void ME_EmptyUndoStack(ME_TextEditor *editor); + /* writer.c */ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, int nStart, int nTo, EDITSTREAM *stream); LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream);

1 0

Hans Leidekker : usp10: Fix a few failing tests and make them pass on Wine.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: c1e686429a730ce850c5877bda968eb2a5a8c51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e686429a730ce850c5877bd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu May 1 17:42:03 2008 +0200 usp10: Fix a few failing tests and make them pass on Wine. --- dlls/usp10/tests/usp10.c | 8 +++++--- dlls/usp10/usp10.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b0a0b85..252f7d9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -498,7 +498,7 @@ static void test_ScriptTextOut(HDC hdc) hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (psc == NULL, "psc should be null\n"); /* Test Rect Rgn is acceptable */ rect.top = 10; @@ -508,7 +508,7 @@ static void test_ScriptTextOut(HDC hdc) hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (psc == NULL, "psc should be null\n"); iCP = 1; hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust, @@ -953,7 +953,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) /* * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail */ - ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr); + ok(hr == E_INVALIDARG || + hr == E_FAIL, /* win2k3 */ + "ScriptStringFree should return E_INVALIDARG or E_FAIL not %08x\n", hr); } } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5e6b147..57e6611 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1413,7 +1413,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); - if (!hdc && psc && !*psc) return E_INVALIDARG; + if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; fuOptions &= ETO_CLIPPED + ETO_OPAQUE;

1 0

Hans Leidekker : usp10: Remove redundant code from ScriptTextOut.
by Alexandre Julliard May 1, 2008

May 1, 2008

Module: wine Branch: master Commit: 20ae9be59516b28efd1389b6b6c2314b6cf9bfcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ae9be59516b28efd1389b6b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu May 1 17:41:46 2008 +0200 usp10: Remove redundant code from ScriptTextOut. --- dlls/usp10/usp10.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e8e9bf0..5e6b147 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1407,7 +1407,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HFONT hfont; HRESULT hr = S_OK; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", @@ -1416,9 +1415,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc && psc && !*psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); fuOptions &= ETO_CLIPPED + ETO_OPAQUE; if (!psa->fNoGlyphIndex) /* Have Glyphs? */ @@ -1427,7 +1423,6 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) hr = S_FALSE; - unselect_cached_font(psc, hfont); return hr; }

1 0