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

Zebediah Figura : msi: Correctly format the template field for MsiProcessMessage().
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: f9f53fe624be10ada6a2dc7f79ed92d5cc09c8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f53fe624be10ada6a2dc7f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 10 20:46:40 2017 +0200 msi: Correctly format the template field for MsiProcessMessage(). 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/dialog.c | 4 +- dlls/msi/msi.rc | 6 +- dlls/msi/msipriv.h | 2 + dlls/msi/package.c | 150 +++++++++++++++++++++----------- dlls/msi/resource.h | 10 ++- dlls/msi/tests/package.c | 51 ++++++++++- po/ar.po | 214 ++++++++++++++++++++++++--------------------- po/bg.po | 212 ++++++++++++++++++++++++--------------------- po/ca.po | 214 ++++++++++++++++++++++++--------------------- po/cs.po | 214 ++++++++++++++++++++++++--------------------- po/da.po | 214 ++++++++++++++++++++++++--------------------- po/de.po | 214 ++++++++++++++++++++++++--------------------- po/el.po | 212 ++++++++++++++++++++++++--------------------- po/en.po | 216 +++++++++++++++++++++++++--------------------- po/en_US.po | 216 +++++++++++++++++++++++++--------------------- po/eo.po | 212 ++++++++++++++++++++++++--------------------- po/es.po | 214 ++++++++++++++++++++++++--------------------- po/fa.po | 212 ++++++++++++++++++++++++--------------------- po/fi.po | 220 ++++++++++++++++++++++++++--------------------- po/fr.po | 214 ++++++++++++++++++++++++--------------------- po/he.po | 212 ++++++++++++++++++++++++--------------------- po/hi.po | 212 ++++++++++++++++++++++++--------------------- po/hr.po | 214 ++++++++++++++++++++++++--------------------- po/hu.po | 214 ++++++++++++++++++++++++--------------------- po/it.po | 214 ++++++++++++++++++++++++--------------------- po/ja.po | 218 +++++++++++++++++++++++++--------------------- po/ko.po | 214 ++++++++++++++++++++++++--------------------- po/lt.po | 220 ++++++++++++++++++++++++++--------------------- po/ml.po | 212 ++++++++++++++++++++++++--------------------- po/nb_NO.po | 214 ++++++++++++++++++++++++--------------------- po/nl.po | 214 ++++++++++++++++++++++++--------------------- po/or.po | 212 ++++++++++++++++++++++++--------------------- po/pa.po | 212 ++++++++++++++++++++++++--------------------- po/pl.po | 220 ++++++++++++++++++++++++++--------------------- po/pt_BR.po | 214 ++++++++++++++++++++++++--------------------- po/pt_PT.po | 214 ++++++++++++++++++++++++--------------------- po/rm.po | 212 ++++++++++++++++++++++++--------------------- po/ro.po | 214 ++++++++++++++++++++++++--------------------- po/ru.po | 220 ++++++++++++++++++++++++++--------------------- po/sk.po | 212 ++++++++++++++++++++++++--------------------- po/sl.po | 214 ++++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 212 ++++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 212 ++++++++++++++++++++++++--------------------- po/sv.po | 214 ++++++++++++++++++++++++--------------------- po/te.po | 212 ++++++++++++++++++++++++--------------------- po/th.po | 212 ++++++++++++++++++++++++--------------------- po/tr.po | 214 ++++++++++++++++++++++++--------------------- po/uk.po | 220 ++++++++++++++++++++++++++--------------------- po/wa.po | 212 ++++++++++++++++++++++++--------------------- po/wine.pot | 212 ++++++++++++++++++++++++--------------------- po/zh_CN.po | 214 ++++++++++++++++++++++++--------------------- po/zh_TW.po | 214 ++++++++++++++++++++++++--------------------- 52 files changed, 5488 insertions(+), 4583 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9f53fe624be10ada6a2d…

1 0

