January 2010 - Wine-Commits

Nikolay Sivov : include: Add IXmlReader interface definition.
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: ea762fd2a420e53f89bd1d1f7a53f90d0fc5c7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea762fd2a420e53f89bd1d1f7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 18 23:43:11 2010 +0300 include: Add IXmlReader interface definition. --- .gitignore | 1 + include/Makefile.in | 3 +- include/xmllite.idl | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 7dd1f9d..f2a0bd8 100644 --- a/.gitignore +++ b/.gitignore @@ -212,6 +212,7 @@ include/wtypes.h include/wuapi.h include/xmldom.h include/xmldso.h +include/xmllite.h libs/wpp/ppl.yy.c libs/wpp/ppy.tab.c libs/wpp/ppy.tab.h diff --git a/include/Makefile.in b/include/Makefile.in index f957a7b..0c01cfd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -96,7 +96,8 @@ PUBLIC_IDL_H_SRCS = \ wtypes.idl \ wuapi.idl \ xmldom.idl \ - xmldso.idl + xmldso.idl \ + xmllite.idl IDL_TLB_SRCS = \ stdole2.idl diff --git a/include/xmllite.idl b/include/xmllite.idl new file mode 100644 index 0000000..9ba429f --- /dev/null +++ b/include/xmllite.idl @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2010 Nikolay Sivov + * + * 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 "objidl.idl"; +import "oaidl.idl"; + +typedef enum XmlNodeType { + XmlNodeType_None = 0, + XmlNodeType_Element = 1, + XmlNodeType_Attribute = 2, + XmlNodeType_Text = 3, + XmlNodeType_CDATA = 4, + XmlNodeType_ProcessingInstruction = 7, + XmlNodeType_Comment = 8, + XmlNodeType_DocumentType = 10, + XmlNodeType_Whitespace = 13, + XmlNodeType_EndElement = 15, + XmlNodeType_XmlDeclaration = 17, + _XmlNodeType_Last = 17 +} XmlNodeType; + +/* IXmlReader */ +[ + local, + object, + uuid(7279fc81-709d-4095-b63d-69fe4b0d9030), + pointer_default(unique) +] +interface IXmlReader : IUnknown +{ + HRESULT SetInput( [in] IUnknown *input); + HRESULT GetProperty( [in] UINT property, [out] LONG_PTR *value); + HRESULT SetProperty( [in] UINT property, [in] LONG_PTR value); + HRESULT Read( [out] XmlNodeType *node_type); + HRESULT GetNodeType( [out] XmlNodeType *node_type); + HRESULT MoveToFirstAttribute(void); + HRESULT MoveToNextAttribute(void); + HRESULT MoveToAttributeByName( [in] LPCWSTR local_name, + [in] LPCWSTR namespaceUri); + HRESULT MoveToElement(void); + HRESULT GetQualifiedName( [out] LPCWSTR *qualifiedName, + [out] UINT *qualifiedName_length); + HRESULT GetNamespaceUri( [out] LPCWSTR *namespaceUri, + [out] UINT *nnamespaceUri_length); + HRESULT GetLocalName( [out] LPCWSTR *local_name, + [out] UINT *locale_name_length); + HRESULT GetPrefix( [out] LPCWSTR *prefix, + [out] UINT *prefix_length); + HRESULT GetValue( [out] LPCWSTR *value, + [out] UINT *value_length); + HRESULT ReadValueChunk( [out] WCHAR *buffer, + [in] UINT chunk_size, + [in,out] UINT *read); + HRESULT GetBaseUri( [out] LPCWSTR *baseUri, + [out] UINT *baseUri_length); + BOOL IsDefault(void); + BOOL IsEmptyElement(void); + HRESULT GetLineNumber( [out] UINT *lineNumber); + HRESULT GetLinePosition( [out] UINT *linePosition); + HRESULT GetAttributeCount( [out] UINT *attributeCount); + HRESULT GetDepth( [out] UINT *depth); + BOOL IsEOF(void); +} + +/* IXmlReader construction */ +cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);")

1 0

