August 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Bitmap buffer is zeroed on allocation, no need to do it again.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 3f4a284f58036cc9e4dbc6765900ac9ca3a37e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4a284f58036cc9e4dbc6765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 08:39:25 2015 +0300 dwrite: Bitmap buffer is zeroed on allocation, no need to do it again. --- dlls/dwrite/freetype.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index dc6d701..1f7e6a9 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -539,7 +539,6 @@ void freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) ft_bitmap.buffer = bitmap->buf; /* Note: FreeType will only set 'black' bits for us. */ - memset(bitmap->buf, 0, height * bitmap->pitch); if (pFT_Outline_New(library, src->n_points, src->n_contours, &copy) == 0) { pFT_Outline_Copy(src, &copy); pFT_Outline_Translate(&copy, -bbox->left << 6, bbox->bottom << 6); @@ -553,8 +552,6 @@ void freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) int w = min(bitmap->pitch, (ft_bitmap->width + 7) >> 3); int h = min(height, ft_bitmap->rows); - memset(bitmap->buf, 0, height * bitmap->pitch); - while (h--) { memcpy(dst, src, w); src += ft_bitmap->pitch; @@ -680,8 +677,6 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) void freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) { - UINT32 size = (bitmap->bbox.right - bitmap->bbox.left)*(bitmap->bbox.bottom - bitmap->bbox.top); - memset(bitmap->buf, 0, size); } INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol)

1 0

Vincent Povirk : comdlg32: Add WS_CLIPSIBLINGS to controls in the item dialog.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 836f06f6f928959c856bf0c964502b193281e3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=836f06f6f928959c856bf0c96… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 20 15:24:37 2015 -0500 comdlg32: Add WS_CLIPSIBLINGS to controls in the item dialog. --- dlls/comdlg32/comdlg32.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 1e616e6..6612dfd 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -483,16 +483,16 @@ STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_S CAPTION "Open" FONT 8, "MS Shell Dlg" { - LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT - EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS - LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | - CBS_HASSTRINGS | CBS_DROPDOWNLIST + WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST - DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 395, 240, 40, 14 - PUSHBUTTON "&Help", pshHelp, 350, 272, 40, 14 + DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP | WS_CLIPSIBLINGS + PUSHBUTTON "Cancel", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS + PUSHBUTTON "&Help", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS } LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Martin Storsjo : ucrtbase: Hook up _crt_atexit.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 9303c6eeed57fc27b278f3e1399fd94ba29ddb0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9303c6eeed57fc27b278f3e13… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Aug 27 00:06:35 2015 +0300 ucrtbase: Hook up _crt_atexit. --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 8e8fd08..77afe01 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -29,7 +29,7 @@ @ cdecl _controlfp(long long) ucrtbase._controlfp @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s @ stub _crt_at_quick_exit -@ stub _crt_atexit +@ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit @ stub _crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 3d79a4d..0f1343d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -326,6 +326,15 @@ int CDECL MSVCRT_atexit(void (*func)(void)) } /********************************************************************* + * _crt_atexit (UCRTBASE.@) + */ +int CDECL MSVCRT__crt_atexit(void (*func)(void)) +{ + TRACE("(%p)\n", func); + return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; +} + +/********************************************************************* * _set_purecall_handler (MSVCR71.@) */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aacffb8..bb56408 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -241,7 +241,7 @@ @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale @ stub _crt_at_quick_exit -@ stub _crt_atexit +@ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit @ stub _crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s

1 0

Nikolay Sivov : dwrite: Implement grayscale rendering mode.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 26fbbdc48bc803dbfa3ee05d2a90e3ff8ebcd808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26fbbdc48bc803dbfa3ee05d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 08:39:45 2015 +0300 dwrite: Implement grayscale rendering mode. --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 41 +++++++++---- dlls/dwrite/freetype.c | 137 +++++++++++++++++++++++++++++++------------ 3 files changed, 130 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26fbbdc48bc803dbfa3ee…

1 0

