October 2013 - Wine-Commits

Alexandre Julliard : makedep: Remove some unnecessary typedefs.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: cf34a967ccad82a6bff8992840e5c032673a13d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf34a967ccad82a6bff899284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 10:51:37 2013 +0200 makedep: Remove some unnecessary typedefs. --- tools/makedep.c | 88 +++++++++++++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf34a967ccad82a6bff89…

1 0

Alexandre Julliard : makefiles: Remove useless definitions of COM_NO_WINDOWS_H.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 55e44092bd56cba4dff41cb85ae245d2a9e67660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e44092bd56cba4dff41cb85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 13 18:04:47 2013 +0200 makefiles: Remove useless definitions of COM_NO_WINDOWS_H. --- dlls/browseui/Makefile.in | 1 - dlls/dplayx/Makefile.in | 1 - dlls/explorerframe/Makefile.in | 1 - dlls/gameux/Makefile.in | 1 - dlls/infosoft/Makefile.in | 1 - dlls/inseng/Makefile.in | 1 - dlls/itss/Makefile.in | 1 - dlls/mlang/Makefile.in | 1 - dlls/mshtml/Makefile.in | 1 - dlls/msxml3/Makefile.in | 1 - dlls/msxml4/Makefile.in | 1 - dlls/msxml6/Makefile.in | 1 - dlls/ole32/Makefile.in | 3 +-- dlls/oleaut32/Makefile.in | 3 +-- dlls/oledb32/Makefile.in | 1 - dlls/query/Makefile.in | 1 - dlls/rpcrt4/Makefile.in | 2 +- dlls/rsabase/Makefile.in | 1 - dlls/rsaenh/Makefile.in | 1 - dlls/shell32/Makefile.in | 2 +- dlls/sti/tests/Makefile.in | 2 +- dlls/wuapi/Makefile.in | 1 - 22 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index b463cd7..cdd066d 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,6 +1,5 @@ MODULE = browseui.dll IMPORTS = uuid ole32 comctl32 user32 advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ aclmulti.c \ diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 164b271..9c62659 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = dplayx.dll IMPORTLIB = dplayx IMPORTS = dxguid uuid winmm ole32 user32 advapi32 diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index dcb2826..dc523a1 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = explorerframe.dll IMPORTS = uuid ole32 shell32 user32 diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index 3b52a63..f3d4612 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = gameux.dll IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index f6af67c..f7c1bbf 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -1,6 +1,5 @@ MODULE = infosoft.dll IMPORTS = uuid advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ infosoft_main.c \ diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 6a76691..ea053cf 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,6 +1,5 @@ MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ inseng_main.c diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 4de0d26..af7aee4 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -1,6 +1,5 @@ MODULE = itss.dll IMPORTS = uuid urlmon shlwapi ole32 -EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ chm_lib.c \ diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index c12b33a..a066b53 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -2,7 +2,6 @@ MODULE = mlang.dll IMPORTLIB = mlang IMPORTS = uuid ole32 gdi32 advapi32 DELAYIMPORTS = oleaut32 -EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ mlang.c diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index e479bf8..65d0056 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,7 +1,6 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet C_SRCS = \ diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 4c9d00a..1e056cf 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = msxml3.dll IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 EXTRALIBS = @XML2_LIBS@ diff --git a/dlls/msxml4/Makefile.in b/dlls/msxml4/Makefile.in index c4115b2..eb2eca5 100644 --- a/dlls/msxml4/Makefile.in +++ b/dlls/msxml4/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = msxml4.dll IMPORTS = ole32 advapi32 diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in index 4a7f756..9f4a7d2 100644 --- a/dlls/msxml6/Makefile.in +++ b/dlls/msxml6/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = msxml6.dll IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index f24f035..8174f28 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -2,8 +2,7 @@ MODULE = ole32.dll IMPORTLIB = ole32 IMPORTS = uuid advapi32 user32 gdi32 rpcrt4 DELAYIMPORTS = oleaut32 -EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL +EXTRADEFS = -D_OLE32_ -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL C_SRCS = \ antimoniker.c \ diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 69bfe62..7d215b7 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -2,8 +2,7 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs -EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer +EXTRADEFS = -D_OLEAUT32_ -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer C_SRCS = \ connpt.c \ diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 0f4f36a..449913a 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = oledb32.dll IMPORTS = uuid oleaut32 ole32 user32 advapi32 diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index ff67194..9dd81d2 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,6 +1,5 @@ MODULE = query.dll IMPORTS = uuid -EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ query_main.c diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 812e7aa..8326cf5 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H -DMSWMSG +EXTRADEFS = -D_RPCRT4_ -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 diff --git a/dlls/rsabase/Makefile.in b/dlls/rsabase/Makefile.in index db0ebd5..11b647d 100644 --- a/dlls/rsabase/Makefile.in +++ b/dlls/rsabase/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = rsabase.dll IMPORTS = rsaenh diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index ef4ea5e..a80b97f 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = rsaenh.dll IMPORTLIB = rsaenh IMPORTS = crypt32 advapi32 diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index ef2d734..dd3f8f4 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H +EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi comctl32 user32 gdi32 advapi32 diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in index 4d4a4d0..008b5be 100644 --- a/dlls/sti/tests/Makefile.in +++ b/dlls/sti/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS +EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS TESTDLL = sti.dll IMPORTS = uuid ole32 diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 81d50ba..ca04185 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = wuapi.dll IMPORTS = uuid ole32 advapi32

