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 27 Aug '15

27 Aug '15

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

Nikolay Sivov : dwrite: Implement grayscale rendering mode.
by Alexandre Julliard 27 Aug '15

27 Aug '15

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

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

27 Aug '15

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

Jactry Zeng : riched20: Implement EM_SETFONTSIZE.
by Alexandre Julliard 27 Aug '15

27 Aug '15

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

Matt Durgavich : advapi32/tests: Fix for crashes on Mac OS X.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: b573986188a176da669cec6c9f4f6fe447b2d35f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b573986188a176da669cec6c9… Author: Matt Durgavich <mattdurgavich(a)gmail.com> Date: Tue Aug 25 22:10:51 2015 -0400 advapi32/tests: Fix for crashes on Mac OS X. --- dlls/advapi32/tests/cred.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 0ee08ef..7fbd31a 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -295,7 +295,7 @@ static void test_generic(void) for (i = 0; i < count; i++) { - if (!strcmp(creds[i]->TargetName, TEST_TARGET_NAME)) + if (creds[i]->TargetName && !strcmp(creds[i]->TargetName, TEST_TARGET_NAME)) { ok(creds[i]->Type == CRED_TYPE_GENERIC || creds[i]->Type == CRED_TYPE_DOMAIN_PASSWORD, /* Vista */ @@ -353,7 +353,7 @@ static void test_domain_password(DWORD cred_type) for (i = 0; i < count; i++) { - if (!strcmp(creds[i]->TargetName, TEST_TARGET_NAME)) + if (creds[i]->TargetName && !strcmp(creds[i]->TargetName, TEST_TARGET_NAME)) { ok(creds[i]->Type == cred_type, "expected creds[%d]->Type CRED_TYPE_DOMAIN_PASSWORD but got %d\n", i, creds[i]->Type); ok(!creds[i]->Flags, "expected creds[%d]->Flags 0 but got 0x%x\n", i, creds[i]->Flags);

1 0

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

26 Aug '15

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

Philippe Groarke : crypt32: Add CERT_OCSP_RESPONSE_PROP_ID setter.
by Alexandre Julliard 26 Aug '15

26 Aug '15

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

Martin Storsjo : api-ms-win-crt-stdio-l1-1-0: Add stub dll.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 7c5190e90e7780eb9abbc753c32ed8176afa9b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5190e90e7780eb9abbc753c… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:53 2015 +0300 api-ms-win-crt-stdio-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-stdio-l1-1-0.spec | 159 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 164 insertions(+) diff --git a/configure b/configure index 33e9e90..163c458 100755 --- a/configure +++ b/configure @@ -926,6 +926,7 @@ enable_api_ms_win_crt_multibyte_l1_1_0 enable_api_ms_win_crt_private_l1_1_0 enable_api_ms_win_crt_process_l1_1_0 enable_api_ms_win_crt_runtime_l1_1_0 +enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17177,6 +17178,7 @@ wine_fn_config_dll api-ms-win-crt-multibyte-l1-1-0 enable_api_ms_win_crt_multiby wine_fn_config_dll api-ms-win-crt-private-l1-1-0 enable_api_ms_win_crt_private_l1_1_0 wine_fn_config_dll api-ms-win-crt-process-l1-1-0 enable_api_ms_win_crt_process_l1_1_0 wine_fn_config_dll api-ms-win-crt-runtime-l1-1-0 enable_api_ms_win_crt_runtime_l1_1_0 +wine_fn_config_dll api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_stdio_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index ef86b17..ba023ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2766,6 +2766,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-multibyte-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-process-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in new file mode 100644 index 0000000..19ca3c4 --- /dev/null +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-stdio-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec new file mode 100644 index 0000000..5516364 --- /dev/null +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -0,0 +1,159 @@ +@ stub __acrt_iob_func +@ cdecl __p__commode() ucrtbase.__p__commode +@ cdecl __p__fmode() ucrtbase.__p__fmode +@ stub __stdio_common_vfprintf +@ stub __stdio_common_vfprintf_p +@ stub __stdio_common_vfprintf_s +@ stub __stdio_common_vfscanf +@ stub __stdio_common_vfwprintf +@ stub __stdio_common_vfwprintf_p +@ stub __stdio_common_vfwprintf_s +@ stub __stdio_common_vfwscanf +@ stub __stdio_common_vsnprintf_s +@ stub __stdio_common_vsnwprintf_s +@ stub __stdio_common_vsprintf +@ stub __stdio_common_vsprintf_p +@ stub __stdio_common_vsprintf_s +@ stub __stdio_common_vsscanf +@ stub __stdio_common_vswprintf +@ stub __stdio_common_vswprintf_p +@ stub __stdio_common_vswprintf_s +@ stub __stdio_common_vswscanf +@ cdecl _chsize(long long) ucrtbase._chsize +@ cdecl _chsize_s(long int64) ucrtbase._chsize_s +@ cdecl _close(long) ucrtbase._close +@ cdecl _commit(long) ucrtbase._commit +@ cdecl _creat(str long) ucrtbase._creat +@ cdecl _dup(long) ucrtbase._dup +@ cdecl _dup2(long long) ucrtbase._dup2 +@ cdecl _eof(long) ucrtbase._eof +@ cdecl _fclose_nolock(ptr) ucrtbase._fclose_nolock +@ cdecl _fcloseall() ucrtbase._fcloseall +@ cdecl _fflush_nolock(ptr) ucrtbase._fflush_nolock +@ cdecl _fgetc_nolock(ptr) ucrtbase._fgetc_nolock +@ cdecl _fgetchar() ucrtbase._fgetchar +@ cdecl _fgetwc_nolock(ptr) ucrtbase._fgetwc_nolock +@ cdecl _fgetwchar() ucrtbase._fgetwchar +@ cdecl _filelength(long) ucrtbase._filelength +@ cdecl -ret64 _filelengthi64(long) ucrtbase._filelengthi64 +@ cdecl _fileno(ptr) ucrtbase._fileno +@ cdecl _flushall() ucrtbase._flushall +@ cdecl _fputc_nolock(long ptr) ucrtbase._fputc_nolock +@ cdecl _fputchar(long) ucrtbase._fputchar +@ cdecl _fputwc_nolock(long ptr) ucrtbase._fputwc_nolock +@ cdecl _fputwchar(long) ucrtbase._fputwchar +@ cdecl _fread_nolock(ptr long long ptr) ucrtbase._fread_nolock +@ cdecl _fread_nolock_s(ptr long long long ptr) ucrtbase._fread_nolock_s +@ cdecl _fseek_nolock(ptr long long) ucrtbase._fseek_nolock +@ cdecl _fseeki64(ptr int64 long) ucrtbase._fseeki64 +@ cdecl _fseeki64_nolock(ptr int64 long) ucrtbase._fseeki64_nolock +@ cdecl _fsopen(str str long) ucrtbase._fsopen +@ cdecl _ftell_nolock(ptr) ucrtbase._ftell_nolock +@ cdecl -ret64 _ftelli64(ptr) ucrtbase._ftelli64 +@ cdecl -ret64 _ftelli64_nolock(ptr) ucrtbase._ftelli64_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) ucrtbase._fwrite_nolock +@ cdecl _get_fmode(ptr) ucrtbase._get_fmode +@ cdecl _get_osfhandle(long) ucrtbase._get_osfhandle +@ cdecl _get_printf_count_output() ucrtbase._get_printf_count_output +@ stub _get_stream_buffer_pointers +@ cdecl _getc_nolock(ptr) ucrtbase._getc_nolock +@ cdecl _getcwd(str long) ucrtbase._getcwd +@ cdecl _getdcwd(long str long) ucrtbase._getdcwd +@ cdecl _getmaxstdio() ucrtbase._getmaxstdio +@ cdecl _getw(ptr) ucrtbase._getw +@ cdecl _getwc_nolock(ptr) ucrtbase._getwc_nolock +@ cdecl _getws(ptr) ucrtbase._getws +@ stub _getws_s +@ cdecl _isatty(long) ucrtbase._isatty +@ cdecl _kbhit() ucrtbase._kbhit +@ cdecl _locking(long long long) ucrtbase._locking +@ cdecl _lseek(long long long) ucrtbase._lseek +@ cdecl -ret64 _lseeki64(long int64 long) ucrtbase._lseeki64 +@ cdecl _mktemp(str) ucrtbase._mktemp +@ cdecl _mktemp_s(str long) ucrtbase._mktemp_s +@ varargs _open(str long) ucrtbase._open +@ cdecl _open_osfhandle(long long) ucrtbase._open_osfhandle +@ cdecl _pclose(ptr) ucrtbase._pclose +@ cdecl _pipe(ptr long long) ucrtbase._pipe +@ cdecl _popen(str str) ucrtbase._popen +@ cdecl _putc_nolock(long ptr) ucrtbase._putc_nolock +@ cdecl _putw(long ptr) ucrtbase._putw +@ cdecl _putwc_nolock(long ptr) ucrtbase._putwc_nolock +@ cdecl _putws(wstr) ucrtbase._putws +@ cdecl _read(long ptr long) ucrtbase._read +@ cdecl _rmtmp() ucrtbase._rmtmp +@ cdecl _set_fmode(long) ucrtbase._set_fmode +@ cdecl _set_printf_count_output(long) ucrtbase._set_printf_count_output +@ cdecl _setmaxstdio(long) ucrtbase._setmaxstdio +@ cdecl _setmode(long long) ucrtbase._setmode +@ varargs _sopen(str long long) ucrtbase._sopen +@ stub _sopen_dispatch +@ cdecl _sopen_s(ptr str long long long) ucrtbase._sopen_s +@ cdecl _tell(long) ucrtbase._tell +@ cdecl -ret64 _telli64(long) ucrtbase._telli64 +@ cdecl _tempnam(str str) ucrtbase._tempnam +@ cdecl _ungetc_nolock(long ptr) ucrtbase._ungetc_nolock +@ cdecl _ungetwc_nolock(long ptr) ucrtbase._ungetwc_nolock +@ cdecl _wcreat(wstr long) ucrtbase._wcreat +@ cdecl _wfdopen(long wstr) ucrtbase._wfdopen +@ cdecl _wfopen(wstr wstr) ucrtbase._wfopen +@ cdecl _wfopen_s(ptr wstr wstr) ucrtbase._wfopen_s +@ cdecl _wfreopen(wstr wstr ptr) ucrtbase._wfreopen +@ cdecl _wfreopen_s(ptr wstr wstr ptr) ucrtbase._wfreopen_s +@ cdecl _wfsopen(wstr wstr long) ucrtbase._wfsopen +@ cdecl _wmktemp(wstr) ucrtbase._wmktemp +@ cdecl _wmktemp_s(wstr long) ucrtbase._wmktemp_s +@ varargs _wopen(wstr long) ucrtbase._wopen +@ cdecl _wpopen(wstr wstr) ucrtbase._wpopen +@ cdecl _write(long ptr long) ucrtbase._write +@ varargs _wsopen(wstr long long) ucrtbase._wsopen +@ stub _wsopen_dispatch +@ cdecl _wsopen_s(ptr wstr long long long) ucrtbase._wsopen_s +@ cdecl _wtempnam(wstr wstr) ucrtbase._wtempnam +@ cdecl _wtmpnam(ptr) ucrtbase._wtmpnam +@ stub _wtmpnam_s +@ cdecl clearerr(ptr) ucrtbase.clearerr +@ stub clearerr_s +@ cdecl fclose(ptr) ucrtbase.fclose +@ cdecl feof(ptr) ucrtbase.feof +@ cdecl ferror(ptr) ucrtbase.ferror +@ cdecl fflush(ptr) ucrtbase.fflush +@ cdecl fgetc(ptr) ucrtbase.fgetc +@ cdecl fgetpos(ptr ptr) ucrtbase.fgetpos +@ cdecl fgets(ptr long ptr) ucrtbase.fgets +@ cdecl fgetwc(ptr) ucrtbase.fgetwc +@ cdecl fgetws(ptr long ptr) ucrtbase.fgetws +@ cdecl fopen(str str) ucrtbase.fopen +@ cdecl fopen_s(ptr str str) ucrtbase.fopen_s +@ cdecl fputc(long ptr) ucrtbase.fputc +@ cdecl fputs(str ptr) ucrtbase.fputs +@ cdecl fputwc(long ptr) ucrtbase.fputwc +@ cdecl fputws(wstr ptr) ucrtbase.fputws +@ cdecl fread(ptr long long ptr) ucrtbase.fread +@ cdecl fread_s(ptr long long long ptr) ucrtbase.fread_s +@ cdecl freopen(str str ptr) ucrtbase.freopen +@ cdecl freopen_s(ptr str str ptr) ucrtbase.freopen_s +@ cdecl fseek(ptr long long) ucrtbase.fseek +@ cdecl fsetpos(ptr ptr) ucrtbase.fsetpos +@ cdecl ftell(ptr) ucrtbase.ftell +@ cdecl fwrite(ptr long long ptr) ucrtbase.fwrite +@ cdecl getc(ptr) ucrtbase.getc +@ cdecl getchar() ucrtbase.getchar +@ cdecl gets(str) ucrtbase.gets +@ stub gets_s +@ cdecl getwc(ptr) ucrtbase.getwc +@ cdecl getwchar() ucrtbase.getwchar +@ cdecl putc(long ptr) ucrtbase.putc +@ cdecl putchar(long) ucrtbase.putchar +@ cdecl puts(str) ucrtbase.puts +@ cdecl putwc(long ptr) ucrtbase.putwc +@ cdecl putwchar(long) ucrtbase.putwchar +@ cdecl rewind(ptr) ucrtbase.rewind +@ cdecl setbuf(ptr ptr) ucrtbase.setbuf +@ cdecl setvbuf(ptr str long long) ucrtbase.setvbuf +@ cdecl tmpfile() ucrtbase.tmpfile +@ cdecl tmpfile_s(ptr) ucrtbase.tmpfile_s +@ cdecl tmpnam(ptr) ucrtbase.tmpnam +@ stub tmpnam_s +@ cdecl ungetc(long ptr) ucrtbase.ungetc +@ cdecl ungetwc(long ptr) ucrtbase.ungetwc diff --git a/tools/make_specfiles b/tools/make_specfiles index bc6c48d..e1c5c7f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -62,6 +62,7 @@ my @dll_groups = "api-ms-win-crt-private-l1-1-0", "api-ms-win-crt-process-l1-1-0", "api-ms-win-crt-runtime-l1-1-0", + "api-ms-win-crt-stdio-l1-1-0", ], [ "msvcp120",

1 0

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

26 Aug '15

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

Martin Storsjo : api-ms-win-crt-time-l1-1-0: Add stub dll.
by Alexandre Julliard 26 Aug '15

26 Aug '15

Module: wine Branch: master Commit: 199278b4303faa88eda62b2d89a96de72cbbb673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199278b4303faa88eda62b2d8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 09:44:55 2015 +0300 api-ms-win-crt-time-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-crt-time-l1-1-0/Makefile.in | 1 + .../api-ms-win-crt-time-l1-1-0.spec | 72 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 77 insertions(+) diff --git a/configure b/configure index b1bd452..212c592 100755 --- a/configure +++ b/configure @@ -928,6 +928,7 @@ enable_api_ms_win_crt_process_l1_1_0 enable_api_ms_win_crt_runtime_l1_1_0 enable_api_ms_win_crt_stdio_l1_1_0 enable_api_ms_win_crt_string_l1_1_0 +enable_api_ms_win_crt_time_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 enable_api_ms_win_downlevel_normaliz_l1_1_0 @@ -17181,6 +17182,7 @@ wine_fn_config_dll api-ms-win-crt-process-l1-1-0 enable_api_ms_win_crt_process_l wine_fn_config_dll api-ms-win-crt-runtime-l1-1-0 enable_api_ms_win_crt_runtime_l1_1_0 wine_fn_config_dll api-ms-win-crt-stdio-l1-1-0 enable_api_ms_win_crt_stdio_l1_1_0 wine_fn_config_dll api-ms-win-crt-string-l1-1-0 enable_api_ms_win_crt_string_l1_1_0 +wine_fn_config_dll api-ms-win-crt-time-l1-1-0 enable_api_ms_win_crt_time_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index d1b0494..dc6e852 100644 --- a/configure.ac +++ b/configure.ac @@ -2768,6 +2768,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-process-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-stdio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-crt-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/Makefile.in b/dlls/api-ms-win-crt-time-l1-1-0/Makefile.in new file mode 100644 index 0000000..1887a90 --- /dev/null +++ b/dlls/api-ms-win-crt-time-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-crt-time-l1-1-0.dll diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec new file mode 100644 index 0000000..b619703 --- /dev/null +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -0,0 +1,72 @@ +@ cdecl _Getdays() ucrtbase._Getdays +@ cdecl _Getmonths() ucrtbase._Getmonths +@ cdecl _Gettnames() ucrtbase._Gettnames +@ cdecl _Strftime(str long str ptr ptr) ucrtbase._Strftime +@ cdecl _W_Getdays() ucrtbase._W_Getdays +@ cdecl _W_Getmonths() ucrtbase._W_Getmonths +@ stub _W_Gettnames +@ stub _Wcsftime +@ cdecl __daylight() ucrtbase.__daylight +@ cdecl __dstbias() ucrtbase.__dstbias +@ cdecl __timezone() ucrtbase.__timezone +@ cdecl __tzname() ucrtbase.__tzname +@ cdecl _ctime32(ptr) ucrtbase._ctime32 +@ cdecl _ctime32_s(str long ptr) ucrtbase._ctime32_s +@ cdecl _ctime64(ptr) ucrtbase._ctime64 +@ cdecl _ctime64_s(str long ptr) ucrtbase._ctime64_s +@ cdecl _difftime32(long long) ucrtbase._difftime32 +@ cdecl _difftime64(long long) ucrtbase._difftime64 +@ cdecl _ftime32(ptr) ucrtbase._ftime32 +@ cdecl _ftime32_s(ptr) ucrtbase._ftime32_s +@ cdecl _ftime64(ptr) ucrtbase._ftime64 +@ cdecl _ftime64_s(ptr) ucrtbase._ftime64_s +@ cdecl _futime32(long ptr) ucrtbase._futime32 +@ cdecl _futime64(long ptr) ucrtbase._futime64 +@ cdecl _get_daylight(ptr) ucrtbase._get_daylight +@ stub _get_dstbias +@ cdecl _get_timezone(ptr) ucrtbase._get_timezone +@ cdecl _get_tzname(ptr str long long) ucrtbase._get_tzname +@ cdecl _getsystime(ptr) ucrtbase._getsystime +@ cdecl _gmtime32(ptr) ucrtbase._gmtime32 +@ cdecl _gmtime32_s(ptr ptr) ucrtbase._gmtime32_s +@ cdecl _gmtime64(ptr) ucrtbase._gmtime64 +@ cdecl _gmtime64_s(ptr ptr) ucrtbase._gmtime64_s +@ cdecl _localtime32(ptr) ucrtbase._localtime32 +@ cdecl _localtime32_s(ptr ptr) ucrtbase._localtime32_s +@ cdecl _localtime64(ptr) ucrtbase._localtime64 +@ cdecl _localtime64_s(ptr ptr) ucrtbase._localtime64_s +@ cdecl _mkgmtime32(ptr) ucrtbase._mkgmtime32 +@ cdecl _mkgmtime64(ptr) ucrtbase._mkgmtime64 +@ cdecl _mktime32(ptr) ucrtbase._mktime32 +@ cdecl _mktime64(ptr) ucrtbase._mktime64 +@ cdecl _setsystime(ptr long) ucrtbase._setsystime +@ cdecl _strdate(ptr) ucrtbase._strdate +@ cdecl _strdate_s(ptr long) ucrtbase._strdate_s +@ stub _strftime_l +@ cdecl _strtime(ptr) ucrtbase._strtime +@ cdecl _strtime_s(ptr long) ucrtbase._strtime_s +@ cdecl _time32(ptr) ucrtbase._time32 +@ cdecl _time64(ptr) ucrtbase._time64 +@ stub _timespec32_get +@ stub _timespec64_get +@ cdecl _tzset() ucrtbase._tzset +@ cdecl _utime32(str ptr) ucrtbase._utime32 +@ cdecl _utime64(str ptr) ucrtbase._utime64 +@ cdecl _wasctime(ptr) ucrtbase._wasctime +@ cdecl _wasctime_s(ptr long ptr) ucrtbase._wasctime_s +@ stub _wcsftime_l +@ cdecl _wctime32(ptr) ucrtbase._wctime32 +@ stub _wctime32_s +@ cdecl _wctime64(ptr) ucrtbase._wctime64 +@ stub _wctime64_s +@ cdecl _wstrdate(ptr) ucrtbase._wstrdate +@ cdecl _wstrdate_s(ptr long) ucrtbase._wstrdate_s +@ cdecl _wstrtime(ptr) ucrtbase._wstrtime +@ cdecl _wstrtime_s(ptr long) ucrtbase._wstrtime_s +@ cdecl _wutime32(wstr ptr) ucrtbase._wutime32 +@ cdecl _wutime64(wstr ptr) ucrtbase._wutime64 +@ cdecl asctime(ptr) ucrtbase.asctime +@ cdecl asctime_s(ptr long ptr) ucrtbase.asctime_s +@ cdecl clock() ucrtbase.clock +@ cdecl strftime(str long str ptr) ucrtbase.strftime +@ cdecl wcsftime(ptr long wstr ptr) ucrtbase.wcsftime diff --git a/tools/make_specfiles b/tools/make_specfiles index bab4f4c..f62be3c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -64,6 +64,7 @@ my @dll_groups = "api-ms-win-crt-runtime-l1-1-0", "api-ms-win-crt-stdio-l1-1-0", "api-ms-win-crt-string-l1-1-0", + "api-ms-win-crt-time-l1-1-0", ], [ "msvcp120",

1 0