November 2013 - Wine-Commits

Akira Nakagawa : advapi32: Remove extra comma.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 55928a90e562783b46ce6a9253540c7eb8e851d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55928a90e562783b46ce6a925… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Sun Nov 10 21:18:47 2013 +0900 advapi32: Remove extra comma. --- dlls/advapi32/eventlog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 0922fff..528d81d 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -743,7 +743,7 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; @@ -762,7 +762,7 @@ ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS;

1 0

Michael Müller : quartz: Partial implementation of VMR7MonitorConfig and VMR9MonitorConfig.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 815f252b4a91bf83e69ae8b69defaafe6f7c68a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815f252b4a91bf83e69ae8b69… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 12 20:07:29 2013 +0100 quartz: Partial implementation of VMR7MonitorConfig and VMR9MonitorConfig. --- dlls/quartz/vmr9.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 140 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index dc6b4fc..31f3f8e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1285,6 +1285,74 @@ static const IVMRFilterConfigVtbl VMR7_FilterConfig_Vtbl = VMR7FilterConfig_GetRenderingMode }; +struct get_available_monitors_args +{ + VMRMONITORINFO *info7; + VMR9MonitorInfo *info9; + DWORD arraysize; + DWORD numdev; +}; + +static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) +{ + struct get_available_monitors_args *args = (struct get_available_monitors_args *)lparam; + MONITORINFOEXW mi; + + if (args->info7 || args->info9) + { + + if (!args->arraysize) + return FALSE; + + mi.cbSize = sizeof(mi); + if (!GetMonitorInfoW(hmon, (MONITORINFO*)&mi)) + return TRUE; + + /* fill VMRMONITORINFO struct */ + if (args->info7) + { + VMRMONITORINFO *info = args->info7++; + memset(info, 0, sizeof(*info)); + + info->guid.pGUID = NULL; /* FIXME */ + CopyRect(&info->rcMonitor, &mi.rcMonitor); + info->hMon = hmon; + info->dwFlags = mi.dwFlags; + + lstrcpynW(info->szDevice, mi.szDevice, sizeof(info->szDevice)/sizeof(WCHAR)); + + /* FIXME: how to get these values? */ + info->szDescription[0] = 0; + } + + /* fill VMR9MonitorInfo struct */ + if (args->info9) + { + VMR9MonitorInfo *info = args->info9++; + memset(info, 0, sizeof(*info)); + + info->uDevID = 0; /* FIXME */ + CopyRect(&info->rcMonitor, &mi.rcMonitor); + info->hMon = hmon; + info->dwFlags = mi.dwFlags; + + lstrcpynW(info->szDevice, mi.szDevice, sizeof(info->szDevice)/sizeof(WCHAR)); + + /* FIXME: how to get these values? */ + info->szDescription[0] = 0; + info->dwVendorId = 0; + info->dwDeviceId = 0; + info->dwSubSysId = 0; + info->dwRevision = 0; + } + + args->arraysize--; + } + + args->numdev++; + return TRUE; +} + static HRESULT WINAPI VMR7MonitorConfig_QueryInterface(IVMRMonitorConfig *iface, REFIID riid, LPVOID * ppv) { @@ -1309,7 +1377,11 @@ static HRESULT WINAPI VMR7MonitorConfig_SetMonitor(IVMRMonitorConfig *iface, con struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_GetMonitor(IVMRMonitorConfig *iface, VMRGUID *pGUID) @@ -1317,7 +1389,12 @@ static HRESULT WINAPI VMR7MonitorConfig_GetMonitor(IVMRMonitorConfig *iface, VMR struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + pGUID->pGUID = NULL; /* default DirectDraw device */ + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig *iface, @@ -1326,7 +1403,11 @@ static HRESULT WINAPI VMR7MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig *ifa struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig *iface, VMRGUID *pGUID) @@ -1334,7 +1415,12 @@ static HRESULT WINAPI VMR7MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig *ifa struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + pGUID->pGUID = NULL; /* default DirectDraw device */ + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig *iface, @@ -1342,9 +1428,24 @@ static HRESULT WINAPI VMR7MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig * DWORD *numdev) { struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); + struct get_available_monitors_args args; - FIXME("(%p/%p)->(%p, %u, %p) stub\n", iface, This, info, arraysize, numdev); - return E_NOTIMPL; + FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev); + + if (!numdev) + return E_POINTER; + + if (info && arraysize == 0) + return E_INVALIDARG; + + args.info7 = info; + args.info9 = NULL; + args.arraysize = arraysize; + args.numdev = 0; + EnumDisplayMonitors(NULL, NULL, get_available_monitors_proc, (LPARAM)&args); + + *numdev = args.numdev; + return S_OK; } static const IVMRMonitorConfigVtbl VMR7_MonitorConfig_Vtbl = @@ -1383,7 +1484,8 @@ static HRESULT WINAPI VMR9MonitorConfig_SetMonitor(IVMRMonitorConfig9 *iface, UI struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%u) stub\n", iface, This, uDev); - return E_NOTIMPL; + + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_GetMonitor(IVMRMonitorConfig9 *iface, UINT *uDev) @@ -1391,7 +1493,12 @@ static HRESULT WINAPI VMR9MonitorConfig_GetMonitor(IVMRMonitorConfig9 *iface, UI struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, uDev); - return E_NOTIMPL; + + if (!uDev) + return E_POINTER; + + *uDev = 0; + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig9 *iface, UINT uDev) @@ -1399,7 +1506,8 @@ static HRESULT WINAPI VMR9MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig9 *if struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%u) stub\n", iface, This, uDev); - return E_NOTIMPL; + + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig9 *iface, UINT *uDev) @@ -1407,7 +1515,12 @@ static HRESULT WINAPI VMR9MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig9 *if struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, uDev); - return E_NOTIMPL; + + if (!uDev) + return E_POINTER; + + *uDev = 0; + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig9 *iface, @@ -1415,9 +1528,24 @@ static HRESULT WINAPI VMR9MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig9 DWORD *numdev) { struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); + struct get_available_monitors_args args; - FIXME("(%p/%p)->(%p, %u, %p) stub\n", iface, This, info, arraysize, numdev); - return E_NOTIMPL; + FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev); + + if (!numdev) + return E_POINTER; + + if (info && arraysize == 0) + return E_INVALIDARG; + + args.info7 = NULL; + args.info9 = info; + args.arraysize = arraysize; + args.numdev = 0; + EnumDisplayMonitors(NULL, NULL, get_available_monitors_proc, (LPARAM)&args); + + *numdev = args.numdev; + return S_OK; } static const IVMRMonitorConfig9Vtbl VMR9_MonitorConfig_Vtbl =

