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

Alexandre Julliard : olesvr32: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: fa5042dc852ef96abe7caa638f2eae19f704fc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5042dc852ef96abe7caa63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:49 2019 +0200 olesvr32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olesvr32/Makefile.in | 2 ++ dlls/olesvr32/olesvr_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in index 0cea1ad..67c612d 100644 --- a/dlls/olesvr32/Makefile.in +++ b/dlls/olesvr32/Makefile.in @@ -1,5 +1,7 @@ MODULE = olesvr32.dll IMPORTLIB = olesvr32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ olesvr_main.c diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index 57c28e1..0ca83ba 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Dmitry Timoshkov : mshtml: Add better stub for HTMLDocument7:: get_onmsthumbnailclick.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 756d9cdc6f43052fca5be1cc26a8e08b70515138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=756d9cdc6f43052fca5be1cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 14:09:36 2019 +0800 mshtml: Add better stub for HTMLDocument7::get_onmsthumbnailclick. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/htmlevent.c | 3 +++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/dom.c | 7 +++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 868a9a0..54787f0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3339,8 +3339,10 @@ static HRESULT WINAPI HTMLDocument7_put_onmsthumbnailclick(IHTMLDocument7 *iface static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MSTHUMBNAILCLICK, p); } static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 453fe32..b090d1c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -88,6 +88,7 @@ static const WCHAR mouseoutW[] = {'m','o','u','s','e','o','u','t',0}; static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0}; static const WCHAR mouseupW[] = {'m','o','u','s','e','u','p',0}; static const WCHAR mousewheelW[] = {'m','o','u','s','e','w','h','e','e','l',0}; +static const WCHAR msthumbnailclickW[] = {'m','s','t','h','u','m','b','n','a','i','l','c','l','i','c','k',0}; static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; static const WCHAR resizeW[] = {'r','e','s','i','z','e',0}; @@ -208,6 +209,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {mousewheelW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, EVENT_FIXME}, + {msthumbnailclickW, EVENT_TYPE_MOUSE, DISPID_EVPROP_ONMSTHUMBNAILCLICK, + EVENT_FIXME}, {pasteW, EVENT_TYPE_CLIPBOARD, DISPID_EVMETH_ONPASTE, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {readystatechangeW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONREADYSTATECHANGE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e2f45dc..c5d9753 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -46,6 +46,7 @@ typedef enum { EVENTID_MOUSEOVER, EVENTID_MOUSEUP, EVENTID_MOUSEWHEEL, + EVENTID_MSTHUMBNAILCLICK, EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 01c6191..e152c4f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7014,6 +7014,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDocument7 *new_document; IHTMLLocation *location; IHTMLWindow2 *window; + VARIANT v; IDispatch *disp; test_disp((IUnknown*)dom_implementation, &DIID_DispHTMLDOMImplementation, NULL, "[object]"); @@ -7045,6 +7046,12 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_location(new_document2, &location); ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + memset(&v, 0xcc, sizeof(v)); + hres = IHTMLDocument7_get_onmsthumbnailclick(new_document, &v); + ok(hres == S_OK, "get_onmsthumbnailclick returned: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "got %u\n", V_VT(&v)); + ok((DWORD)(DWORD_PTR)V_DISPATCH(&v) == 0xcccccccc, "got %p\n", V_DISPATCH(&v)); + IHTMLDocument2_Release(new_document2); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2);

1 0

Alexandre Julliard : pstorec: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: eb018308ab3f77957333a12afa709b09d36e5105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb018308ab3f77957333a12a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:49 2019 +0200 pstorec: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index d09f82c..f8009e2 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,6 +1,8 @@ MODULE = pstorec.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ pstorec.c

1 0

Dmitry Timoshkov : mshtml: Replace a useless trace with a slightly better one.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 2348215b82d1c0019a0cdcee79cb2a5aaa34e345 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2348215b82d1c0019a0cdcee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 14:09:59 2019 +0800 mshtml: Replace a useless trace with a slightly better one. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f0daafa..dab4499 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -256,8 +256,10 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, HRESULT hres; hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); - if(FAILED(hres)) + if(FAILED(hres)) { + WARN("GetDocumentation failed: %08x\n", hres); return; + } for(info = data->funcs; info < data->funcs+data->func_cnt; info++) { if(info->id == desc->memid || !wcscmp(info->name, name)) { @@ -269,6 +271,8 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, } } + TRACE("adding %s...\n", debugstr_w(name)); + if(info == data->funcs+data->func_cnt) { if(data->func_cnt == data->func_size) data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); @@ -414,7 +418,6 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp } if(!hook || hook->invoke) { - TRACE("adding...\n"); add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo, hook ? hook->invoke : NULL); }

1 0

Alexandre Julliard : prntvpt: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: b41cc47292b11e951b4d936f1a6b417b9b214125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41cc47292b11e951b4d936f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:20 2019 +0200 prntvpt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/Makefile.in | 2 ++ dlls/prntvpt/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index ce05f50..5efd1c4 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,6 @@ MODULE = prntvpt.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index cdf1b6c..ec7cf7c 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : pidgen: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 6a2d4277d6542e90504574b6148200e20c1791aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a2d4277d6542e90504574b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:52 2019 +0200 pidgen: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/Makefile.in | 2 ++ dlls/pidgen/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in index e70764e..5923cb2 100644 --- a/dlls/pidgen/Makefile.in +++ b/dlls/pidgen/Makefile.in @@ -1,5 +1,7 @@ MODULE = pidgen.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 95f5389..35af226 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : olepro32: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 7e2df6ed13cc716554851c1a297766a8fbe92724 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e2df6ed13cc716554851c1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:17 2019 +0200 olepro32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olepro32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in index 032fdbd..4ff5afc 100644 --- a/dlls/olepro32/Makefile.in +++ b/dlls/olepro32/Makefile.in @@ -2,6 +2,8 @@ MODULE = olepro32.dll IMPORTLIB = olepro32 IMPORTS = oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = olepro32stubs.c IDL_SRCS = olepro.idl

1 0

Alexandre Julliard : oledlg: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 815ae120fb2648b5c7b9aca864a58377d8947cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=815ae120fb2648b5c7b9aca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:11 2019 +0200 oledlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/Makefile.in | 2 ++ dlls/oledlg/insobjdlg.c | 1 - dlls/oledlg/oledlg_main.c | 1 - dlls/oledlg/pastespl.c | 9 ++++----- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 4a16469..ee54844 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -2,6 +2,8 @@ MODULE = oledlg.dll IMPORTLIB = oledlg IMPORTS = ole32 comdlg32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ insobjdlg.c \ oledlg_main.c \ diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 00b991e..18919b2 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -29,7 +29,6 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "oledlg.h" #include "resource.h" diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index ba5b7c8..df53ad7 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -33,7 +33,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 0b8c8c9..2593fd5 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -35,7 +35,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -432,15 +431,15 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) } LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt)); - if((ptr = strstrW(resource_txt, percent_s))) + if((ptr = wcsstr(resource_txt, percent_s))) { /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ - size_t result_txt_len = strlenW(pent->lpstrResultText); + size_t result_txt_len = lstrlenW(pent->lpstrResultText); ptrdiff_t offs = (char*)ptr - (char*)resource_txt; - result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); + result_txt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); memcpy(result_txt, resource_txt, offs); memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR)); - memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR)); + memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (lstrlenW(ptr + 2) + 1) * sizeof(WCHAR)); } else result_txt = resource_txt;

1 0

Alexandre Julliard : winecrt0: Build with msvcrt.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: d401837994a31277103042fbe091e364c2fa55ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=d401837994a31277103042fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 19:18:01 2019 +0200 winecrt0: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 2 ++ dlls/winecrt0/debug.c | 2 +- dlls/winecrt0/delay_load.c | 6 +++--- dlls/winecrt0/dll_entry.c | 6 +++--- dlls/winecrt0/drv_entry.c | 6 +++--- dlls/winecrt0/exe_entry.c | 6 +++--- dlls/winecrt0/exe_main.c | 6 +++--- dlls/winecrt0/exe_wentry.c | 6 +++--- dlls/winecrt0/exe_wmain.c | 6 +++--- dlls/winecrt0/init.c | 6 +++--- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 79ba92f..6edbd04 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,5 +1,7 @@ MODULE = libwinecrt0.a +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ debug.c \ delay_load.c \ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index f4b2573..01bfd4c 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -159,7 +159,7 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) { static char *list[32]; static int pos; - char *ret = _strdup( str ); + char *ret = strdup( str ); int idx; idx = InterlockedIncrement( &pos ) % ARRAY_SIZE(list); diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index aab4079..0589b62 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -63,5 +65,3 @@ static void free_delay_imports(void) if (*descr->phmod) FreeLibrary( *descr->phmod ); } #endif - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index 591aa07..a002d87 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -45,5 +47,3 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, return ret; } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index 4750168..ee9f3b1 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -37,5 +39,3 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 69ebb1b..13a1d89 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -39,5 +41,3 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index f51deba..d966faf 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -50,5 +52,3 @@ int __cdecl main( int argc, char *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 83606f2..9db135e 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -39,5 +41,3 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index f817462..7ada198 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -52,5 +54,3 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/init.c b/dlls/winecrt0/init.c index bd9d9fc..2ffe8e5 100644 --- a/dlls/winecrt0/init.c +++ b/dlls/winecrt0/init.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -42,5 +44,3 @@ void DECLSPEC_HIDDEN __wine_spec_init_ctor(void) if (__wine_spec_init_state == NO_INIT_DONE) __wine_spec_init(); __wine_spec_init_state = CONSTRUCTORS_DONE; } - -#endif /* _WIN32 */

1 0

Alexandre Julliard : makefiles: Support mixing Unix and msvcrt headers in a single module.
by Alexandre Julliard June 18, 2019

June 18, 2019

Module: wine Branch: master Commit: 6bce2b13658468db73b96401b4369e21cd0fa5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bce2b13658468db73b96401… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 19:17:06 2019 +0200 makefiles: Support mixing Unix and msvcrt headers in a single module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 94 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bce2b13658468db73b9…

1 0