September 2016 - Wine-Commits

Andrey Gusev : api-ms-win-core-sidebyside-l1-1-0: Add dll.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: a1a8cddfde144a0eaa58aba8f3a96d32f25811a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a8cddfde144a0eaa58aba8f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 12 11:55:16 2016 +0300 api-ms-win-core-sidebyside-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-sidebyside-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 5e33a01..488bc00 100755 --- a/configure +++ b/configure @@ -936,6 +936,7 @@ enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 +enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 @@ -17590,6 +17591,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-1-0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_sidebyside_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 diff --git a/configure.ac b/configure.ac index 8007469..c838b7d 100644 --- a/configure.ac +++ b/configure.ac @@ -2712,6 +2712,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in b/dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in new file mode 100644 index 0000000..6c84fdb --- /dev/null +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sidebyside-l1-1-0.dll diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec new file mode 100644 index 0000000..bad0023 --- /dev/null +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stdcall ActivateActCtx(ptr ptr) kernel32.ActivateActCtx +@ stdcall AddRefActCtx(ptr) kernel32.AddRefActCtx +@ stdcall CreateActCtxW(ptr) kernel32.CreateActCtxW +@ stdcall DeactivateActCtx(long ptr) kernel32.DeactivateActCtx +@ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) kernel32.FindActCtxSectionGuid +@ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) kernel32.FindActCtxSectionStringW +@ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx +@ stub QueryActCtxSettingsW +@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) kernel32.QueryActCtxW +@ stdcall ReleaseActCtx(ptr) kernel32.ReleaseActCtx +@ stdcall ZombifyActCtx(ptr) kernel32.ZombifyActCtx diff --git a/tools/make_specfiles b/tools/make_specfiles index 68274f8..8fa7729 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -136,6 +136,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", + "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0",

1 0

Sebastian Lackner : jscript: Allocate string of correct size in Date toLocaleDateString method.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 4d67ffd57e471f50bd96edc9e4e08030db1ffa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d67ffd57e471f50bd96edc9e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:47:57 2016 +0200 jscript: Allocate string of correct size in Date toLocaleDateString method. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 36 +++++++++--------------------------- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index fdc3051..6553e80 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -769,9 +769,10 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) BOOL formatAD = TRUE; WCHAR week[64], month[64]; + WCHAR buf[192]; jsstr_t *date_str; DOUBLE time; - int len, size, year, day; + int year, day; DWORD lcid_en; if(isnan(date->time)) { @@ -783,46 +784,27 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) time = local_time(date->time, date); if(r) { - WCHAR *ptr; - - len = 5; - lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - assert(size); - len += size-1; + week[0] = 0; + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); - assert(size); - len += size-1; - - year = year_from_time(time); - if(year<0) - year = -year+1; - do { - year /= 10; - len++; - } while(year); + month[0] = 0; + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); year = year_from_time(time); if(year<0) { formatAD = FALSE; year = -year+1; - len += 5; } day = date_from_time(time); - do { - day /= 10; - len++; - } while(day); - day = date_from_time(time); - date_str = jsstr_alloc_buf(len, &ptr); + sprintfW(buf, formatAD ? formatADW : formatBCW, week, month, day, year); + + date_str = jsstr_alloc(buf); if(!date_str) return E_OUTOFMEMORY; - sprintfW(ptr, formatAD?formatADW:formatBCW, week, month, day, year); *r = jsval_string(date_str); } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b365f3f..e986294 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2153,6 +2153,8 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 201 tmp = (new Date()).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleDateString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toTimeString();

1 0

Bruno Jesus : xinput1_3: Test proper no new data error from XInputGetKeystroke.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: cb855d98d50c21136b6743b958842fdc24909f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb855d98d50c21136b6743b95… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 10 18:46:27 2016 -0300 xinput1_3: Test proper no new data error from XInputGetKeystroke. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index ef11b50..17884e1 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -133,7 +133,8 @@ static void test_get_keystroke(void) ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); result = pXInputGetKeystroke(controllerNum, XINPUT_FLAG_GAMEPAD, &keystroke); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetKeystroke failed with (%d)\n", result); + ok(result == ERROR_EMPTY || result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, + "XInputGetKeystroke failed with (%d)\n", result); if (ERROR_DEVICE_NOT_CONNECTED == result) {