Jactry Zeng : riched20: Implement EM_SETFONTSIZE.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: d62dd465161f736fd6091fd2483c2c25803c972b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62dd465161f736fd6091fd24… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Aug 25 21:16:00 2015 +0800 riched20: Implement EM_SETFONTSIZE. --- dlls/riched20/editor.c | 45 ++++++++++++++++++++- dlls/riched20/tests/editor.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 276636f..a55a109 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -96,7 +96,7 @@ + EM_SETCHARFORMAT (partly done, no ANSI) - EM_SETEDITSTYLE + EM_SETEVENTMASK (few notifications supported) - - EM_SETFONTSIZE + + EM_SETFONTSIZE - EM_SETIMECOLOR 1.0asian - EM_SETIMEOPTIONS 1.0asian - EM_SETIMESTATUS @@ -3265,7 +3265,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) - UNSUPPORTED_MSG(EM_SETFONTSIZE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) UNSUPPORTED_MSG(EM_SETMARGINS) UNSUPPORTED_MSG(EM_SETPALETTE) @@ -3341,6 +3340,48 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return settings; } + case EM_SETFONTSIZE: + { + CHARFORMAT2W cf; + LONG tmp_size, size; + BOOL is_increase = ((LONG)wParam > 0); + + if (editor->mode & TM_PLAINTEXT) + return FALSE; + + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_SIZE; + ME_GetSelectionCharFormat(editor, &cf); + tmp_size = (cf.yHeight / 20) + wParam; + + if (tmp_size <= 1) + size = 1; + else if (tmp_size > 12 && tmp_size < 28 && tmp_size % 2) + size = tmp_size + (is_increase ? 1 : -1); + else if (tmp_size > 28 && tmp_size < 36) + size = is_increase ? 36 : 28; + else if (tmp_size > 36 && tmp_size < 48) + size = is_increase ? 48 : 36; + else if (tmp_size > 48 && tmp_size < 72) + size = is_increase ? 72 : 48; + else if (tmp_size > 72 && tmp_size < 80) + size = is_increase ? 80 : 72; + else if (tmp_size > 80 && tmp_size < 1638) + size = 10 * (is_increase ? (tmp_size / 10 + 1) : (tmp_size / 10)); + else if (tmp_size >= 1638) + size = 1638; + else + size = tmp_size; + + cf.yHeight = size * 20; /* convert twips to points */ + ME_SetSelectionCharFormat(editor, &cf); + ME_CommitUndo(editor); + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); + ME_Repaint(editor); + + return TRUE; + } case EM_SETOPTIONS: { /* these flags are equivalent to ES_* counterparts, except for diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 29af470..4705dd6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7857,6 +7857,100 @@ static void test_EM_SETREADONLY(void) DestroyWindow(richedit); } +static inline LONG twips2points(LONG value) +{ + return value / 20; +} + +#define TEST_EM_SETFONTSIZE(hwnd,size,expected_size,expected_res,expected_undo) \ + _test_font_size(__LINE__,hwnd,size,expected_size,expected_res,expected_undo) +static void _test_font_size(unsigned line, HWND hwnd, LONG size, LONG expected_size, + LRESULT expected_res, BOOL expected_undo) +{ + CHARFORMAT2A cf; + LRESULT res; + BOOL isundo; + + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_SIZE; + + res = SendMessageA(hwnd, EM_SETFONTSIZE, size, 0); + SendMessageA(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + isundo = SendMessageA(hwnd, EM_CANUNDO, 0, 0); + ok_(__FILE__,line)(res == expected_res, "EM_SETFONTSIZE unexpected return value: %lx.\n", res); + ok_(__FILE__,line)(twips2points(cf.yHeight) == expected_size, "got wrong font size: %d, expected: %d\n", + twips2points(cf.yHeight), expected_size); + ok_(__FILE__,line)(isundo == expected_undo, "get wrong undo mark: %d, expected: %d.\n", + isundo, expected_undo); +} + +static void test_EM_SETFONTSIZE(void) +{ + HWND richedit = new_richedit(NULL); + CHAR text[] = "wine"; + CHARFORMAT2A tmp_cf; + LONG default_size; + + tmp_cf.cbSize = sizeof(tmp_cf); + tmp_cf.dwMask = CFM_SIZE; + tmp_cf.yHeight = 9 * 20.0; + SendMessageA(richedit, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&tmp_cf); + + SendMessageA(richedit, WM_SETTEXT, 0, (LPARAM)text); + + SendMessageA(richedit, EM_SETMODIFY, FALSE, 0); + /* without selection */ + TEST_EM_SETFONTSIZE(richedit, 1, 10, TRUE, FALSE); /* 9 + 1 -> 10 */ + SendMessageA(richedit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&tmp_cf); + default_size = twips2points(tmp_cf.yHeight); + ok(default_size == 9, "Default font size should not be changed.\n"); + ok(SendMessageA(richedit, EM_SETMODIFY, 0, 0) == FALSE, "Modify flag should not be changed.\n"); + + SendMessageA(richedit, EM_SETSEL, 0, 2); + + TEST_EM_SETFONTSIZE(richedit, 0, 9, TRUE, TRUE); /* 9 + 0 -> 9 */ + + SendMessageA(richedit, EM_SETMODIFY, FALSE, 0); + TEST_EM_SETFONTSIZE(richedit, 3, 12, TRUE, TRUE); /* 9 + 3 -> 12 */ + ok(SendMessageA(richedit, EM_SETMODIFY, 0, 0) == FALSE, "Modify flag should not be changed.\n"); + + TEST_EM_SETFONTSIZE(richedit, 1, 14, TRUE, TRUE); /* 12 + 1 + 1 -> 14 */ + TEST_EM_SETFONTSIZE(richedit, -1, 12, TRUE, TRUE); /* 14 - 1 - 1 -> 12 */ + TEST_EM_SETFONTSIZE(richedit, 4, 16, TRUE, TRUE); /* 12 + 4 -> 16 */ + TEST_EM_SETFONTSIZE(richedit, 3, 20, TRUE, TRUE); /* 16 + 3 + 1 -> 20 */ + TEST_EM_SETFONTSIZE(richedit, 0, 20, TRUE, TRUE); /* 20 + 0 -> 20 */ + TEST_EM_SETFONTSIZE(richedit, 8, 28, TRUE, TRUE); /* 20 + 8 -> 28 */ + TEST_EM_SETFONTSIZE(richedit, 0, 28, TRUE, TRUE); /* 28 + 0 -> 28 */ + TEST_EM_SETFONTSIZE(richedit, 1, 36, TRUE, TRUE); /* 28 + 1 -> 36 */ + TEST_EM_SETFONTSIZE(richedit, 0, 36, TRUE, TRUE); /* 36 + 0 -> 36 */ + TEST_EM_SETFONTSIZE(richedit, 1, 48, TRUE, TRUE); /* 36 + 1 -> 48 */ + TEST_EM_SETFONTSIZE(richedit, 0, 48, TRUE, TRUE); /* 48 + 0 -> 48 */ + TEST_EM_SETFONTSIZE(richedit, 1, 72, TRUE, TRUE); /* 48 + 1 -> 72 */ + TEST_EM_SETFONTSIZE(richedit, 0, 72, TRUE, TRUE); /* 72 + 0 -> 72 */ + TEST_EM_SETFONTSIZE(richedit, 1, 80, TRUE, TRUE); /* 72 + 1 -> 80 */ + TEST_EM_SETFONTSIZE(richedit, 0, 80, TRUE, TRUE); /* 80 + 0 -> 80 */ + TEST_EM_SETFONTSIZE(richedit, 1, 90, TRUE, TRUE); /* 80 + 1 -> 90 */ + TEST_EM_SETFONTSIZE(richedit, 0, 90, TRUE, TRUE); /* 90 + 0 -> 90 */ + TEST_EM_SETFONTSIZE(richedit, 1, 100, TRUE, TRUE); /* 90 + 1 -> 100 */ + TEST_EM_SETFONTSIZE(richedit, 25, 130, TRUE, TRUE); /* 100 + 25 -> 130 */ + TEST_EM_SETFONTSIZE(richedit, -1, 120, TRUE, TRUE); /* 130 - 1 -> 120 */ + TEST_EM_SETFONTSIZE(richedit, -35, 80, TRUE, TRUE); /* 120 - 35 -> 80 */ + TEST_EM_SETFONTSIZE(richedit, -7, 72, TRUE, TRUE); /* 80 - 7 -> 72 */ + TEST_EM_SETFONTSIZE(richedit, -42, 28, TRUE, TRUE); /* 72 - 42 -> 28 */ + TEST_EM_SETFONTSIZE(richedit, -16, 12, TRUE, TRUE); /* 28 - 16 -> 12 */ + TEST_EM_SETFONTSIZE(richedit, -3, 9, TRUE, TRUE); /* 12 - 3 -> 9 */ + TEST_EM_SETFONTSIZE(richedit, -8, 1, TRUE, TRUE); /* 9 - 8 -> 1 */ + TEST_EM_SETFONTSIZE(richedit, -111, 1, TRUE, TRUE); /* 1 - 111 -> 1 */ + TEST_EM_SETFONTSIZE(richedit, 10086, 1638, TRUE, TRUE); /* 1 + 10086 -> 1638 */ + + /* return FALSE when richedit is TM_PLAINTEXT mode */ + SendMessageA(richedit, WM_SETTEXT, 0, (LPARAM)""); + SendMessageA(richedit, EM_SETTEXTMODE, (WPARAM)TM_PLAINTEXT, 0); + TEST_EM_SETFONTSIZE(richedit, 0, 9, FALSE, FALSE); + + DestroyWindow(richedit); +} + START_TEST( editor ) { BOOL ret; @@ -7922,6 +8016,7 @@ START_TEST( editor ) test_WM_CREATE(); test_reset_default_para_fmt(); test_EM_SETREADONLY(); + test_EM_SETFONTSIZE(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Philippe Groarke : crypt32: Add CERT_OCSP_RESPONSE_PROP_ID setter.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: dcc6868057605296a7dacd89211e0673396abe45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc6868057605296a7dacd892… Author: Philippe Groarke <philippe.groarke(a)gmail.com> Date: Wed Aug 26 01:36:29 2015 -0400 crypt32: Add CERT_OCSP_RESPONSE_PROP_ID setter. --- dlls/crypt32/cert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 0cda2c4..a4b43ff 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -694,6 +694,7 @@ static BOOL CertContext_SetProperty(cert_t *cert, DWORD dwPropId, case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: case CERT_ENROLLMENT_PROP_ID: case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: + case CERT_OCSP_RESPONSE_PROP_ID: case CERT_RENEWAL_PROP_ID: { if (pvData)

1 0

Henri Verbeet : wined3d: Use unsigned mask constants in shifts.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 2773b27bb14c47a07007b1f72b9167a6be79fcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2773b27bb14c47a07007b1f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 12:46:47 2015 +0200 wined3d: Use unsigned mask constants in shifts. --- dlls/wined3d/arb_program_shader.c | 66 ++++++++++++++----------- dlls/wined3d/buffer.c | 8 +-- dlls/wined3d/context.c | 40 +++++++-------- dlls/wined3d/device.c | 36 +++++++------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 24 ++++----- dlls/wined3d/glsl_shader.c | 96 ++++++++++++++++++------------------ dlls/wined3d/nvidia_texture_shader.c | 12 +++-- dlls/wined3d/shader.c | 70 +++++++++++++------------- dlls/wined3d/shader_sm1.c | 38 +++++++------- dlls/wined3d/shader_sm4.c | 28 +++++------ dlls/wined3d/state.c | 62 +++++++++++------------ dlls/wined3d/stateblock.c | 22 ++++----- dlls/wined3d/surface.c | 16 +++--- dlls/wined3d/utils.c | 62 +++++++++++------------ dlls/wined3d/wined3d_private.h | 64 ++++++++++++------------ include/wine/wined3d.h | 38 +++++++------- 17 files changed, 348 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2773b27bb14c47a07007b…

1 0

Henri Verbeet : wined3d: Get rid of some powf() calls.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: 9f530b579eeb538b28e38cd223894cd9374b72f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f530b579eeb538b28e38cd22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 26 12:46:46 2015 +0200 wined3d: Get rid of some powf() calls. --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85ad4a4..fc00823 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1795,21 +1795,21 @@ static inline unsigned short float_32_to_16(const float *in) if (isinf(*in)) return (*in < 0.0f ? 0xfc00 : 0x7c00); - if (tmp < powf(2, 10)) + if (tmp < (float)(1u << 10)) { do { tmp = tmp * 2.0f; exp--; - } while (tmp < powf(2, 10)); + } while (tmp < (float)(1u << 10)); } - else if (tmp >= powf(2, 11)) + else if (tmp >= (float)(1u << 11)) { do { tmp /= 2.0f; exp++; - } while (tmp >= powf(2, 11)); + } while (tmp >= (float)(1u << 11)); } mantissa = (unsigned int)tmp;

1 0

Martin Storsjo : api-ms-win-crt-string-l1-1-0: Add stub dll.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: e015c85af9da442032100ba30aabf1ff8c83c7b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e015c85af9da442032100ba30… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:54 2015 +0300 api-ms-win-crt-string-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-crt-string-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-string-l1-1-0.spec | 178 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 183 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e015c85af9da442032100…

1 0

Hans Leidekker : msi: Implement Installer::SummaryInformation.
by Alexandre Julliard Aug. 26, 2015

Aug. 26, 2015

Module: wine Branch: master Commit: d3ce29449b0caf39ee6e96a2da52cf23a670e956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ce29449b0caf39ee6e96a2d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 26 08:45:53 2015 +0200 msi: Implement Installer::SummaryInformation. --- dlls/msi/automation.c | 36 ++++++++++++++++++++++++++++++++---- dlls/msi/tests/automation.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 01765cb..e974387 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1832,13 +1832,41 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, EXCEPINFO* pExcepInfo, UINT* puArgErr) { - if (!(wFlags & DISPATCH_METHOD)) + UINT ret; + HRESULT hr; + MSIHANDLE hsuminfo; + IDispatch *dispatch; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_PROPERTYGET)) return DISP_E_MEMBERNOTFOUND; - FIXME("\n"); + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; - VariantInit(pVarResult); - return S_OK; + VariantInit(&varg1); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) + return hr; + + V_VT(pVarResult) = VT_DISPATCH; + + ret = MsiGetSummaryInformationW(0, V_BSTR(&varg0), V_I4(&varg1), &hsuminfo); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + hr = create_summaryinfo(hsuminfo, &dispatch); + if (SUCCEEDED(hr)) + V_DISPATCH(pVarResult) = dispatch; + +done: + VariantClear(&varg0); + return hr; } static HRESULT InstallerImpl_UILevel(WORD wFlags, diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 016b1a2..e31527f 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1128,6 +1128,25 @@ static HRESULT Installer_UILevelPut(int level) return invoke(pInstaller, "UILevel", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } +static HRESULT Installer_SummaryInformation(BSTR PackagePath, int UpdateCount, IDispatch **pSumInfo) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(PackagePath); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = UpdateCount; + + hr = invoke(pInstaller, "SummaryInformation", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_DISPATCH); + *pSumInfo = V_DISPATCH(&varresult); + return hr; +} + static HRESULT Session_Installer(IDispatch *pSession, IDispatch **pInst) { VARIANT varresult; @@ -2602,7 +2621,7 @@ static void test_Installer(void) static const WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; - IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL; + IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL, *pSumInfo = NULL; int iValue, iCount; if (!pInstaller) return; @@ -2678,6 +2697,18 @@ static void test_Installer(void) IDispatch_Release(pDatabase); } + /* Installer::SummaryInformation */ + hr = Installer_SummaryInformation(szPath, 0, &pSumInfo); + ok(hr == S_OK, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); + if (hr == S_OK) + { + test_SummaryInfo(pSumInfo, summary_info, sizeof(summary_info)/sizeof(msi_summary_info), TRUE); + IDispatch_Release(pSumInfo); + } + + hr = Installer_SummaryInformation(NULL, 0, &pSumInfo); + ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); + /* Installer::RegistryValue */ test_Installer_RegistryValue();

1 0