March 2014 - Wine-commits - list.winehq.org

Frédéric Delanoy : riched20: Use BOOL type where appropriate.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 5f88ba5b616ddc47c31c089f6a1ef2ad28db1505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f88ba5b616ddc47c31c089f6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 19 09:14:53 2014 +0100 riched20: Use BOOL type where appropriate. --- dlls/riched20/caret.c | 13 ++++++------- dlls/riched20/editor.c | 10 +++++----- dlls/riched20/reader.c | 16 ++++++++-------- dlls/riched20/rtf.h | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e510033..90b30a2 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -904,7 +904,7 @@ static ME_DisplayItem* ME_FindPixelPosInTableRow(int x, int y, } static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, ME_Cursor *cursor, int *pbCaretAtEnd) + int x, ME_Cursor *cursor, BOOL *pbCaretAtEnd) { ME_DisplayItem *pNext, *pLastRun; ME_Row *row = &pRow->member.row; @@ -964,7 +964,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, y -= editor->rcFormat.top; if (is_eol) - *is_eol = 0; + *is_eol = FALSE; /* find paragraph */ for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) @@ -1109,8 +1109,7 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) { ME_Cursor tmp_cursor; - int is_selection = 0; - BOOL is_shift; + BOOL is_selection = FALSE, is_shift; editor->nUDArrowX = -1; @@ -1535,14 +1534,14 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_CheckCharOffsets(editor); switch(nVKey) { case VK_LEFT: - editor->bCaretAtEnd = 0; + editor->bCaretAtEnd = FALSE; if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, -1); else success = ME_MoveCursorChars(editor, &tmp_curs, -1); break; case VK_RIGHT: - editor->bCaretAtEnd = 0; + editor->bCaretAtEnd = FALSE; if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, +1); else @@ -1565,7 +1564,7 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_ArrowCtrlHome(editor, &tmp_curs); else ME_ArrowHome(editor, &tmp_curs); - editor->bCaretAtEnd = 0; + editor->bCaretAtEnd = FALSE; break; } case VK_END: diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e419bf6..d38d28e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1633,7 +1633,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_Cursor linebreakCursor = *selEnd; ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize); - ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, 0); + ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE); if (lastchar[0] == '\r' && (lastchar[1] == '\n' || lastchar[1] == '\0')) { ME_InternalDeleteText(editor, &linebreakCursor, linebreakSize, FALSE); } @@ -2003,12 +2003,12 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, { if (!strText) return 0; if (unicode) { - return ME_GetTextW(editor, strText, INT_MAX, start, nLen, 0); + return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE); } else { int nChars; WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); if (!p) return 0; - nChars = ME_GetTextW(editor, p, nLen, start, nLen, 0); + nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, nLen+1, NULL, NULL); FREE_OBJ(p); @@ -4702,7 +4702,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, int nLen; /* bCRLF flag is only honored in 2.0 and up. 1.0 must always return text verbatim */ - if (editor->bEmulateVersion10) bCRLF = 0; + if (editor->bEmulateVersion10) bCRLF = FALSE; pRun = start->pRun; assert(pRun); @@ -4987,7 +4987,7 @@ static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, i WCHAR bufferW[MAX_PREFIX_LEN + 1]; unsigned int i; - ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, 0); + ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, FALSE); for (i = 0; i < sizeof(prefixes) / sizeof(*prefixes); i++) { if (nChars < prefixes[i].length) continue; diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index f7459ab..09b711a 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -256,7 +256,7 @@ void RTFInit(RTF_Info *info) info->rtfLineNum = 0; info->rtfLinePos = 0; info->prevChar = EOF; - info->bumpLine = 0; + info->bumpLine = FALSE; info->dwCPOutputCount = 0; if (!info->cpOutputBuffer) @@ -722,7 +722,7 @@ static void _RTFGetToken2(RTF_Info *info) static int GetChar(RTF_Info *info) { int c; - int oldBumpLine; + BOOL oldBumpLine; if ((c = _RTFGetChar(info)) != EOF) { @@ -730,16 +730,16 @@ static int GetChar(RTF_Info *info) info->rtfTextBuf[info->rtfTextLen] = '\0'; } if (info->prevChar == EOF) - info->bumpLine = 1; - oldBumpLine = info->bumpLine; /* non-zero if prev char was line ending */ - info->bumpLine = 0; + info->bumpLine = TRUE; + oldBumpLine = info->bumpLine; /* TRUE if prev char was line ending */ + info->bumpLine = FALSE; if (c == '\r') - info->bumpLine = 1; + info->bumpLine = TRUE; else if (c == '\n') { - info->bumpLine = 1; + info->bumpLine = TRUE; if (info->prevChar == '\r') /* oops, previous \r wasn't */ - oldBumpLine = 0; /* really a line ending */ + oldBumpLine = FALSE; /* really a line ending */ } ++info->rtfLinePos; if (oldBumpLine) /* were we supposed to increment the */ diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 9f3822f..064ba60 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1139,7 +1139,7 @@ struct _RTF_Info { char *pushedTextBuf; int prevChar; - int bumpLine; + BOOL bumpLine; /* Document-wide attributes */ RTFFont *fontList; /* these lists MUST be */

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Add stub MmLockPagableSectionByHandle.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: efb3b07f1391e5fa0b29b081d509abd1266c0d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb3b07f1391e5fa0b29b081d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 19 09:23:03 2014 +1100 ntoskrnl.exe: Add stub MmLockPagableSectionByHandle. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 67feed0..f227e11 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1503,6 +1503,14 @@ PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes /*********************************************************************** + * MmLockPagableSectionByHandle (NTOSKRNL.EXE.@) + */ +VOID WINAPI MmLockPagableSectionByHandle(PVOID ImageSectionHandle) +{ + FIXME("stub %p\n", ImageSectionHandle); +} + +/*********************************************************************** * MmMapLockedPagesSpecifyCache (NTOSKRNL.EXE.@) */ PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2d221ef..cec8c87 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -687,7 +687,7 @@ @ stub MmIsVerifierEnabled @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection -@ stub MmLockPagableSectionByHandle +@ stdcall MmLockPagableSectionByHandle(ptr) @ stdcall MmMapIoSpace(long long long long) @ stub MmMapLockedPages @ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long)

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Add stub MmUnlockPagableImageSection.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: ba138930309410df79d2fe20e57516c36244b7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba138930309410df79d2fe20e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 19 10:12:02 2014 +1100 ntoskrnl.exe: Add stub MmUnlockPagableImageSection. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f227e11..69e56d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1521,6 +1521,13 @@ PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSO return NULL; } +/*********************************************************************** + * MmUnlockPagableImageSection (NTOSKRNL.EXE.@) + */ +VOID WINAPI MmUnlockPagableImageSection(PVOID ImageSectionHandle) +{ + FIXME("stub %p\n", ImageSectionHandle); +} /*********************************************************************** * MmPageEntireDriver (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index cec8c87..e70c380 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -716,7 +716,7 @@ @ stub MmSizeOfMdl @ stub MmSystemRangeStart @ stub MmTrimAllSystemPagableMemory -@ stub MmUnlockPagableImageSection +@ stdcall MmUnlockPagableImageSection(ptr) @ stdcall MmUnlockPages(ptr) @ stdcall MmUnmapIoSpace(ptr long) @ stub MmUnmapLockedPages

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Add stub KeInsertQueue.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: d8c6a11971289a1e40fe379b90b33bcf522bfa55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c6a11971289a1e40fe379b9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 19 09:54:29 2014 +1100 ntoskrnl.exe: Add stub KeInsertQueue. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/Makefile.in | 1 + include/ddk/ntifs.h | 31 +++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 69e56d7..17a0d39 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -34,6 +34,7 @@ #include "excpt.h" #include "winioctl.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "wine/unicode.h" #include "wine/server.h" #include "wine/list.h" @@ -1287,6 +1288,14 @@ void WINAPI KeInitializeTimer( PKTIMER Timer ) KeInitializeTimerEx(Timer, NotificationTimer); } +/*********************************************************************** + * KeInsertQueue (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) +{ + FIXME( "stub: %p %p\n", Queue, Entry ); + return 0; +} /********************************************************************** * KeQueryActiveProcessors (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e70c380..b9de94b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -558,7 +558,7 @@ @ stub KeInsertByKeyDeviceQueue @ stub KeInsertDeviceQueue @ stub KeInsertHeadQueue -@ stub KeInsertQueue +@ stdcall KeInsertQueue(ptr ptr) @ stub KeInsertQueueApc @ stub KeInsertQueueDpc @ stub KeIsAttachedProcess diff --git a/include/Makefile.in b/include/Makefile.in index 7153467..de0e563 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -244,6 +244,7 @@ SRCDIR_INCLUDES = \ ddk/ntddk.h \ ddk/ntddser.h \ ddk/ntddtape.h \ + ddk/ntifs.h \ ddk/usb.h \ ddk/usb100.h \ ddk/usb200.h \ diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h new file mode 100644 index 0000000..37ec637 --- /dev/null +++ b/include/ddk/ntifs.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2014 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __NTIFS_H__ +#define __NTIFS_H__ + +typedef struct _KQUEUE +{ + DISPATCHER_HEADER Header; + LIST_ENTRY EntryListHead; + volatile ULONG CurrentCount; + ULONG MaximumCount; + LIST_ENTRY ThreadListHead; +} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + +#endif

1 0

Alistair Leslie-Hughes : include: Add netcfgx.idl.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 84e8d18902a6dbff11c9e89c13d2be305376e80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e8d18902a6dbff11c9e89c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 19 14:01:38 2014 +1100 include: Add netcfgx.idl. --- dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/netcfgx.idl | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index fb06f2d..af96221 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -86,6 +86,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "commdlg.h" #include "tlogstg.h" #include "msdasc.h" +#include "netcfgx.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/Makefile.in b/include/Makefile.in index de0e563..525e4eb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -74,6 +74,7 @@ PUBLIC_IDL_H_SRCS = \ msxml.idl \ msxml2.idl \ msxml6.idl \ + netcfgx.idl \ netcon.idl \ netfw.idl \ oaidl.idl \ diff --git a/include/netcfgx.idl b/include/netcfgx.idl new file mode 100644 index 0000000..c465410 --- /dev/null +++ b/include/netcfgx.idl @@ -0,0 +1,115 @@ +/* + * + * Copyright 2014 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "wtypes.idl"; + +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + local, + object, + uuid(c0e8ae99-306e-11d1-aacf-00805fc1270e), + pointer_default(unique) +] +interface INetCfgComponent : IUnknown +{ + typedef enum tagCOMPONENT_CHARACTERISTICS + { + NCF_VIRTUAL = 0x00000001, + NCF_SOFTWARE_ENUMERATED = 0x00000002, + NCF_PHYSICAL = 0x00000004, + NCF_HIDDEN = 0x00000008, + NCF_NO_SERVICE = 0x00000010, + NCF_NOT_USER_REMOVABLE = 0x00000020, + NCF_MULTIPORT_INSTANCED_ADAPTER = 0x00000040, + NCF_HAS_UI = 0x00000080, + NCF_SINGLE_INSTANCE = 0x00000100, + NCF_FILTER = 0x00000400, + NCF_DONTEXPOSELOWER = 0x00001000, + NCF_HIDE_BINDING = 0x00002000, + NCF_NDIS_PROTOCOL = 0x00004000, + NCF_FIXED_BINDING = 0x00020000, + NCF_LW_FILTER = 0x00040000 + } COMPONENT_CHARACTERISTICS; + + typedef enum tagNCRP_FLAGS + { + NCRP_QUERY_PROPERTY_UI = 0x00000001, + NCRP_SHOW_PROPERTY_UI = 0x00000002 + } NCRP_FLAGS; + + HRESULT GetDisplayName ([out] LPWSTR* ppszwDisplayName); + HRESULT SetDisplayName ([in] LPCWSTR pszwDisplayName); + HRESULT GetHelpText ([out] LPWSTR* pszwHelpText); + HRESULT GetId ([out] LPWSTR* ppszwId); + HRESULT GetCharacteristics ([out] LPDWORD pdwCharacteristics); + HRESULT GetInstanceGuid ([out] GUID* pGuid); + HRESULT GetPnpDevNodeId ([out] LPWSTR* ppszwDevNodeId); + HRESULT GetClassGuid ([out] GUID* pGuid); + HRESULT GetBindName ([out] LPWSTR* ppszwBindName); + HRESULT GetDeviceStatus ([out] ULONG* pulStatus); + HRESULT OpenParamKey ([out] HKEY* phkey); + HRESULT RaisePropertyUi ([in] HWND hwndParent, [in] DWORD dwFlags, [in] IUnknown* punkContext); +}; + + +[ + local, + object, + uuid(c0e8ae92-306e-11d1-aacf-00805fc1270e), + pointer_default(unique) +] +interface IEnumNetCfgComponent : IUnknown +{ + HRESULT Next ([in] ULONG celt, [out] INetCfgComponent** rgelt, [out] ULONG *pceltFetched); + HRESULT Skip ([in] ULONG celt); + HRESULT Reset (); + HRESULT Clone ([out] IEnumNetCfgComponent** ppenum); +}; + +[ + local, + object, + uuid(c0e8ae93-306e-11d1-aacf-00805fc1270e), + pointer_default(unique) +] +interface INetCfg : IUnknown +{ + HRESULT Initialize ([in] PVOID pvReserved); + HRESULT Uninitialize (); + HRESULT Apply (); + HRESULT Cancel (); + HRESULT EnumComponents ([in] const GUID* pguidClass, [out] IEnumNetCfgComponent** ppenumComponent); + HRESULT FindComponent ([in] LPCWSTR pszwInfId, [out] INetCfgComponent** pComponent); + HRESULT QueryNetCfgClass ([in] const GUID* pguidClass, [in] REFIID riid,[out] void** ppvObject); +}; + +[ + threading(both), + uuid(5b035261-40f9-11d1-aaec-00805fc1270e) +] +coclass CNetCfg +{ + [default] interface INetCfg; +}

1 0

Dmitry Timoshkov : widl: Move is_ptr() and is_array() to header.h and make them inline.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: e809f0bd8c21558d030acf0bd2b7cf87fdc001ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e809f0bd8c21558d030acf0bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 19 19:26:18 2014 +0900 widl: Move is_ptr() and is_array() to header.h and make them inline. --- tools/widl/header.h | 10 ++++++++++ tools/widl/typelib.c | 10 ---------- tools/widl/widltypes.h | 3 --- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 3af57d6..8ca1cf1 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -58,6 +58,16 @@ extern const var_t *get_func_handle_var( const type_t *iface, const var_t *func, extern int has_out_arg_or_return(const var_t *func); extern int is_const_decl(const var_t *var); +static inline int is_ptr(const type_t *t) +{ + return type_get_type(t) == TYPE_POINTER; +} + +static inline int is_array(const type_t *t) +{ + return type_get_type(t) == TYPE_ARRAY; +} + static inline int last_ptr(const type_t *type) { return is_ptr(type) && !is_declptr(type_pointer_get_ref(type)); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index e3fc0b9..8632fdf 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -49,16 +49,6 @@ static typelib_t *typelib; -int is_ptr(const type_t *t) -{ - return type_get_type(t) == TYPE_POINTER; -} - -int is_array(const type_t *t) -{ - return type_get_type(t) == TYPE_ARRAY; -} - /* List of oleauto types that should be recognized by name. * (most of) these seem to be intrinsic types in mktyplib. * This table MUST be alphabetically sorted on the kw field. diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 30b6560..47c8844 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -544,9 +544,6 @@ type_t *alloc_type(void); void set_all_tfswrite(int val); void clear_all_offsets(void); -int is_ptr(const type_t *t); -int is_array(const type_t *t); - #define tsENUM 1 #define tsSTRUCT 2 #define tsUNION 3

1 0

Dmitry Timoshkov : widl: Unify indentation of comments.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: ae843427ed7951990992b47543ce9e7cf4007e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae843427ed7951990992b4754… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 19 19:26:24 2014 +0900 widl: Unify indentation of comments. --- tools/widl/typegen.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6527437..d017521 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -860,7 +860,7 @@ static const char *get_context_handle_type_name(const type_t *type) do { \ if (file) \ fprintf(file, "/* %2u */\n", typestring_offset); \ - print_file((file), 2, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ + print_file((file), 2, "0x%02x,\t/* " #fctype " */\n", RPC_##fctype); \ } \ while (0) @@ -1447,8 +1447,8 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i if (!is_new_style) { print_file(file, 0, "/* %u (void) */\n", *offset); - print_file(file, indent, "0x5b, /* FC_END */\n"); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); + print_file(file, indent, "0x5b,\t/* FC_END */\n"); + print_file(file, indent, "0x5c,\t/* FC_PAD */\n"); *offset += 2; } } @@ -2350,10 +2350,10 @@ static void write_end(FILE *file, unsigned int *tfsoff) { if (*tfsoff % 2 == 0) { - print_file(file, 2, "0x%x,\t\t/* FC_PAD */\n", RPC_FC_PAD); + print_file(file, 2, "0x%x,\t/* FC_PAD */\n", RPC_FC_PAD); *tfsoff += 1; } - print_file(file, 2, "0x%x,\t\t/* FC_END */\n", RPC_FC_END); + print_file(file, 2, "0x%x,\t/* FC_END */\n", RPC_FC_END); *tfsoff += 1; } @@ -2842,7 +2842,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, WRITE_FCTYPE(file, FC_WSTRING, *typestring_offset); else WRITE_FCTYPE(file, FC_CSTRING, *typestring_offset); - print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + print_file(file, 2, "0x%x,\t/* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; print_file(file, 2, "NdrFcShort(0x%hx),\t/* %d */\n", (unsigned short)dim, dim); @@ -2857,7 +2857,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, WRITE_FCTYPE(file, FC_C_WSTRING, *typestring_offset); else WRITE_FCTYPE(file, FC_C_CSTRING, *typestring_offset); - print_file(file, 2, "0x%x, /* FC_STRING_SIZED */\n", RPC_FC_STRING_SIZED); + print_file(file, 2, "0x%x,\t/* FC_STRING_SIZED */\n", RPC_FC_STRING_SIZED); *typestring_offset += 2; *typestring_offset += write_conf_or_var_desc( @@ -2878,7 +2878,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, WRITE_FCTYPE(file, FC_C_WSTRING, *typestring_offset); else WRITE_FCTYPE(file, FC_C_CSTRING, *typestring_offset); - print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + print_file(file, 2, "0x%x,\t/* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; update_tfsoff(type, start_offset, file); @@ -2964,11 +2964,11 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (type_has_pointers(type_array_get_element(type)) && (type_array_is_decl_as_ptr(type) || !current_structure)) { - print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); - print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + print_file(file, 2, "0x%x,\t/* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x,\t/* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; write_pointer_description(file, type, typestring_offset); - print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + print_file(file, 2, "0x%x,\t/* FC_END */\n", RPC_FC_END); *typestring_offset += 1; } @@ -3151,11 +3151,11 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, (fc == RPC_FC_CPSTRUCT) || (fc == RPC_FC_CVSTRUCT && type_has_pointers(type))) { - print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); - print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + print_file(file, 2, "0x%x,\t/* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x,\t/* FC_PAD */\n", RPC_FC_PAD); *tfsoff += 2; write_pointer_description(file, type, tfsoff); - print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + print_file(file, 2, "0x%x,\t/* FC_END */\n", RPC_FC_END); *tfsoff += 1; }

1 0

Alexandre Julliard : user32/tests: Mark a failing test as todo.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 06960ac2674d15b922d1d63a4cf3505a97eba5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06960ac2674d15b922d1d63a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 19 12:56:11 2014 +0100 user32/tests: Mark a failing test as todo. --- dlls/user32/tests/msg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9c1320d..b716630 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11316,9 +11316,6 @@ if (0) /* FIXME: Wine behaves completely different here */ win_rc.left, win_rc.top, win_rc.right, win_rc.bottom, wp.rcNormalPosition.left, wp.rcNormalPosition.top, wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); - - flush_events(); - flush_sequence(); } DestroyWindow(hwnd); @@ -14300,7 +14297,7 @@ static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, switch (message) { case WM_ENTERIDLE: - ok(GetCapture() == hwnd, "expected %p, got %p\n", hwnd, GetCapture()); + todo_wine ok(GetCapture() == hwnd, "expected %p, got %p\n", hwnd, GetCapture()); EndMenu(); break; case WM_INITMENU:

1 0

Alexandre Julliard : user32: Set the queue mask only after flushing the window surfaces.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: fc183ba2c5145106b3fc54a6bfe5cc8445c9427f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc183ba2c5145106b3fc54a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 19 15:56:22 2014 +0100 user32: Set the queue mask only after flushing the window surfaces. --- dlls/user32/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2cd1472..1aee670 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4093,6 +4093,8 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, return WAIT_FAILED; } + flush_window_surfaces( TRUE ); + /* set the queue mask */ SERVER_START_REQ( set_queue_mask ) { @@ -4107,7 +4109,6 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); - flush_window_surfaces( TRUE ); return wow_handlers.wait_message( count+1, handles, timeout, mask, flags ); }