1 0

Bruno Jesus : xinput1_4: Remove XInputGetDSoundAudioDeviceGuids and add XInputGetStateEx to spec file.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 2b5c93f77999279896c82a6b2f64a39f1773b18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5c93f77999279896c82a6b2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 10 18:46:25 2016 -0300 xinput1_4: Remove XInputGetDSoundAudioDeviceGuids and add XInputGetStateEx to spec file. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_4/xinput1_4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index 25a79a0..4b88c71 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -3,7 +3,7 @@ 3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState 4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities 5 stdcall XInputEnable(long) xinput1_3.XInputEnable -6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids 7 stdcall XInputGetBatteryInformation(long long ptr) xinput1_3.XInputGetBatteryInformation 8 stdcall XInputGetKeystroke(long long ptr) xinput1_3.XInputGetKeystroke 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) +100 stdcall XInputGetStateEx(long ptr) xinput1_3.XInputGetStateEx

1 0

Dmitry Timoshkov : gdiplus: Implement GdipCreateMetafileFromFile.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: b1e77d3fc8cee25152309324aab632f9a9a3dcce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e77d3fc8cee25152309324a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 9 13:42:46 2016 -0500 gdiplus: Implement GdipCreateMetafileFromFile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d471a13..6d58170 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1922,8 +1922,22 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, GpMetafile **metafile) { - FIXME("(%p, %p): stub\n", file, metafile); - return NotImplemented; + GpStatus status; + IStream *stream; + + TRACE("(%p, %p)\n", file, metafile); + + if (!file || !metafile) return InvalidParameter; + + *metafile = NULL; + + status = GdipCreateStreamOnFile(file, GENERIC_READ, &stream); + if (status == Ok) + { + status = GdipCreateMetafileFromStream(stream, metafile); + IStream_Release(stream); + } + return status; } GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream,

1 0

Dmitry Timoshkov : gdiplus: Implement GdipCreateMetafileFromStream.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 3769778917b2cea0590ffb50e1174e354235174c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3769778917b2cea0590ffb50e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 9 13:42:43 2016 -0500 gdiplus: Implement GdipCreateMetafileFromStream. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 71d89ae..b3b4682 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1917,8 +1917,21 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, GpMetafile **metafile) { - FIXME("(%p, %p): stub\n", stream, metafile); - return NotImplemented; + GpStatus stat; + + TRACE("%p %p\n", stream, metafile); + + stat = GdipLoadImageFromStream(stream, (GpImage **)metafile); + if (stat != Ok) return stat; + + if ((*metafile)->image.type != ImageTypeMetafile) + { + GdipDisposeImage(&(*metafile)->image); + *metafile = NULL; + return GenericError; + } + + return Ok; } GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile,

1 0