Damjan Jovanovic : sti: Add launch application registry.
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: 226998185f0dda70efb0a726139bb1a41abfb60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=226998185f0dda70efb0a7261… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jan 18 21:29:26 2010 +0200 sti: Add launch application registry. --- dlls/sti/sti.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/sti/tests/sti.c | 29 +++++++++++++++++++++++ 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index c88205d..974bd06 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -31,9 +31,19 @@ #include "sti_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(sti); +static const WCHAR registeredAppsLaunchPath[] = { + 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'S','t','i','l','l','I','m','a','g','e','\\', + 'R','e','g','i','s','t','e','r','e','d',' ','A','p','p','l','i','c','a','t','i','o','n','s',0 +}; + static inline stillimage *impl_from_StillImageW(IStillImageW *iface) { return (stillimage *)((char*)iface - FIELD_OFFSET(stillimage, lpVtbl)); @@ -119,16 +129,60 @@ static HRESULT WINAPI stillimagew_GetSTILaunchInformation(IStillImageW *iface, L static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface, LPWSTR pwszAppName, LPWSTR pwszCommandLine) { + static const WCHAR format[] = {'%','s',' ','%','s',0}; + static const WCHAR commandLineSuffix[] = { + '/','S','t','i','D','e','v','i','c','e',':','%','1',' ', + '/','S','t','i','E','v','e','n','t',':','%','2',0}; + HKEY registeredAppsKey = NULL; + DWORD ret; + HRESULT hr = S_OK; stillimage *This = impl_from_StillImageW(iface); - FIXME("(%p, %s, %s): stub\n", This, debugstr_w(pwszAppName), debugstr_w(pwszCommandLine)); - return E_NOTIMPL; + + TRACE("(%p, %s, %s)\n", This, debugstr_w(pwszAppName), debugstr_w(pwszCommandLine)); + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, registeredAppsLaunchPath, &registeredAppsKey); + if (ret == ERROR_SUCCESS) + { + WCHAR *value = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(pwszCommandLine) + 1 + lstrlenW(commandLineSuffix) + 1) * sizeof(WCHAR)); + if (value) + { + sprintfW(value, format, pwszCommandLine, commandLineSuffix); + ret = RegSetValueExW(registeredAppsKey, pwszAppName, 0, + REG_SZ, (BYTE*)value, (lstrlenW(value)+1)*sizeof(WCHAR)); + if (ret != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, value); + } + else + hr = E_OUTOFMEMORY; + RegCloseKey(registeredAppsKey); + } + else + hr = HRESULT_FROM_WIN32(ret); + return hr; } static HRESULT WINAPI stillimagew_UnregisterLaunchApplication(IStillImageW *iface, LPWSTR pwszAppName) { stillimage *This = impl_from_StillImageW(iface); - FIXME("(%p, %s): stub\n", This, debugstr_w(pwszAppName)); - return S_OK; + HKEY registeredAppsKey = NULL; + DWORD ret; + HRESULT hr = S_OK; + + TRACE("(%p, %s)\n", This, debugstr_w(pwszAppName)); + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, registeredAppsLaunchPath, &registeredAppsKey); + if (ret == ERROR_SUCCESS) + { + ret = RegDeleteValueW(registeredAppsKey, pwszAppName); + if (ret != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(ret); + RegCloseKey(registeredAppsKey); + } + else + hr = HRESULT_FROM_WIN32(ret); + return hr; } static HRESULT WINAPI stillimagew_EnableHwNotifications(IStillImageW *iface, LPCWSTR pwszDeviceName, diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 0575d29..7b9aade 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -228,6 +228,34 @@ static void test_stillimage_aggregation(void) skip("No StiCreateInstanceW function\n"); } +static void test_launch_app_registry(void) +{ + static WCHAR appName[] = {'w','i','n','e','s','t','i','t','e','s','t','a','p','p',0}; + IStillImageW *pStiW = NULL; + HRESULT hr; + + if (pStiCreateInstanceW == NULL) + { + win_skip("No StiCreateInstanceW function\n"); + return; + } + + hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + if (SUCCEEDED(hr)) + { + hr = IStillImage_RegisterLaunchApplication(pStiW, appName, appName); + ok(SUCCEEDED(hr), "could not register launch application, error 0x%X\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStillImage_UnregisterLaunchApplication(pStiW, appName); + ok(SUCCEEDED(hr), "could not unregister launch application, error 0x%X\n", hr); + } + IStillImage_Release(pStiW); + } + else + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); +} + START_TEST(sti) { if (SUCCEEDED(CoInitialize(NULL))) @@ -236,6 +264,7 @@ START_TEST(sti) { test_version_flag_versus_aw(); test_stillimage_aggregation(); + test_launch_app_registry(); FreeLibrary(sti_dll); } else

