March 2015 - Wine-Commits - list.winehq.org

Sebastian Lackner : ntdll: Move all structs and definitions to the beginning in threadpool.c.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 41b24f216843653709964bdac19f084c0dcf5a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b24f216843653709964bdac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 11 03:24:59 2015 +0100 ntdll: Move all structs and definitions to the beginning in threadpool.c. --- dlls/ntdll/threadpool.c | 89 ++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 7f2ed65..513c13d 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -37,7 +37,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(threadpool); -#define WORKER_TIMEOUT 30000 /* 30 seconds */ +#define OLD_WORKER_TIMEOUT 30000 /* 30 seconds */ +#define EXPIRE_NEVER (~(ULONGLONG)0) +#define TIMER_QUEUE_MAGIC 0x516d6954 /* TimQ */ static RTL_CRITICAL_SECTION_DEBUG critsect_debug; static RTL_CRITICAL_SECTION_DEBUG critsect_compl_debug; @@ -87,6 +89,44 @@ struct work_item PVOID context; }; +struct wait_work_item +{ + HANDLE Object; + HANDLE CancelEvent; + WAITORTIMERCALLBACK Callback; + PVOID Context; + ULONG Milliseconds; + ULONG Flags; + HANDLE CompletionEvent; + LONG DeleteCount; + BOOLEAN CallbackInProgress; +}; + +struct timer_queue; +struct queue_timer +{ + struct timer_queue *q; + struct list entry; + ULONG runcount; /* number of callbacks pending execution */ + RTL_WAITORTIMERCALLBACKFUNC callback; + PVOID param; + DWORD period; + ULONG flags; + ULONGLONG expire; + BOOL destroy; /* timer should be deleted; once set, never unset */ + HANDLE event; /* removal event */ +}; + +struct timer_queue +{ + DWORD magic; + RTL_CRITICAL_SECTION cs; + struct list timers; /* sorted by expiration time */ + BOOL quit; /* queue should be deleted; once set, never unset */ + HANDLE event; + HANDLE thread; +}; + static inline LONG interlocked_inc( PLONG dest ) { return interlocked_xchg_add( dest, 1 ) + 1; @@ -102,7 +142,7 @@ static void WINAPI worker_thread_proc(void * param) struct list *item; struct work_item *work_item_ptr, work_item; LARGE_INTEGER timeout; - timeout.QuadPart = -(WORKER_TIMEOUT * (ULONGLONG)10000); + timeout.QuadPart = -(OLD_WORKER_TIMEOUT * (ULONGLONG)10000); RtlEnterCriticalSection( &old_threadpool.threadpool_cs ); old_threadpool.num_workers++; @@ -311,19 +351,6 @@ static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout return pTime; } -struct wait_work_item -{ - HANDLE Object; - HANDLE CancelEvent; - WAITORTIMERCALLBACK Callback; - PVOID Context; - ULONG Milliseconds; - ULONG Flags; - HANDLE CompletionEvent; - LONG DeleteCount; - BOOLEAN CallbackInProgress; -}; - static void delete_wait_work_item(struct wait_work_item *wait_work_item) { NtClose( wait_work_item->CancelEvent ); @@ -526,34 +553,6 @@ NTSTATUS WINAPI RtlDeregisterWait(HANDLE WaitHandle) /************************** Timer Queue Impl **************************/ -struct timer_queue; -struct queue_timer -{ - struct timer_queue *q; - struct list entry; - ULONG runcount; /* number of callbacks pending execution */ - RTL_WAITORTIMERCALLBACKFUNC callback; - PVOID param; - DWORD period; - ULONG flags; - ULONGLONG expire; - BOOL destroy; /* timer should be deleted; once set, never unset */ - HANDLE event; /* removal event */ -}; - -struct timer_queue -{ - DWORD magic; - RTL_CRITICAL_SECTION cs; - struct list timers; /* sorted by expiration time */ - BOOL quit; /* queue should be deleted; once set, never unset */ - HANDLE event; - HANDLE thread; -}; - -#define EXPIRE_NEVER (~(ULONGLONG) 0) -#define TIMER_QUEUE_MAGIC 0x516d6954 /* TimQ */ - static void queue_remove_timer(struct queue_timer *t) { /* We MUST hold the queue cs while calling this function. This ensures @@ -861,10 +860,10 @@ NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) return status; } -static struct timer_queue *default_timer_queue; - static struct timer_queue *get_timer_queue(HANDLE TimerQueue) { + static struct timer_queue *default_timer_queue; + if (TimerQueue) return TimerQueue; else