Vincent Povirk : gdiplus: Add more tests for GdipGetMetafileHeaderFromMetafile.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: f60d2b63cceeec696f0bc8105db37ba6179ea55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60d2b63cceeec696f0bc8105… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 9 13:42:45 2016 -0500 gdiplus: Add more tests for GdipGetMetafileHeaderFromMetafile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index a965d4c..6a21afa 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -360,6 +360,34 @@ static void test_empty(void) stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); expect(Ok, stat); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmfPlusOnly, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(28, header.EmfPlusHeaderSize); + expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(0, U(header).EmfHeader.rclBounds.left); + expect(0, U(header).EmfHeader.rclBounds.top); + expect(-1, U(header).EmfHeader.rclBounds.right); + expect(-1, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(Ok, stat); @@ -418,6 +446,34 @@ static void test_empty(void) expect(Ok, stat); expectf(header.DpiY, yres); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmfPlusOnly, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(1, header.EmfPlusFlags); /* reference device was display, not printer */ + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(28, header.EmfPlusHeaderSize); + expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(0, U(header).EmfHeader.rclBounds.left); + expect(0, U(header).EmfHeader.rclBounds.top); + expect(-1, U(header).EmfHeader.rclBounds.right); + expect(-1, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); } @@ -603,6 +659,13 @@ static void test_emfonly(void) stat = GdipGetHemfFromMetafile(metafile, &hemf); expect(InvalidParameter, stat); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + /* The rest is zeroed or seemingly random/uninitialized garbage. */ + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); @@ -650,6 +713,35 @@ static void test_emfonly(void) stat = GdipGetImageVerticalResolution((GpImage*)metafile, &yres); expect(Ok, stat); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + /* For some reason a recoreded EMF Metafile has an EMF+ version. */ + todo_wine ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + expect(0, header.EmfPlusFlags); + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(25, U(header).EmfHeader.rclBounds.left); + expect(25, U(header).EmfHeader.rclBounds.top); + expect(74, U(header).EmfHeader.rclBounds.right); + expect(74, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -765,6 +857,34 @@ static void test_emfonly(void) expect(Ok, stat); expectf(header.DpiY, yres); + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + expect(U(header).EmfHeader.nBytes, header.Size); + expect(0x10000, header.Version); + expect(0, header.EmfPlusFlags); + expectf(xres, header.DpiX); + expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4); + expectf(yres, header.DpiY); + expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4); + expect(0, header.X); + expect(0, header.Y); + expect(100, header.Width); + expect(100, header.Height); + expect(0, header.EmfPlusHeaderSize); + expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiX); + expect(EMR_HEADER, U(header).EmfHeader.iType); + expect(25, U(header).EmfHeader.rclBounds.left); + expect(25, U(header).EmfHeader.rclBounds.top); + expect(74, U(header).EmfHeader.rclBounds.right); + expect(74, U(header).EmfHeader.rclBounds.bottom); + expect(0, U(header).EmfHeader.rclFrame.left); + expect(0, U(header).EmfHeader.rclFrame.top); + expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0); + expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0); + stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); }

1 0

Kai Blaschke : bcrypt/tests: Show that BCryptGetFipsAlgorithmMode checks a registry key.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: c1bc25dd38dab0504bd9eb45641a830ff08488b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1bc25dd38dab0504bd9eb456… Author: Kai Blaschke <kai.blaschke(a)kb-dev.net> Date: Thu Sep 8 19:24:19 2016 -0300 bcrypt/tests: Show that BCryptGetFipsAlgorithmMode checks a registry key. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/Makefile.in | 2 +- dlls/bcrypt/tests/bcrypt.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in index 0f130b1..1bf7d2c 100644 --- a/dlls/bcrypt/tests/Makefile.in +++ b/dlls/bcrypt/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = bcrypt.dll -IMPORTS = bcrypt user32 +IMPORTS = bcrypt user32 advapi32 C_SRCS = \ bcrypt.c diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9bd2cea..5cdb065 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -61,11 +61,45 @@ static void test_BCryptGenRandom(void) static void test_BCryptGetFipsAlgorithmMode(void) { - NTSTATUS ret; + static const WCHAR policyKeyVistaW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'L','s','a','\\', + 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; + static const WCHAR policyValueVistaW[] = {'E','n','a','b','l','e','d',0}; + static const WCHAR policyKeyXPW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'L','s','a',0}; + static const WCHAR policyValueXPW[] = { + 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; + BOOLEAN expected; BOOLEAN enabled; + DWORD value, count[2] = {sizeof(value), sizeof(value)}; + NTSTATUS ret; + + if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyVistaW, policyValueVistaW, + RRF_RT_REG_DWORD, NULL, &value, &count[0])) + { + expected = !!value; + } + else if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyXPW, policyValueXPW, + RRF_RT_REG_DWORD, NULL, &value, &count[1])) + { + expected = !!value; + } + else + { + expected = FALSE; +todo_wine + ok(0, "Neither XP or Vista key is present\n"); + } ret = BCryptGetFipsAlgorithmMode(&enabled); ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + ok(enabled == expected, "expected result %d, got %d\n", expected, enabled); ret = BCryptGetFipsAlgorithmMode(NULL); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret);

1 0