1 0

Nikolay Sivov : msctf: Fix some interface casts left from cleanup.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: f2b29ecf7201e0bd4d84ec5d3c4be3888f886350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b29ecf7201e0bd4d84ec5d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 16:14:45 2013 +0400 msctf: Fix some interface casts left from cleanup. --- dlls/msctf/categorymgr.c | 11 +++++------ dlls/msctf/compartmentmgr.c | 14 +++++++------- dlls/msctf/context.c | 8 ++++---- dlls/msctf/displayattributemgr.c | 9 ++++----- dlls/msctf/documentmgr.c | 29 +++++++++++++---------------- dlls/msctf/inputprocessor.c | 12 ++++++------ dlls/msctf/langbarmgr.c | 4 ++-- dlls/msctf/range.c | 2 +- 8 files changed, 42 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2b29ecf7201e0bd4d84e…

1 0

Nikolay Sivov : msctf: Remove some duplication.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: bf395eb172ad0f103f3c7f82bbb6f91356c6c09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf395eb172ad0f103f3c7f82b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 16:17:52 2013 +0400 msctf: Remove some duplication. --- dlls/msctf/documentmgr.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 956932b..d9ba057 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -183,19 +183,17 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) if (dwFlags == TF_POPF_ALL) { - if (This->contextStack[0]) - { - ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); - Context_Uninitialize(This->contextStack[0]); - ITfContext_Release(This->contextStack[0]); - } - if (This->contextStack[1]) - { - ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[1]); - Context_Uninitialize(This->contextStack[1]); - ITfContext_Release(This->contextStack[1]); - } - This->contextStack[0] = This->contextStack[1] = NULL; + int i; + + for (i = 0; i < sizeof(This->contextStack)/sizeof(This->contextStack[0]); i++) + if (This->contextStack[i]) + { + ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink, This->contextStack[i]); + Context_Uninitialize(This->contextStack[i]); + ITfContext_Release(This->contextStack[i]); + This->contextStack[i] = NULL; + } + ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); return S_OK; }