1 0

Jörg Höhle : wine.inf: Correct MCI entries.
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: ac1ad1372dbab6b2efffb0a5cf6bea3370866982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1ad1372dbab6b2efffb0a5c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Dec 3 21:44:50 2009 +0100 wine.inf: Correct MCI entries. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e03a7e4..d1d528c 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -492,6 +492,7 @@ HKLM,%Mci32Str%,"AVIVideo",,"mciavi32.dll" HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll" HKLM,%Mci32Str%,"Sequencer",,"mciseq.dll" HKLM,%Mci32Str%,"WaveAudio",,"mciwave.dll" +HKLM,%Mci32Str%,"MPEGVideo",,"mciqtz32.dll" HKLM,%MciExtStr%,"aifc",,"MPEGVideo" HKLM,%MciExtStr%,"asf",,"MPEGVideo" @@ -514,7 +515,6 @@ HKLM,%MciExtStr%,"mpeg",,"MPEGVideo" HKLM,%MciExtStr%,"mpg",,"MPEGVideo" HKLM,%MciExtStr%,"mpv",,"MPEGVideo" HKLM,%MciExtStr%,"mpv2",,"MPEGVideo" -HKLM,%MciExtStr%,"rmi",,"MPEGVideo" HKLM,%MciExtStr%,"rmi",,"Sequencer" HKLM,%MciExtStr%,"snd",,"MPEGVideo" HKLM,%MciExtStr%,"wav",,"WaveAudio"

1 0