Andrey Gusev : api-ms-win-core-stringansi-l1-1-0: Add dll.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 09c40f67df8d90951d5d93b1d9b98dd8b2993a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c40f67df8d90951d5d93b1d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 12 11:57:23 2016 +0300 api-ms-win-core-stringansi-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-stringansi-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 488bc00..941ae9e 100755 --- a/configure +++ b/configure @@ -940,6 +940,7 @@ enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 +enable_api_ms_win_core_stringansi_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_1_0 @@ -17595,6 +17596,7 @@ wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_side wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-stringansi-l1-1-0 enable_api_ms_win_core_stringansi_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 diff --git a/configure.ac b/configure.ac index c838b7d..ab0feca 100644 --- a/configure.ac +++ b/configure.ac @@ -2716,6 +2716,7 @@ WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-stringansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) diff --git a/dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..7cfc591 --- /dev/null +++ b/dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-stringansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec new file mode 100644 index 0000000..2c58a16 --- /dev/null +++ b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall CharLowerA(str) user32.CharLowerA +@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA +@ stdcall CharNextA(str) user32.CharNextA +@ stdcall CharNextExA(long str long) user32.CharNextExA +@ stdcall CharPrevA(str str) user32.CharPrevA +@ stdcall CharPrevExA(long str str long) user32.CharPrevExA +@ stdcall CharUpperA(str) user32.CharUpperA +@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA +@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA +@ stdcall IsCharLowerA(long) user32.IsCharLowerA +@ stdcall IsCharUpperA(long) user32.IsCharUpperA diff --git a/tools/make_specfiles b/tools/make_specfiles index 8fa7729..a45bb7d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -232,6 +232,7 @@ my @dll_groups = ], [ "user32", + "api-ms-win-core-stringansi-l1-1-0", "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0",

1 0

Sebastian Lackner : jscript: Simplify date_to_string and add basic tests.
by Alexandre Julliard Sept. 12, 2016

Sept. 12, 2016

Module: wine Branch: master Commit: 20d5bbaa638f6ab5ab3366cec362848cd80a27c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d5bbaa638f6ab5ab3366cec… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:48:54 2016 +0200 jscript: Simplify date_to_string and add basic tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 48 ++++++++++++++--------------------------------- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 6553e80..a9d2ab4 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -494,8 +494,9 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, BOOL formatAD = TRUE; WCHAR week[64], month[64]; + WCHAR buf[192]; jsstr_t *date_jsstr; - int len, size, year, day; + int year, day; DWORD lcid_en; WCHAR sign = '-'; @@ -506,66 +507,45 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, } if(r) { - WCHAR *date_str; - - len = 21; - lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - assert(size); - len += size-1; - - size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); - len += size-1; + week[0] = 0; + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - year = year_from_time(time); - if(year<0) - year = -year+1; - do { - year /= 10; - len++; - } while(year); + month[0] = 0; + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); year = year_from_time(time); if(year<0) { formatAD = FALSE; year = -year+1; - len += 5; } day = date_from_time(time); - do { - day /= 10; - len++; - } while(day); - day = date_from_time(time); - if(!show_offset) len -= 9; - else if(offset == 0) len -= 5; - else if(offset < 0) { + if(offset < 0) { sign = '+'; offset = -offset; } - date_jsstr = jsstr_alloc_buf(len, &date_str); - if(!date_jsstr) - return E_OUTOFMEMORY; - if(!show_offset) - sprintfW(date_str, formatNoOffsetW, week, month, day, + sprintfW(buf, formatNoOffsetW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), year, formatAD?ADW:BCW); else if(offset) - sprintfW(date_str, formatW, week, month, day, + sprintfW(buf, formatW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, year, formatAD?ADW:BCW); else - sprintfW(date_str, formatUTCW, week, month, day, + sprintfW(buf, formatUTCW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), year, formatAD?ADW:BCW); + date_jsstr = jsstr_alloc(buf); + if(!date_jsstr) + return E_OUTOFMEMORY; + *r = jsval_string(date_jsstr); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e986294..40a749b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2155,8 +2155,12 @@ tmp = (new Date()).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date()).toString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte");

1 0