1 0

Detlef Riekenberg : wintrust/tests: Accept the CryptCATAdminAcquireContext win8 results.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 48ae4314d0c10cc827400d1a5f7f0531c199c88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae4314d0c10cc827400d1a5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 17 15:18:26 2013 +0100 wintrust/tests: Accept the CryptCATAdminAcquireContext win8 results. --- dlls/wintrust/crypt.c | 2 +- dlls/wintrust/tests/crypt.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 0ed45d3..84188f8 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -113,7 +113,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, TRACE("%p %s %x\n", catAdmin, debugstr_guid(sys), dwFlags); - if (!catAdmin) + if (!catAdmin || dwFlags) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index cb5818e..7f2fe76 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -284,13 +284,21 @@ static void test_context(void) ret = pCryptCATAdminReleaseContext(hca, 0); ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - /* Flags not equal to 0 */ + hca = (void *) 0xdeadbeef; + SetLastError(0xdeadbeef); + /* Flags is documented as unused, but the parameter is checked since win8 */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - ok(hca != NULL, "Expected a context handle, got NULL\n"); + ok((!ret && (GetLastError() == ERROR_INVALID_PARAMETER) && (hca == (void *) 0xdeadbeef)) || + broken(ret && hca != NULL && hca != (void *) 0xdeadbeef), + "Expected FALSE and ERROR_INVALID_PARAMETER with untouched handle, got %d and %u with %p\n", + ret, GetLastError(), hca); - ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + if (ret && hca) + { + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(hca, 0); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + } } /* TODO: Check whether SHA-1 is the algorithm that's always used */

1 0

Nikolay Sivov : shell32: Cache typeinfo instances.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: b6efcef7a7f005c752621fdce00f059e4af9a23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6efcef7a7f005c752621fdce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 16:12:33 2013 +0400 shell32: Cache typeinfo instances. --- dlls/shell32/shell32_main.c | 1 + dlls/shell32/shell32_main.h | 2 + dlls/shell32/shelldispatch.c | 192 +++++++++++++++++++++++++++--------------- 3 files changed, 126 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6efcef7a7f005c752621…

1 0

Frédéric Delanoy : localspl: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 6a512d0d3c6c19c0dfa500e26093552a65b78163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a512d0d3c6c19c0dfa500e26… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 19 01:05:55 2013 +0100 localspl: Use BOOL type where appropriate. --- dlls/localspl/provider.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 87d84fd..a34fff3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -216,7 +216,7 @@ static LPWSTR strdupW(LPCWSTR p) static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd ) { WCHAR *srcname; - DWORD res; + BOOL res; apd->src[apd->srclen] = '\0'; apd->dst[apd->dstlen] = '\0'; @@ -239,9 +239,9 @@ static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd ) /* FIXME: handle APD_COPY_NEW_FILES */ res = CopyFileW(srcname, apd->dst, FALSE); - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %d with %u\n", res, GetLastError()); - return (apd->lazy) ? TRUE : res; + return apd->lazy || res; } /******************************************************************