Rob Shearman : wpp: Fix expansion of macro bodies following the parsing of a numerical digit.
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: 3fecf9ddcd5dd8ac8d3b48106e8eab7e3e303371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fecf9ddcd5dd8ac8d3b48106… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 18 22:15:09 2010 +0000 wpp: Fix expansion of macro bodies following the parsing of a numerical digit. The current regular expression causes all letters and spaces (among other characters) following the appearance of a digit to be classed as a literal, including C identifiers which may need to be expanded. The expression was intended to catch the remaining characters that were not covered by the first two rules ([^a-zA-Z0-9'"#/\\\n]+ and {cident}), but the [^'"#/\\\n] expression caught {cident} as well. While one solution would have been just to catch the expression that match [a-zA-Z0-9]* that don't match {cident}, i.e. [0-9][a-zA-Z0-9]*, in the interests of avoiding unnecessary multiple LITERALs being generated and then combined during parsing the expression also includes the first expression, making it [0-9][a-zA-Z0-9]*[^a-zA-Z0-9'"#/\\\n]*. --- libs/wpp/ppl.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 1ce98fb..06a4f18 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -527,7 +527,7 @@ void pp_writestring(const char *format, ...) <pp_mbody>{cident} ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; <pp_mbody>\#\# return tCONCAT; <pp_mbody>\# return tSTRINGIZE; -<pp_mbody>[0-9][^'"#/\\\n]* ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; +<pp_mbody>[0-9][a-zA-Z0-9]*[^a-zA-Z0-9'"#/\\\n]* ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; <pp_mbody>(\\\r?)|(\/[^/*'"#\\\n]*) ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; <pp_mbody>\\\r?\n{ws}+ newline(0); ppy_lval.cptr = pp_xstrdup(" "); return tLITERAL; <pp_mbody>\\\r?\n newline(0);

1 0

Nikolay Sivov : msxml3: Use a helper to check for created content handler.
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: ff992282aa49efd23c5d537b77ba281d2fa7141f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff992282aa49efd23c5d537b7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 18 23:30:50 2010 +0300 msxml3: Use a helper to check for created content handler. --- dlls/msxml3/saxreader.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2573e84..ff8b41a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -126,6 +126,11 @@ static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) return (saxattributes *)((char*)iface - FIELD_OFFSET(saxattributes, lpSAXAttributesVtbl)); } +static inline BOOL has_content_handler(const saxlocator *locator) +{ + return (locator->vbInterface && locator->saxreader->vbcontentHandler) || + (!locator->vbInterface && locator->saxreader->contentHandler); +} static HRESULT namespacePush(saxlocator *locator, int ns) { @@ -978,8 +983,7 @@ static void libxmlStartDocument(void *ctx) saxlocator *This = ctx; HRESULT hr; - if((This->vbInterface && This->saxreader->vbcontentHandler) - || (!This->vbInterface && This->saxreader->contentHandler)) + if(has_content_handler(This)) { if(This->vbInterface) hr = IVBSAXContentHandler_startDocument(This->saxreader->vbcontentHandler); @@ -1003,8 +1007,7 @@ static void libxmlEndDocument(void *ctx) if(This->ret != S_OK) return; - if((This->vbInterface && This->saxreader->vbcontentHandler) - || (!This->vbInterface && This->saxreader->contentHandler)) + if(has_content_handler(This)) { if(This->vbInterface) hr = IVBSAXContentHandler_endDocument(This->saxreader->vbcontentHandler); @@ -1039,8 +1042,7 @@ static void libxmlStartElementNS( update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); hr = namespacePush(This, nb_namespaces); - if(hr==S_OK && ((This->vbInterface && This->saxreader->vbcontentHandler) - || (!This->vbInterface && This->saxreader->contentHandler))) + if(hr==S_OK && has_content_handler(This)) { for(index=0; index<nb_namespaces; index++) { @@ -1119,8 +1121,7 @@ static void libxmlEndElementNS( nsNr = namespacePop(This); - if((This->vbInterface && This->saxreader->vbcontentHandler) - || (!This->vbInterface && This->saxreader->contentHandler)) + if(has_content_handler(This)) { NamespaceUri = bstr_from_xmlChar(URI); LocalName = bstr_from_xmlChar(localname); @@ -1186,9 +1187,7 @@ static void libxmlCharacters( xmlChar *end; BOOL lastEvent = FALSE; - if((This->vbInterface && !This->saxreader->vbcontentHandler) - || (!This->vbInterface && !This->saxreader->contentHandler)) - return; + if(!(has_content_handler(This))) return; cur = (xmlChar*)ch; if(*(ch-1)=='\r') cur--; @@ -1384,8 +1383,7 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) if(change) *end = '\n'; - if((This->vbInterface && This->saxreader->vbcontentHandler) || - (!This->vbInterface && This->saxreader->contentHandler)) + if(has_content_handler(This)) { Chars = bstr_from_xmlCharN(cur, end-cur+1); if(This->vbInterface)

1 0

Ilya Shpigor : gdi32: Additional checking in the test for font creation with the OEM charset.
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: 91a1321a97af2162bb663c3dd9a5958d63ab5d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a1321a97af2162bb663c3dd… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Mon Jan 18 12:08:26 2010 +0300 gdi32: Additional checking in the test for font creation with the OEM charset. --- dlls/gdi32/tests/font.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 904f0d0..87ca494 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2848,7 +2848,7 @@ static void test_orientation(void) static void test_oemcharset(void) { HDC hdc; - LOGFONTA lf; + LOGFONTA lf, clf; HFONT hfont, old_hfont; int charset; @@ -2863,7 +2863,12 @@ static void test_oemcharset(void) charset = GetTextCharset(hdc); todo_wine ok(charset == OEM_CHARSET, "expected %d charset, got %d\n", OEM_CHARSET, charset); - SelectObject(hdc, old_hfont); + hfont = SelectObject(hdc, old_hfont); + GetObjectA(hfont, sizeof(clf), &clf); + ok(!lstrcmpA(clf.lfFaceName, lf.lfFaceName), "expected %s face name, got %s\n", lf.lfFaceName, clf.lfFaceName); + ok(clf.lfPitchAndFamily == lf.lfPitchAndFamily, "expected %x family, got %x\n", lf.lfPitchAndFamily, clf.lfPitchAndFamily); + ok(clf.lfCharSet == lf.lfCharSet, "expected %d charset, got %d\n", lf.lfCharSet, clf.lfCharSet); + ok(clf.lfHeight == lf.lfHeight, "expected %d height, got %d\n", lf.lfHeight, clf.lfHeight); DeleteObject(hfont); DeleteDC(hdc); }

1 0

Nikolay Sivov : msxml3: Implement IXMLDOMElement::removeAttribute().
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: 7724b053e24d974b8a0005b5cb921e18cb30541c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7724b053e24d974b8a0005b5c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 18 23:29:21 2010 +0300 msxml3: Implement IXMLDOMElement::removeAttribute(). --- dlls/msxml3/element.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index b698042..e6f2f76 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -598,8 +598,19 @@ static HRESULT WINAPI domelem_removeAttribute( IXMLDOMElement *iface, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + IXMLDOMNamedNodeMap *attr; + HRESULT hr; + + TRACE("(%p)->(%s)", This, debugstr_w(p)); + + hr = IXMLDOMElement_get_attributes(iface, &attr); + if (hr != S_OK) return hr; + + hr = IXMLDOMNamedNodeMap_removeNamedItem(attr, p, NULL); + IXMLDOMNamedNodeMap_Release(attr); + + return hr; } static HRESULT WINAPI domelem_getAttributeNode(

1 0

Alexandre Julliard : ntdll: Fix the NtCreateEvent prototype.
by Alexandre Julliard Jan. 19, 2010

Jan. 19, 2010

Module: wine Branch: master Commit: 3b67ad9bd47b553c82a85bdf6b205555acc496d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b67ad9bd47b553c82a85bdf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 18 20:34:54 2010 +0100 ntdll: Fix the NtCreateEvent prototype. It takes an event type, not a manual reset flag. --- dlls/kernel32/console.c | 2 +- dlls/kernel32/except.c | 2 +- dlls/kernel32/sync.c | 3 ++- dlls/krnl386.exe16/task.c | 2 +- dlls/ntdll/reg.c | 2 +- dlls/ntdll/serial.c | 2 +- dlls/ntdll/sync.c | 10 +++------- dlls/ntdll/threadpool.c | 8 ++++---- include/winternl.h | 2 +- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4aa0b44..eb3e21d 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1195,7 +1195,7 @@ static BOOL start_console_renderer(STARTUPINFOA* si) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - NtCreateEvent(&hEvent, EVENT_ALL_ACCESS, &attr, TRUE, FALSE); + NtCreateEvent(&hEvent, EVENT_ALL_ACCESS, &attr, NotificationEvent, FALSE); if (!hEvent) return FALSE; /* first try environment variable */ diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 701f921..d6dea99 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -366,7 +366,7 @@ static int start_debugger_atomic(PEXCEPTION_POINTERS epointers) /* ask for manual reset, so that once the debugger is started, * every thread will know it */ - NtCreateEvent( &hEvent, EVENT_ALL_ACCESS, &attr, TRUE, FALSE ); + NtCreateEvent( &hEvent, EVENT_ALL_ACCESS, &attr, NotificationEvent, FALSE ); if (InterlockedCompareExchangePointer( &hRunOnce, hEvent, 0 ) == 0) { /* ok, our event has been set... we're the winning thread */ diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 8918f3d..fbe055d 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -489,7 +489,8 @@ HANDLE WINAPI CreateEventExW( SECURITY_ATTRIBUTES *sa, LPCWSTR name, DWORD flags attr.RootDirectory = get_BaseNamedObjects_handle(); } - status = NtCreateEvent( &ret, access, &attr, (flags & CREATE_EVENT_MANUAL_RESET) != 0, + status = NtCreateEvent( &ret, access, &attr, + (flags & CREATE_EVENT_MANUAL_RESET) ? NotificationEvent : SynchronizationEvent, (flags & CREATE_EVENT_INITIAL_SET) != 0 ); if (status == STATUS_OBJECT_NAME_EXISTS) SetLastError( ERROR_ALREADY_EXISTS ); diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 06f9d94..1b252e9 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -350,7 +350,7 @@ static TDB *TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, LPCSTR cmdline, BYT /* Create scheduler event for 16-bit tasks */ if ( !(pTask->flags & TDBF_WIN32) ) - NtCreateEvent( &pTask->hEvent, EVENT_ALL_ACCESS, NULL, TRUE, FALSE ); + NtCreateEvent( &pTask->hEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); if (!initial_task) initial_task = hTask; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index cb214a7..50ec081 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -651,7 +651,7 @@ NTSTATUS WINAPI NtNotifyChangeKey( { OBJECT_ATTRIBUTES attr; InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); - ret = NtCreateEvent( &Event, EVENT_ALL_ACCESS, &attr, FALSE, FALSE ); + ret = NtCreateEvent( &Event, EVENT_ALL_ACCESS, &attr, SynchronizationEvent, FALSE ); if (ret != STATUS_SUCCESS) return ret; } diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 1936428..0c00303 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1363,7 +1363,7 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice, attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateEvent(&hev, EVENT_ALL_ACCESS, &attr, FALSE, FALSE); + status = NtCreateEvent(&hev, EVENT_ALL_ACCESS, &attr, SynchronizationEvent, FALSE); if (status) goto done; } diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f3f969a..3e27d09 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -247,12 +247,8 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, PULONG previous * NtCreateEvent (NTDLL.@) * ZwCreateEvent (NTDLL.@) */ -NTSTATUS WINAPI NtCreateEvent( - OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN const OBJECT_ATTRIBUTES *attr, - IN BOOLEAN ManualReset, - IN BOOLEAN InitialState) +NTSTATUS WINAPI NtCreateEvent( PHANDLE EventHandle, ACCESS_MASK DesiredAccess, + const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN InitialState) { DWORD len = attr && attr->ObjectName ? attr->ObjectName->Length : 0; NTSTATUS ret; @@ -274,7 +270,7 @@ NTSTATUS WINAPI NtCreateEvent( { req->access = DesiredAccess; req->attributes = (attr) ? attr->Attributes : 0; - req->manual_reset = ManualReset; + req->manual_reset = (type == NotificationEvent); req->initial_state = InitialState; wine_server_add_data( req, &objattr, sizeof(objattr) ); if (objattr.sd_len) wine_server_add_data( req, sd, objattr.sd_len ); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 31a1a56..44afb01 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -440,7 +440,7 @@ NTSTATUS WINAPI RtlRegisterWait(PHANDLE NewWaitObject, HANDLE Object, wait_work_item->DeleteCount = 0; wait_work_item->CompletionEvent = NULL; - status = NtCreateEvent( &wait_work_item->CancelEvent, EVENT_ALL_ACCESS, NULL, TRUE, FALSE ); + status = NtCreateEvent( &wait_work_item->CancelEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); if (status != STATUS_SUCCESS) { RtlFreeHeap( GetProcessHeap(), 0, wait_work_item ); @@ -485,7 +485,7 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) { if (CompletionEvent == INVALID_HANDLE_VALUE) { - status = NtCreateEvent( &CompletionEvent, EVENT_ALL_ACCESS, NULL, TRUE, FALSE ); + status = NtCreateEvent( &CompletionEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); if (status != STATUS_SUCCESS) return status; interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); @@ -778,7 +778,7 @@ NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE NewTimerQueue) RtlInitializeCriticalSection(&q->cs); list_init(&q->timers); q->quit = FALSE; - status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); if (status != STATUS_SUCCESS) { RtlFreeHeap(GetProcessHeap(), 0, q); @@ -1013,7 +1013,7 @@ NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, return STATUS_INVALID_PARAMETER_1; q = t->q; if (CompletionEvent == INVALID_HANDLE_VALUE) - status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); else if (CompletionEvent) event = CompletionEvent; diff --git a/include/winternl.h b/include/winternl.h index 315becf..6860950 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1902,7 +1902,7 @@ NTSYSAPI NTSTATUS WINAPI NtCompleteConnectPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PLPC_SECTION_READ,PULONG,PVOID,PULONG); NTSYSAPI NTSTATUS WINAPI NtContinue(PCONTEXT,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCreateDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); -NTSYSAPI NTSTATUS WINAPI NtCreateEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *,BOOLEAN,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtCreateEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *,EVENT_TYPE,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCreateEventPair(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtCreateFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtCreateIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,ULONG);

1 0

Andrew Nguyen : mapi32/tests: Report skip for MAPIGetDefaultMalloc.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 9996897c511f18bbf3e4e55c40dce68c27b033e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9996897c511f18bbf3e4e55c4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 18 06:59:54 2010 -0600 mapi32/tests: Report skip for MAPIGetDefaultMalloc. --- dlls/mapi32/tests/imalloc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/tests/imalloc.c b/dlls/mapi32/tests/imalloc.c index 485180c..341155c 100644 --- a/dlls/mapi32/tests/imalloc.c +++ b/dlls/mapi32/tests/imalloc.c @@ -45,11 +45,18 @@ static void test_IMalloc(void) pMAPIGetDefaultMalloc = (void*)GetProcAddress(hMapi32, "MAPIGetDefaultMalloc(a)0"); if (!pMAPIGetDefaultMalloc) + { + win_skip("MAPIGetDefaultMalloc is not available\n"); return; + } lpMalloc = pMAPIGetDefaultMalloc(); + ok(lpMalloc != NULL, "Expected MAPIGetDefaultMalloc to return non-NULL\n"); if (!lpMalloc) + { + skip("MAPIGetDefaultMalloc failed\n"); return; + } lpVoid = NULL; hRet = IMalloc_QueryInterface(lpMalloc, &IID_IUnknown, &lpVoid);

1 0

Andrew Nguyen : mapi32/tests: Report skips for unavailable utility functions.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 4904e31133082f4def38dddea2dbddc7c97c90c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4904e31133082f4def38dddea… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 18 06:59:49 2010 -0600 mapi32/tests: Report skips for unavailable utility functions. --- dlls/mapi32/tests/util.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index feb2c6d..a638cff 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -46,7 +46,10 @@ static void test_SwapPword(void) pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword(a)8"); if (!pSwapPword) + { + win_skip("SwapPword is not available\n"); return; + } shorts[0] = 0xff01; shorts[1] = 0x10ff; @@ -63,7 +66,10 @@ static void test_SwapPlong(void) pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong(a)8"); if (!pSwapPlong) + { + win_skip("SwapPlong is not available\n"); return; + } longs[0] = 0xffff0001; longs[1] = 0x1000ffff; @@ -92,7 +98,10 @@ static void test_HexFromBin(void) pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin(a)12"); pFBinFromHex = (void*)GetProcAddress(hMapi32, "FBinFromHex(a)8"); if (!pHexFromBin || !pFBinFromHex) + { + win_skip("Hexadecimal conversion functions are not available\n"); return; + } for (i = 0; i < 255; i++) data[i] = i; @@ -114,7 +123,10 @@ static void test_UFromSz(void) { pUFromSz = (void*)GetProcAddress(hMapi32, "UFromSz(a)4"); if (!pUFromSz) + { + win_skip("UFromSz is not available\n"); return; + } ok(pUFromSz("105679") == 105679u, "UFromSz: expected 105679, got %d\n", pUFromSz("105679")); @@ -127,7 +139,10 @@ static void test_UlFromSzHex(void) { pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex(a)4"); if (!pUlFromSzHex) + { + win_skip("UlFromSzHex is not available\n"); return; + } ok(pUlFromSzHex("fF") == 0xffu, "UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF")); @@ -143,7 +158,10 @@ static void test_CbOfEncoded(void) pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded(a)4"); if (!pCbOfEncoded) + { + win_skip("CbOfEncoded is not available\n"); return; + } for (i = 0; i < sizeof(buff) - 1; i++) { @@ -162,7 +180,10 @@ static void test_IsBadBoundedStringPtr(void) { pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr(a)8"); if (!pIsBadBoundedStringPtr) + { + win_skip("IsBadBoundedStringPtr is not available\n"); return; + } ok(pIsBadBoundedStringPtr(NULL, 0) == TRUE, "IsBadBoundedStringPtr: expected TRUE\n"); ok(pIsBadBoundedStringPtr("TEST", 4) == TRUE, "IsBadBoundedStringPtr: expected TRUE\n");

1 0