July 2017 - Wine-commits - list.winehq.org

Rosanne DiMesio : Favor distributions selected from list over textboxes
by Jeremy Newman 12 Jul '17

12 Jul '17

Module: appdb Branch: master Commit: c3635c89ab31de3a272aab97bda350d65f224837 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c3635c89ab31de3a272aab97… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 12 10:07:59 2017 -0500 Favor distributions selected from list over textboxes When a distribution has been selected from the dropdown list, anything typed in the add distribution textboxes is a mistake. Also corrects a typo that prevented the notice that the user had added a new distribution from displaying fully. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 051ef65..8dac819 100644 --- a/include/testData.php +++ b/include/testData.php @@ -814,7 +814,7 @@ class testData{ "please add it using the form below."; } else { - $sDistributionHelp = "The user added a new distribution; "; + $sDistributionHelp = "The user added a new distribution; ". "review it in the form below or replace ". "it with one from the list."; } @@ -825,7 +825,7 @@ class testData{ echo '<td class=color0>',"\n"; echo $sDistributionHelp; - distribution::make_distribution_list("iDistributionId", $this->iDistributionId); + distribution::make_distribution_list("iTestDistributionId", $this->iDistributionId); echo '</td></tr>',"\n"; // Version List @@ -927,7 +927,7 @@ class testData{ } // No Distribution entered, and nothing in the list is selected - if (empty($aValues['sDistribution']) && !$aValues['iDistributionId']) + if (empty($aValues['sDistribution']) && !$aValues['iTestDistributionId']) $errors .= "<li>Please enter a distribution.</li>\n"; if (empty($aValues['sInstalls'])) @@ -973,7 +973,13 @@ class testData{ $this->shWhatDoesnt = $aValues['shWhatDoesnt']; $this->shWhatNotTested = $aValues['shWhatNotTested']; $this->sTestedDate = $aValues['sTestedDate']; - $this->iDistributionId = $aValues['iDistributionId']; + + //Favor distribution dropdown list selections over textboxes. + if($aValues['iTestDistributionId']) + $this->iDistributionId = $aValues['iTestDistributionId']; + else + $this->iDistributionId = $aValues['iDistributionId']; + $this->sTestedRelease = $aValues['sTestedRelease']; $this->iStaging = intval($aValues['iStaging']); $this->sInstalls = $aValues['sInstalls'];

1 0

Stefan Dösinger : msvcp140: Implement _File_size.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: dc736dae6356f540a7828b75455c71ecd66abfb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc736dae6356f540a7828b754… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 11 12:30:15 2017 +0200 msvcp140: Implement _File_size. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 56 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 12 +++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 0216450..2d51168 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3648,7 +3648,7 @@ @ extern _FNan _FNan @ stub _FSinh @ extern _FSnan _FSnan -@ stub _File_size +@ cdecl _File_size(wstr) @ cdecl -ret64 _Getcoll() _Getcoll @ cdecl _Getctype(ptr) _Getctype @ cdecl _Getcvt(ptr) _Getcvt diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 7cb75f5..f555980 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -152,6 +152,7 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); @@ -216,6 +217,7 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_File_size, "_File_size"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); @@ -563,6 +565,59 @@ static void test_to_wide(void) } } +static void test_File_size(void) +{ + ULONGLONG val; + HANDLE file; + LARGE_INTEGER file_size; + WCHAR test_f1_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + WCHAR test_f2_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; + WCHAR test_dir_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + WCHAR test_ne_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','n','e',0}; + WCHAR temp_path[MAX_PATH], origin_path[MAX_PATH]; + + memset(origin_path, 0, sizeof(origin_path)); + memset(origin_path, 0, sizeof(temp_path)); + GetCurrentDirectoryW(MAX_PATH, origin_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + CreateDirectoryW(test_dir_W, NULL); + + file = CreateFileW(test_f1_W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + val = p_File_size(test_f1_W); + ok(val == 7, "file_size is %s\n", wine_dbgstr_longlong(val)); + + file = CreateFileW(test_f2_W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + val = p_File_size(test_f2_W); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); + + val = p_File_size(test_dir_W); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); + + errno = 0xdeadbeef; + val = p_File_size(test_ne_W); + ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + val = p_File_size(NULL); + ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(DeleteFileW(test_f1_W), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(test_f2_W), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(test_dir_W), "expect wine_test_dir to exist\n"); + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -574,5 +629,6 @@ START_TEST(msvcp140) test_chore(); test_to_byte(); test_to_wide(); + test_File_size(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8e3376c..e3ba648 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15471,6 +15471,18 @@ ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +/* _File_size, msvcp140 version. Different error handling. */ +ULONGLONG __cdecl _File_size(WCHAR const* path) +{ + WIN32_FILE_ATTRIBUTE_DATA fad; + + TRACE("(%s)\n", debugstr_w(path)); + if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) + return ~(ULONGLONG)0; + + return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; +} + /* ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ /* ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2)

1 0

Stefan Dösinger : msvcp140: Implement _Current_get.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: f3b6c6ac0415010fa22d7d0440cb46f507328407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b6c6ac0415010fa22d7d044… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 11 12:30:16 2017 +0200 msvcp140: Implement _Current_get. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 10 ++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 2d51168..10bad33 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3634,7 +3634,7 @@ @ cdecl _Cnd_wait(ptr ptr) @ stub _Copy_file @ stub _Cosh -@ stub _Current_get +@ cdecl _Current_get(ptr) @ stub _Current_set @ extern _Denorm _Denorm @ cdecl _Dtest(ptr) _Dtest diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index f555980..7f1aae3 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -152,6 +152,7 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); @@ -217,6 +218,7 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_Current_get, "_Current_get"); SET(p_File_size, "_File_size"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); @@ -618,6 +620,31 @@ static void test_File_size(void) ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } +static void test_Current_get(void) +{ + WCHAR temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; + BOOL ret; + memset(origin_path, 0, sizeof(origin_path)); + GetCurrentDirectoryW(MAX_PATH, origin_path); + memset(temp_path, 0, sizeof(temp_path)); + GetTempPathW(MAX_PATH, temp_path); + + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + current_path[wcslen(current_path)] = '\\'; + ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); + + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + ok(!wcscmp(origin_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(origin_path), wine_dbgstr_w(current_path)); +} + START_TEST(msvcp140) { if(!init()) return; @@ -630,5 +657,6 @@ START_TEST(msvcp140) test_to_byte(); test_to_wide(); test_File_size(); + test_Current_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e3ba648..9d62454 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15530,6 +15530,16 @@ WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path) return current_path; } +/* _Current_get, msvcp140 version */ +BOOL __cdecl _Current_get(WCHAR *current_path) +{ + TRACE("(%s)\n", debugstr_w(current_path)); + + if(!GetCurrentDirectoryW(MAX_PATH, current_path)) + return FALSE; + return TRUE; +} + /* ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z */ /* ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z */ MSVCP_bool __cdecl tr2_sys__Current_set_wchar(WCHAR const* path)