1 0

Alexandre Julliard : makefiles: Generate include path options from makedep.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: c8a42b4735a9f2183960680c8020a49e56850789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a42b4735a9f2183960680c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 13:03:55 2013 +0100 makefiles: Generate include path options from makedep. --- Make.rules.in | 9 ++++----- configure | 2 +- configure.ac | 2 +- tools/makedep.c | 30 ++++++++++++++++++++---------- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 00fe0bb..7409e06 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -11,11 +11,10 @@ # First some useful definitions -INCLUDES = -I$(srcdir) $(PARENTSRC:%=-I(a)srcdir@/%) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) DEFS = -D__WINESRC__ $(EXTRADEFS) -ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) -RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) +ALLCFLAGS = $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) +IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) +RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) @@ -28,7 +27,7 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) -ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) +ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules diff --git a/configure b/configure index 89fde02..3d88128 100755 --- a/configure +++ b/configure @@ -17521,7 +17521,7 @@ then ac_config_commands="$ac_config_commands tools" wine_fn_append_rule "tools/makedep$ac_exeext: tools/makedep.c include/config.h - \$(CC) \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext" fi diff --git a/configure.ac b/configure.ac index 9dbfabc..98a73f2 100644 --- a/configure.ac +++ b/configure.ac @@ -3522,7 +3522,7 @@ then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( [tools/makedep$ac_exeext: tools/makedep.c include/config.h - \$(CC) \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext]) fi diff --git a/tools/makedep.c b/tools/makedep.c index 29e78d0..692ee58 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1148,6 +1148,16 @@ static void output_sources(void) strarray_init( &clean_files ); strarray_init( &subdirs ); + column = output( "includes = -I." ); + if (src_dir) output_filename( strmake( "-I%s", src_dir ), &column ); + if (parent_dir) + { + if (src_dir) output_filename( strmake( "-I%s/%s", src_dir, parent_dir ), &column ); + else output_filename( strmake( "-I%s", parent_dir ), &column ); + } + for (i = 0; i < paths.count; i++) output_filename( strmake( "-I%s", paths.str[i] ), &column ); + output( "\n" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { char *obj = xstrdup( source->name ); @@ -1174,7 +1184,7 @@ static void output_sources(void) output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); output( "%s.tab.o: %s.tab.c\n", obj, obj ); - output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s.tab.c\n", obj ); + output( "\t$(CC) -c $(includes) $(ALLCFLAGS) -o $@ %s.tab.c\n", obj ); strarray_add( &clean_files, strmake( "%s.tab.c", obj )); strarray_add( &clean_files, strmake( "%s.tab.o", obj )); column += output( "%s.tab.o:", obj ); @@ -1185,7 +1195,7 @@ static void output_sources(void) output( "%s.yy.c: %s\n", obj, source->filename ); output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); output( "%s.yy.o: %s.yy.c\n", obj, obj ); - output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s.yy.c\n", obj ); + output( "\t$(CC) -c $(includes) $(ALLCFLAGS) -o $@ %s.yy.c\n", obj ); strarray_add( &clean_files, strmake( "%s.yy.c", obj )); strarray_add( &clean_files, strmake( "%s.yy.o", obj )); column += output( "%s.yy.o:", obj ); @@ -1195,14 +1205,14 @@ static void output_sources(void) if (source->flags & FLAG_RC_PO) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename ); - output( "\t$(WRC) $(RCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(WRC) $(includes) $(RCFLAGS) -o $@ %s\n", source->filename ); column += output( "%s.res rsrc.pot:", obj ); po_srcs++; } else { output( "%s.res: $(WRC) %s\n", obj, source->filename ); - output( "\t$(WRC) $(RCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(WRC) $(includes) $(RCFLAGS) -o $@ %s\n", source->filename ); column += output( "%s.res:", obj ); } strarray_add( &clean_files, strmake( "%s.res", obj )); @@ -1227,7 +1237,7 @@ static void output_sources(void) { if (!(source->flags & idl_outputs[i].flag)) continue; output( "%s%s: $(WIDL)\n", obj, idl_outputs[i].ext ); - output( "\t$(WIDL) %s -o $@ %s\n", idl_outputs[i].widl_arg, source->filename ); + output( "\t$(WIDL) $(includes) %s -o $@ %s\n", idl_outputs[i].widl_arg, source->filename ); targets[nb_targets++] = strmake( "%s%s", obj, idl_outputs[i].ext ); } for (i = 0; i < nb_targets; i++) @@ -1274,15 +1284,15 @@ static void output_sources(void) strarray_add( &clean_files, strmake( "%s.%s", obj, object_extensions.str[i] )); output( "%s.%s: %s\n", obj, object_extensions.str[i], source->filename ); if (strstr( object_extensions.str[i], "cross" )) - output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(CROSSCC) -c $(includes) $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); else - output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(CC) -c $(includes) $(ALLCFLAGS) -o $@ %s\n", source->filename ); } if (source->flags & FLAG_C_IMPLIB) { strarray_add( &clean_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, source->filename ); - output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(CROSSCC) -c $(includes) $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); } if (is_test && !strcmp( ext, "c" ) && !is_generated_idl( source )) { @@ -1309,7 +1319,7 @@ static void output_sources(void) LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (source->flags & FLAG_RC_PO) output_filename( source->filename, &column ); output( "\n" ); - column = output( "\t$(WRC) $(RCFLAGS) -O pot -o $@" ); + column = output( "\t$(WRC) $(includes) $(RCFLAGS) -O pot -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (source->flags & FLAG_RC_PO) output_filename( source->filename, &column ); output( "\n" ); @@ -1332,7 +1342,7 @@ static void output_sources(void) if (find_src_file( "dlldata.o" )) { output( "dlldata.c: $(WIDL) Makefile.in\n" ); - column = output( "\t$(WIDL) $(IDLFLAGS) --dlldata-only -o $@" ); + column = output( "\t$(WIDL) --dlldata-only -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (source->flags & FLAG_IDL_PROXY) output_filename( source->filename, &column ); output( "\n" );