1 0

Nikolay Sivov : xmllite: Support resuming and value reporting for whitespace nodes in Misc.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 619ceae967ed6520b6dea3edbb7f04c58d3545d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619ceae967ed6520b6dea3edb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 14 08:10:34 2013 +0400 xmllite: Support resuming and value reporting for whitespace nodes in Misc. --- dlls/xmllite/reader.c | 50 ++++++++++++++++++++++++++++++------------- dlls/xmllite/tests/reader.c | 9 +++++++ 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a216951..6d5c99b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -68,7 +68,8 @@ typedef enum XmlReadResumeState_CDATA, XmlReadResumeState_Comment, XmlReadResumeState_STag, - XmlReadResumeState_CharData + XmlReadResumeState_CharData, + XmlReadResumeState_Whitespace } XmlReaderResumeState; /* saved pointer index to resume from particular input position */ @@ -962,11 +963,11 @@ static inline BOOL is_wchar_space(WCHAR ch) static int reader_skipspaces(xmlreader *reader) { encoded_buffer *buffer = &reader->input->buffer->utf16; - const WCHAR *ptr = reader_get_ptr(reader), *start = ptr; + const WCHAR *ptr = reader_get_ptr(reader); + UINT start = reader_get_cur(reader); while (is_wchar_space(*ptr)) { - buffer->cur++; if (*ptr == '\r') reader->pos = 0; else if (*ptr == '\n') @@ -976,10 +977,12 @@ static int reader_skipspaces(xmlreader *reader) } else reader->pos++; - ptr++; + + buffer->cur++; + ptr = reader_get_ptr(reader); } - return ptr - start; + return reader_get_cur(reader) - start; } /* [26] VersionNum ::= '1.' [0-9]+ */ @@ -1488,19 +1491,34 @@ static HRESULT reader_parse_pi(xmlreader *reader) /* This one is used to parse significant whitespace nodes, like in Misc production */ static HRESULT reader_parse_whitespace(xmlreader *reader) { - WCHAR *start, *ptr; + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_Whitespace; + reader->resume[XmlReadResume_Body] = reader_get_cur(reader); + reader->nodetype = XmlNodeType_Whitespace; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + case XmlReadResumeState_Whitespace: + { + strval value; + UINT start; - reader_shrink(reader); - start = reader_get_ptr(reader); + reader_skipspaces(reader); + if (is_reader_pending(reader)) return S_OK; - reader_skipspaces(reader); - ptr = reader_get_ptr(reader); - TRACE("%s\n", debugstr_wn(start, ptr-start)); + start = reader->resume[XmlReadResume_Body]; + reader_init_strvalue(start, reader_get_cur(reader)-start, &value); + reader_set_strvalue(reader, StringValue_Value, &value); + TRACE("%s\n", debug_strval(reader, &value)); + reader->resumestate = XmlReadResumeState_Initial; + } + default: + ; + } - reader->nodetype = XmlNodeType_Whitespace; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } @@ -1522,6 +1540,8 @@ static HRESULT reader_parse_misc(xmlreader *reader) return reader_parse_pi(reader); case XmlReadResumeState_Comment: return reader_parse_comment(reader); + case XmlReadResumeState_Whitespace: + return reader_parse_whitespace(reader); default: ERR("unknown resume state %d\n", reader->resumestate); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 5c4f2a6..658bb10 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1000,6 +1000,15 @@ static void test_read_full(void) ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); if (test->types[i] == XmlNodeType_None) break; ok(type == test->types[i], "%d: got wrong type %d, expected %d\n", i, type, test->types[i]); + if (type == XmlNodeType_Whitespace) + { + const WCHAR *ptr; + UINT len = 0; + + hr = IXmlReader_GetValue(reader, &ptr, &len); + ok(hr == S_OK, "%d: GetValue failed 0x%08x\n", i, hr); + ok(len > 0, "%d: wrong value length %d\n", i, len); + } hr = IXmlReader_Read(reader, &type); i++; }