1 0

Alexandre Julliard : server: Restore the masks from the previous get_message when a wait is satisfied.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: f846312f46bab8dc373a8fd98fdef9c3aebe8ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f846312f46bab8dc373a8fd98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 19 16:50:26 2014 +0100 server: Restore the masks from the previous get_message when a wait is satisfied. --- server/queue.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index c19bb3a..a410691 100644 --- a/server/queue.c +++ b/server/queue.c @@ -117,8 +117,10 @@ struct msg_queue struct fd *fd; /* optional file descriptor to poll */ unsigned int wake_bits; /* wakeup bits */ unsigned int wake_mask; /* wakeup mask */ + unsigned int wake_get_msg; /* wakeup mask of last get_message */ unsigned int changed_bits; /* changed wakeup bits */ unsigned int changed_mask; /* changed wakeup mask */ + unsigned int changed_get_msg; /* changed wakeup mask of last get_message */ int paint_count; /* pending paint messages count */ int hotkey_count; /* pending hotkey messages count */ int quit_message; /* is there a pending quit message? */ @@ -277,8 +279,10 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ queue->fd = NULL; queue->wake_bits = 0; queue->wake_mask = 0; + queue->wake_get_msg = 0; queue->changed_bits = 0; queue->changed_mask = 0; + queue->changed_get_msg = 0; queue->paint_count = 0; queue->hotkey_count = 0; queue->quit_message = 0; @@ -927,8 +931,8 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - queue->wake_mask = 0; - queue->changed_mask = 0; + queue->wake_mask = queue->wake_get_msg; + queue->changed_mask = queue->changed_get_msg; } static void msg_queue_destroy( struct object *obj ) @@ -2197,7 +2201,11 @@ DECL_HANDLER(set_queue_mask) if (is_signaled( queue )) { /* if skip wait is set, do what would have been done in the subsequent wait */ - if (req->skip_wait) queue->wake_mask = queue->changed_mask = 0; + if (req->skip_wait) + { + queue->wake_mask = queue->wake_get_msg; + queue->changed_mask = queue->changed_get_msg; + } else wake_up( &queue->obj, 0 ); } } @@ -2369,6 +2377,7 @@ DECL_HANDLER(get_message) if (!queue) return; queue->last_get_msg = current_time; + queue->wake_get_msg = queue->changed_get_msg = 0; if (!filter) filter = QS_ALLINPUT; /* first check for sent messages */ @@ -2440,8 +2449,8 @@ DECL_HANDLER(get_message) } if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event ); - queue->wake_mask = req->wake_mask; - queue->changed_mask = req->changed_mask; + queue->wake_mask = queue->wake_get_msg = req->wake_mask; + queue->changed_mask = queue->changed_get_msg = req->changed_mask; set_error( STATUS_PENDING ); /* FIXME */ }

1 0