1 0

Stefan Dösinger : msvcp140: Export _Current_set.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 8810c88abff72df3c6f51c07b11d2efe55a220dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8810c88abff72df3c6f51c07b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 11 12:30:17 2017 +0200 msvcp140: Export _Current_set. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 10bad33..22871bc 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3635,7 +3635,7 @@ @ stub _Copy_file @ stub _Cosh @ cdecl _Current_get(ptr) -@ stub _Current_set +@ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar @ extern _Denorm _Denorm @ cdecl _Dtest(ptr) _Dtest @ stub _Equivalent diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 7f1aae3..7ab1ba5 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -153,6 +153,7 @@ static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); +static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); @@ -219,6 +220,7 @@ static BOOL init(void) } SET(p_Current_get, "_Current_get"); + SET(p_Current_set, "_Current_set"); SET(p_File_size, "_File_size"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); @@ -645,6 +647,50 @@ static void test_Current_get(void) wine_dbgstr_w(origin_path), wine_dbgstr_w(current_path)); } +static void test_Current_set(void) +{ + WCHAR temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; + MSVCP_bool ret; + WCHAR testW[] = {'.','/',0}; + WCHAR not_exit_dirW[] = {'n', 'o', 't', '_', 'e', 'x', 'i', 's', 't', '_', 'd', 'i', 'r', 0}; + WCHAR invalid_nameW[] = {'?', '?', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'n', 'a', 'm', 'e', '>', '>', 0}; + memset(temp_path, 0, sizeof(temp_path)); + GetTempPathW(MAX_PATH, temp_path); + memset(origin_path, 0, sizeof(origin_path)); + GetCurrentDirectoryW(MAX_PATH, origin_path); + + ok(p_Current_set(temp_path), "p_Current_set to temp_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + current_path[wcslen(current_path)] = '\\'; + ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); + + ok(p_Current_set(testW), "p_Current_set to temp_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + current_path[wcslen(current_path)] = '\\'; + ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); + + errno = 0xdeadbeef; + ok(!p_Current_set(not_exit_dirW), "p_Current_set to not_exist_dir succeed\n"); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ok(!p_Current_set(invalid_nameW), "p_Current_set to ??invalid_name>> succeed\n"); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(p_Current_set(origin_path), "p_Current_set to origin_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + ok(!wcscmp(origin_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(origin_path), wine_dbgstr_w(current_path)); +} + START_TEST(msvcp140) { if(!init()) return; @@ -658,5 +704,6 @@ START_TEST(msvcp140) test_to_wide(); test_File_size(); test_Current_get(); + test_Current_set(); FreeLibrary(msvcp); }

1 0

Nikolay Sivov : dwrite: Avoid repeated method calls during run rendering.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 18fe44c7af612d02711631c100360114c6a6d09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18fe44c7af612d02711631c10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 16:57:40 2017 +0300 dwrite: Avoid repeated method calls during run rendering. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 2 ++ dlls/dwrite/freetype.c | 11 ++++------- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7694b79..9530399 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -260,6 +260,7 @@ extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; /* FreeType integration */ struct dwrite_glyphbitmap { IDWriteFontFace4 *fontface; + DWORD simulations; FLOAT emsize; BOOL nohint; UINT16 index; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0332587..114833a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4862,6 +4862,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface; + glyph_bitmap.simulations = IDWriteFontFace4_GetSimulations(fontface); glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) @@ -4954,6 +4955,7 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface; + glyph_bitmap.simulations = IDWriteFontFace4_GetSimulations(fontface); glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); glyph_bitmap.type = analysis->texture_type; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 2ad513e..934ca80 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -636,7 +636,6 @@ static BOOL is_face_scalable(IDWriteFontFace4 *fontface) static BOOL get_glyph_transform(struct dwrite_glyphbitmap *bitmap, FT_Matrix *ret) { - USHORT simulations = IDWriteFontFace4_GetSimulations(bitmap->fontface); FT_Matrix m; ret->xx = 1 << 16; @@ -646,10 +645,10 @@ static BOOL get_glyph_transform(struct dwrite_glyphbitmap *bitmap, FT_Matrix *re /* Some fonts provide mostly bitmaps and very few outlines, for example for .notdef. Disable transform if that's the case. */ - if (!is_face_scalable(bitmap->fontface) || (!bitmap->m && simulations == 0)) + if (!is_face_scalable(bitmap->fontface) || (!bitmap->m && bitmap->simulations == 0)) return FALSE; - if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) { + if (bitmap->simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) { m.xx = 1 << 16; m.xy = (1 << 16) / 3; m.yx = 0; @@ -667,7 +666,6 @@ static BOOL get_glyph_transform(struct dwrite_glyphbitmap *bitmap, FT_Matrix *re void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) { - USHORT simulations = IDWriteFontFace4_GetSimulations(bitmap->fontface); FTC_ImageTypeRec imagetype; FT_BBox bbox = { 0 }; BOOL needs_transform; @@ -688,7 +686,7 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) FT_Glyph glyph_copy; if (pFT_Glyph_Copy(glyph, &glyph_copy) == 0) { - if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) + if (bitmap->simulations & DWRITE_FONT_SIMULATIONS_BOLD) embolden_glyph(glyph_copy, bitmap->emsize); /* Includes oblique and user transform. */ @@ -826,7 +824,6 @@ static BOOL freetype_get_aa_glyph_bitmap(struct dwrite_glyphbitmap *bitmap, FT_G BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) { - USHORT simulations = IDWriteFontFace4_GetSimulations(bitmap->fontface); FTC_ImageTypeRec imagetype; BOOL needs_transform; BOOL ret = FALSE; @@ -847,7 +844,7 @@ BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) if (needs_transform) { if (pFT_Glyph_Copy(glyph, &glyph_copy) == 0) { - if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) + if (bitmap->simulations & DWRITE_FONT_SIMULATIONS_BOLD) embolden_glyph(glyph_copy, bitmap->emsize); /* Includes oblique and user transform. */

1 0

André Hentschel : vcomp: Add ARM64 support.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 33a8f192b0678e3fa5b8287dc1759995e6983986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a8f192b0678e3fa5b8287dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 9 17:10:59 2017 +0200 vcomp: Add ARM64 support. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 5206e47..ab51ef2 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -229,6 +229,51 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "mov SP, r5\n\t" "pop {r4, r5, PC}" ) +#elif defined(__aarch64__) + +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +__ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, + "stp x29, x30, [SP,#-16]!\n\t" + "mov x29, SP\n\t" + "mov x9, x0\n\t" + "cbz w1, 2f\n\t" + "mov w10, w1\n\t" + "mov x11, x2\n\t" + "ldr w12, [x11, #24]\n\t" + "ldr x13, [x11, #8]\n\t" + "ldr x0, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "ldr x1, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "ldr x2, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "ldr x3, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "ldr x4, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "ldr x5, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "ldr x6, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "ldr x7, [x13, w12, sxtw]\n\t" + "add w12, w12, #8\n\t" + "add x13, x13, w12, sxtw\n\t" + "subs w12, w10, #8\n\t" + "b.le 2f\n\t" + "ldr x11, [x11]\n\t" + "lsl w12, w12, #3\n\t" + "sub SP, SP, w12, sxtw\n\t" + "tbz w12, #3, 1f\n\t" + "sub SP, SP, #8\n\t" + "1: sub w12, w12, #8\n\t" + "ldr x14, [x13, w12, sxtw]\n\t" + "str x14, [SP, w12, sxtw]\n\t" + "cbnz w12, 1b\n\t" + "2: blr x9\n\t" + "mov SP, x29\n\t" + "ldp x29, x30, [SP], #16\n\t" + "ret\n" ) + #else static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args)

1 0

Zebediah Figura : msi: Rewrite dump_record().
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: f348c7c04c04946935e5bd4e10c7438fb69a9cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f348c7c04c04946935e5bd4e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 11 00:18:32 2017 -0500 msi: Rewrite dump_record(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 1 + dlls/msi/record.c | 25 +++++++++++++++++++++++++ dlls/msi/table.c | 19 ------------------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 71a0873..600800c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -840,6 +840,7 @@ extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) DECLSPEC_HIDDEN; extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int) DECLSPEC_HIDDEN; extern const WCHAR *msi_record_get_string(const MSIRECORD *, UINT, int *) DECLSPEC_HIDDEN; +extern void dump_record(MSIRECORD *) DECLSPEC_HIDDEN; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f1d7eff..6c24f61 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1860,6 +1860,7 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, char *msg; TRACE("%x\n", eMessageType); + if (TRACE_ON(msi)) dump_record(record); if ((eMessageType & 0xff000000) == INSTALLMESSAGE_FATALEXIT) log_type |= INSTALLLOGMODE_FATALEXIT; diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 39ef70f..de45191 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1077,3 +1077,28 @@ WCHAR *msi_dup_record_field( MSIRECORD *rec, INT field ) } return str; } + +void dump_record(MSIRECORD *rec) +{ + int i; + if (!rec) + { + TRACE("(null)\n"); + return; + } + + TRACE("["); + for (i = 0; i <= rec->count; i++) + { + switch(rec->fields[i].type) + { + case MSIFIELD_NULL: TRACE("(null)"); break; + case MSIFIELD_INT: TRACE("%d", rec->fields[i].u.iVal); break; + case MSIFIELD_WSTR: TRACE("%s", debugstr_w(rec->fields[i].u.szwVal)); break; + case MSIFIELD_INTPTR: TRACE("%ld", rec->fields[i].u.pVal); break; + case MSIFIELD_STREAM: TRACE("%p", rec->fields[i].u.stream); break; + } + if (i < rec->count) TRACE(", "); + } + TRACE("]\n"); +} diff --git a/dlls/msi/table.c b/dlls/msi/table.c index b364d97..45a1814 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2410,25 +2410,6 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string return rec; } -static void dump_record( MSIRECORD *rec ) -{ - UINT i, n; - - n = MSI_RecordGetFieldCount( rec ); - for( i=1; i<=n; i++ ) - { - int len; - const WCHAR *sval; - - if( MSI_RecordIsNull( rec, i ) ) - TRACE("row -> []\n"); - else if( (sval = msi_record_get_string( rec, i, &len )) ) - TRACE("row -> [%s]\n", debugstr_wn(sval, len)); - else - TRACE("row -> [0x%08x]\n", MSI_RecordGetInteger( rec, i ) ); - } -} - static void dump_table( const string_table *st, const USHORT *rawdata, UINT rawsize ) { UINT i;

1 0

Zebediah Figura : msi: Return the correct values from custom actions.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 16f0dffd011341201db846546873bddc07d7e06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f0dffd011341201db846546… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 11 00:18:33 2017 -0500 msi: Return the correct values from custom actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 35 +++++++++++++++++++++++++---------- dlls/msi/dialog.c | 12 ++++++------ dlls/msi/msipriv.h | 2 +- dlls/msi/tests/package.c | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3f97c82..2d05ba1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -172,7 +172,7 @@ static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR descripti } static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, - UINT rc) + INT rc) { MSIRECORD *row; WCHAR template[1024]; @@ -189,9 +189,10 @@ static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, if (!row) return; MSI_RecordSetStringW(row, 0, message); MSI_RecordSetStringW(row, 1, action); - MSI_RecordSetInteger(row, 2, start ? package->LastActionResult : !rc); + MSI_RecordSetInteger(row, 2, start ? package->LastActionResult : rc); MSI_ProcessMessage(package, INSTALLMESSAGE_INFO, row); msiobj_release(&row->hdr); + if (!start) package->LastActionResult = rc; } enum parse_state @@ -620,15 +621,30 @@ static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT return ERROR_INSTALL_USEREXIT; ui_actioninfo(package, action, TRUE, 0); arc = ACTION_CustomAction( package, action, script ); + uirc = !arc; if (arc == ERROR_FUNCTION_NOT_CALLED && needs_ui_sequence(package)) - arc = ACTION_ShowDialog(package, action); - - if (arc == ERROR_INSTALL_USEREXIT) /* dialog UI returned -1 */ - return ERROR_SUCCESS; + { + uirc = ACTION_ShowDialog(package, action); + switch (uirc) + { + case -1: + return ERROR_SUCCESS; /* stop immediately */ + case 0: arc = ERROR_FUNCTION_NOT_CALLED; break; + case 1: arc = ERROR_SUCCESS; break; + case 2: arc = ERROR_INSTALL_USEREXIT; break; + case 3: arc = ERROR_INSTALL_FAILURE; break; + case 4: arc = ERROR_INSTALL_SUSPEND; break; + case 5: arc = ERROR_MORE_DATA; break; + case 6: arc = ERROR_INVALID_HANDLE_STATE; break; + case 7: arc = ERROR_INVALID_DATA; break; + case 8: arc = ERROR_INSTALL_ALREADY_RUNNING; break; + case 9: arc = ERROR_INSTALL_PACKAGE_REJECTED; break; + default: arc = ERROR_FUNCTION_FAILED; break; + } + } - ui_actioninfo(package, action, FALSE, arc); - package->LastActionResult = !arc; + ui_actioninfo(package, action, FALSE, uirc); return arc; } @@ -7765,8 +7781,7 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) { ui_actioninfo( package, action, TRUE, 0 ); rc = StandardActions[i].handler( package ); - ui_actioninfo( package, action, FALSE, rc ); - package->LastActionResult = !rc; + ui_actioninfo( package, action, FALSE, !rc ); if (StandardActions[i].action_rollback && !package->need_rollback) { diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ac2b29b..6c215b1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4507,20 +4507,21 @@ static UINT event_reset( msi_dialog *dialog, const WCHAR *argument ) return ERROR_SUCCESS; } -UINT ACTION_ShowDialog( MSIPACKAGE *package, const WCHAR *dialog ) +INT ACTION_ShowDialog( MSIPACKAGE *package, const WCHAR *dialog ) { static const WCHAR szDialog[] = {'D','i','a','l','o','g',0}; MSIRECORD *row; INT rc; - if (!TABLE_Exists(package->db, szDialog)) return ERROR_FUNCTION_NOT_CALLED; + if (!TABLE_Exists(package->db, szDialog)) return 0; row = MSI_CreateRecord(0); - if (!row) return ERROR_OUTOFMEMORY; + if (!row) return -1; MSI_RecordSetStringW(row, 0, dialog); rc = MSI_ProcessMessage(package, INSTALLMESSAGE_SHOWDIALOG, row); msiobj_release(&row->hdr); - if (rc == -1) return ERROR_INSTALL_USEREXIT; + + if (rc == -2) rc = 0; if (!rc) { @@ -4540,9 +4541,8 @@ UINT ACTION_ShowDialog( MSIPACKAGE *package, const WCHAR *dialog ) MSI_ProcessMessage(package, INSTALLMESSAGE_INFO, row); msiobj_release(&row->hdr); - return ERROR_FUNCTION_NOT_CALLED; } - return ERROR_SUCCESS; + return rc; } /* Return ERROR_SUCCESS if dialog is process and ERROR_FUNCTION_FAILED diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 600800c..84e53ff 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -802,7 +802,7 @@ extern void msi_free_patchinfo( MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; -extern UINT ACTION_ShowDialog( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; +extern INT ACTION_ShowDialog( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; extern UINT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR) DECLSPEC_HIDDEN; extern UINT ACTION_ForceReboot(MSIPACKAGE *package) DECLSPEC_HIDDEN; extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e15dc57..1173c92 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9389,6 +9389,11 @@ static const struct externalui_message doaction_custom_fullui_sequence[] = { {0} }; +static const struct externalui_message doaction_custom_cancel_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {0} +}; + static const struct externalui_message doaction_dialog_nonexistent_sequence[] = { {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, @@ -9415,6 +9420,22 @@ static const struct externalui_message doaction_dialog_error_sequence[] = { {0} }; +static const struct externalui_message doaction_dialog_3_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "dialog", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "0"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"dialog"}, {1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "3"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_dialog_12345_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "dialog", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "3"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"dialog"}, {1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "12345"}, {0, 1, 1}}, + {0} +}; + static const struct externalui_message closehandle_sequence[] = { {INSTALLMESSAGE_TERMINATE, -1}, {0} @@ -9577,6 +9598,11 @@ static void test_externalui_message(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok_sequence(doaction_custom_fullui_sequence, "MsiDoAction(\"custom\")", FALSE); + retval = 2; + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_INSTALL_USEREXIT, "Expected ERROR_INSTALL_USEREXIT, got %d\n", r); + ok_sequence(doaction_custom_cancel_sequence, "MsiDoAction(\"custom\")", FALSE); + retval = 0; r = MsiDoActionA(hpkg, "custom"); ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); @@ -9595,6 +9621,21 @@ static void test_externalui_message(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok_sequence(doaction_dialog_error_sequence, "MsiDoAction(\"error\")", FALSE); + retval = -2; + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); + ok_sequence(doaction_dialog_nonexistent_sequence, "MsiDoAction(\"custom\")", FALSE); + + retval = 3; + r = MsiDoActionA(hpkg, "dialog"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %d\n", r); + ok_sequence(doaction_dialog_3_sequence, "MsiDoAction(\"dialog\")", FALSE); + + retval = 12345; + r = MsiDoActionA(hpkg, "dialog"); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_INSTALL_FAILURE, got %d\n", r); + ok_sequence(doaction_dialog_12345_sequence, "MsiDoAction(\"dialog\")", FALSE); + MsiCloseHandle(hpkg); ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE);

1 0

Zebediah Figura : msi: Properly parse empty format strings.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 51bd884384da29872faf878fc41b4572da634aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bd884384da29872faf878fc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 11 00:18:34 2017 -0500 msi: Properly parse empty format strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 87 +++++++++++++++++++++---------------------------- dlls/msi/tests/format.c | 27 +++++++++++++++ 2 files changed, 64 insertions(+), 50 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 581dd55..4297fbc 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -276,7 +276,7 @@ static WCHAR *deformat_environment( FORMAT *format, FORMSTR *str, int *ret_len ) } static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound, - BOOL *nonprop, int *type, int *len ) + int *type, int *len ) { LPCWSTR data = get_formstr_data(format, str); WCHAR *replaced = NULL; @@ -343,58 +343,24 @@ static LPWSTR build_default_format(const MSIRECORD* record) { int i; int count; - LPWSTR rc, buf; - static const WCHAR fmt[] = {'%','i',':',' ','%','s',' ',0}; - static const WCHAR fmt_null[] = {'%','i',':',' ',' ',0}; - static const WCHAR fmt_index[] = {'%','i',0}; - LPCWSTR str; - WCHAR index[10]; - DWORD size, max_len, len; + WCHAR *rc, buf[26]; + static const WCHAR fmt[] = {'%','i',':',' ','[','%','i',']',' ',0}; + DWORD size; count = MSI_RecordGetFieldCount(record); - max_len = MAX_PATH; - buf = msi_alloc((max_len + 1) * sizeof(WCHAR)); - - rc = NULL; + rc = msi_alloc(1); + rc[0] = 0; size = 1; + for (i = 1; i <= count; i++) { - sprintfW(index, fmt_index, i); - str = MSI_RecordGetString(record, i); - len = (str) ? lstrlenW(str) : 0; - len += (sizeof(fmt_null)/sizeof(fmt_null[0]) - 3) + lstrlenW(index); - size += len; - - if (len > max_len) - { - max_len = len; - buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); - if (!buf) - { - msi_free(rc); - return NULL; - } - } - - if (str) - sprintfW(buf, fmt, i, str); - else - sprintfW(buf, fmt_null, i); - - if (!rc) - { - rc = msi_alloc(size * sizeof(WCHAR)); - lstrcpyW(rc, buf); - } - else - { - rc = msi_realloc(rc, size * sizeof(WCHAR)); - lstrcatW(rc, buf); - } + sprintfW(buf, fmt, i, i); + size += lstrlenW(buf); + rc = msi_realloc(rc, size * sizeof(WCHAR)); + lstrcatW(rc, buf); } - msi_free(buf); return rc; } @@ -685,7 +651,7 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, content->len = *oldsize - 2; content->type = *type; - if (*type == FORMAT_NUMBER) + if (*type == FORMAT_NUMBER && format->record) { replaced = deformat_index( format, content, len ); if (replaced) @@ -699,7 +665,7 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, } else if (format->package) { - replaced = deformat_literal( format, content, propfound, nonprop, type, len ); + replaced = deformat_literal( format, content, propfound, type, len ); } else { @@ -791,7 +757,7 @@ static BOOL verify_format(LPWSTR data) static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data, DWORD *len, - MSIRECORD* record, INT* failcount) + MSIRECORD* record) { FORMAT format; FORMSTR *str = NULL; @@ -877,15 +843,34 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, WCHAR *format, *deformated; UINT rc = ERROR_INVALID_PARAMETER; DWORD len; + MSIRECORD *record_deformated; + int field_count, i; TRACE("%p %p %p %p\n", package, record, buffer, size); + dump_record(record); if (!(format = msi_dup_record_field( record, 0 ))) format = build_default_format( record ); - TRACE("%s\n", debugstr_w(format)); + field_count = MSI_RecordGetFieldCount(record); + record_deformated = MSI_CloneRecord(record); + if (!record_deformated) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + MSI_RecordSetStringW(record_deformated, 0, format); + for (i = 1; i <= field_count; i++) + { + if (MSI_RecordGetString(record, i)) + { + deformat_string_internal(package, MSI_RecordGetString(record, i), &deformated, &len, NULL); + MSI_RecordSetStringW(record_deformated, i, deformated); + msi_free(deformated); + } + } - deformat_string_internal( package, format, &deformated, &len, record, NULL ); + deformat_string_internal(package, format, &deformated, &len, record_deformated); if (buffer) { if (*size>len) @@ -907,6 +892,8 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, else rc = ERROR_SUCCESS; *size = len; + msiobj_release(&record_deformated->hdr); +end: msi_free( format ); msi_free( deformated ); return rc; diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 6209399..b476c6b 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -494,6 +494,15 @@ static void test_formatrecord(void) ok( sz == 7, "size wrong\n"); ok( 0 == strcmp(buffer,"boo hoo"), "wrong output\n"); + /* self-referential format field */ + r = MsiRecordSetStringA(hrec, 0, "[1] test [0]"); + ok( r == ERROR_SUCCESS, "set string failed\n"); + sz = sizeof buffer; + r = MsiFormatRecordA(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + ok( sz == 21, "size wrong\n"); + ok( 0 == strcmp(buffer,"boo test [1] test [0]"), "wrong output\n"); + /* empty string */ r = MsiRecordSetStringA(hrec, 0, ""); ok( r == ERROR_SUCCESS, "set string failed\n"); @@ -504,6 +513,18 @@ static void test_formatrecord(void) ok( 0 == strcmp(buffer,"1: boo 2: hoo 3: 4: 5: 6: "), "wrong output(%s)\n",buffer); + /* empty string with numbers */ + r = MsiRecordSetStringA(hrec, 1, "123"); + ok( r == ERROR_SUCCESS, "set string failed\n"); + r = MsiRecordSetInteger(hrec, 2, 4567); + ok( r == ERROR_SUCCESS, "set string failed\n"); + sz = sizeof buffer; + r = MsiFormatRecordA(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + ok( sz == 31, "size wrong %i\n",sz); + ok( 0 == strcmp(buffer,"1: 123 2: 4567 3: 4: 5: 6: "), + "wrong output(%s)\n",buffer); + /* play games with recursive lookups */ r = MsiRecordSetStringA(hrec, 0, "[[1]] [2]"); ok( r == ERROR_SUCCESS, "set string failed\n"); @@ -2575,6 +2596,12 @@ static void test_formatrecord_tables(void) ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); ok( !lstrcmpA( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); + size = MAX_PATH; + MsiRecordSetStringA( hrec, 0, "1: [1] " ); + r = MsiFormatRecordA( hpkg, hrec, buf, &size ); + ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); + ok( !lstrcmpA( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); + /* environment variable doesn't exist */ size = MAX_PATH; MsiRecordSetStringA( hrec, 1, "[%idontexist]" );

1 0

Alistair Leslie-Hughes : widl: Only generate Proxy Stubs when functions have the call_as attribute.
by Alexandre Julliard 11 Jul '17

11 Jul '17

Module: wine Branch: master Commit: 084fa63e606ca6d289e98e5ca7c11718591f5f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=084fa63e606ca6d289e98e5ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 11 02:30:15 2017 +0000 widl: Only generate Proxy Stubs when functions have the call_as attribute. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 3 +++ include/unknwn.idl | 10 ++++++++++ tools/widl/header.c | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 9da82f1..fba7fc7 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -45,6 +45,9 @@ typedef struct BitmapTestSrc { const bitmap_data *data; } BitmapTestSrc; +extern HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_WriteSource_Proxy(IWICBitmapFrameEncode* This, + IWICBitmapSource *pIBitmapSource, WICRect *prc); + static BOOL near_equal(float a, float b) { return fabsf(a - b) < 0.001; diff --git a/include/unknwn.idl b/include/unknwn.idl index 78a2d9d..7856a7f 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -46,6 +46,16 @@ interface IUnknown ULONG Release(); } +cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown* This, REFIID riid, void **ppvObject);") +cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown* This);") +cpp_quote("void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown* This);") +cpp_quote("void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") + cpp_quote("#ifdef SAVE_WIDL_C_INLINE_WRAPPERS") cpp_quote("#define WIDL_C_INLINE_WRAPPERS") cpp_quote("#endif") diff --git a/tools/widl/header.c b/tools/widl/header.c index 7b97158..e48b488 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1172,7 +1172,7 @@ static void write_method_proto(FILE *header, const type_t *iface) { const var_t *func = stmt->u.var; - if (!is_local(func->attrs)) { + if (is_callas(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); if (!callconv) callconv = "STDMETHODCALLTYPE"; /* proxy prototype */

1 0