Zebediah Figura : msi: Allow setting NULL in MsiSetInteger().
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 1505912ce14d09bb2a84ad01886fd2a7b4fe9d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1505912ce14d09bb2a84ad018… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 7 09:03:13 2017 -0500 msi: Allow setting NULL in MsiSetInteger(). 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/record.c | 13 +++++++++++-- dlls/msi/tests/record.c | 19 +++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 51e7a23..39ef70f 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -333,8 +333,17 @@ UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal ) return ERROR_INVALID_PARAMETER; MSI_FreeField( &rec->fields[iField] ); - rec->fields[iField].type = MSIFIELD_INT; - rec->fields[iField].u.iVal = iVal; + + if (iVal == MSI_NULL_INTEGER) + { + rec->fields[iField].type = MSIFIELD_NULL; + rec->fields[iField].u.szwVal = NULL; + } + else + { + rec->fields[iField].type = MSIFIELD_INT; + rec->fields[iField].u.iVal = iVal; + } return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 38d0f76..5caaefc 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -162,6 +162,21 @@ static void test_msirecord(void) ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); + /* same record, but add a null integer to it */ + r = MsiRecordSetInteger(h, 0, 1); + ok(r == ERROR_SUCCESS, "Failed to set integer at 0\n"); + r = MsiRecordIsNull(h, 0); + ok(r == FALSE, "expected field to be non-null\n"); + r = MsiRecordSetInteger(h, 0, MSI_NULL_INTEGER); + ok(r == ERROR_SUCCESS, "Failed to set integer at 0\n"); + r = MsiRecordIsNull(h, 0); + ok(r == TRUE, "expected field to be null\n"); + sz = sizeof buf; + r = MsiRecordGetStringA(h, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(buf[0] == 0, "MsiRecordGetStringA returned the wrong string\n"); + ok(sz == 0, "MsiRecordGetStringA returned the wrong length\n"); + /* same record, but add a string to it */ r = MsiRecordSetStringA(h,0,str); ok(r == ERROR_SUCCESS, "Failed to set string at 0\n"); @@ -431,7 +446,7 @@ static void test_MsiRecordGetString(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf); - ok(sz == 1, "Expectd 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %d\n", sz); r = MsiRecordSetInteger(rec, 1, -5); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -441,7 +456,7 @@ static void test_MsiRecordGetString(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "-5"), "Expected \"-5\", got \"%s\"\n", buf); - ok(sz == 2, "Expectd 2, got %d\n", sz); + ok(sz == 2, "Expected 2, got %d\n", sz); MsiCloseHandle(rec); }

1 0

