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

Alistair Leslie-Hughes : dbghelp: Return a dos path from SymGetLineFromAddr.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 4aa7fbe0561e6a27f098a05a63c5a7d12397e678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aa7fbe0561e6a27f098a05a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 13 08:29:58 2019 +0000 dbghelp: Return a dos path from SymGetLineFromAddr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34687 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2516904..3689500 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1478,7 +1478,19 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun } if (found) { - line->FileName = (char*)source_get(module, dli->u.source_file); + if (dbghelp_opt_native) + { + /* Return native file paths when using winedbg */ + line->FileName = (char*)source_get(module, dli->u.source_file); + } + else + { + WCHAR *dospath = wine_get_dos_file_name(source_get(module, dli->u.source_file)); + DWORD len = WideCharToMultiByte(CP_ACP, 0, dospath, -1, NULL, 0, NULL, NULL); + line->FileName = fetch_buffer(module->process, len); + WideCharToMultiByte(CP_ACP, 0, dospath, -1, line->FileName, len, NULL, NULL); + HeapFree( GetProcessHeap(), 0, dospath ); + } return TRUE; } }

1 0

Alexandre Julliard : ntoskrnl: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

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

Alexandre Julliard : ntprint: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

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 : objsel: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

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 : odbccp32: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 45ea03c8a70240e2081ddc87b2865861bb853c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=45ea03c8a70240e2081ddc87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:29:58 2019 +0200 odbccp32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/Makefile.in | 2 ++ dlls/odbccp32/odbccp32.c | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in index 7730827..e1276a1 100644 --- a/dlls/odbccp32/Makefile.in +++ b/dlls/odbccp32/Makefile.in @@ -2,5 +2,7 @@ MODULE = odbccp32.dll IMPORTLIB = odbccp32 IMPORTS = uuid advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ odbccp32.c diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..283ed41 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -30,7 +30,6 @@ #include "winreg.h" #include "winnls.h" #include "sqlext.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -317,7 +316,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) { WCHAR *divider, *value; - name = heap_alloc( (strlenW(args) + 1) * sizeof(WCHAR)); + name = heap_alloc( (lstrlenW(args) + 1) * sizeof(WCHAR)); if(!name) { push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); @@ -325,7 +324,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) } lstrcpyW(name, args); - divider = strchrW(name,'='); + divider = wcschr(name,'='); if(!divider) { push_error(ODBC_ERROR_INVALID_KEYWORD_VALUE, odbc_error_invalid_keyword); @@ -337,7 +336,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) TRACE("Write pair: %s = %s\n", debugstr_w(name), debugstr_w(value)); if(RegSetValueExW(hkeydriver, name, 0, REG_SZ, (BYTE*)value, - (strlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) + (lstrlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) ERR("Failed to write registry installed key\n"); heap_free(name); @@ -860,7 +859,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons for (; *p; p += lstrlenW(p) + 1) { - WCHAR *divider = strchrW(p,'='); + WCHAR *divider = wcschr(p,'='); if (divider) { @@ -1519,7 +1518,7 @@ BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) clear_errors(); TRACE("%s\n", debugstr_w(lpszDSN)); - if(strlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrkW(lpszDSN, invalid) != NULL) + if(lstrlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || wcspbrk(lpszDSN, invalid) != NULL) { return FALSE; }

1 0

Alexandre Julliard : ole2: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

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 : ole2disp: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

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 : ole2nls: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 7176090a4f53075f9fa6d82462e34fdea0e738c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7176090a4f53075f9fa6d824… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:30:43 2019 +0200 ole2nls: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2nls.dll16/Makefile.in | 2 +- dlls/ole2nls.dll16/ole2nls.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in index bea1513..1047810 100644 --- a/dlls/ole2nls.dll16/Makefile.in +++ b/dlls/ole2nls.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = ole2nls.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll C_SRCS = ole2nls.c diff --git a/dlls/ole2nls.dll16/ole2nls.c b/dlls/ole2nls.dll16/ole2nls.c index 68db449..b4b332f 100644 --- a/dlls/ole2nls.dll16/ole2nls.c +++ b/dlls/ole2nls.dll16/ole2nls.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <string.h> #include <stdarg.h> #include <stdio.h>

1 0

Alexandre Julliard : ole32: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

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 : oleacc: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 0ed304e99002ff69e0018818a3facd4053fd348c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed304e99002ff69e0018818… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:37:11 2019 +0200 oleacc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/Makefile.in | 2 ++ dlls/oleacc/client.c | 1 - dlls/oleacc/main.c | 11 +++++------ dlls/oleacc/window.c | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 331229f..c8e2a30 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -2,6 +2,8 @@ MODULE = oleacc.dll IMPORTLIB = oleacc IMPORTS = uuid oleaut32 ole32 user32 rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ client.c \ main.c \ diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0d313a2..1d43ec3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -20,7 +20,6 @@ #include "oleacc_private.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index b90bc2c..f26abbd 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -31,7 +31,6 @@ #include "oleacc_private.h" #include "resource.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc); @@ -114,7 +113,7 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) TRACE("got window class: %s\n", debugstr_w(class_name)); for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { - if(!strcmpiW(class_name, builtin_classes[i].name)) { + if(!wcsicmp(class_name, builtin_classes[i].name)) { accessible_create ret; ret = (objid==OBJID_CLIENT ? @@ -198,13 +197,13 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix))) return E_FAIL; p = atom_str + ARRAY_SIZE(lresult_atom_prefix); - proc_id = strtoulW(p, &p, 16); + proc_id = wcstoul(p, &p, 16); if(*p != ':') return E_FAIL; - server_mapping = ULongToHandle( strtoulW(p+1, &p, 16) ); + server_mapping = ULongToHandle( wcstoul(p+1, &p, 16) ); if(*p != ':') return E_FAIL; - size = strtoulW(p+1, &p, 16); + size = wcstoul(p+1, &p, 16); if(*p != 0) return E_FAIL; @@ -320,7 +319,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) } memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); - sprintfW(atom_str+ARRAY_SIZE(lresult_atom_prefix), atom_fmt, GetCurrentProcessId(), + swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); atom = GlobalAddAtomW(atom_str); if(!atom) { diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 32c19fd..5957d49 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -20,7 +20,6 @@ #include "oleacc_private.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h"

1 0