wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Sebastian Lackner : winex11: Send XEMBED_REQUEST_FOCUS request for embedded windows.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 2e0ca3e74669b55f5d64b39e8fd32dc052652d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0ca3e74669b55f5d64b39e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 13 16:59:38 2013 +0100 winex11: Send XEMBED_REQUEST_FOCUS request for embedded windows. --- dlls/winex11.drv/event.c | 57 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 64188bc..767c003 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -183,6 +183,31 @@ static inline void free_event_data( XEvent *event ) } /*********************************************************************** + * xembed_request_focus + */ +static void xembed_request_focus( Display *display, Window window, DWORD timestamp ) +{ + XEvent xev; + + xev.xclient.type = ClientMessage; + xev.xclient.window = window; + xev.xclient.message_type = x11drv_atom(_XEMBED); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + + xev.xclient.data.l[0] = timestamp; + xev.xclient.data.l[1] = XEMBED_REQUEST_FOCUS; + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + + XSendEvent(display, window, False, NoEventMask, &xev); + XFlush( display ); +} + +/*********************************************************************** * X11DRV_register_event_handler * * Register a handler for a given event type. @@ -532,14 +557,14 @@ static inline BOOL can_activate_window( HWND hwnd ) /********************************************************************** * set_input_focus * - * Try to force focus for non-managed windows. + * Try to force focus for embedded or non-managed windows. */ -static void set_input_focus( Display *display, Window window ) +static void set_input_focus( struct x11drv_win_data *data ) { XWindowChanges changes; DWORD timestamp; - if (!window) return; + if (!data->whole_window) return; if (EVENT_x11_time_to_win32_time(0)) /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ @@ -550,8 +575,13 @@ static void set_input_focus( Display *display, Window window ) /* Set X focus and install colormap */ changes.stack_mode = Above; - XConfigureWindow( display, window, CWStackMode, &changes ); - XSetInputFocus( display, window, RevertToParent, timestamp ); + XConfigureWindow( data->display, data->whole_window, CWStackMode, &changes ); + + if (data->embedder) + xembed_request_focus( data->display, data->embedder, timestamp ); + else + XSetInputFocus( data->display, data->whole_window, RevertToParent, timestamp ); + } /********************************************************************** @@ -904,7 +934,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { HWND hwndFocus = GetFocus(); if (hwndFocus && IsChild( hwnd, hwndFocus )) - set_input_focus( data->display, data->whole_window ); + set_input_focus( data ); } release_win_data( data ); } @@ -1365,9 +1395,18 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) { struct x11drv_win_data *data; - if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; - if (!(data = get_win_data( hwnd ))) return; - if (!data->managed) set_input_focus( data->display, data->whole_window ); + HWND parent; + + for (;;) + { + if (!(data = get_win_data( hwnd ))) return; + if (data->embedded) break; + parent = GetAncestor( hwnd, GA_PARENT ); + if (!parent || parent == GetDesktopWindow()) break; + release_win_data( data ); + hwnd = parent; + } + if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); }

1 0

Akira Nakagawa : advapi32: Remove extra comma.
by Alexandre Julliard 19 Nov '13

19 Nov '13

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 19 Nov '13

19 Nov '13

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 19 Nov '13

19 Nov '13

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 19 Nov '13

19 Nov '13

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

Nikolay Sivov : shell32: Cache typeinfo instances.
by Alexandre Julliard 19 Nov '13

19 Nov '13

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 19 Nov '13

19 Nov '13

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

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

19 Nov '13

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 19 Nov '13

19 Nov '13

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

Frédéric Delanoy : kernel32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: a10dfea044c37d99a9359457bce35afb3c027e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10dfea044c37d99a9359457b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 19 01:05:54 2013 +0100 kernel32/tests: Use BOOL type where appropriate. --- dlls/kernel32/tests/heap.c | 4 ++-- dlls/kernel32/tests/pipe.c | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 4a730c7..111e1f7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -56,7 +56,7 @@ static SIZE_T resize_9x(SIZE_T size) static void test_sized_HeapAlloc(int nbytes) { - int success; + BOOL success; char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes); ok(buf != NULL, "allocate failed\n"); ok(buf[0] == 0, "buffer not zeroed\n"); @@ -66,7 +66,7 @@ static void test_sized_HeapAlloc(int nbytes) static void test_sized_HeapReAlloc(int nbytes1, int nbytes2) { - int success; + BOOL success; char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes1); ok(buf != NULL, "allocate failed\n"); ok(buf[0] == 0, "buffer not zeroed\n"); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 30dcc8e..b192f96 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -452,7 +452,7 @@ static DWORD CALLBACK serverThreadMain1(LPVOID arg) char buf[512]; DWORD written; DWORD readden; - DWORD success; + BOOL success; /* Wait for client to connect */ trace("Server calling ConnectNamedPipe...\n"); @@ -504,13 +504,15 @@ static DWORD CALLBACK serverThreadMain2(LPVOID arg) char buf[512]; DWORD written; DWORD readden; - DWORD success; + DWORD ret; + BOOL success; + user_apc_ran = FALSE; if (i == 0 && pQueueUserAPC) { trace("Queueing an user APC\n"); /* verify the pipe is non alerable */ - success = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); - ok(success, "QueueUserAPC failed: %d\n", GetLastError()); + ret = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); + ok(ret, "QueueUserAPC failed: %d\n", GetLastError()); } /* Wait for client to connect */ @@ -587,7 +589,7 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) DWORD written; DWORD readden; DWORD dummy; - DWORD success; + BOOL success; OVERLAPPED oOverlap; int letWFSOEwait = (i & 2); int letGORwait = (i & 1); @@ -713,7 +715,7 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) DWORD written; DWORD readden; DWORD dummy; - DWORD success; + BOOL success; OVERLAPPED oConnect; OVERLAPPED oRead; OVERLAPPED oWrite; @@ -837,7 +839,7 @@ static DWORD CALLBACK serverThreadMain5(LPVOID arg) for (i = 0; i < NB_SERVER_LOOPS; i++) { char buf[512]; DWORD readden; - DWORD success; + BOOL success; OVERLAPPED oOverlap; DWORD err;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013