Zebediah Figura : msi: Provide the result of the last action.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: c788ed858ed21e698977dd5961e2afb18e2bad93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c788ed858ed21e698977dd596… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 7 09:03:14 2017 -0500 msi: Provide the result of the last action. 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 | 4 +++- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 1 + dlls/msi/tests/package.c | 10 +++++++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fef076f..741e834 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -189,7 +189,7 @@ 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, !rc); + MSI_RecordSetInteger(row, 2, start ? package->LastActionResult : !rc); MSI_ProcessMessage(package, INSTALLMESSAGE_INFO, row); msiobj_release(&row->hdr); } @@ -628,6 +628,7 @@ static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT return ERROR_SUCCESS; ui_actioninfo(package, action, FALSE, arc); + package->LastActionResult = !arc; return arc; } @@ -7800,6 +7801,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; if (StandardActions[i].action_rollback && !package->need_rollback) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bb9d224..a3c3c0f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -391,6 +391,7 @@ typedef struct tagMSIPACKAGE LPWSTR ActionFormat; LPWSTR LastAction; LPWSTR LastActionTemplate; + UINT LastActionResult; UINT action_progress_increment; HANDLE log_file; IAssemblyCache *cache_net[CLR_VERSION_MAX]; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7ba7c9a..325d212 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1099,6 +1099,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->LastAction = NULL; package->LastActionTemplate = NULL; + package->LastActionResult = MSI_NULL_INTEGER; package->WordCount = 0; package->PackagePath = strdupW( db->path ); package->BaseURL = strdupW( base_url ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4bf1f87..e15dc57 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9536,7 +9536,7 @@ static void test_externalui_message(void) /* Test a standard action */ r = MsiDoActionA(hpkg, "CostInitialize"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", TRUE); + ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", FALSE); /* Test a custom action */ r = MsiDoActionA(hpkg, "custom"); @@ -9575,7 +9575,7 @@ static void test_externalui_message(void) /* Test a custom action */ r = MsiDoActionA(hpkg, "custom"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok_sequence(doaction_custom_fullui_sequence, "MsiDoAction(\"custom\")", TRUE); + ok_sequence(doaction_custom_fullui_sequence, "MsiDoAction(\"custom\")", FALSE); retval = 0; r = MsiDoActionA(hpkg, "custom"); @@ -9584,13 +9584,17 @@ static void test_externalui_message(void) r = MsiDoActionA(hpkg, "dialog"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok_sequence(doaction_dialog_sequence, "MsiDoAction(\"dialog\")", TRUE); + ok_sequence(doaction_dialog_sequence, "MsiDoAction(\"dialog\")", FALSE); retval = -1; r = MsiDoActionA(hpkg, "error"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok_sequence(doaction_dialog_error_sequence, "MsiDoAction(\"error\")", FALSE); + r = MsiDoActionA(hpkg, "error"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_dialog_error_sequence, "MsiDoAction(\"error\")", FALSE); + MsiCloseHandle(hpkg); ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE);

1 0

Zebediah Figura : msi: Use the given record for INSTALLMESSAGE_ACTIONDATA.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: f9c68dfd920702f5c81b3631344c59b1134e0f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c68dfd920702f5c81b36313… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 7 09:03:15 2017 -0500 msi: Use the given record for INSTALLMESSAGE_ACTIONDATA. 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 | 103 +++++++++++++++++---------------------------------- dlls/msi/appsearch.c | 2 +- dlls/msi/assembly.c | 4 +- dlls/msi/classes.c | 16 ++++---- dlls/msi/files.c | 12 +++--- dlls/msi/font.c | 4 +- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 1 + dlls/msi/upgrade.c | 2 +- 9 files changed, 55 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c68dfd920702f5c81b3…

1 0

Gerald Pfeifer : user.exe16: Fix ADD_TO_T macro.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 51fea2208eb02a6f500e0cbaad15e3feae701f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51fea2208eb02a6f500e0cbaa… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jul 10 01:06:15 2017 +0800 user.exe16: Fix ADD_TO_T macro. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 267714a..35f2585 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3179,12 +3179,14 @@ DWORD WINAPI FormatMessage16( talloced= 100; #define ADD_TO_T(c) \ - *t++=c;\ - if (t-target == talloced) {\ + do { \ + *t++=c;\ + if (t-target == talloced) {\ target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ t = target+talloced;\ talloced*=2;\ - } + } \ + } while(0) if (from) { f=from;

1 0

Alexandre Julliard : user32: Implement LR_MONOCHROME for loading cursors.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: b7e19e4a1ae86bc6d182b99bc52c11d8e84fe2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e19e4a1ae86bc6d182b99bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:41:22 2017 +0200 user32: Implement LR_MONOCHROME for loading cursors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 33ce5cb..4b2d6bd 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -559,7 +559,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_entry, int width, int height, int depth, UINT loadflags ) { - int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; + int i, maxwidth, maxheight, maxbits, cx, cy, bits, bestEntry = -1; if (loadflags & LR_DEFAULTSIZE) { @@ -573,22 +573,22 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ return 0; } - /* Double height to account for AND and XOR masks */ - - height *= 2; - /* First find the largest one smaller than or equal to the requested size*/ - maxwidth = maxheight = 0; + maxwidth = maxheight = maxbits = 0; for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { - if ((cx <= width) && (cy <= height) && - (cx > maxwidth) && (cy > maxheight)) + if (cx > width || cy > height) continue; + if (cx < maxwidth || cy < maxheight) continue; + if (loadflags & LR_MONOCHROME) { - bestEntry = i; - maxwidth = cx; - maxheight = cy; + if (maxbits && bits >= maxbits) continue; } + else if (bits <= maxbits) continue; + bestEntry = i; + maxwidth = cx; + maxheight = cy; + maxbits = bits; } if (bestEntry != -1) return bestEntry; @@ -597,13 +597,18 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ maxwidth = maxheight = 255; for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { - if (((cx < maxwidth) && (cy < maxheight)) || (bestEntry == -1)) + if (cx > maxwidth || cy > maxheight) continue; + if (loadflags & LR_MONOCHROME) { - bestEntry = i; - maxwidth = cx; - maxheight = cy; + if (maxbits && bits >= maxbits) continue; } + else if (bits <= maxbits) continue; + bestEntry = i; + maxwidth = cx; + maxheight = cy; + maxbits = bits; } + if (bestEntry == -1) bestEntry = 0; return bestEntry; }

1 0

Alexandre Julliard : winex11: Load a monochrome cursor instead of converting a color one when possible.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 2e0a1cfd8355ee0328838eb56b283494103fcd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0a1cfd8355ee0328838eb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:42:08 2017 +0200 winex11: Load a monochrome cursor instead of converting a color one when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 259263d..5ace405 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1160,6 +1160,43 @@ done: } /*********************************************************************** + * create_xlib_load_mono_cursor + * + * Create a monochrome X cursor from a color Windows one by trying to load the monochrome resource. + */ +static Cursor create_xlib_load_mono_cursor( HDC hdc, HANDLE handle, int width, int height ) +{ + Cursor cursor = None; + HANDLE mono; + ICONINFOEXW info; + BITMAP bm; + + if (!(mono = CopyImage( handle, IMAGE_CURSOR, width, height, LR_MONOCHROME | LR_COPYFROMRESOURCE ))) + return None; + + info.cbSize = sizeof(info); + if (GetIconInfoExW( mono, &info )) + { + if (!info.hbmColor) + { + GetObjectW( info.hbmMask, sizeof(bm), &bm ); + bm.bmHeight = max( 1, bm.bmHeight / 2 ); + /* make sure hotspot is valid */ + if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + { + info.xHotspot = bm.bmWidth / 2; + info.yHotspot = bm.bmHeight / 2; + } + cursor = create_xlib_monochrome_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + } + else DeleteObject( info.hbmColor ); + DeleteObject( info.hbmMask ); + } + DestroyCursor( mono ); + return cursor; +} + +/*********************************************************************** * create_xlib_color_cursor * * Create a color X cursor from a Windows one. @@ -1334,6 +1371,7 @@ static Cursor create_cursor( HANDLE handle ) if (pXcursorImagesLoadCursor) cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif + if (!cursor) cursor = create_xlib_load_mono_cursor( hdc, handle, bm.bmWidth, bm.bmHeight ); if (!cursor) cursor = create_xlib_color_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor ); }

1 0

Alex Henrie : msvcr120: Correct asinh specfile definitions.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: fff25a6052cf5e204196b4f497b3ae4707955a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff25a6052cf5e204196b4f49… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 9 22:55:02 2017 -0600 msvcr120: Correct asinh specfile definitions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index d5ade42..6a9ccae 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -129,9 +129,9 @@ @ stub acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf -@ cdecl asinh(double double) ucrtbase.asinh -@ cdecl asinhf(float float) ucrtbase.asinhf -@ cdecl asinhl(double double) ucrtbase.asinhl +@ cdecl asinh(double) ucrtbase.asinh +@ cdecl asinhf(float) ucrtbase.asinhf +@ cdecl asinhl(double) ucrtbase.asinhl @ cdecl atan(double) ucrtbase.atan @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 15cfe60..54f6c81 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2018,9 +2018,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ cdecl asinh(double double) MSVCR120_asinh -@ cdecl asinhf(float float) MSVCR120_asinhf -@ cdecl asinhl(double double) MSVCR120_asinhl +@ cdecl asinh(double) MSVCR120_asinh +@ cdecl asinhf(float) MSVCR120_asinhf +@ cdecl asinhl(double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9690d4d..129456f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1684,9 +1684,9 @@ @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin @ cdecl -arch=arm,x86_64 asinf(float) msvcr120.asinf -@ cdecl asinh(double double) msvcr120.asinh -@ cdecl asinhf(float float) msvcr120.asinhf -@ cdecl asinhl(double double) msvcr120.asinhl +@ cdecl asinh(double) msvcr120.asinh +@ cdecl asinhf(float) msvcr120.asinhf +@ cdecl asinhl(double) msvcr120.asinhl @ cdecl atan(double) msvcr120.atan @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a27a2c6..5a0f957 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2160,9 +2160,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ cdecl asinh(double double) MSVCR120_asinh -@ cdecl asinhf(float float) MSVCR120_asinhf -@ cdecl asinhl(double double) MSVCR120_asinhl +@ cdecl asinh(double) MSVCR120_asinh +@ cdecl asinhf(float) MSVCR120_asinhf +@ cdecl asinhl(double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f

1 0

Alex Henrie : msvcr120: Correct erff specfile definition.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 718f8265c07967d6c211cf93993e0439af23d039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f8265c07967d6c211cf939… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 9 22:55:03 2017 -0600 msvcr120: Correct erff specfile definition. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 6a9ccae..5d2499b 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -224,7 +224,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) ucrtbase.erff +@ cdecl erff(float) ucrtbase.erff @ cdecl erfl(double) ucrtbase.erfl @ cdecl exp(double) ucrtbase.exp @ cdecl exp2(double) ucrtbase.exp2 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 54f6c81..989a3cb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2126,7 +2126,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) MSVCR120_erff +@ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 129456f..345bb51 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1792,7 +1792,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) msvcr120.erff +@ cdecl erff(float) msvcr120.erff @ cdecl erfl(double) msvcr120.erfl @ cdecl exit(long) msvcr120.exit @ cdecl exp(double) msvcr120.exp diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5a0f957..3e7c795 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2269,7 +2269,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) MSVCR120_erff +@ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp

1 0

Stefan Dösinger : msvcp140: Remove a redundant check.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 8cb8c145700d44abb4441581d0b278fb8e840224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb8c145700d44abb4441581d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 9 22:14:36 2017 +0200 msvcp140: Remove a redundant check. 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/msvcp90/locale.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f7a9294..f80c9b6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11227,10 +11227,6 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s int __cdecl _To_wide(const char *src, wchar_t *dst) { TRACE("(%s %p)\n", debugstr_a(src), dst); - - if (!src || !dst) - return 0; - return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); }

1 0