1 0

Frédéric Delanoy : opengl32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 1c53957f082a645e7246086ee740274d6db65f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c53957f082a645e7246086ee… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 19 01:05:56 2013 +0100 opengl32: Use BOOL type where appropriate. --- dlls/opengl32/wgl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index dc5282a..9255e34 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1233,11 +1233,11 @@ static void (WINAPI *pgluTessVertex)(GLUtesselator *tess, GLdouble *location, GL static HMODULE load_libglu(void) { static const WCHAR glu32W[] = {'g','l','u','3','2','.','d','l','l',0}; - static int already_loaded; + static BOOL already_loaded; static HMODULE module; if (already_loaded) return module; - already_loaded = 1; + already_loaded = TRUE; TRACE("Trying to load GLU library\n"); module = LoadLibraryW( glu32W );

1 0

Frédéric Delanoy : shell32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 6021107afd4e92ef3c347d9ef40d32e9d73689de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6021107afd4e92ef3c347d9ef… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 19 01:05:57 2013 +0100 shell32: Use BOOL type where appropriate. --- dlls/shell32/classes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 70abfe6..316abd5 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -424,10 +424,10 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) TRACE("(pidlFolder=%p, pdwAttributes=%p)\n", pidlFolder, pdwAttributes); if (!_ILIsPidlSimple(pidlFolder)) { - static int firstHit = 1; + static BOOL firstHit = TRUE; if (firstHit) { ERR("should be called for simple PIDL's only!\n"); - firstHit = 0; + firstHit = FALSE; } return FALSE; }

1 0