1 0

Nikolay Sivov : ntdll: Support pinning module refcount with LdrAddRefDll().
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 146ff49161fb35095ae9ac6f4c40281cd8f748f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=146ff49161fb35095ae9ac6f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 14 08:07:58 2013 +0400 ntdll: Support pinning module refcount with LdrAddRefDll(). --- dlls/ntdll/loader.c | 7 ++++- dlls/ntdll/tests/rtl.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b1c7600..3a28b41 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2124,13 +2124,16 @@ NTSTATUS WINAPI LdrAddRefDll( ULONG flags, HMODULE module ) NTSTATUS ret = STATUS_SUCCESS; WINE_MODREF *wm; - if (flags) FIXME( "%p flags %x not implemented\n", module, flags ); + if (flags & ~LDR_ADDREF_DLL_PIN) FIXME( "%p flags %x not implemented\n", module, flags ); RtlEnterCriticalSection( &loader_section ); if ((wm = get_modref( module ))) { - if (wm->ldr.LoadCount != -1) wm->ldr.LoadCount++; + if (flags & LDR_ADDREF_DLL_PIN) + wm->ldr.LoadCount = -1; + else + if (wm->ldr.LoadCount != -1) wm->ldr.LoadCount++; TRACE( "(%s) ldr.LoadCount: %d\n", debugstr_w(wm->ldr.BaseDllName.Buffer), wm->ldr.LoadCount ); } else ret = STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 38909a3..54e3db5 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -89,6 +89,7 @@ static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,US static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); +static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -133,6 +134,7 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); + pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1486,6 +1488,55 @@ static void test_RtlIpv4StringToAddress(void) } } +static void test_LdrAddRefDll(void) +{ + HMODULE mod, mod2; + NTSTATUS status; + BOOL ret; + + mod = LoadLibraryA("comctl32.dll"); + ok(mod != NULL, "got %p\n", mod); + ret = FreeLibrary(mod); + ok(ret, "got %d\n", ret); + + mod2 = GetModuleHandleA("comctl32.dll"); + ok(mod2 == NULL, "got %p\n", mod2); + + /* load, addref and release 2 times */ + mod = LoadLibraryA("comctl32.dll"); + ok(mod != NULL, "got %p\n", mod); + status = pLdrAddRefDll(0, mod); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ret = FreeLibrary(mod); + ok(ret, "got %d\n", ret); + + mod2 = GetModuleHandleA("comctl32.dll"); + ok(mod2 != NULL, "got %p\n", mod2); + ret = FreeLibrary(mod); + ok(ret, "got %d\n", ret); + + mod2 = GetModuleHandleA("comctl32.dll"); + ok(mod2 == NULL, "got %p\n", mod2); + + /* pin refcount */ + mod = LoadLibraryA("comctl32.dll"); + ok(mod != NULL, "got %p\n", mod); + status = pLdrAddRefDll(LDR_ADDREF_DLL_PIN, mod); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ret = FreeLibrary(mod); + ok(ret, "got %d\n", ret); + ret = FreeLibrary(mod); + ok(ret, "got %d\n", ret); + ret = FreeLibrary(mod); + ok(ret, "got %d\n", ret); + ret = FreeLibrary(mod); + ok(ret, "got %d\n", ret); + + mod2 = GetModuleHandleA("comctl32.dll"); + ok(mod2 != NULL, "got %p\n", mod2); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1510,4 +1561,5 @@ START_TEST(rtl) test_RtlIpv4AddressToString(); test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); + test_LdrAddRefDll(); } diff --git a/include/winternl.h b/include/winternl.h index c879450..d93b37a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1970,6 +1970,9 @@ typedef struct _LDR_MODULE #define LDR_DONT_RESOLVE_REFS 0x40000000 #define LDR_WINE_INTERNAL 0x80000000 +/* flag for LdrAddRefDll */ +#define LDR_ADDREF_DLL_PIN 0x00000001 + /* FIXME: to be checked */ #define MAXIMUM_FILENAME_LENGTH 256

