June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : ole2disp: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 24533530c16c4322c93ad160a931a94cb495c6cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=24533530c16c4322c93ad160… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:30:32 2019 +0200 ole2disp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/Makefile.in | 2 +- dlls/ole2disp.dll16/ole2disp.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in index 86100fe..009e0de 100644 --- a/dlls/ole2disp.dll16/Makefile.in +++ b/dlls/ole2disp.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = ole2disp.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,oleaut32.dll C_SRCS = ole2disp.c diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index b981485..5323959 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <string.h>

1 0

Alexandre Julliard : ntoskrnl: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: a1cdcc5290618c00d73e7a71aaa38897ec501138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1cdcc5290618c00d73e7a71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:28:35 2019 +0200 ntoskrnl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 2 + dlls/ntoskrnl.exe/instr.c | 3 - dlls/ntoskrnl.exe/ntoskrnl.c | 94 +++++----------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 156 ++++++++++++++++++------------------ dlls/ntoskrnl.exe/pnp.c | 49 +++++------ dlls/ntoskrnl.exe/sync.c | 1 - 6 files changed, 124 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1cdcc5290618c00d73e…

1 0

Akihiro Sagawa : usp10: Fix advance width when glyph is missing.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: ac0c1d41d1773f5029cc73ae9bd4cfb2ef358b80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac0c1d41d1773f5029cc73ae… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 13 23:50:25 2019 +0900 usp10: Fix advance width when glyph is missing. This fixes a regression introduced by 8d018d8d1dadf9d731690567b9c98d5a9eae37db. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47327 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 4 ++-- dlls/usp10/usp10.c | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 270a0f4..ecfac4b 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2199,11 +2199,11 @@ static void test_ScriptPlace(HDC hdc) { ok(offset[i].du == 0, "[%d] expected 0, got %d\n", i, offset[i].du); ok(offset[i].dv == 0, "[%d] expected 0, got %d\n", i, offset[i].dv); - todo_wine ok(widths[i] > tm.tmAveCharWidth, "[%d] expected greater than %d, got %d\n", + ok(widths[i] > tm.tmAveCharWidth, "[%d] expected greater than %d, got %d\n", i, tm.tmAveCharWidth, widths[i]); total += widths[i]; } - todo_wine ok(total == sz.cx, "expected %d, got %d\n", sz.cx, total); + ok(total == sz.cx, "expected %d, got %d\n", sz.cx, total); } else skip("Associated font is unavailable\n"); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6975a49..a2e1a73 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3434,9 +3434,27 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (FAILED(hr = ScriptGetCMap(hdc, psc, &pwGlyphs[i], 1, 0, &glyph))) return hr; } else + { + hr = S_OK; glyph = pwGlyphs[i]; + } - if (!get_cache_glyph_widths(psc, glyph, &abc)) + if (hr == S_FALSE) + { + if (!hdc) return E_PENDING; + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) + { + if (!GetCharABCWidthsW(hdc, pwGlyphs[i], pwGlyphs[i], &abc)) return S_FALSE; + } + else + { + INT width; + if (!GetCharWidthW(hdc, pwGlyphs[i], pwGlyphs[i], &width)) return S_FALSE; + abc.abcB = width; + abc.abcA = abc.abcC = 0; + } + } + else if (!get_cache_glyph_widths(psc, glyph, &abc)) { if (!hdc) return E_PENDING; if (get_cache_pitch_family(psc) & TMPF_TRUETYPE)

1 0

Alexandre Julliard : ole32: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 0f47bb66a6952080cca9d0eb7a3bed62ca44127d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f47bb66a6952080cca9d0eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:36:46 2019 +0200 ole32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 2 ++ dlls/ole32/bindctx.c | 2 +- dlls/ole32/classmoniker.c | 5 ++--- dlls/ole32/clipboard.c | 2 +- dlls/ole32/comcat.c | 9 ++++---- dlls/ole32/compobj.c | 47 +++++++++++++++++++---------------------- dlls/ole32/compositemoniker.c | 3 +-- dlls/ole32/datacache.c | 1 - dlls/ole32/defaulthandler.c | 5 ++--- dlls/ole32/errorinfo.c | 3 +-- dlls/ole32/filelockbytes.c | 5 ++--- dlls/ole32/filemoniker.c | 49 +++++++++++++++++++++---------------------- dlls/ole32/ftmarshal.c | 2 -- dlls/ole32/hglobalstream.c | 2 -- dlls/ole32/ifs.c | 2 -- dlls/ole32/itemmoniker.c | 9 ++++---- dlls/ole32/marshal.c | 1 - dlls/ole32/memlockbytes.c | 2 -- dlls/ole32/moniker.c | 12 ++++------- dlls/ole32/ole2.c | 21 ++++++++----------- dlls/ole32/ole2stubs.c | 2 -- dlls/ole32/ole32_main.c | 3 --- dlls/ole32/oleproxy.c | 2 -- dlls/ole32/rpc.c | 8 ++----- dlls/ole32/stg_prop.c | 8 ++----- dlls/ole32/storage32.c | 17 +++++++-------- dlls/ole32/usrmarshal.c | 11 +++++----- 27 files changed, 96 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f47bb66a6952080cca9…

1 0

Alexandre Julliard : ole2: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 19ed5ae26d4344d698f5be32e1ae3824415cd916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19ed5ae26d4344d698f5be32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:30:19 2019 +0200 ole2: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/Makefile.in | 2 +- dlls/ole2.dll16/memlockbytes.c | 2 -- dlls/ole2.dll16/ole2.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ole2.dll16/Makefile.in b/dlls/ole2.dll16/Makefile.in index bb9fa89..01f4638 100644 --- a/dlls/ole2.dll16/Makefile.in +++ b/dlls/ole2.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = ole2.dll16 IMPORTS = uuid ole32 user32 gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll C_SRCS = \ memlockbytes.c \ diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 93f91bc..9a246ef 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdarg.h> #include <string.h> diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index bd9cf45..5e6142f 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <stdlib.h> #include <stdarg.h>

1 0

Alexandre Julliard : objsel: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 8b81c5219df3b86def4ef6f43f4f716c1e82a73e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b81c5219df3b86def4ef6f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:29:47 2019 +0200 objsel: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/objsel/Makefile.in | 2 ++ dlls/objsel/objsel_private.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in index 4032c39..87b970c2 100644 --- a/dlls/objsel/Makefile.in +++ b/dlls/objsel/Makefile.in @@ -1,6 +1,8 @@ MODULE = objsel.dll IMPORTS = strmiids uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ factory.c \ objsel.c diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index f6e6baa..9289c00 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -35,7 +35,6 @@ #include "olectl.h" #include "unknwn.h" #include "objsel.h" -#include "wine/unicode.h" #include "uuids.h" /**********************************************************************

1 0

Alexandre Julliard : ntprint: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 690e9619ba4f94371dc37c3ae892b60bd900f62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=690e9619ba4f94371dc37c3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:28:49 2019 +0200 ntprint: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntprint/Makefile.in | 2 ++ dlls/ntprint/ntprint.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index 055df60..29edde3 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,6 +1,8 @@ MODULE = ntprint.dll IMPORTS = winspool +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ ntprint.c diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 75a8e00..1003857 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -30,7 +30,6 @@ #include "winver.h" #include "winspool.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ntprint);

1 0

Alexandre Julliard : normaliz: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 1f13221498e7b5efbcae9bfdd0bc70944245aa02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f13221498e7b5efbcae9bfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:44 2019 +0200 normaliz: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/normaliz/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/normaliz/Makefile.in b/dlls/normaliz/Makefile.in index f5af896..444c168 100644 --- a/dlls/normaliz/Makefile.in +++ b/dlls/normaliz/Makefile.in @@ -1,5 +1,7 @@ MODULE = normaliz.dll IMPORTLIB = normaliz +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ normaliz.c

1 0

Alexandre Julliard : winebuild: Don' t import standard C functions in Unix mode.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 450f0fa6967f35a888d24c9ad37585f4e4134a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=450f0fa6967f35a888d24c9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:24:45 2019 +0200 winebuild: Don't import standard C functions in Unix mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 382829c..ad6e2a8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -38,6 +38,8 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + typedef enum { TYPE_VARIABLE, /* variable */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6c68dbd..7cf0655 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -38,6 +38,93 @@ #include "wine/list.h" #include "build.h" +/* standard C functions that are also exported from ntdll */ +static const char *stdc_names[] = +{ + "abs", + "atan", + "atoi", + "atol", + "bsearch", + "ceil", + "cos", + "fabs", + "floor", + "isalnum", + "isalpha", + "iscntrl", + "isdigit", + "isgraph", + "islower", + "isprint", + "ispunct", + "isspace", + "isupper", + "iswalpha", + "iswctype", + "iswdigit", + "iswlower", + "iswspace", + "iswxdigit", + "isxdigit", + "labs", + "log", + "mbstowcs", + "memchr", + "memcmp", + "memcpy", + "memmove", + "memset", + "pow", + "qsort", + "sin", + "sprintf", + "sqrt", + "sscanf", + "strcat", + "strchr", + "strcmp", + "strcpy", + "strcspn", + "strlen", + "strncat", + "strncmp", + "strncpy", + "strnlen", + "strpbrk", + "strrchr", + "strspn", + "strstr", + "strtol", + "strtoul", + "swprintf", + "tan", + "tolower", + "toupper", + "towlower", + "towupper", + "vsprintf", + "wcscat", + "wcschr", + "wcscmp", + "wcscpy", + "wcscspn", + "wcslen", + "wcsncat", + "wcsncmp", + "wcsncpy", + "wcspbrk", + "wcsrchr", + "wcsspn", + "wcsstr", + "wcstok", + "wcstol", + "wcstombs", + "wcstoul" +}; + +static struct strarray stdc_functions = { stdc_names, ARRAY_SIZE(stdc_names), ARRAY_SIZE(stdc_names) }; + struct import_func { const char *name; @@ -566,7 +653,8 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) add_undef_import( p + strlen( import_func_prefix ), 0 ); else if (!strncmp( p, import_ord_prefix, strlen(import_ord_prefix) )) add_undef_import( p + strlen( import_ord_prefix ), 1 ); - else strarray_add( &undef_symbols, xstrdup( p ), NULL ); + else if (!unix_lib || !find_name( p, &stdc_functions )) + strarray_add( &undef_symbols, xstrdup( p ), NULL ); } if ((err = pclose( f ))) warning( "%s failed with status %d\n", cmd, err ); free( cmd );

1 0

Zebediah Figura : qcap/avimux: Store the source pin and AVI data inline in the AviMux structure.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 3c40ce0549ebdc45601ce3ad109424e1669ab653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c40ce0549ebdc45601ce3ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:34:59 2019 -0500 qcap/avimux: Store the source pin and AVI data inline in the AviMux structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 193 +++++++++++++++++++++++++---------------------------- 1 file changed, 92 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c40ce0549ebdc45601c…

1 0