1 0

Francois Gouget : oledb32/tests: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: f597fe8f4f3d78d829a61446b5a9a29f9f804ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f597fe8f4f3d78d829a61446b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:37 2015 +0100 oledb32/tests: Remove unneeded NONAMELESSXXX directives. --- dlls/oledb32/tests/database.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index a46725c..b4ce139 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -21,8 +21,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Nikolay Sivov : dwrite: Initially format and layout don' t have a fallback set.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 947f8e64d5570edfd9d73f7de891583816391bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947f8e64d5570edfd9d73f7de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 00:43:20 2015 +0300 dwrite: Initially format and layout don't have a fallback set. --- dlls/dwrite/layout.c | 21 +++++++++++++++++---- dlls/dwrite/tests/layout.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 24fb580..32c248b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -57,6 +57,7 @@ struct dwrite_textformat_data { IDWriteInlineObject *trimmingsign; IDWriteFontCollection *collection; + IDWriteFontFallback *fallback; }; enum layout_range_attr_kind { @@ -173,6 +174,7 @@ static const IDWriteTextFormat1Vtbl dwritetextformatvtbl; static void release_format_data(struct dwrite_textformat_data *data) { if (data->collection) IDWriteFontCollection_Release(data->collection); + if (data->fallback) IDWriteFontFallback_Release(data->fallback); if (data->trimmingsign) IDWriteInlineObject_Release(data->trimmingsign); heap_free(data->family_name); heap_free(data->locale); @@ -219,6 +221,14 @@ static inline const char *debugstr_run(const struct layout_run *run) run->descr.stringLength); } +static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) +{ + *fallback = format->fallback; + if (*fallback) + IDWriteFontFallback_AddRef(*fallback); + return S_OK; +} + static struct layout_run *alloc_layout_run(void) { struct layout_run *ret; @@ -1877,8 +1887,8 @@ static HRESULT WINAPI dwritetextlayout2_SetFontFallback(IDWriteTextLayout2 *ifac static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback **fallback) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return get_fontfallback_from_format(&This->format, fallback); } static const IDWriteTextLayout2Vtbl dwritetextlayoutvtbl = { @@ -2194,6 +2204,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); layout->format.readingdir = IDWriteTextFormat_GetReadingDirection(format); layout->format.flow = IDWriteTextFormat_GetFlowDirection(format); + layout->format.fallback = NULL; hr = IDWriteTextFormat_GetLineSpacing(format, &layout->format.spacingmethod, &layout->format.spacing, &layout->format.baseline); if (FAILED(hr)) @@ -2228,6 +2239,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); if (hr == S_OK) { layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + IDWriteTextFormat1_GetFontFallback(format1, &layout->format.fallback); IDWriteTextFormat1_Release(format1); } else @@ -2745,8 +2757,8 @@ static HRESULT WINAPI dwritetextformat1_SetFontFallback(IDWriteTextFormat1 *ifac static HRESULT WINAPI dwritetextformat1_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return get_fontfallback_from_format(&This->format, fallback); } static const IDWriteTextFormat1Vtbl dwritetextformatvtbl = { @@ -2822,6 +2834,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimming.delimiterCount = 0; This->format.trimmingsign = NULL; This->format.collection = collection; + This->format.fallback = NULL; IDWriteFontCollection_AddRef(collection); *format = (IDWriteTextFormat*)&This->IDWriteTextFormat1_iface; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a0de75e..663605e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1122,6 +1122,42 @@ static void test_SetVerticalGlyphOrientation(void) IDWriteTextLayout2_Release(layout2); } +static void test_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteFontFallback *fallback; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("GetFontFallback() is not supported.\n"); + return; + } + +if (0) /* crashes on native */ + hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + IDWriteTextLayout2_Release(layout2); +} + START_TEST(layout) { HRESULT hr; @@ -1150,6 +1186,7 @@ START_TEST(layout) test_SetLocaleName(); test_SetPairKerning(); test_SetVerticalGlyphOrientation(); + test_fallback(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/tests: Use separate factory for each test in layout tests.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: bd3069c0c1a1c601f5cd5352c19bfd7d86de7d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3069c0c1a1c601f5cd5352c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 01:00:48 2015 +0300 dwrite/tests: Use separate factory for each test in layout tests. --- dlls/dwrite/tests/layout.c | 77 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd3069c0c1a1c601f5cd5…

1 0

Sebastian Lackner : kernel32: Fix file handle leak in exec_process ( Coverity).
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: d48e3a0bead8d5bcc0ea348f392e5dbca60320e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48e3a0bead8d5bcc0ea348f3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 17 06:23:57 2015 +0100 kernel32: Fix file handle leak in exec_process (Coverity). --- dlls/kernel32/process.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b371e73..199b2f3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2493,7 +2493,12 @@ static void exec_process( LPCWSTR name ) /* Determine executable type */ - if (binary_info.flags & BINARY_FLAG_DLL) return; + if (binary_info.flags & BINARY_FLAG_DLL) + { + CloseHandle( hFile ); + return; + } + switch (binary_info.type) { case BINARY_PE:

1 0

Nikolay Sivov : dwrite: Implement SetFontFallback().
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: fa1fe44c342e1912d54b3cc02281877915735ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa1fe44c342e1912d54b3cc02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 03:52:35 2015 +0300 dwrite: Implement SetFontFallback(). --- dlls/dwrite/layout.c | 26 ++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8e8bc9d..7326aa3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -235,6 +235,16 @@ static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data return S_OK; } +static HRESULT set_fontfallback_for_format(struct dwrite_textformat_data *format, IDWriteFontFallback *fallback) +{ + if (format->fallback) + IDWriteFontFallback_Release(format->fallback); + format->fallback = fallback; + if (fallback) + IDWriteFontFallback_AddRef(fallback); + return S_OK; +} + static struct layout_run *alloc_layout_run(void) { struct layout_run *ret; @@ -1867,8 +1877,8 @@ static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextlayout2_GetOpticalAlignment(IDW static HRESULT WINAPI dwritetextlayout2_SetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback *fallback) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return set_fontfallback_for_format(&This->format, fallback); } static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback **fallback) @@ -2228,15 +2238,15 @@ static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_layout_GetOpticalAlignm static HRESULT WINAPI dwritetextformat1_layout_SetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback *fallback) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return IDWriteTextLayout2_SetFontFallback(&This->IDWriteTextLayout2_iface, fallback); } static HRESULT WINAPI dwritetextformat1_layout_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - TRACE("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return IDWriteTextLayout2_GetFontFallback(&This->IDWriteTextLayout2_iface, fallback); } static const IDWriteTextFormat1Vtbl dwritetextformat1_layout_vtbl = { @@ -3055,8 +3065,8 @@ static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_GetOpticalAlignment(IDW static HRESULT WINAPI dwritetextformat1_SetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback *fallback) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return set_fontfallback_for_format(&This->format, fallback); } static HRESULT WINAPI dwritetextformat1_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b06c6bc..5b15c37 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1204,10 +1204,12 @@ static void test_SetVerticalGlyphOrientation(void) static void test_fallback(void) { static const WCHAR strW[] = {'a','b','c','d',0}; - IDWriteFontFallback *fallback; + IDWriteFontFallback *fallback, *fallback2; IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; IDWriteTextFormat *format; IDWriteTextLayout *layout; + IDWriteFactory2 *factory2; IDWriteFactory *factory; HRESULT hr; @@ -1238,6 +1240,43 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(fallback == NULL, "got %p\n", fallback); + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = NULL; + hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + ok(fallback != NULL, "got %p\n", fallback); + + hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == fallback, "got %p\n", fallback2); + + hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == NULL, "got %p\n", fallback2); + + IDWriteFontFallback_Release(fallback); +} + IDWriteTextFormat1_Release(format1); IDWriteTextLayout2_Release(layout2); IDWriteFactory_Release(factory); }

1 0

Mark Jansen : kernel32/tests: Parameter validation tests for FindActCtxSectionString.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: f091ff5851d2d1e2a9088c59eabba7b17152c5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f091ff5851d2d1e2a9088c59e… Author: Mark Jansen <learn0more(a)gmail.com> Date: Sun Mar 15 23:39:09 2015 +0100 kernel32/tests: Parameter validation tests for FindActCtxSectionString. --- dlls/kernel32/tests/actctx.c | 150 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 60763b1..887c6b0 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include <winbase.h> #include <windef.h> @@ -39,6 +41,10 @@ static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); +static NTSTATUS(NTAPI *pRtlFindActivationContextSectionString)(DWORD,const GUID *,ULONG,PUNICODE_STRING,PACTCTX_SECTION_KEYED_DATA); +static BOOLEAN (NTAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, PCSZ); +static VOID (NTAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); + static const char* strw(LPCWSTR x) { static char buffer[1024]; @@ -2048,6 +2054,140 @@ static void test_app_manifest(void) } } +static HANDLE create_manifest(const char *filename, const char *data, int line) +{ + HANDLE handle; + create_manifest_file(filename, data, -1, NULL, NULL); + + handle = test_create(filename); + ok_(__FILE__, line)(handle != INVALID_HANDLE_VALUE, + "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); + + DeleteFileA(filename); + return handle; +} + +static void kernel32_find(ULONG section, const char *string_to_find, BOOL should_find, BOOL todo, int line) +{ + UNICODE_STRING string_to_findW; + ACTCTX_SECTION_KEYED_DATA data; + BOOL ret; + DWORD err; + + pRtlCreateUnicodeStringFromAsciiz(&string_to_findW, string_to_find); + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + SetLastError(0); + ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, &data); + err = GetLastError(); + ok_(__FILE__, line)(ret == should_find, + "FindActCtxSectionStringA: expected ret = %u, got %u\n", should_find, ret); + if (todo) + todo_wine + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringA: unexpected error %u\n", err); + else + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringA: unexpected error %u\n", err); + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + SetLastError(0); + ret = pFindActCtxSectionStringW(0, NULL, section, string_to_findW.Buffer, &data); + err = GetLastError(); + ok_(__FILE__, line)(ret == should_find, + "FindActCtxSectionStringW: expected ret = %u, got %u\n", should_find, ret); + if (todo) + todo_wine + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringW: unexpected error %u\n", err); + else + ok_(__FILE__, line)(err == (should_find ? ERROR_SUCCESS : ERROR_SXS_KEY_NOT_FOUND), + "FindActCtxSectionStringW: unexpected error %u\n", err); + + SetLastError(0); + ret = pFindActCtxSectionStringA(0, NULL, section, string_to_find, NULL); + err = GetLastError(); + ok_(__FILE__, line)(!ret, + "FindActCtxSectionStringA: expected failure, got %u\n", ret); + ok_(__FILE__, line)(err == ERROR_INVALID_PARAMETER, + "FindActCtxSectionStringA: unexpected error %u\n", err); + + SetLastError(0); + ret = pFindActCtxSectionStringW(0, NULL, section, string_to_findW.Buffer, NULL); + err = GetLastError(); + ok_(__FILE__, line)(!ret, + "FindActCtxSectionStringW: expected failure, got %u\n", ret); + ok_(__FILE__, line)(err == ERROR_INVALID_PARAMETER, + "FindActCtxSectionStringW: unexpected error %u\n", err); + + pRtlFreeUnicodeString(&string_to_findW); +} + +static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_find, BOOL todo, int line) +{ + UNICODE_STRING string_to_findW; + ACTCTX_SECTION_KEYED_DATA data; + NTSTATUS ret; + + pRtlCreateUnicodeStringFromAsciiz(&string_to_findW, string_to_find); + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, &data); + if (todo) + todo_wine + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + else + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + + ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL); + todo_wine + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + + pRtlFreeUnicodeString(&string_to_findW); +} + +static void test_findsectionstring(void) +{ + HANDLE handle; + BOOL ret; + ULONG_PTR cookie; + + handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); + ret = pActivateActCtx(handle, &cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + + /* first we show the parameter validation from kernel32 */ + kernel32_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, TRUE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, FALSE, __LINE__); + kernel32_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, FALSE, __LINE__); + + /* then we show that ntdll plays by different rules */ + ntdll_find(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION, "testdep", FALSE, TRUE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib.dll", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib2.dll", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "testlib3.dll", FALSE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass2", TRUE, FALSE, __LINE__); + ntdll_find(ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, "wndClass3", FALSE, FALSE, __LINE__); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + pReleaseActCtx(handle); +} + static void run_child_process(void) { char cmdline[MAX_PATH]; @@ -2263,9 +2403,9 @@ todo_wine static BOOL init_funcs(void) { - HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hLibrary = GetModuleHandleA("kernel32.dll"); -#define X(f) if (!(p##f = (void*)GetProcAddress(hKernel32, #f))) return FALSE; +#define X(f) if (!(p##f = (void*)GetProcAddress(hLibrary, #f))) return FALSE; X(ActivateActCtx); X(CreateActCtxA); X(CreateActCtxW); @@ -2277,6 +2417,11 @@ static BOOL init_funcs(void) X(QueryActCtxW); X(ReleaseActCtx); X(FindActCtxSectionGuid); + + hLibrary = GetModuleHandleA("ntdll.dll"); + X(RtlFindActivationContextSectionString); + X(RtlCreateUnicodeStringFromAsciiz); + X(RtlFreeUnicodeString); #undef X return TRUE; @@ -2303,5 +2448,6 @@ START_TEST(actctx) test_actctx(); test_CreateActCtx(); + test_findsectionstring(); run_child_process(); }

1 0

Francois Gouget : oleaut32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 4d65584f8a593d34456868bb63722e646df3526a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d65584f8a593d34456868bb6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:17 2015 +0100 oleaut32: Remove unneeded NONAMELESSXXX directives. --- dlls/oleaut32/olepicture.c | 1 - dlls/oleaut32/olepropframe.c | 1 - dlls/oleaut32/recinfo.c | 1 - dlls/oleaut32/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 1 - dlls/oleaut32/usrmarshal.c | 1 - dlls/oleaut32/varformat.c | 2 -- dlls/oleaut32/variant.h | 3 +-- 8 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index dfaf6f4..5d0d801 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -48,7 +48,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 9a563f1..b89d3a6 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index be61fd5..f60fb8a 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -20,7 +20,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 89dc894..7bf62b7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -33,7 +33,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c6c539e..54dbc05 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -58,7 +58,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 108f819..3187ca2 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 27bedce..5d220fa 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -32,8 +32,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wine/unicode.h" diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 1e75bd8..e5d9a56 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -17,8 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winerror.h" #include "objbase.h"

1 0

Francois Gouget : ws2_32: Add more WSA_FLAG_XXX values.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 7bf46e46c518642d5219d9eabbb6b43ca21a4695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf46e46c518642d5219d9eab… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 17:45:36 2015 +0100 ws2_32: Add more WSA_FLAG_XXX values. --- include/winsock2.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index 04f3aea..fa3d26b 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -184,11 +184,14 @@ extern "C" { #endif /* USE_WS_PREFIX */ /* Constants for WSAIoctl() */ -#define WSA_FLAG_OVERLAPPED 0x01 -#define WSA_FLAG_MULTIPOINT_C_ROOT 0x02 -#define WSA_FLAG_MULTIPOINT_C_LEAF 0x04 -#define WSA_FLAG_MULTIPOINT_D_ROOT 0x08 -#define WSA_FLAG_MULTIPOINT_D_LEAF 0x10 +#define WSA_FLAG_OVERLAPPED 0x0001 +#define WSA_FLAG_MULTIPOINT_C_ROOT 0x0002 +#define WSA_FLAG_MULTIPOINT_C_LEAF 0x0004 +#define WSA_FLAG_MULTIPOINT_D_ROOT 0x0008 +#define WSA_FLAG_MULTIPOINT_D_LEAF 0x0010 +#define WSA_FLAG_ACCESS_SYSTEM_SECURITY 0x0040 +#define WSA_FLAG_NO_HANDLE_INHERIT 0x0080 +#define WSA_FLAG_REGISTERED_IO 0x0100 /* Constants for WSAJoinLeaf() */ #define JL_SENDER_ONLY 0x01

1 0

Francois Gouget : devenum: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 8c3170d7f47c4a5e8f7161c827b5f545e445de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3170d7f47c4a5e8f7161c82… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 18:59:09 2015 +0100 devenum: Mark internal symbols with hidden visibility. --- dlls/devenum/devenum_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 4f14423..347aebb 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -82,8 +82,8 @@ HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR /********************************************************************** * Global string constant declarations */ -extern const WCHAR clsid_keyname[6]; -extern const WCHAR wszInstanceKeyName[]; +extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; +extern const WCHAR wszInstanceKeyName[] DECLSPEC_HIDDEN; #define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR)) /**********************************************************************

1 0