1 0

Nikolay Sivov : msxml3: Handle parser failure when loading from url.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: abdf02526ee9e0e19527f05767237d11fabde005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdf02526ee9e0e19527f0576… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 12 22:11:41 2013 +0400 msxml3: Handle parser failure when loading from url. --- dlls/msxml3/bsc.c | 2 +- dlls/msxml3/domdoc.c | 16 +------------- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++------------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 580d509..c8683d5 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -174,7 +174,7 @@ static HRESULT WINAPI bsc_OnStopBinding( DWORD len = GlobalSize(hglobal); char *ptr = GlobalLock(hglobal); - This->hres = hr = This->onDataAvailable(This->obj, ptr, len); + This->hres = This->onDataAvailable(This->obj, ptr, len); GlobalUnlock(hglobal); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a96b5c7..26a2dad 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -129,7 +129,6 @@ struct domdoc VARIANT_BOOL validating; VARIANT_BOOL resolving; domdoc_properties* properties; - bsc_t *bsc; HRESULT error; /* IObjectWithSite*/ @@ -940,9 +939,6 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) { int eid; - if(This->bsc) - detach_bsc(This->bsc); - if (This->site) IUnknown_Release( This->site ); destroy_xmlnode(&This->node); @@ -2067,7 +2063,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return attach_xmldoc(This, xmldoc); } - return S_OK; + return E_FAIL; } static HRESULT domdoc_load_moniker(domdoc *This, IMoniker *mon) @@ -2079,14 +2075,7 @@ static HRESULT domdoc_load_moniker(domdoc *This, IMoniker *mon) if(FAILED(hr)) return hr; - if(This->bsc) { - hr = detach_bsc(This->bsc); - if(FAILED(hr)) - return hr; - } - - This->bsc = bsc; - return S_OK; + return detach_bsc(bsc); } static HRESULT WINAPI domdoc_load( @@ -3555,7 +3544,6 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->error = S_OK; doc->site = NULL; doc->safeopt = 0; - doc->bsc = NULL; doc->cp_list = NULL; doc->namespaces = NULL; memset(doc->events, 0, sizeof(doc->events)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 921cb16..914b9e7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -405,6 +405,8 @@ static const char win1252decl[] = DECL_WIN_1252 ; +static const char nocontent[] = "no xml content here"; + static const char szExampleXML[] = "<?xml version='1.0' encoding='utf-8'?>\n" "<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' a=\"attr a\" foo:b=\"attr b\" >\n" @@ -1125,10 +1127,9 @@ static void test_domdoc( void ) V_VT(&var) = VT_BSTR; V_BSTR(&var) = _bstr_(path); hr = IXMLDOMDocument_load(doc, var, &b); - todo_wine { EXPECT_HR(hr, class_ptr->ret[0].hr); ok(b == class_ptr->ret[0].b, "%d:%d, got %d, expected %d\n", index, i, b, class_ptr->ret[0].b); - } + DeleteFileA(path); b = 0xc; @@ -9512,28 +9513,33 @@ static void test_selection(void) free_bstrs(); } +static void write_to_file(const char *name, const char *data) +{ + DWORD written; + HANDLE hfile; + BOOL ret; + + hfile = CreateFileA(name, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file: %s\n", name); + + ret = WriteFile(hfile, data, strlen(data), &written, NULL); + ok(ret, "WriteFile failed: %s, %d\n", name, GetLastError()); + + CloseHandle(hfile); +} + static void test_load(void) { IXMLDOMDocument *doc; IXMLDOMNodeList *list; VARIANT_BOOL b; - HANDLE hfile; VARIANT src; HRESULT hr; - BOOL ret; BSTR path, bstr1, bstr2; - DWORD written; void* ptr; /* prepare a file */ - hfile = CreateFileA("test.xml", GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); - ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file\n"); - if(hfile == INVALID_HANDLE_VALUE) return; - - ret = WriteFile(hfile, win1252xml, strlen(win1252xml), &written, NULL); - ok(ret, "WriteFile failed\n"); - - CloseHandle(hfile); + write_to_file("test.xml", win1252xml); doc = create_document(&IID_IXMLDOMDocument); @@ -9567,9 +9573,20 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); - IXMLDOMDocument_Release(doc); + DeleteFileA("test.xml"); + + /* load from existing path, no xml content */ + write_to_file("test.xml", nocontent); + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = path; + b = VARIANT_TRUE; + hr = IXMLDOMDocument_load(doc, src, &b); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); DeleteFileA("test.xml"); + IXMLDOMDocument_Release(doc); doc = create_document(&IID_IXMLDOMDocument);

1 0

Marcus Meissner : d3drm: Added some freeing of memory in error paths ( Coverity).
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 8431e75af3e277d17130eb89f421d115e2624dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8431e75af3e277d17130eb89f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 13 11:13:32 2013 +0200 d3drm: Added some freeing of memory in error paths (Coverity). --- dlls/d3drm/frame.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index ea20d15..36baf2e 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -758,7 +758,10 @@ static HRESULT WINAPI d3drm_frame2_GetVisuals(IDirect3DRMFrame2 *iface, IDirect3 ULONG i; if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, frame->nb_visuals * sizeof(*array->visuals)))) + { + HeapFree(GetProcessHeap(), 0, array); return E_OUTOFMEMORY; + } for (i = 0; i < frame->nb_visuals; ++i) { array->visuals[i] = frame->visuals[i]; @@ -1506,7 +1509,10 @@ static HRESULT WINAPI d3drm_frame3_GetChildren(IDirect3DRMFrame3 *iface, IDirect ULONG i; if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame->nb_children * sizeof(*array->frames)))) + { + HeapFree(GetProcessHeap(), 0, array); return E_OUTOFMEMORY; + } for (i = 0; i < frame->nb_children; ++i) { IDirect3DRMFrame3_QueryInterface(frame->children[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]); @@ -1544,7 +1550,10 @@ static HRESULT WINAPI d3drm_frame3_GetLights(IDirect3DRMFrame3 *iface, IDirect3D ULONG i; if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, frame->nb_lights * sizeof(*array->lights)))) + { + HeapFree(GetProcessHeap(), 0, array); return E_OUTOFMEMORY; + } for (i = 0; i < frame->nb_lights; ++i) { IDirect3DRMLight_QueryInterface(frame->lights[i], &IID_IDirect3DRMLight, (void **)&array->lights[i]);

1 0

Andrew Cook : include: Add types for SetInformationJobObject.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 868890fb72d042d674b0da0a3e176e97273a8b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868890fb72d042d674b0da0a3… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sun Oct 13 18:48:13 2013 +1100 include: Add types for SetInformationJobObject. --- include/winbase.h | 1 + include/winnt.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index f20a619..8e51c0b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -674,6 +674,7 @@ typedef struct _TIME_ZONE_INFORMATION{ #define CREATE_SEPARATE_WOW_VDM 0x00000800 #define CREATE_SHARED_WOW_VDM 0x00001000 #define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 +#define CREATE_BREAKAWAY_FROM_JOB 0x01000000 #define CREATE_DEFAULT_ERROR_MODE 0x04000000 #define CREATE_NO_WINDOW 0x08000000 #define PROFILE_USER 0x10000000 diff --git a/include/winnt.h b/include/winnt.h index a2fcd43..293e05d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5392,6 +5392,96 @@ typedef enum _JOBOBJECTINFOCLASS MaxJobObjectInfoClass } JOBOBJECTINFOCLASS; +typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION { + LARGE_INTEGER TotalUserTime; + LARGE_INTEGER TotalKernelTime; + LARGE_INTEGER ThisPeriodTotalUserTime; + LARGE_INTEGER ThisPeriodTotalKernelTime; + DWORD TotalPageFaultCount; + DWORD TotalProcesses; + DWORD ActiveProcesses; + DWORD TotalTerminatedProcesses; +} JOBOBJECT_BASIC_ACCOUNTING_INFORMATION, *PJOBOBJECT_BASIC_ACCOUNTING_INFORMATION; + +typedef struct _JOBOBJECT_BASIC_LIMIT_INFORMATION { + LARGE_INTEGER PerProcessUserTimeLimit; + LARGE_INTEGER PerJobUserTimeLimit; + DWORD LimitFlags; + SIZE_T MinimumWorkingSetSize; + SIZE_T MaximumWorkingSetSize; + DWORD ActiveProcessLimit; + ULONG_PTR Affinity; + DWORD PriorityClass; + DWORD SchedulingClass; +} JOBOBJECT_BASIC_LIMIT_INFORMATION, *PJOBOBJECT_BASIC_LIMIT_INFORMATION; + +typedef struct _JOBOBJECT_BASIC_PROCESS_ID_LIST { + DWORD NumberOfAssignedProcesses; + DWORD NumberOfProcessIdsInList; + ULONG_PTR ProcessIdList[1]; +} JOBOBJECT_BASIC_PROCESS_ID_LIST, *PJOBOBJECT_BASIC_PROCESS_ID_LIST; + +typedef struct _JOBOBJECT_BASIC_UI_RESTRICTIONS { + DWORD UIRestrictionsClass; +} JOBOBJECT_BASIC_UI_RESTRICTIONS, *PJOBOBJECT_BASIC_UI_RESTRICTIONS; + +typedef struct _JOBOBJECT_SECURITY_LIMIT_INFORMATION { + DWORD SecurityLimitFlags; + HANDLE JobToken; + PTOKEN_GROUPS SidsToDisable; + PTOKEN_PRIVILEGES PrivilegesToDelete; + PTOKEN_GROUPS RestrictedSids; +} JOBOBJECT_SECURITY_LIMIT_INFORMATION, *PJOBOBJECT_SECURITY_LIMIT_INFORMATION; + +typedef struct _JOBOBJECT_END_OF_JOB_TIME_INFORMATION { + DWORD EndOfJobTimeAction; +} JOBOBJECT_END_OF_JOB_TIME_INFORMATION, PJOBOBJECT_END_OF_JOB_TIME_INFORMATION; + +typedef struct _JOBOBJECT_ASSOCIATE_COMPLETION_PORT { + PVOID CompletionKey; + HANDLE CompletionPort; +} JOBOBJECT_ASSOCIATE_COMPLETION_PORT, *PJOBOBJECT_ASSOCIATE_COMPLETION_PORT; + +#define JOB_OBJECT_MSG_END_OF_JOB_TIME 1 +#define JOB_OBJECT_MSG_END_OF_PROCESS_TIME 2 +#define JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT 3 +#define JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO 4 +#define JOB_OBJECT_MSG_NEW_PROCESS 6 +#define JOB_OBJECT_MSG_EXIT_PROCESS 7 +#define JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS 8 +#define JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT 9 +#define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT 10 + +typedef struct JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION { + JOBOBJECT_BASIC_ACCOUNTING_INFORMATION BasicInfo; + IO_COUNTERS IoInfo; +} JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION, *PJOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION; + +typedef struct _JOBOBJECT_EXTENDED_LIMIT_INFORMATION { + JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation; + IO_COUNTERS IoInfo; + SIZE_T ProcessMemoryLimit; + SIZE_T JobMemoryLimit; + SIZE_T PeakProcessMemoryUsed; + SIZE_T PeakJobMemoryUsed; +} JOBOBJECT_EXTENDED_LIMIT_INFORMATION, *PJOBOBJECT_EXTENDED_LIMIT_INFORMATION; + +#define JOB_OBJECT_LIMIT_WORKINGSET 0x00000001 +#define JOB_OBJECT_LIMIT_PROCESS_TIME 0x00000002 +#define JOB_OBJECT_LIMIT_JOB_TIME 0x00000004 +#define JOB_OBJECT_LIMIT_ACTIVE_PROCESS 0x00000008 +#define JOB_OBJECT_LIMIT_AFFINITY 0x00000010 +#define JOB_OBJECT_LIMIT_PRIORITY_CLASS 0x00000020 +#define JOB_OBJECT_LIMIT_PRESERVE_JOB_TIME 0x00000040 +#define JOB_OBJECT_LIMIT_SCHEDULING_CLASS 0x00000080 +#define JOB_OBJECT_LIMIT_PROCESS_MEMORY 0x00000100 +#define JOB_OBJECT_LIMIT_JOB_MEMORY 0x00000200 +#define JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION 0x00000400 +#define JOB_OBJECT_LIMIT_BREAKAWAY_OK 0x00000800 +#define JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK 0x00001000 +#define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x00002000 +#define JOB_OBJECT_LIMIT_SUBSET_AFFINITY 0x00004000 + typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { RelationProcessorCore = 0,

1 0

Alexandre Julliard : winex11: Add a helper function to return the primary monitor rectangle.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 0f03f264b772e8638d4f1311a2cbdfc515b7faa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f03f264b772e8638d4f1311a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 14:59:01 2013 +0200 winex11: Add a helper function to return the primary monitor rectangle. --- dlls/winex11.drv/desktop.c | 26 +++++++++++++++++++------- dlls/winex11.drv/init.c | 24 ++++++++++++++++-------- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/settings.c | 3 ++- dlls/winex11.drv/x11drv.h | 8 ++++---- dlls/winex11.drv/x11drv_main.c | 2 -- dlls/winex11.drv/xinerama.c | 11 +++++++---- 7 files changed, 49 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f03f264b772e8638d4f1…

1 0

Qian Hong : user32/tests: Try harder to set foreground window.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 6e32d18f9fa637ade98ef66f7ab7cd881a90c8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e32d18f9fa637ade98ef66f7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Oct 12 18:53:28 2013 +0800 user32/tests: Try harder to set foreground window. --- dlls/user32/tests/winstation.c | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d2238dd..9525902 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -758,6 +758,32 @@ static DWORD WINAPI create_window(LPVOID param) return 0; } +static DWORD set_foreground(HWND hwnd) +{ + HWND hwnd_fore; + DWORD set_id, fore_id, ret; + char win_text[1024]; + + hwnd_fore = GetForegroundWindow(); + GetWindowText(hwnd_fore, win_text, 1024); + set_id = GetWindowThreadProcessId(hwnd, NULL); + fore_id = GetWindowThreadProcessId(hwnd_fore, NULL); + trace("\"%s\" %p %08x hwnd %p %08x\n", win_text, hwnd_fore, fore_id, hwnd, set_id); + ret = AttachThreadInput(set_id, fore_id, TRUE); + trace("AttachThreadInput returned %08x\n", ret); + ret = ShowWindow(hwnd, SW_SHOWNORMAL); + trace("ShowWindow returned %08x\n", ret); + ret = SetWindowPos(hwnd, HWND_TOPMOST, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE); + trace("set topmost returned %08x\n", ret); + ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE); + trace("set notopmost returned %08x\n", ret); + ret = SetForegroundWindow(hwnd); + trace("SetForegroundWindow returned %08x\n", ret); + Sleep(250); + AttachThreadInput(set_id, fore_id, FALSE); + return ret; +} + static void test_foregroundwindow(void) { HWND hwnd, hwnd_test, partners[2], hwnds[2]; @@ -824,12 +850,11 @@ static void test_foregroundwindow(void) ok(ret, "set thread desktop failed!\n"); ret = SwitchDesktop(hdesks[input_desk_id]); ok(ret, "switch desktop failed!\n"); - SetForegroundWindow(partners[0]); - SetForegroundWindow(partners[1]); + set_foreground(partners[0]); + set_foreground(partners[1]); hwnd = GetForegroundWindow(); ok(hwnd != hwnd_test, "unexpected foreground window %p\n", hwnd); - ret = SetForegroundWindow(hwnd_test); - Sleep(250); + ret = set_foreground(hwnd_test); hwnd = GetForegroundWindow(); GetWindowText(hwnd, win_text, 1024); trace("hwnd %p name %s\n", hwnd, win_text);

1 0

Frédéric Delanoy : wined3d: Avoid initializing some variables.
by Alexandre Julliard Oct. 14, 2013

Oct. 14, 2013

Module: wine Branch: master Commit: 5c1ea9bff19d61f5a2eb2b28c26206bd6eee1ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1ea9bff19d61f5a2eb2b28c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 12 11:11:57 2013 +0200 wined3d: Avoid initializing some variables. --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c03953..15a0b5a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -819,8 +819,8 @@ static GLenum gl_stencil_op(enum wined3d_stencil_op op) static void state_stencil(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - DWORD onesided_enable = FALSE; - DWORD twosided_enable = FALSE; + DWORD onesided_enable; + DWORD twosided_enable; GLint func = GL_ALWAYS; GLint func_ccw = GL_ALWAYS; GLint ref = 0;

1 0